zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed admin issue and potential panics

Browse Source
This commit is contained in:
0xdcarns
2022-11-10 14:54:53 -05:00
parent 5ff5e5dca3
commit ea854a6b98
3 changed files with 5 additions and 2 deletions
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{} clients := []models.ExtClient{}
var err error var err error
if networksSlice[0] == logic.ALL_NETWORK_ACCESS { if len(networksSlice) > 0 && networksSlice[0] == logic.ALL_NETWORK_ACCESS {
clients, err = functions.GetAllExtClients() clients, err = functions.GetAllExtClients()
if err != nil && !database.IsEmptyRecord(err) { if err != nil && !database.IsEmptyRecord(err) {
logger.Log(0, "failed to get all extclients: ", err.Error()) 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{} allnetworks := []models.Network{}
var err error var err error
if networksSlice[0] == logic.ALL_NETWORK_ACCESS { if len(networksSlice) > 0 && networksSlice[0] == logic.ALL_NETWORK_ACCESS {
allnetworks, err = logic.GetNetworks() allnetworks, err = logic.GetNetworks()
if err != nil && !database.IsEmptyRecord(err) { if err != nil && !database.IsEmptyRecord(err) {
logger.Log(0, r.Header.Get("user"), "failed to fetch networks: ", err.Error()) 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 user.Password = userchange.Password
} }
if userchange.IsAdmin != user.IsAdmin {
user.IsAdmin = userchange.IsAdmin
}
err := ValidateUser(user) err := ValidateUser(user)
if err != nil { if err != nil {