mirror of
https://github.com/netbirdio/netbird.git
synced 2026-09-13 10:19:07 +02:00
Zoltan PappandClaude Opus 5
9615d2ab16
* [client] Report the remote jobs key in the MDM UI snapshot Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * [client] Align the remote jobs snapshot key with the policy key The snapshot field carried the JSON tag remoteJobsAllowed while the policy key is allowRemoteJobs. GetConfigResponse.mDMManagedFields reports the raw policy keys, and applyMDMRestrictions matches them against the struct's JSON tags, so the field never turned true for a policy that set the key. Every other field in Fields already uses its policy key as the JSON tag; this was the only divergence. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
92 lines
3.4 KiB
Go
92 lines
3.4 KiB
Go
package mdm
|
|
|
|
import "encoding/json"
|
|
|
|
// Fields carries the per-key MDM enforcement state for a UI: value-typed
|
|
// fields hold the enforced value (nil pointer = not managed), boolean
|
|
// fields report that the key is managed.
|
|
type Fields struct {
|
|
ManagementURL string `json:"managementURL"`
|
|
PreSharedKey bool `json:"preSharedKey"`
|
|
WireguardPort bool `json:"wireguardPort"`
|
|
RosenpassEnabled bool `json:"rosenpassEnabled"`
|
|
RosenpassPermissive bool `json:"rosenpassPermissive"`
|
|
DisableClientRoutes bool `json:"disableClientRoutes"`
|
|
DisableServerRoutes bool `json:"disableServerRoutes"`
|
|
AllowServerSSH *bool `json:"allowServerSSH"`
|
|
DisableAutoConnect bool `json:"disableAutoConnect"`
|
|
DisableAutostart bool `json:"disableAutostart"`
|
|
BlockInbound bool `json:"blockInbound"`
|
|
DisableMetricsCollection bool `json:"disableMetricsCollection"`
|
|
SplitTunnelMode bool `json:"splitTunnelMode"`
|
|
SplitTunnelApps bool `json:"splitTunnelApps"`
|
|
RemoteJobsAllowed bool `json:"allowRemoteJobs"`
|
|
DisableAdvancedView *bool `json:"disableAdvancedView"`
|
|
}
|
|
|
|
// Features carries the feature gates a UI must honor.
|
|
type Features struct {
|
|
DisableProfiles bool `json:"disableProfiles"`
|
|
DisableNetworks bool `json:"disableNetworks"`
|
|
DisableUpdateSettings bool `json:"disableUpdateSettings"`
|
|
}
|
|
|
|
// Restrictions is the UI-facing enforcement snapshot; the JSON shape is
|
|
// shared by the desktop frontend and the mobile bridges.
|
|
type Restrictions struct {
|
|
MDM Fields `json:"mdm"`
|
|
Features Features `json:"features"`
|
|
}
|
|
|
|
// BuildRestrictions derives the UI enforcement snapshot from the active
|
|
// policy.
|
|
func BuildRestrictions(policy *Policy) Restrictions {
|
|
var r Restrictions
|
|
if policy.IsEmpty() {
|
|
return r
|
|
}
|
|
|
|
if v, ok := policy.GetString(KeyManagementURL); ok {
|
|
r.MDM.ManagementURL = CanonicalURL(v)
|
|
}
|
|
r.MDM.PreSharedKey = policy.HasKey(KeyPreSharedKey)
|
|
r.MDM.WireguardPort = policy.HasKey(KeyWireguardPort)
|
|
r.MDM.RosenpassEnabled = policy.HasKey(KeyRosenpassEnabled)
|
|
r.MDM.RosenpassPermissive = policy.HasKey(KeyRosenpassPermissive)
|
|
r.MDM.DisableClientRoutes = policy.HasKey(KeyDisableClientRoutes)
|
|
r.MDM.DisableServerRoutes = policy.HasKey(KeyDisableServerRoutes)
|
|
r.MDM.DisableAutoConnect = policy.HasKey(KeyDisableAutoConnect)
|
|
r.MDM.DisableAutostart = policy.HasKey(KeyDisableAutostart)
|
|
r.MDM.BlockInbound = policy.HasKey(KeyBlockInbound)
|
|
r.MDM.DisableMetricsCollection = policy.HasKey(KeyDisableMetricsCollection)
|
|
r.MDM.SplitTunnelMode = policy.HasKey(KeySplitTunnelMode)
|
|
r.MDM.SplitTunnelApps = policy.HasKey(KeySplitTunnelApps)
|
|
r.MDM.RemoteJobsAllowed = policy.HasKey(KeyRemoteJobsAllowed)
|
|
if v, ok := policy.GetBool(KeyAllowServerSSH); ok {
|
|
r.MDM.AllowServerSSH = &v
|
|
}
|
|
if v, ok := policy.GetBool(KeyDisableAdvancedView); ok {
|
|
r.MDM.DisableAdvancedView = &v
|
|
}
|
|
|
|
if v, ok := policy.GetBool(KeyDisableProfiles); ok {
|
|
r.Features.DisableProfiles = v
|
|
}
|
|
if v, ok := policy.GetBool(KeyDisableNetworks); ok {
|
|
r.Features.DisableNetworks = v
|
|
}
|
|
if v, ok := policy.GetBool(KeyDisableUpdateSettings); ok {
|
|
r.Features.DisableUpdateSettings = v
|
|
}
|
|
return r
|
|
}
|
|
|
|
// JSON renders the snapshot in the shared UI JSON shape.
|
|
func (r Restrictions) JSON() (string, error) {
|
|
b, err := json.Marshal(r)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return string(b), nil
|
|
}
|