Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backup Restore: clarify password (#22411)

Browse source
This commit is contained in:
Michael Geers 2025-07-17 12:39:21 +02:00 • committed by GitHub
parent 8c87582a57
commit a2975d824a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
server/http_site_handler.go
View file

@ -354,6 +354,11 @@ func logHandler(w http.ResponseWriter, r *http.Request) {
jsonResult(w, log)
}
// adminPasswordValid validates the admin password and returns true if valid
func adminPasswordValid(authObject auth.Auth, password string) bool {
return authObject.GetAuthMode() == auth.Disabled || authObject.IsAdminPasswordValid(password)
}
func getBackup(authObject auth.Auth) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req loginRequest
@ -362,7 +367,7 @@ func getBackup(authObject auth.Auth) http.HandlerFunc {
return
}
if authObject.GetAuthMode() == auth.Enabled && !authObject.IsAdminPasswordValid(req.Password) {
if !adminPasswordValid(authObject, req.Password) {
http.Error(w, "Invalid password", http.StatusUnauthorized)
return
}
@ -422,7 +427,7 @@ func restoreDatabase(authObject auth.Auth, shutdown func()) http.HandlerFunc {
return
}
if authObject.GetAuthMode() == auth.Enabled && !authObject.IsAdminPasswordValid(r.FormValue("password")) {
if !adminPasswordValid(authObject, r.FormValue("password")) {
http.Error(w, "Invalid password", http.StatusUnauthorized)
return
}
@ -479,7 +484,7 @@ func resetDatabase(authObject auth.Auth, shutdown func()) http.HandlerFunc {
return
}
if authObject.GetAuthMode() == auth.Enabled && !authObject.IsAdminPasswordValid(req.Password) {
if !adminPasswordValid(authObject, req.Password) {
http.Error(w, "Invalid password", http.StatusUnauthorized)
return
}