Fix iPadOS user enrollment command verification

zentralopensource · May 15, 2024 · ae9f79a · ae9f79a
1 parent 4cddc04
commit ae9f79a
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 24 deletions.
diff --git a/tests/mdm/test_certificate_list_command.py b/tests/mdm/test_certificate_list_command.py
@@ -71,10 +71,10 @@ def test_scope_user_enrollment_ios_ok(self):
             self.enrolled_device
         ))
 
-    def test_scope_user_enrollment_ipados_not_ok(self):
+    def test_scope_user_enrollment_ipados_ok(self):
         self.enrolled_device.platform = Platform.IPADOS
         self.enrolled_device.user_enrollment = True
-        self.assertFalse(CertificateList.verify_channel_and_device(
+        self.assertTrue(CertificateList.verify_channel_and_device(
             Channel.DEVICE,
             self.enrolled_device
         ))

diff --git a/tests/mdm/test_device_information_command.py b/tests/mdm/test_device_information_command.py
@@ -49,7 +49,7 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, True),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, True),
             (Channel.DEVICE, Platform.TVOS, True, False),
         ):

diff --git a/tests/mdm/test_install_application_command.py b/tests/mdm/test_install_application_command.py
@@ -119,7 +119,7 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, True),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, True),
             (Channel.DEVICE, Platform.TVOS, True, False),
         ):

diff --git a/tests/mdm/test_install_profile_command.py b/tests/mdm/test_install_profile_command.py
@@ -128,11 +128,11 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, True),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, True),
             (Channel.DEVICE, Platform.TVOS, True, False),
             (Channel.USER, Platform.IOS, True, False),
-            (Channel.USER, Platform.IPADOS, True, False),
+            (Channel.USER, Platform.IPADOS, True, True),
             (Channel.USER, Platform.MACOS, True, True),
             (Channel.USER, Platform.TVOS, True, False),
         ):

diff --git a/tests/mdm/test_installed_application_list_command.py b/tests/mdm/test_installed_application_list_command.py
@@ -53,7 +53,7 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, True),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, False),
             (Channel.DEVICE, Platform.TVOS, True, False),
             (Channel.USER, Platform.IOS, True, False),

diff --git a/tests/mdm/test_managed_application_list_command.py b/tests/mdm/test_managed_application_list_command.py
@@ -143,7 +143,7 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, True),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, True),
             (Channel.DEVICE, Platform.TVOS, True, False),
             (Channel.USER, Platform.IOS, True, False),

diff --git a/tests/mdm/test_profile_list_command.py b/tests/mdm/test_profile_list_command.py
@@ -48,11 +48,11 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, True),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, True),
             (Channel.DEVICE, Platform.TVOS, True, False),
             (Channel.USER, Platform.IOS, True, False),
-            (Channel.USER, Platform.IPADOS, True, False),
+            (Channel.USER, Platform.IPADOS, True, True),
             (Channel.USER, Platform.MACOS, True, True),
             (Channel.USER, Platform.TVOS, True, False),
         ):

diff --git a/tests/mdm/test_remove_application_command.py b/tests/mdm/test_remove_application_command.py
@@ -122,7 +122,7 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, False),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, False),
             (Channel.DEVICE, Platform.TVOS, True, False),
             (Channel.USER, Platform.IOS, True, False),

diff --git a/tests/mdm/test_remove_profile_command.py b/tests/mdm/test_remove_profile_command.py
@@ -127,11 +127,11 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, True),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, True),
             (Channel.DEVICE, Platform.TVOS, True, False),
             (Channel.USER, Platform.IOS, True, False),
-            (Channel.USER, Platform.IPADOS, True, False),
+            (Channel.USER, Platform.IPADOS, True, True),
             (Channel.USER, Platform.MACOS, True, True),
             (Channel.USER, Platform.TVOS, True, False),
         ):

diff --git a/tests/mdm/test_security_info_command.py b/tests/mdm/test_security_info_command.py
@@ -63,7 +63,7 @@ def test_scope(self):
             (Channel.USER, Platform.MACOS, False, False),
             (Channel.USER, Platform.TVOS, False, False),
             (Channel.DEVICE, Platform.IOS, True, True),
-            (Channel.DEVICE, Platform.IPADOS, True, False),
+            (Channel.DEVICE, Platform.IPADOS, True, True),
             (Channel.DEVICE, Platform.MACOS, True, True),
             (Channel.DEVICE, Platform.TVOS, True, False),
         ):

diff --git a/zentral/contrib/mdm/commands/certificate_list.py b/zentral/contrib/mdm/commands/certificate_list.py
@@ -20,7 +20,7 @@ def verify_channel_and_device(channel, enrolled_device):
             channel == Channel.DEVICE
             and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform in (Platform.IOS, Platform.MACOS)
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS, Platform.MACOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/device_information.py b/zentral/contrib/mdm/commands/device_information.py
@@ -106,7 +106,7 @@ def verify_channel_and_device(channel, enrolled_device):
                 or enrolled_device.platform in (Platform.MACOS, Platform.IPADOS)
             ) and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform in (Platform.IOS, Platform.MACOS)
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS, Platform.MACOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/install_application.py b/zentral/contrib/mdm/commands/install_application.py
@@ -20,7 +20,7 @@ def verify_channel_and_device(channel, enrolled_device):
                 or enrolled_device.platform == Platform.MACOS
             ) and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform in (Platform.IOS, Platform.MACOS)
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS, Platform.MACOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/install_profile.py b/zentral/contrib/mdm/commands/install_profile.py
@@ -53,7 +53,7 @@ def verify_channel_and_device(channel, enrolled_device):
                 or enrolled_device.platform in (Platform.IPADOS, Platform.MACOS)
             ) and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform in (Platform.IOS, Platform.MACOS)
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS, Platform.MACOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/installed_application_list.py b/zentral/contrib/mdm/commands/installed_application_list.py
@@ -19,7 +19,7 @@ def verify_channel_and_device(channel, enrolled_device):
                 or enrolled_device.platform == Platform.MACOS
             ) and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform == Platform.IOS
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/managed_application_list.py b/zentral/contrib/mdm/commands/managed_application_list.py
@@ -18,7 +18,7 @@ def verify_channel_and_device(channel, enrolled_device):
                 or enrolled_device.platform == Platform.MACOS
             ) and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform in (Platform.IOS, Platform.MACOS)
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS, Platform.MACOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/profile_list.py b/zentral/contrib/mdm/commands/profile_list.py
@@ -22,7 +22,7 @@ def verify_channel_and_device(channel, enrolled_device):
                 or enrolled_device.platform in (Platform.IPADOS, Platform.MACOS)
             ) and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform in (Platform.IOS, Platform.MACOS)
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS, Platform.MACOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/remove_application.py b/zentral/contrib/mdm/commands/remove_application.py
@@ -16,7 +16,7 @@ def verify_channel_and_device(channel, enrolled_device):
             channel == Channel.DEVICE
             and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform == Platform.IOS
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/remove_profile.py b/zentral/contrib/mdm/commands/remove_profile.py
@@ -18,7 +18,7 @@ def verify_channel_and_device(channel, enrolled_device):
                 or enrolled_device.platform in (Platform.IPADOS, Platform.MACOS)
             ) and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform in (Platform.IOS, Platform.MACOS)
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS, Platform.MACOS)
             )
         )
 

diff --git a/zentral/contrib/mdm/commands/security_info.py b/zentral/contrib/mdm/commands/security_info.py
@@ -29,7 +29,7 @@ def verify_channel_and_device(channel, enrolled_device):
             channel == Channel.DEVICE
             and (
                 not enrolled_device.user_enrollment
-                or enrolled_device.platform in (Platform.IOS, Platform.MACOS)
+                or enrolled_device.platform in (Platform.IOS, Platform.IPADOS, Platform.MACOS)
             )
         )