From afc3784a071ef0fbe133a250cf7a5ae397fabfa1 Mon Sep 17 00:00:00 2001 From: Jaxel Rojas Lopez Date: Wed, 16 Jul 2025 16:42:34 -0400 Subject: [PATCH 1/3] feat: added option logic to sign cip files --- .../TrustedSigning/Commands/InvokeCIPolicySigning.cs | 7 ++++--- .../TrustedSigning/Models/CodeSigningServiceClient.cs | 8 ++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/TrustedSigning/TrustedSigning/Commands/InvokeCIPolicySigning.cs b/src/TrustedSigning/TrustedSigning/Commands/InvokeCIPolicySigning.cs index 6ee29c471d07..238fb7bd69b6 100644 --- a/src/TrustedSigning/TrustedSigning/Commands/InvokeCIPolicySigning.cs +++ b/src/TrustedSigning/TrustedSigning/Commands/InvokeCIPolicySigning.cs @@ -65,7 +65,6 @@ public class InvokeCIPolicySigning : CodeSigningCmdletBase HelpMessage = "The endpoint url used to submit request to Azure TrustedSigning.")] public string EndpointUrl { get; set; } - /// /// Metadata File Path /// @@ -143,7 +142,9 @@ private void WriteMessage(string message) private void ValidateFileType(string fullInPath) { - if (string.Equals(System.IO.Path.GetExtension(fullInPath), ".bin", StringComparison.OrdinalIgnoreCase)) + string fileExtension = System.IO.Path.GetExtension(fullInPath); + if (string.Equals(fileExtension, ".bin", StringComparison.OrdinalIgnoreCase) || + string.Equals(fileExtension, ".cip", StringComparison.OrdinalIgnoreCase)) { WriteMessage(Environment.NewLine); WriteMessage("CI Policy file submitted"); @@ -166,7 +167,7 @@ private void ValidateFileType(string fullInPath) if (doc?.Root.Name == SiPolicyRootElementName) { WriteWarning("Input file is an XML-based policy file."); - WriteWarning("Please run 'ConvertFrom-CiPolicy' to create a .bin file before running this command."); + WriteWarning("Please run 'ConvertFrom-CiPolicy' to create a .bin or .cip file before running this command."); } try diff --git a/src/TrustedSigning/TrustedSigning/Models/CodeSigningServiceClient.cs b/src/TrustedSigning/TrustedSigning/Models/CodeSigningServiceClient.cs index ea4a79783945..bbd788c84875 100644 --- a/src/TrustedSigning/TrustedSigning/Models/CodeSigningServiceClient.cs +++ b/src/TrustedSigning/TrustedSigning/Models/CodeSigningServiceClient.cs @@ -43,17 +43,13 @@ public CodeSigningServiceClient(IAuthenticationFactory authFactory, IAzureContex if (context == null) throw new ArgumentNullException(nameof(context)); if (context.Environment == null) - //throw new ArgumentException(KeyVaultProperties.Resources.InvalidAzureEnvironment); + { throw new ArgumentException("Invalid Environment"); + } Initialize(authFactory, context); } - private Exception GetInnerException(Exception exception) - { - while (exception.InnerException != null) exception = exception.InnerException; - return exception; - } private void Initialize(IAuthenticationFactory authFactory, IAzureContext context) { From 9f835c928c56be2b8f21b3c759f319695e553941 Mon Sep 17 00:00:00 2001 From: Jaxel Rojas Lopez Date: Thu, 17 Jul 2025 11:15:14 -0400 Subject: [PATCH 2/3] docs; updated changelog.md --- src/TrustedSigning/TrustedSigning/ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/TrustedSigning/TrustedSigning/ChangeLog.md b/src/TrustedSigning/TrustedSigning/ChangeLog.md index 2fd44ec14754..60dd178a64d7 100644 --- a/src/TrustedSigning/TrustedSigning/ChangeLog.md +++ b/src/TrustedSigning/TrustedSigning/ChangeLog.md @@ -18,6 +18,7 @@ - Additional information about change #1 --> ## Upcoming Release +* Updated InvokeCiPolicySigning to support signing files with the .cip extension ## Version 0.1.1 * Modified InvokeCiPolicySigning to include ShouldProcess command confirmation From 9f411ded1e3c5af8ffff3fc37c97bde786f3e961 Mon Sep 17 00:00:00 2001 From: Jaxel Rojas Lopez Date: Thu, 17 Jul 2025 12:39:33 -0400 Subject: [PATCH 3/3] docs: update per copilot feedback --- src/TrustedSigning/TrustedSigning/ChangeLog.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TrustedSigning/TrustedSigning/ChangeLog.md b/src/TrustedSigning/TrustedSigning/ChangeLog.md index 60dd178a64d7..b7c02f34b7dc 100644 --- a/src/TrustedSigning/TrustedSigning/ChangeLog.md +++ b/src/TrustedSigning/TrustedSigning/ChangeLog.md @@ -18,10 +18,10 @@ - Additional information about change #1 --> ## Upcoming Release -* Updated InvokeCiPolicySigning to support signing files with the .cip extension +* Updated InvokeCIPolicySigning to support signing files with the .cip extension ## Version 0.1.1 -* Modified InvokeCiPolicySigning to include ShouldProcess command confirmation +* Modified InvokeCIPolicySigning to include ShouldProcess command confirmation ## Version 0.1.0 * Renamed from Az.CodeSigning