vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-01 18:19:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #54 from safing/feature/api-auth-err-messages

Browse source 
Add authentication failure error messages
This commit is contained in:
Patrick Pacher 2020-06-04 08:37:59 +02:00 • committed by GitHub
commit 1cb93512f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
api/authentication.go
View file

@ -2,6 +2,7 @@ package api
import (
"encoding/base64"
"errors"
"net/http"
"sync"
"time"
@ -16,6 +17,10 @@ var (
authFnLock sync.Mutex
authFn Authenticator
// ErrAPIAccessDeniedMessage should be returned by Authenticator functions in
// order to signify a blocked request, including a error message for the user.
ErrAPIAccessDeniedMessage = errors.New("")
)
const (
@ -28,7 +33,7 @@ const (
)
// Authenticator is a function that can be set as the authenticator for the API endpoint. If none is set, all requests will be allowed.
type Authenticator func(s *http.Server, r *http.Request) (grantAccess bool, err error)
type Authenticator func(s *http.Server, r *http.Request) (err error)
// SetAuthenticator sets an authenticator function for the API endpoint. If none is set, all requests will be allowed.
func SetAuthenticator(fn Authenticator) error {
@ -79,15 +84,15 @@ func authMiddleware(next http.Handler) http.Handler {
}
// get auth decision
grantAccess, err := authenticator(server, r)
err = authenticator(server, r)
if err != nil {
log.Warningf("api: authenticator failed: %s", err)
http.Error(w, "Bad Request: Could not identify client", http.StatusBadRequest)
return
}
if !grantAccess {
log.Warningf("api: denying api access to %s", r.RemoteAddr)
http.Error(w, "Forbidden", http.StatusForbidden)
if errors.Is(err, ErrAPIAccessDeniedMessage) {
log.Warningf("api: denying api access to %s", r.RemoteAddr)
http.Error(w, err.Error(), http.StatusForbidden)
} else {
log.Warningf("api: authenticator failed: %s", err)
http.Error(w, "Internal server error during authentication.", http.StatusInternalServerError)
}
return
}