Fix macOS 14.7 build parsing

tests/inventory/test_macos_build_parser.py

@@ -104,6 +104,8 @@ def test_ok(self):
  ("23D60", ("macOS", 14, 3, 1, None), "macOS 14.3.1 (23D60)"),
  ("23E214", ("macOS", 14, 4, 0, None), "macOS 14.4 (23E214)"),
  ("23G93", ("macOS", 14, 6, 1, None), "macOS 14.6.1 (23G93)"),
+ ("23H124", ("macOS", 14, 7, 0, None), "macOS 14.7 (23H124)"),
+ ("24A335", ("macOS", 15, 0, 0, None), "macOS 15.0 (24A335)"),
  ):
  expected_version_d = {
  "name": name,

tests/santa/test_setup_views.py

@@ -384,7 +384,7 @@ def test_post_update_configuration_view(self, post_event):
  "remount_usb_mode": "rdonly, noexec",
  "voting_realm": realm.pk,
  "banned_threshold": -50,
- "default_ballot_target_types": "METABUNDLE,SIGNINGID",
+ "default_ballot_target_types": ["METABUNDLE", "SIGNINGID"],
  "default_voting_weight": 1,
  "globally_allowlisted_threshold": 500,
  "partially_allowlisted_threshold": 100,

zentral/contrib/inventory/conf.py

@@ -271,7 +271,7 @@ def macos_version_from_build(build):
  patch = 0
  if patch_letter >= "G" and major == 12 and patch_number >= 816:
  minor = 7
- elif patch_letter >= "G" and patch_number >= 115:
+ elif patch_letter >= "G" and major in (12, 13) and patch_number >= 115:
  minor = 6
  elif minor > 0 and major < 14:
  minor -= 1

zentral/contrib/santa/forms.py

@@ -16,11 +16,22 @@
 logger = logging.getLogger("zentral.contrib.santa.forms")
 
 
+class TargetTypesWidget(forms.CheckboxSelectMultiple):
+ def __init__(self, attrs=None, choices=()):
+ super().__init__(attrs, choices=Target.Type.choices)
+
+ def format_value(self, value):
+ if isinstance(value, str) and value:
+ value = [v.strip() for v in value.split(",")]
+ return super().format_value(value)
+
+
 class ConfigurationForm(forms.ModelForm):
  class Meta:
  model = Configuration
  fields = '__all__'
  widgets = {
+ "default_ballot_target_types": TargetTypesWidget,
  "event_detail_url": forms.Textarea(attrs={"cols": "40", "rows": "3"}),
  "allowed_path_regex": forms.Textarea(attrs={"cols": "40", "rows": "3"}),
  "blocked_path_regex": forms.Textarea(attrs={"cols": "40", "rows": "3"})
@@ -73,6 +84,7 @@ class Meta:
  "ballot_target_types",
  "voting_weight"
  )
+ widgets = {"ballot_target_types": TargetTypesWidget}
 
  def __init__(self, *args, **kwargs):
  self.configuration = kwargs.pop("configuration")
@@ -1023,7 +1035,7 @@ def results(self, current_username, current_email, offset, limit):
 
  for key, display_str in Target.objects.get_targets_display_strings(targets.keys()).items():
  for idx in targets[key]:
- results[idx][f"target_display_str"] = display_str
+ results[idx]["target_display_str"] = display_str
 
  return results