gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-12 16:14:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

changed check to network http create

Browse source
This commit is contained in:
worker-9 2021-08-05 12:23:36 -04:00
parent 44d03f6805
commit 3a49eb3b4c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
controllers/networkHttpController.go
View file

@ -69,14 +69,6 @@ func securityCheck(reqAdmin bool, next http.Handler) http.HandlerFunc {
func SecurityCheck(reqAdmin bool, netname, token string) (error, []string, string) { func SecurityCheck(reqAdmin bool, netname, token string) (error, []string, string) {
networkexists, err := functions.NetworkExists(netname)
if err != nil {
return err, nil, ""
}
if netname != "" && !networkexists {
return errors.New("This network does not exist"), nil, ""
}
var hasBearer = true var hasBearer = true
var tokenSplit = strings.Split(token, " ") var tokenSplit = strings.Split(token, " ")
var authToken = "" var authToken = ""
@ -94,14 +86,22 @@ func SecurityCheck(reqAdmin bool, netname, token string) (error, []string, strin
userName, networks, isadmin, err := functions.VerifyUserToken(authToken) userName, networks, isadmin, err := functions.VerifyUserToken(authToken)
username = userName username = userName
if err != nil { if err != nil {
return errors.New("Error verifying user token"), nil, username return errors.New("error verifying user token"), nil, username
} }
if !isadmin && reqAdmin { if !isadmin && reqAdmin {
return errors.New("You are unauthorized to access this endpoint"), nil, username return errors.New("you are unauthorized to access this endpoint"), nil, username
} }
userNetworks = networks userNetworks = networks
if isadmin { if isadmin {
userNetworks = []string{ALL_NETWORK_ACCESS} userNetworks = []string{ALL_NETWORK_ACCESS}
} else {
networkexists, err := functions.NetworkExists(netname)
if err != nil {
return err, nil, ""
}
if netname != "" && !networkexists {
return errors.New("this network does not exist"), nil, ""
}
} }
} else if isMasterAuthenticated { } else if isMasterAuthenticated {
userNetworks = []string{ALL_NETWORK_ACCESS} userNetworks = []string{ALL_NETWORK_ACCESS}