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

Merge pull request #3202 from gravitl/master

Browse source 
Master
This commit is contained in:
Abhishek K 2024-11-12 13:38:57 +04:00 • committed by GitHub
commit e721552044
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 91 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controllers/ext_client.go
View file

@ -470,8 +470,8 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
extclient.IngressGatewayID = nodeid
extclient.Network = node.Network
extclient.Tags = make(map[models.TagID]struct{})
extclient.Tags[models.TagID(fmt.Sprintf("%s.%s", extclient.Network,
models.RemoteAccessTagName))] = struct{}{}
// extclient.Tags[models.TagID(fmt.Sprintf("%s.%s", extclient.Network,
// models.RemoteAccessTagName))] = struct{}{}
// set extclient dns to ingressdns if extclient dns is not explicitly set
if (extclient.DNS == "") && (node.IngressDNS != "") {
extclient.DNS = node.IngressDNS

28
controllers/server.go
View file

@ -140,26 +140,26 @@ func getStatus(w http.ResponseWriter, r *http.Request) {
if servercfg.ErrLicenseValidation != nil {
licenseErr = servercfg.ErrLicenseValidation.Error()
}
var trialEndDate time.Time
var err error
isOnTrial := false
if servercfg.IsPro &&
(servercfg.GetLicenseKey() == "" || servercfg.GetNetmakerTenantID() == "") {
trialEndDate, err = logic.GetTrialEndDate()
if err != nil {
slog.Error("failed to get trial end date", "error", err)
} else {
isOnTrial = true
}
}
//var trialEndDate time.Time
//var err error
// isOnTrial := false
// if servercfg.IsPro &&
// (servercfg.GetLicenseKey() == "" || servercfg.GetNetmakerTenantID() == "") {
// trialEndDate, err = logic.GetTrialEndDate()
// if err != nil {
// slog.Error("failed to get trial end date", "error", err)
// } else {
// isOnTrial = true
// }
// }
currentServerStatus := status{
DB: database.IsConnected(),
Broker: mq.IsConnected(),
IsBrokerConnOpen: mq.IsConnectionOpen(),
LicenseError: licenseErr,
IsPro: servercfg.IsPro,
TrialEndDate: trialEndDate,
IsOnTrialLicense: isOnTrial,
//TrialEndDate: trialEndDate,
//IsOnTrialLicense: isOnTrial,
}
w.Header().Set("Content-Type", "application/json")

1
logic/extpeers.go
View file

@ -802,6 +802,7 @@ func GetStaticNodesByNetwork(network models.NetworkID, onlyWg bool) (staticNode
if err != nil {
return
}
SortExtClient(extClients[:])
for _, extI := range extClients {
if extI.Network == network.String() {
if onlyWg && extI.RemoteAccessClientID != "" {

10
logic/peers.go
View file

@ -227,6 +227,16 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
} else if host.EndpointIPv6 != nil && peerHost.EndpointIPv6 != nil {
peerEndpoint = peerHost.EndpointIPv6
}
if host.EndpointIP == nil && peerEndpoint == nil {
if peerHost.EndpointIP != nil {
peerEndpoint = peerHost.EndpointIP
}
}
if host.EndpointIPv6 == nil && peerEndpoint == nil {
if peerHost.EndpointIPv6 != nil {
peerEndpoint = peerHost.EndpointIPv6
}
}
peerConfig.Endpoint = &net.UDPAddr{
IP: peerEndpoint,

12
migrate/migrate.go
View file

@ -226,18 +226,6 @@ func updateNodes() {
}
}
}
extclients, _ := logic.GetAllExtClients()
for _, extclient := range extclients {
tagID := models.TagID(fmt.Sprintf("%s.%s", extclient.Network,
models.RemoteAccessTagName))
if extclient.Tags == nil {
extclient.Tags = make(map[models.TagID]struct{})
}
if _, ok := extclient.Tags[tagID]; !ok {
extclient.Tags[tagID] = struct{}{}
logic.SaveExtClient(&extclient)
}
}
}
func removeInterGw(egressRanges []string) ([]string, bool) {

3
models/user_mgmt.go
View file

@ -80,7 +80,8 @@ const (
AllUserRsrcID RsrcID = "all_user"
AllDnsRsrcID RsrcID = "all_dns"
AllFailOverRsrcID RsrcID = "all_fail_over"
AllAclsRsrcID RsrcID = "all_acls"
AllAclsRsrcID RsrcID = "all_acl"
AllTagsRsrcID RsrcID = "all_tag"
)
// Pre-Defined User Roles

4
pro/controllers/users.go
View file

@ -1006,8 +1006,8 @@ func getRemoteAccessGatewayConf(w http.ResponseWriter, r *http.Request) {
userConf.Enabled = parentNetwork.DefaultACL == "yes"
}
userConf.Tags = make(map[models.TagID]struct{})
userConf.Tags[models.TagID(fmt.Sprintf("%s.%s", userConf.Network,
models.RemoteAccessTagName))] = struct{}{}
// userConf.Tags[models.TagID(fmt.Sprintf("%s.%s", userConf.Network,
// models.RemoteAccessTagName))] = struct{}{}
if err = logic.CreateExtClient(&userConf); err != nil {
slog.Error(
"failed to create extclient",

60
pro/logic/user_mgmt.go
View file

@ -60,6 +60,36 @@ var NetworkUserAllPermissionTemplate = models.UserRolePermissionTemplate{
SelfOnly: true,
},
},
models.DnsRsrc: {
models.AllDnsRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.AclRsrc: {
models.AllAclsRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.EgressGwRsrc: {
models.AllEgressGwRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.InetGwRsrc: {
models.AllInetGwRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.RelayRsrc: {
models.AllRelayRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.TagRsrc: {
models.AllTagsRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
},
}
@ -147,6 +177,36 @@ func CreateDefaultNetworkRolesAndGroups(netID models.NetworkID) {
SelfOnly: true,
},
},
models.DnsRsrc: {
models.AllDnsRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.AclRsrc: {
models.AllAclsRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.EgressGwRsrc: {
models.AllEgressGwRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.InetGwRsrc: {
models.AllInetGwRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.RelayRsrc: {
models.AllRelayRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
models.TagRsrc: {
models.AllTagsRsrcID: models.RsrcPermissionScope{
Read: true,
},
},
},
}
d, _ := json.Marshal(NetworkAdminPermissionTemplate)