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

fixed admin issue and potential panics

Browse source
This commit is contained in:
0xdcarns 2022-11-10 14:54:53 -05:00 • committed by Matthew R. Kasun
parent dfd5961c6c
commit 31990fca45
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/ext_client.go
View file

@ -101,7 +101,7 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) {
}
clients := []models.ExtClient{}
var err error
if networksSlice[0] == logic.ALL_NETWORK_ACCESS {
if len(networksSlice) > 0 && networksSlice[0] == logic.ALL_NETWORK_ACCESS {
clients, err = functions.GetAllExtClients()
if err != nil && !database.IsEmptyRecord(err) {
logger.Log(0, "failed to get all extclients: ", err.Error())

2
controllers/network.go
View file

@ -57,7 +57,7 @@ func getNetworks(w http.ResponseWriter, r *http.Request) {
}
allnetworks := []models.Network{}
var err error
if networksSlice[0] == logic.ALL_NETWORK_ACCESS {
if len(networksSlice) > 0 && networksSlice[0] == logic.ALL_NETWORK_ACCESS {
allnetworks, err = logic.GetNetworks()
if err != nil && !database.IsEmptyRecord(err) {
logger.Log(0, r.Header.Get("user"), "failed to fetch networks: ", err.Error())

3
logic/auth.go
View file

@ -282,6 +282,9 @@ func UpdateUser(userchange models.User, user models.User) (models.User, error) {
user.Password = userchange.Password
}
if userchange.IsAdmin != user.IsAdmin {
user.IsAdmin = userchange.IsAdmin
}
err := ValidateUser(user)
if err != nil {