only enable ipv6 check for NAV tenant

sechmann · sechmann · commit 9caf49871f93 · 2024-01-31T11:06:24.000+01:00
diff --git a/internal/device-agent/runtimeconfig/runtimeconfig.go b/internal/device-agent/runtimeconfig/runtimeconfig.go
@@ -257,8 +257,11 @@ func (r *runtimeConfig) LoadEnrollConfig() error {
 		return err
 	}
 
-	if ec.DeviceIPv6 == "" || strings.HasPrefix(ec.DeviceIPv6, "fd") {
-		return fmt.Errorf("bootstrap config does not contain a valid IPv6 address, should re-enroll")
+	// IPv6 is only enabled in NAV
+	if strings.EqualFold(r.GetActiveTenant().Name, "NAV") {
+		if ec.DeviceIPv6 == "" || strings.HasPrefix(ec.DeviceIPv6, "fd") {
+			return fmt.Errorf("bootstrap config does not contain a valid IPv6 address, should re-enroll")
+		}
 	}
 
 	r.enrollConfig = ec

Original file line number	Diff line number	Diff line change
`@@ -257,8 +257,11 @@ func (r *runtimeConfig) LoadEnrollConfig() error {`
`257`	`257`	`return err`
`258`	`258`	`}`
`259`	`259`
`260`		`- if ec.DeviceIPv6 == "" \|\| strings.HasPrefix(ec.DeviceIPv6, "fd") {`
`261`		`- return fmt.Errorf("bootstrap config does not contain a valid IPv6 address, should re-enroll")`
	`260`	`+ // IPv6 is only enabled in NAV`
	`261`	`+ if strings.EqualFold(r.GetActiveTenant().Name, "NAV") {`
	`262`	`+ if ec.DeviceIPv6 == "" \|\| strings.HasPrefix(ec.DeviceIPv6, "fd") {`
	`263`	`+ return fmt.Errorf("bootstrap config does not contain a valid IPv6 address, should re-enroll")`
	`264`	`+ }`
`262`	`265`	`}`
`263`	`266`
`264`	`267`	`r.enrollConfig = ec`