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

fix: fix extclient creation and ACL migration (#2831)

Browse Source
This commit is contained in:
Aceix
2024-02-28 02:01:07 +00:00
committed by GitHub
parent 0638dcac49
commit b79a457ce2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/ext_client.go
View File

@@ -430,14 +430,14 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
extclient.Enabled = parentNetwork.DefaultACL == "yes" extclient.Enabled = parentNetwork.DefaultACL == "yes"
} }
if err := logic.SetClientDefaultACLs(&extclient); err != nil { if err = logic.CreateExtClient(&extclient); err != nil {
slog.Error("failed to set default acls for extclient", "user", r.Header.Get("user"), "network", node.Network, "error", err) slog.Error("failed to create extclient", "user", r.Header.Get("user"), "network", node.Network, "error", err)
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
return return
} }
if err = logic.CreateExtClient(&extclient); err != nil { if err := logic.SetClientDefaultACLs(&extclient); err != nil {
slog.Error("failed to create extclient", "user", r.Header.Get("user"), "network", node.Network, "error", err) slog.Error("failed to set default acls for extclient", "user", r.Header.Get("user"), "network", node.Network, "error", err)
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
return return
} }

2
migrate/migrate.go
View File

@@ -284,9 +284,11 @@ func updateAcls() {
} }
// save new acls // save new acls
slog.Info(fmt.Sprintf("(migration) saving new acls for network: %s", network.NetID), "networkAcl", networkAcl)
if _, err := networkAcl.Save(acls.ContainerID(network.NetID)); err != nil { if _, err := networkAcl.Save(acls.ContainerID(network.NetID)); err != nil {
slog.Error(fmt.Sprintf("error during acls migration. error saving new acls for network: %s", network.NetID), "error", err) slog.Error(fmt.Sprintf("error during acls migration. error saving new acls for network: %s", network.NetID), "error", err)
continue continue
} }
slog.Info(fmt.Sprintf("(migration) successfully saved new acls for network: %s", network.NetID))
} }
} }