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

fix(go): prevent disabling basic auth if deployed by operator; (#3561)

Browse source
This commit is contained in:
Vishal Dalwadi 2025-07-24 11:57:53 +05:30 • committed by GitHub
parent 39ea1ed9fc
commit ffe5e0e65a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
logic/settings.go
View file

@ -33,6 +33,11 @@ func UpsertServerSettings(s models.ServerSettings) error {
if s.ClientSecret == Mask() { if s.ClientSecret == Mask() {
s.ClientSecret = currSettings.ClientSecret s.ClientSecret = currSettings.ClientSecret
} }
if servercfg.DeployedByOperator() {
s.BasicAuth = true
}
data, err := json.Marshal(s) data, err := json.Marshal(s)
if err != nil { if err != nil {
return err return err
@ -317,6 +322,10 @@ func GetManageDNS() bool {
// IsBasicAuthEnabled - checks if basic auth has been configured to be turned off // IsBasicAuthEnabled - checks if basic auth has been configured to be turned off
func IsBasicAuthEnabled() bool { func IsBasicAuthEnabled() bool {
if servercfg.DeployedByOperator() {
return true
}
return GetServerSettings().BasicAuth return GetServerSettings().BasicAuth
} }

4
servercfg/serverconf.go
View file

@ -721,6 +721,10 @@ func GetEmqxRestEndpoint() string {
// IsBasicAuthEnabled - checks if basic auth has been configured to be turned off // IsBasicAuthEnabled - checks if basic auth has been configured to be turned off
func IsBasicAuthEnabled() bool { func IsBasicAuthEnabled() bool {
if DeployedByOperator() {
return true
}
var enabled = true //default var enabled = true //default
if os.Getenv("BASIC_AUTH") != "" { if os.Getenv("BASIC_AUTH") != "" {
enabled = os.Getenv("BASIC_AUTH") == "yes" enabled = os.Getenv("BASIC_AUTH") == "yes"