upstream/webhookd
1
0
Fork 0
mirror of https://github.com/ncarlier/webhookd.git synced 2024-09-20 08:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(auth): simplify validate method

Browse Source
This commit is contained in:
Nicolas Carlier 2020-02-09 09:26:04 +00:00
parent 22a82baca1
commit 5948b6001f
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/auth/htpasswd-file.go
View File

@ -7,7 +7,6 @@ import (
"net/http"
"os"
"regexp"
"strings"
"golang.org/x/crypto/bcrypt"
)
@ -54,22 +53,11 @@ func NewHtpasswdFromFile(path string) (*HtpasswdFile, error) {
// Validate HTTP request credentials
func (h *HtpasswdFile) Validate(r *http.Request) bool {
s := strings.SplitN(r.Header.Get("Authorization"), " ", 2)
if len(s) != 2 {
user, passwd, ok := r.BasicAuth()
if !ok {
return false
}
b, err := base64.StdEncoding.DecodeString(s[1])
if err != nil {
return false
}
pair := strings.SplitN(string(b), ":", 2)
if len(pair) != 2 {
return false
}
return h.validateCredentials(pair[0], pair[1])
return h.validateCredentials(user, passwd)
}
func (h *HtpasswdFile) validateCredentials(user string, password string) bool {