sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-23 05:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixup: MDM wins. always

Browse Source
This commit is contained in:
riccardom
2026-06-08 18:06:02 +02:00
parent d6780522ea
commit e55b64f2f7
1 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/server/server.go
+16 -27
View File
@@ -1731,49 +1731,38 @@ func (s *Server) connect(ctx context.Context, config *profilemanager.Config, sta
return nil return nil
} }
// MDM authority: when the platform-native MDM source sets a kill switch
// key (regardless of true/false value), that value wins. The CLI flag
// supplied at service install time is the fallback used only when the
// MDM source is silent on the key. This honors the "MDM decides
// everything" semantic agreed for NET-1214 — an admin pushing
// disableX=false via MDM explicitly re-enables the feature even on a
// box installed with --disable-X.
func (s *Server) checkProfilesDisabled() bool { func (s *Server) checkProfilesDisabled() bool {
// CLI flag set at service install time wins.
if s.profilesDisabled {
return true
}
// MDM kill switch: either source can disable the feature; neither
// can re-enable a switch the other has set.
if s.config != nil { if s.config != nil {
if v, ok := s.config.Policy().GetBool(mdm.KeyDisableProfiles); ok && v { if v, ok := s.config.Policy().GetBool(mdm.KeyDisableProfiles); ok {
return true return v
} }
} }
return false return s.profilesDisabled
} }
func (s *Server) checkNetworksDisabled() bool { func (s *Server) checkNetworksDisabled() bool {
// CLI flag set at service install time wins.
if s.networksDisabled {
return true
}
// MDM kill switch: either source can disable the feature; neither
// can re-enable a switch the other has set.
if s.config != nil { if s.config != nil {
if v, ok := s.config.Policy().GetBool(mdm.KeyDisableNetworks); ok && v { if v, ok := s.config.Policy().GetBool(mdm.KeyDisableNetworks); ok {
return true return v
} }
} }
return false return s.networksDisabled
} }
func (s *Server) checkUpdateSettingsDisabled() bool { func (s *Server) checkUpdateSettingsDisabled() bool {
// CLI flag set at service install time wins.
if s.updateSettingsDisabled {
return true
}
// MDM kill switch: either source can disable the feature; neither
// can re-enable a switch the other has set.
if s.config != nil { if s.config != nil {
if v, ok := s.config.Policy().GetBool(mdm.KeyDisableUpdateSettings); ok && v { if v, ok := s.config.Policy().GetBool(mdm.KeyDisableUpdateSettings); ok {
return true return v
} }
} }
return false return s.updateSettingsDisabled
} }
func (s *Server) startUpdateManagerForGUI() { func (s *Server) startUpdateManagerForGUI() {