dominik/homepage-plus
1
0
Fork 0
mirror of https://github.com/DI0IK/homepage-plus.git synced 2025-07-10 15:28:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cleanup data validation

Browse source
This commit is contained in:
shamoon 2023-04-11 11:05:30 -07:00
parent 8476b97f7d
commit a83d105764
3 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/utils/proxy/handlers/credentialed.js
View file

@ -67,6 +67,10 @@ export default async function credentialedProxyHandler(req, res, map) {
let resultData = data;
if (resultData.error?.url) {
resultData.error.url = sanitizeErrorURL(url);
}
if (status === 204 || status === 304) {
return res.status(status).end();
}
@ -74,16 +78,12 @@ export default async function credentialedProxyHandler(req, res, map) {
if (status >= 400) {
logger.error("HTTP Error %d calling %s", status, url.toString());
}
if (!validateWidgetData(widget, endpoint, data)) {
if (data.error && data.error.url) {
data.error.url = sanitizeErrorURL(url);
if (status === 200) {
if (!validateWidgetData(widget, endpoint, resultData)) {
return res.status(500).json({error: {message: "Invalid data", url: sanitizeErrorURL(url), data: resultData}});
}
return res.status(500).json({error: {message: "Invalid data", url: sanitizeErrorURL(url), data}});
}
if (status === 200 && map) {
resultData = map(data);
if (map) resultData = map(resultData);
}
if (contentType) res.setHeader("Content-Type", contentType);

18
src/utils/proxy/handlers/generic.js
View file

@ -39,15 +39,15 @@ export default async function genericProxyHandler(req, res, map) {
let resultData = data;
if (!validateWidgetData(widget, endpoint, resultData)) {
if (resultData.error && resultData.error.url) {
resultData.error.url = sanitizeErrorURL(url);
}
return res.status(status).json({error: {message: "Invalid data", url: sanitizeErrorURL(url), data: resultData}});
if (resultData.error?.url) {
resultData.error.url = sanitizeErrorURL(url);
}
if (status === 200 && map) {
resultData = map(data);
if (status === 200) {
if (!validateWidgetData(widget, endpoint, resultData)) {
return res.status(status).json({error: {message: "Invalid data", url: sanitizeErrorURL(url), data: resultData}});
}
if (map) resultData = map(resultData);
}
if (contentType) res.setHeader("Content-Type", contentType);
@ -58,7 +58,7 @@ export default async function genericProxyHandler(req, res, map) {
if (status >= 400) {
logger.debug("HTTP Error %d calling %s//%s%s...", status, url.protocol, url.hostname, url.pathname);
return res.status(status).json({error: {message: "HTTP Error", url: sanitizeErrorURL(url), data}});
return res.status(status).json({error: {message: "HTTP Error", url: sanitizeErrorURL(url), resultData}});
}
return res.status(status).send(resultData);