Ignore expired identities for Darwin codesigning. (project-chip#19330)

Fixes project-chip#19327
bzbarsky-apple · Jun 8, 2022 · 2593ab9 · 2593ab9
1 parent 3bec7f6
commit 2593ab9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/examples/all-clusters-app/linux/entitlements/codesign.py b/examples/all-clusters-app/linux/entitlements/codesign.py
@@ -34,7 +34,8 @@ def get_identity():
             "No valid identity has been found. Application will run without entitlements.")
         exit(0)
 
-    identity = re.search(r'\b[0-9a-fA-F]{40}\b', command_result)
+    command_result = command_result.replace("\\n", "\n")
+    identity = re.search(r'\b[0-9a-fA-F]{40}\b(?![^\n]*\(CSSMERR_TP_CERT_EXPIRED\))', command_result)
     if identity is None:
         print(
             "No valid identity has been found. Application will run without entitlements.")

diff --git a/examples/all-clusters-minimal-app/linux/entitlements/codesign.py b/examples/all-clusters-minimal-app/linux/entitlements/codesign.py
@@ -34,7 +34,8 @@ def get_identity():
             "No valid identity has been found. Application will run without entitlements.")
         exit(0)
 
-    identity = re.search(r'\b[0-9a-fA-F]{40}\b', command_result)
+    command_result = command_result.replace("\\n", "\n")
+    identity = re.search(r'\b[0-9a-fA-F]{40}\b(?![^\n]*\(CSSMERR_TP_CERT_EXPIRED\))', command_result)
     if identity is None:
         print(
             "No valid identity has been found. Application will run without entitlements.")

diff --git a/examples/darwin-framework-tool/entitlements/codesign.py b/examples/darwin-framework-tool/entitlements/codesign.py
@@ -34,7 +34,8 @@ def get_identity():
             "No valid identity has been found. Application will run without entitlements.")
         exit(0)
 
-    identity = re.search(r'\b[0-9a-fA-F]{40}\b', command_result)
+    command_result = command_result.replace("\\n", "\n")
+    identity = re.search(r'\b[0-9a-fA-F]{40}\b(?![^\n]*\(CSSMERR_TP_CERT_EXPIRED\))', command_result)
     if identity is None:
         print(
             "No valid identity has been found. Application will run without entitlements.")