Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-11-10 01:20:58 +01:00
Code Issues Projects Releases Wiki Activity

fix: guard every error statement with early return (#2810)

Browse Source
This commit is contained in:
Elyas Asmad 2025-10-22 19:48:07 +08:00 committed by GitHub
parent 8becb7e54a
commit 2c9e98d3f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hscontrol/app.go
View File

@ -380,7 +380,6 @@ func (h *Headscale) httpAuthenticationMiddleware(next http.Handler) http.Handler
writer http.ResponseWriter, writer http.ResponseWriter,
req *http.Request, req *http.Request,
) { ) {
if err := func() error {
log.Trace(). log.Trace().
Caller(). Caller().
Str("client_address", req.RemoteAddr). Str("client_address", req.RemoteAddr).
@ -388,14 +387,20 @@ func (h *Headscale) httpAuthenticationMiddleware(next http.Handler) http.Handler
authHeader := req.Header.Get("Authorization") authHeader := req.Header.Get("Authorization")
writeUnauthorized := func(statusCode int) {
writer.WriteHeader(statusCode)
if _, err := writer.Write([]byte("Unauthorized")); err != nil {
log.Error().Err(err).Msg("writing HTTP response failed")
}
}
if !strings.HasPrefix(authHeader, AuthPrefix) { if !strings.HasPrefix(authHeader, AuthPrefix) {
log.Error(). log.Error().
Caller(). Caller().
Str("client_address", req.RemoteAddr). Str("client_address", req.RemoteAddr).
Msg(`missing "Bearer " prefix in "Authorization" header`) Msg(`missing "Bearer " prefix in "Authorization" header`)
writer.WriteHeader(http.StatusUnauthorized) writeUnauthorized(http.StatusUnauthorized)
_, err := writer.Write([]byte("Unauthorized")) return
return err
} }
valid, err := h.state.ValidateAPIKey(strings.TrimPrefix(authHeader, AuthPrefix)) valid, err := h.state.ValidateAPIKey(strings.TrimPrefix(authHeader, AuthPrefix))
@ -405,28 +410,15 @@ func (h *Headscale) httpAuthenticationMiddleware(next http.Handler) http.Handler
Err(err). Err(err).
Str("client_address", req.RemoteAddr). Str("client_address", req.RemoteAddr).
Msg("failed to validate token") Msg("failed to validate token")
writeUnauthorized(http.StatusInternalServerError)
writer.WriteHeader(http.StatusInternalServerError) return
_, err := writer.Write([]byte("Unauthorized"))
return err
} }
if !valid { if !valid {
log.Info(). log.Info().
Str("client_address", req.RemoteAddr). Str("client_address", req.RemoteAddr).
Msg("invalid token") Msg("invalid token")
writeUnauthorized(http.StatusUnauthorized)
writer.WriteHeader(http.StatusUnauthorized)
_, err := writer.Write([]byte("Unauthorized"))
return err
}
return nil
}(); err != nil {
log.Error().
Caller().
Err(err).
Msg("Failed to write HTTP response")
return return
} }