gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-08 07:41:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3266 from gravitl/release-v0.30.0

Browse source 
Release v0.30.0
This commit is contained in:
Abhishek K 2024-12-18 23:10:03 +04:00 • committed by GitHub
commit 697d0d6af6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 50 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
controllers/dns.go
View file

@ -164,7 +164,8 @@ func createDNS(w http.ResponseWriter, r *http.Request) {
return
}
// check if default domain is appended if not append
if !strings.HasSuffix(entry.Name, servercfg.GetDefaultDomain()) {
if servercfg.GetDefaultDomain() != "" &&
!strings.HasSuffix(entry.Name, servercfg.GetDefaultDomain()) {
entry.Name += "." + servercfg.GetDefaultDomain()
}
entry, err = logic.CreateDNS(entry)

49
logic/acls.go
View file

@ -39,14 +39,15 @@ func CreateDefaultAclNetworkPolicies(netID models.NetworkID) {
_, _ = ListAclsByNetwork(netID)
if !IsAclExists(fmt.Sprintf("%s.%s", netID, "all-nodes")) {
defaultDeviceAcl := models.Acl{
ID: fmt.Sprintf("%s.%s", netID, "all-nodes"),
Name: "All Nodes",
MetaData: "This Policy allows all nodes in the network to communicate with each other",
Default: true,
NetworkID: netID,
Proto: models.ALL,
Port: []string{},
RuleType: models.DevicePolicy,
ID: fmt.Sprintf("%s.%s", netID, "all-nodes"),
Name: "All Nodes",
MetaData: "This Policy allows all nodes in the network to communicate with each other",
Default: true,
NetworkID: netID,
Proto: models.ALL,
ServiceType: models.Any,
Port: []string{},
RuleType: models.DevicePolicy,
Src: []models.AclPolicyTag{
{
ID: models.DeviceAclID,
@ -66,14 +67,15 @@ func CreateDefaultAclNetworkPolicies(netID models.NetworkID) {
}
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,
Port: []string{},
RuleType: models.UserPolicy,
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,
@ -94,13 +96,14 @@ func CreateDefaultAclNetworkPolicies(netID models.NetworkID) {
if !IsAclExists(fmt.Sprintf("%s.%s", netID, "all-remote-access-gws")) {
defaultUserAcl := models.Acl{
ID: fmt.Sprintf("%s.%s", netID, "all-remote-access-gws"),
Default: true,
Name: "All Remote Access Gateways",
NetworkID: netID,
Proto: models.ALL,
Port: []string{},
RuleType: models.DevicePolicy,
ID: fmt.Sprintf("%s.%s", netID, "all-remote-access-gws"),
Default: true,
Name: "All Remote Access Gateways",
NetworkID: netID,
Proto: models.ALL,
ServiceType: models.Any,
Port: []string{},
RuleType: models.DevicePolicy,
Src: []models.AclPolicyTag{
{
ID: models.DeviceAclID,

6
logic/dns.go
View file

@ -116,7 +116,11 @@ func GetNodeDNS(network string) ([]models.DNSEntry, error) {
continue
}
var entry = models.DNSEntry{}
entry.Name = fmt.Sprintf("%s.%s.%s", host.Name, network, defaultDomain)
if defaultDomain == "" {
entry.Name = fmt.Sprintf("%s.%s", host.Name, network)
} else {
entry.Name = fmt.Sprintf("%s.%s.%s", host.Name, network, defaultDomain)
}
entry.Network = network
if node.Address.IP != nil {
entry.Address = node.Address.IP.String()

26
pro/logic/user_mgmt.go
View file

@ -1207,12 +1207,13 @@ func CreateDefaultUserPolicies(netID models.NetworkID) {
if !logic.IsAclExists(fmt.Sprintf("%s.%s-grp", netID, models.NetworkAdmin)) {
defaultUserAcl := models.Acl{
ID: fmt.Sprintf("%s.%s-grp", netID, models.NetworkAdmin),
Name: "Network Admin",
MetaData: "This Policy allows all network admins to communicate with all remote access gateways",
Default: true,
NetworkID: netID,
RuleType: models.UserPolicy,
ID: fmt.Sprintf("%s.%s-grp", netID, models.NetworkAdmin),
Name: "Network Admin",
MetaData: "This Policy allows all network admins to communicate with all remote access gateways",
Default: true,
ServiceType: models.Any,
NetworkID: netID,
RuleType: models.UserPolicy,
Src: []models.AclPolicyTag{
{
ID: models.UserGroupAclID,
@ -1238,12 +1239,13 @@ func CreateDefaultUserPolicies(netID models.NetworkID) {
if !logic.IsAclExists(fmt.Sprintf("%s.%s-grp", netID, models.NetworkUser)) {
defaultUserAcl := models.Acl{
ID: fmt.Sprintf("%s.%s-grp", netID, models.NetworkUser),
Name: "Network User",
MetaData: "This Policy allows all network users to communicate with all remote access gateways",
Default: true,
NetworkID: netID,
RuleType: models.UserPolicy,
ID: fmt.Sprintf("%s.%s-grp", netID, models.NetworkUser),
Name: "Network User",
MetaData: "This Policy allows all network users to communicate with all remote access gateways",
Default: true,
ServiceType: models.Any,
NetworkID: netID,
RuleType: models.UserPolicy,
Src: []models.AclPolicyTag{
{
ID: models.UserGroupAclID,

2
scripts/netmaker.default.env
View file

@ -87,7 +87,7 @@ EMAIL_SENDER_USER=
# sender smtp password
EMAIL_SENDER_PASSWORD=
# default domain for internal DNS lookup
DEFAULT_DOMAIN=netmaker.hosted
DEFAULT_DOMAIN=hosted.nm
# managed dns setting, set to true to resolve dns entries on netmaker network
MANAGE_DNS=false
# set to true, old acl is supported, otherwise, old acl is disabled

7
servercfg/serverconf.go
View file

@ -12,7 +12,6 @@ import (
"github.com/gravitl/netmaker/config"
"github.com/gravitl/netmaker/models"
"golang.org/x/exp/slog"
)
// EmqxBrokerType denotes the broker type for EMQX MQTT
@ -684,13 +683,11 @@ func IsOldAclEnabled() bool {
// GetDefaultDomain - get the default domain
func GetDefaultDomain() string {
//default netmaker.hosted
domain := "netmaker.hosted"
//default hosted.nm
var domain string
if os.Getenv("DEFAULT_DOMAIN") != "" {
if validateDomain(os.Getenv("DEFAULT_DOMAIN")) {
domain = os.Getenv("DEFAULT_DOMAIN")
} else {
slog.Warn("invalid value, set to default domain: netmaker.hosted", "warn", os.Getenv("DEFAULT_DOMAIN"))
}
}
return domain