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

Merge pull request #3525 from gravitl/master

Browse source 
Master
This commit is contained in:
Abhishek K 2025-06-24 07:08:08 +05:30 • committed by GitHub
commit 7808d29808
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controllers/server.go
View file

@ -247,7 +247,10 @@ func getConfig(w http.ResponseWriter, r *http.Request) {
// @Success 200 {object} config.ServerSettings
func getSettings(w http.ResponseWriter, r *http.Request) {
scfg := logic.GetServerSettings()
scfg.ClientSecret = logic.Mask()
if scfg.ClientSecret != "" {
scfg.ClientSecret = logic.Mask()
}
logic.ReturnSuccessResponseWithJson(w, r, scfg, "fetched server settings successfully")
}

36
logic/user_mgmt.go
View file

@ -2,6 +2,8 @@ package logic
import (
"encoding/json"
"fmt"
"time"
"github.com/gravitl/netmaker/database"
"github.com/gravitl/netmaker/models"
@ -60,7 +62,39 @@ var InitialiseRoles = userRolesInit
var IntialiseGroups = func() {}
var DeleteNetworkRoles = func(netID string) {}
var CreateDefaultNetworkRolesAndGroups = func(netID models.NetworkID) {}
var CreateDefaultUserPolicies = func(netID models.NetworkID) {}
var CreateDefaultUserPolicies = func(netID models.NetworkID) {
if netID.String() == "" {
return
}
if !IsAclExists(fmt.Sprintf("%s.%s", netID, "all-users")) {
defaultUserAcl := models.Acl{
ID: fmt.Sprintf("%s.%s", netID, "all-users"),
Default: true,
Name: "All Users",
MetaData: "This policy gives access to everything in the network for an user",
NetworkID: netID,
Proto: models.ALL,
ServiceType: models.Any,
Port: []string{},
RuleType: models.UserPolicy,
Src: []models.AclPolicyTag{
{
ID: models.UserAclID,
Value: "*",
},
},
Dst: []models.AclPolicyTag{{
ID: models.NodeTagID,
Value: "*",
}},
AllowedDirection: models.TrafficDirectionUni,
Enabled: true,
CreatedBy: "auto",
CreatedAt: time.Now().UTC(),
}
InsertAcl(defaultUserAcl)
}
}
var GetUserGroupsInNetwork = func(netID models.NetworkID) (networkGrps map[models.UserGroupID]models.UserGroup) { return }
var GetUserGroup = func(groupId models.UserGroupID) (userGrps models.UserGroup, err error) { return }
var AddGlobalNetRolesToAdmins = func(u *models.User) {}