Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-04-29 12:03:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Security: Sanitize widget api keys from response

Browse Source 
Closes https://github.com/gethomepage/homepage/security/advisories/GHSA-cjgf-vhj6-8cx4
This commit is contained in:
shamoon 2024-06-05 19:38:26 -07:00
parent 36e77e1fe3
commit f0d7cf3ce6
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/api/widgets/openweathermap.js
View File

@ -1,9 +1,11 @@
import cachedFetch from "utils/proxy/cached-fetch"; import cachedFetch from "utils/proxy/cached-fetch";
import { getSettings } from "utils/config/config"; import { getSettings } from "utils/config/config";
import { getPrivateWidgetOptions } from "utils/config/widget-helpers";
export default async function handler(req, res) { export default async function handler(req, res) {
const { latitude, longitude, units, provider, cache, lang } = req.query; const { latitude, longitude, units, provider, cache, lang, index } = req.query;
let { apiKey } = req.query; const privateWidgetOptions = await getPrivateWidgetOptions("openweathermap", index);
let { apiKey } = privateWidgetOptions;
if (!apiKey && !provider) { if (!apiKey && !provider) {
return res.status(400).json({ error: "Missing API key or provider" }); return res.status(400).json({ error: "Missing API key or provider" });

6
src/pages/api/widgets/weather.js
View File

@ -1,9 +1,11 @@
import cachedFetch from "utils/proxy/cached-fetch"; import cachedFetch from "utils/proxy/cached-fetch";
import { getSettings } from "utils/config/config"; import { getSettings } from "utils/config/config";
import { getPrivateWidgetOptions } from "utils/config/widget-helpers";
export default async function handler(req, res) { export default async function handler(req, res) {
const { latitude, longitude, provider, cache, lang } = req.query; const { latitude, longitude, provider, cache, lang, index } = req.query;
let { apiKey } = req.query; const privateWidgetOptions = await getPrivateWidgetOptions("weatherapi", index);
let { apiKey } = privateWidgetOptions;
if (!apiKey && !provider) { if (!apiKey && !provider) {
return res.status(400).json({ error: "Missing API key or provider" }); return res.status(400).json({ error: "Missing API key or provider" });

5
src/utils/config/widget-helpers.js
View File

@ -32,7 +32,7 @@ export async function cleanWidgetGroups(widgets) {
const optionKeys = Object.keys(sanitizedOptions); const optionKeys = Object.keys(sanitizedOptions);
// delete private options from the sanitized options // delete private options from the sanitized options
["username", "password", "key"].forEach((pO) => { ["username", "password", "key", "apiKey"].forEach((pO) => {
if (optionKeys.includes(pO)) { if (optionKeys.includes(pO)) {
delete sanitizedOptions[pO]; delete sanitizedOptions[pO];
} }
@ -57,7 +57,7 @@ export async function getPrivateWidgetOptions(type, widgetIndex) {
const widgets = await widgetsFromConfig(); const widgets = await widgetsFromConfig();
const privateOptions = widgets.map((widget) => { const privateOptions = widgets.map((widget) => {
const { index, url, username, password, key } = widget.options; const { index, url, username, password, key, apiKey } = widget.options;
return { return {
type: widget.type, type: widget.type,
@ -67,6 +67,7 @@ export async function getPrivateWidgetOptions(type, widgetIndex) {
username, username,
password, password,
key, key,
apiKey,
}, },
}; };
}); });