refactor signature handling validations (swiftlang#6680)

motivation: code cleanup changes: * extract signature validation to a seperate function * use guards to improve readability
bnbarham · Jul 7, 2023 · cf540dd · cf540dd
1 parent 99bab1c
commit cf540dd
Showing 1 changed file with 57 additions and 48 deletions.
diff --git a/Sources/Workspace/Workspace.swift b/Sources/Workspace/Workspace.swift
@@ -1130,58 +1130,14 @@ extension Workspace {
             observabilityScope: observabilityScope
         )
 
-        try expectedSigningEntities.forEach { identity, expectedSigningEntity in
-            if let package = packageGraph.packages.first(where: { $0.identity == identity }) {
-                if let actualSigningEntity = package.registryMetadata?.signature?.signedBy {
-                    if actualSigningEntity != expectedSigningEntity {
-                        throw SigningError.mismatchedSigningEntity(
-                            package: identity,
-                            expected: expectedSigningEntity,
-                            actual: actualSigningEntity
-                        )
-                    }
-                } else {
-                    throw SigningError.unsigned(package: identity, expected: expectedSigningEntity)
-                }
-            } else {
-                if let mirror = self.mirrors.mirror(for: identity.description) {
-                    let mirroredIdentity = PackageIdentity.plain(mirror)
-                    if mirroredIdentity.isRegistry {
-                        if let package = packageGraph.packages.first(where: { $0.identity == mirroredIdentity }) {
-                            if let actualSigningEntity = package.registryMetadata?.signature?.signedBy {
-                                if actualSigningEntity != expectedSigningEntity {
-                                    throw SigningError.mismatchedSigningEntity(
-                                        package: identity,
-                                        expected: expectedSigningEntity,
-                                        actual: actualSigningEntity
-                                    )
-                                }
-                            } else {
-                                throw SigningError.unsigned(package: identity, expected: expectedSigningEntity)
-                            }
-                        } else {
-                            // Unsure if this case is reachable in practice.
-                            throw SigningError.expectedIdentityNotFound(package: identity)
-                        }
-                    } else {
-                        throw SigningError.expectedSignedMirroredToSourceControl(package: identity, expected: expectedSigningEntity)
-                    }
-                } else {
-                    throw SigningError.expectedIdentityNotFound(package: identity)
-                }
-            }
-        }
+        try self.validateSignatures(
+            packageGraph: packageGraph,
+            expectedSigningEntities: expectedSigningEntities
+        )
 
         return packageGraph
     }
 
-    public enum SigningError: Swift.Error {
-        case expectedIdentityNotFound(package: PackageIdentity)
-        case expectedSignedMirroredToSourceControl(package: PackageIdentity, expected: RegistryReleaseMetadata.SigningEntity)
-        case mismatchedSigningEntity(package: PackageIdentity, expected: RegistryReleaseMetadata.SigningEntity, actual: RegistryReleaseMetadata.SigningEntity)
-        case unsigned(package: PackageIdentity, expected: RegistryReleaseMetadata.SigningEntity)
-    }
-
     @discardableResult
     public func loadPackageGraph(
         rootPath: AbsolutePath,
@@ -3552,6 +3508,59 @@ extension Workspace {
      }
  }
 
+// MARK: - Signatures
+
+extension Workspace {
+    private func validateSignatures(
+        packageGraph: PackageGraph,
+        expectedSigningEntities: [PackageIdentity: RegistryReleaseMetadata.SigningEntity]
+    ) throws {
+        try expectedSigningEntities.forEach { identity, expectedSigningEntity in
+            if let package = packageGraph.packages.first(where: { $0.identity == identity }) {
+                guard let actualSigningEntity = package.registryMetadata?.signature?.signedBy else {
+                    throw SigningError.unsigned(package: identity, expected: expectedSigningEntity)
+                }
+                if actualSigningEntity != expectedSigningEntity {
+                    throw SigningError.mismatchedSigningEntity(
+                        package: identity,
+                        expected: expectedSigningEntity,
+                        actual: actualSigningEntity
+                    )
+                }
+            } else {
+                guard let mirror = self.mirrors.mirror(for: identity.description) else {
+                    throw SigningError.expectedIdentityNotFound(package: identity)
+                }
+                let mirroredIdentity = PackageIdentity.plain(mirror)
+                guard mirroredIdentity.isRegistry else {
+                    throw SigningError.expectedSignedMirroredToSourceControl(package: identity, expected: expectedSigningEntity)
+                }
+                guard let package = packageGraph.packages.first(where: { $0.identity == mirroredIdentity }) else {
+                    // Unsure if this case is reachable in practice.
+                    throw SigningError.expectedIdentityNotFound(package: identity)
+                }
+                guard let actualSigningEntity = package.registryMetadata?.signature?.signedBy else {
+                    throw SigningError.unsigned(package: identity, expected: expectedSigningEntity)
+                }
+                if actualSigningEntity != expectedSigningEntity {
+                    throw SigningError.mismatchedSigningEntity(
+                        package: identity,
+                        expected: expectedSigningEntity,
+                        actual: actualSigningEntity
+                    )
+                }
+            }
+        }
+    }
+
+    public enum SigningError: Swift.Error {
+        case expectedIdentityNotFound(package: PackageIdentity)
+        case expectedSignedMirroredToSourceControl(package: PackageIdentity, expected: RegistryReleaseMetadata.SigningEntity)
+        case mismatchedSigningEntity(package: PackageIdentity, expected: RegistryReleaseMetadata.SigningEntity, actual: RegistryReleaseMetadata.SigningEntity)
+        case unsigned(package: PackageIdentity, expected: RegistryReleaseMetadata.SigningEntity)
+    }
+}
+
 // MARK: - Utility extensions
 
 fileprivate extension Workspace.ManagedArtifact {