extern/glance
1
0
Fork 0
mirror of https://github.com/glanceapp/glance.git synced 2025-08-18 11:59:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support passwordless Pi-hole 6+

Browse Source 
This commit support Pi-hole v6+ instances where no password is set. In
this case, the session id endpoint should not be called since it returns
'no password set'.
This commit is contained in:
David Davis
2025-08-02 07:19:32 -04:00
parent 9720ebe9b1
commit 160a724fdc
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configuration.md
View File

@@ -2359,7 +2359,7 @@ Only required when using AdGuard Home. The username used to log into the admin d
##### `password` ##### `password`
Required when using AdGuard Home, where the password is the one used to log into the admin dashboard. Required when using AdGuard Home, where the password is the one used to log into the admin dashboard.
Also required when using Pi-hole major version 6 and above, where the password is the one used to log into the admin dashboard or the application password, which can be found in `Settings -> Web Interface / API -> Configure app password`. For Pi-hole version 6+, this field is required if you have set a password to log into Pi-hole. You can either use the password you use to log into the admin dashboard or the application password, which can be found in `Settings -> Web Interface / API -> Configure app password`.
##### `token` ##### `token`
Required when using Pi-hole major version 5 or earlier. The API token which can be found in `Settings -> API -> Show API token`. Required when using Pi-hole major version 5 or earlier. The API token which can be found in `Settings -> API -> Show API token`.

32
internal/glance/widget-dns-stats.go
View File

@@ -429,22 +429,24 @@ func fetchPiholeStats(
return nil return nil
} }
if sessionID == "" { if password != "" {
if err := fetchNewSessionID(); err != nil { if sessionID == "" {
slog.Error("Failed to fetch Pihole v6 session ID", "error", err)
return nil, "", fmt.Errorf("fetching session ID: %v", err)
}
} else {
isValid, err := checkPiholeSessionIDIsValid(instanceURL, client, sessionID)
if err != nil {
slog.Error("Failed to check Pihole v6 session ID validity", "error", err)
return nil, "", fmt.Errorf("checking session ID: %v", err)
}
if !isValid {
if err := fetchNewSessionID(); err != nil { if err := fetchNewSessionID(); err != nil {
slog.Error("Failed to renew Pihole v6 session ID", "error", err) slog.Error("Failed to fetch Pihole v6 session ID", "error", err)
return nil, "", fmt.Errorf("renewing session ID: %v", err) return nil, "", fmt.Errorf("fetching session ID: %v", err)
}
} else {
isValid, err := checkPiholeSessionIDIsValid(instanceURL, client, sessionID)
if err != nil {
slog.Error("Failed to check Pihole v6 session ID validity", "error", err)
return nil, "", fmt.Errorf("checking session ID: %v", err)
}
if !isValid {
if err := fetchNewSessionID(); err != nil {
slog.Error("Failed to renew Pihole v6 session ID", "error", err)
return nil, "", fmt.Errorf("renewing session ID: %v", err)
}
} }
} }
} }