zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-17 06:11:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

admin user auth working

Browse Source
This commit is contained in:
afeiszli
2021-05-29 20:18:22 +00:00
parent 02ec2df48a
commit 4f531e1c54
7 changed files with 33 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/userHttpController.go
View File

@@ -126,7 +126,7 @@ func authorizeUser(next http.Handler) http.HandlerFunc {
//get the auth token
bearerToken := r.Header.Get("Authorization")
err := ValidateToken(bearerToken)
err := ValidateUserToken(bearerToken)
if err != nil {
returnErrorResponse(w, r, formatError(err, "unauthorized"))
return
@@ -135,7 +135,7 @@ func authorizeUser(next http.Handler) http.HandlerFunc {
}
}
func ValidateToken(token string) error {
func ValidateUserToken(token string) error {
var tokenSplit = strings.Split(token, " ")
//I put this in in case the user doesn't put in a token at all (in which case it's empty)
@@ -148,10 +148,6 @@ func ValidateToken(token string) error {
return errors.New("Missing Auth Token.")
}
//This checks if
//A: the token is the master password
//B: the token corresponds to a mac address, and if so, which one
//TODO: There's probably a better way of dealing with the "master token"/master password. Plz Halp.
username, _, err := functions.VerifyUserToken(authToken)
if err != nil {
return errors.New("Error Verifying Auth Token")