mirror of
https://github.com/netbirdio/netbird.git
synced 2026-09-02 04:51:29 +02:00
c281b15cfa
The mobile bridges only carried the policy fetcher, leaving every enforcement decision to the native apps: the desktop derived its UI restrictions in the Wails service layer, the daemon kept the conflict machinery in the server package, and both mobile bridges duplicated the JSON fetch adapter. Anything the native side had to reimplement was a place for iOS and Android to drift apart. Enforcement now lives in client/mdm and is consumed identically by all three platforms: - conflicts.go holds the value-aware conflict checks lifted out of the daemon, so the same normalization (canonical URLs, PSK sentinel echo) applies wherever a config change is validated. - restrictions.go derives the UI enforcement snapshot from a policy and renders it in the JSON shape the desktop frontend already consumes. The service-layer types become aliases, keeping one source of truth. - jsonloader.go replaces the adapter that was copy-pasted into both bridges. - changedetector.go moves change detection off the native side: the caller forwards the OS notification and asks whether the managed configuration actually changed, instead of diffing dictionaries itself. The mobile bridges gain the enforcement the daemon already had. The Preferences getters resolve managed keys from the policy, so a naive UI shows the enforced value; Commit rejects a staged change that diverges from a managed key; NewAuth resolves the managed management URL before persisting the config and overlays the policy on it, so a login can no longer run against a URL the policy forbids. Android's profile mutations fail closed when disableProfiles is set. NewAuth takes the fetcher as a required argument rather than keeping a policy-blind overload: the apps consume this code as a submodule, so a compile error at the bump is the point. The mobile PSK getter is replaced by a presence check — the key has no reason to cross the bridge, and not returning it means the native side needs no redaction sentinel of its own.
109 lines
2.5 KiB
Go
109 lines
2.5 KiB
Go
package mdm
|
|
|
|
import "net/url"
|
|
|
|
// PreSharedKeyRedactedSentinel is the redaction mask returned in place of a
|
|
// real pre-shared key; an incoming value equal to it is a round-trip echo,
|
|
// never an override.
|
|
const PreSharedKeyRedactedSentinel = "**********"
|
|
|
|
// ConflictCheck is a value-aware comparison between a single requested field
|
|
// and the corresponding MDM-enforced value.
|
|
type ConflictCheck struct {
|
|
Key string
|
|
Check func(*Policy) bool
|
|
}
|
|
|
|
// ConflictBool builds a ConflictCheck for a boolean MDM key.
|
|
func ConflictBool(key string, p *bool) ConflictCheck {
|
|
return ConflictCheck{
|
|
Key: key,
|
|
Check: func(pol *Policy) bool {
|
|
if p == nil {
|
|
return true
|
|
}
|
|
want, ok := pol.GetBool(key)
|
|
return ok && want == *p
|
|
},
|
|
}
|
|
}
|
|
|
|
// ConflictString builds a ConflictCheck for a string MDM key.
|
|
func ConflictString(key, got string) ConflictCheck {
|
|
return ConflictCheck{
|
|
Key: key,
|
|
Check: func(pol *Policy) bool {
|
|
if got == "" {
|
|
return true
|
|
}
|
|
want, ok := pol.GetString(key)
|
|
return ok && want == got
|
|
},
|
|
}
|
|
}
|
|
|
|
// ConflictURL builds a ConflictCheck for a URL-typed MDM key; both sides are
|
|
// normalized via CanonicalURL before comparison.
|
|
func ConflictURL(key, got string) ConflictCheck {
|
|
return ConflictCheck{
|
|
Key: key,
|
|
Check: func(pol *Policy) bool {
|
|
if got == "" {
|
|
return true
|
|
}
|
|
want, ok := pol.GetString(key)
|
|
return ok && CanonicalURL(want) == CanonicalURL(got)
|
|
},
|
|
}
|
|
}
|
|
|
|
// ConflictInt64 builds a ConflictCheck for an integer MDM key.
|
|
func ConflictInt64(key string, p *int64) ConflictCheck {
|
|
return ConflictCheck{
|
|
Key: key,
|
|
Check: func(pol *Policy) bool {
|
|
if p == nil {
|
|
return true
|
|
}
|
|
want, ok := pol.GetInt(key)
|
|
return ok && want == *p
|
|
},
|
|
}
|
|
}
|
|
|
|
// ResolveConflicts returns the names of keys whose requested value diverges
|
|
// from the policy-enforced value; keys the policy does not manage are skipped.
|
|
func ResolveConflicts(policy *Policy, checks []ConflictCheck) []string {
|
|
if policy.IsEmpty() {
|
|
return nil
|
|
}
|
|
var conflicts []string
|
|
for _, c := range checks {
|
|
if !policy.HasKey(c.Key) {
|
|
continue
|
|
}
|
|
if !c.Check(policy) {
|
|
conflicts = append(conflicts, c.Key)
|
|
}
|
|
}
|
|
return conflicts
|
|
}
|
|
|
|
// CanonicalURL normalizes a service URL by appending the scheme default port
|
|
// when none is present; unparseable input is returned unchanged.
|
|
func CanonicalURL(s string) string {
|
|
u, err := url.ParseRequestURI(s)
|
|
if err != nil {
|
|
return s
|
|
}
|
|
if u.Port() == "" {
|
|
switch u.Scheme {
|
|
case "https":
|
|
u.Host += ":443"
|
|
case "http":
|
|
u.Host += ":80"
|
|
}
|
|
}
|
|
return u.String()
|
|
}
|