Skip to content

fix: move invalid token to log field #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simskij merged 3 commits into from
Jan 22, 2022
Merged

fix: move invalid token to log field #1171

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f1c39f
fix: move invalid token to log field
piksel Dec 20, 2021
5e03ad7
escape invalid token in log field
piksel Dec 20, 2021
0d07bfb
Update pkg/api/api.go
simskij Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pkg/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package api

import (
"fmt"
log "github.com/sirupsen/logrus"
"net/http"

log "github.com/sirupsen/logrus"
)

const tokenMissingMsg = "api token is empty or has not been set. exiting"
Expand All @@ -28,8 +29,10 @@ func (api *API) RequireToken(fn http.HandlerFunc) http.HandlerFunc {
auth := r.Header.Get("Authorization")
want := fmt.Sprintf("Bearer %s", api.Token)
if auth != want {
log.Tracef("Invalid Authorization header \"%s\"", auth)
log.Tracef("Expected Authorization header to be \"%s\"", want)
log.WithFields(log.Fields{
"got": fmt.Sprintf("%q", auth),
"expected": want,
}).Tracef("Invalid Authorization header")
w.WriteHeader(http.StatusUnauthorized)
return
}
Expand Down