Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-01 13:09:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhancement: support pihole v6 with api auth disabled (#3995)

Browse Source
This commit is contained in:
shamoon 2024-09-14 23:32:56 -07:00 committed by GitHub
parent 85736c55c9
commit 587027df37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/widgets/services/pihole.md
View File

@ -5,8 +5,6 @@ description: PiHole Widget Configuration
Learn more about [PiHole](https://github.com/pi-hole/pi-hole). Learn more about [PiHole](https://github.com/pi-hole/pi-hole).
As of v2022.12 [PiHole requires the use of an API key](https://pi-hole.net/blog/2022/11/17/upcoming-changes-authentication-for-more-api-endpoints-required/#page-content) if an admin password is set. Older versions do not require any authentication even if the admin uses a password.
Allowed fields: `["queries", "blocked", "blocked_percent", "gravity"]`. Allowed fields: `["queries", "blocked", "blocked_percent", "gravity"]`.
Note: by default the "blocked" and "blocked_percent" fields are merged e.g. "1,234 (15%)" but explicitly including the "blocked_percent" field will change them to display separately. Note: by default the "blocked" and "blocked_percent" fields are merged e.g. "1,234 (15%)" but explicitly including the "blocked_percent" field will change them to display separately.
@ -18,5 +16,3 @@ widget:
version: 6 # required if running v6 or higher, defaults to 5 version: 6 # required if running v6 or higher, defaults to 5
key: yourpiholeapikey # optional key: yourpiholeapikey # optional
``` ```
_Added in v0.1.0, updated in v0.8.9_

18
src/widgets/pihole/proxy.js
View File

@ -57,23 +57,27 @@ export default async function piholeProxyHandler(req, res) {
} }
// pihole v6 // pihole v6
if (!cache.get(`${sessionSIDCacheKey}.${service}`)) { if (!cache.get(`${sessionSIDCacheKey}.${service}`) && widget.key) {
await login(widget, service); await login(widget, service);
} }
const sid = cache.get(`${sessionSIDCacheKey}.${service}`); const sid = cache.get(`${sessionSIDCacheKey}.${service}`);
if (!sid) { if (widget.key && !sid) {
return res.status(500).json({ error: "Failed to authenticate with Pi-hole" }); return res.status(500).json({ error: "Failed to authenticate with Pi-hole" });
} }
try { try {
logger.debug("Calling Pi-hole API endpoint: %s", endpoint); logger.debug("Calling Pi-hole API endpoint: %s", endpoint);
const headers = {
"Content-Type": "application/json",
};
if (sid) {
headers["X-FTL-SID"] = sid;
} else {
logger.debug("Pi-hole request is unauthenticated");
}
[status, , data] = await httpProxy(formatApiCall(widgets[widget.type].api, { ...widget, endpoint }), { [status, , data] = await httpProxy(formatApiCall(widgets[widget.type].api, { ...widget, endpoint }), {
headers: { headers,
"Content-Type": "application/json",
"X-FTL-SID": sid,
},
}); });
if (status !== 200) { if (status !== 200) {