Merge pull request dotnet#388 from dotnet/custom-cn

Enable common name to be specified

src/SignService/Controllers/KeyVaultController.cs

@@ -78,7 +78,7 @@ public async Task<IActionResult> CreateCertificate(CreateCertificateRequestModel
         {
             try
             {
-                var csr = await keyVaultAdminService.CreateCsrAsync(model.VaultName, model.CertificateName, model.CertificateName);
+                var csr = await keyVaultAdminService.CreateCsrAsync(model.VaultName, model.CertificateId, model.CommonName);
 
                 return RedirectToAction(nameof(Details), new { id = model.VaultName });
             }

src/SignService/Models/CreateCertificateRequestModel.cs

@@ -1,11 +1,17 @@
-using Microsoft.AspNetCore.Mvc;
+using System.ComponentModel;
+
+using Microsoft.AspNetCore.Mvc;
 
 namespace SignService.Models
 {
     public class CreateCertificateRequestModel
     {
         [HiddenInput]
         public string VaultName { get; set; }
-        public string CertificateName { get; set; }
+
+        [DisplayName("Certificate Id in the Key Vault")]
+        public string CertificateId { get; set; }
+
+        public string CommonName { get; set; }
     }
 }

src/SignService/Services/KeyVaultAdminService.cs

@@ -28,7 +28,7 @@ public interface IKeyVaultAdminService
         Task<DeleteCertificateOperation> CancelCsrAsync(string vaultName, string certificateName);
         Task<KeyVaultCertificateWithPolicy> MergeCertificate(string vaultName, string certificateName, byte[] certData);
         Task<CertificateOperation> GetCertificateOperation(Uri vaultUrl, string certificateName);
-        Task<CertificateOperation> CreateCsrAsync(string vaultName, string certificateName, string displayName);
+        Task<CertificateOperation> CreateCsrAsync(string vaultName, string certificateName, string commonName);
     }
 
     public class KeyVaultAdminService : IKeyVaultAdminService
@@ -300,9 +300,9 @@ public async Task<CertificateOperation> GetCertificateOperation(Uri vaultUrl, st
             }            
         }
 
-        public async Task<CertificateOperation> CreateCsrAsync(string vaultName, string certificateName, string displayName)
+        public async Task<CertificateOperation> CreateCsrAsync(string vaultName, string certificateName, string commonName)
         {
-            var policy = new CertificatePolicy("Unknown", $"CN={displayName}")
+            var policy = new CertificatePolicy("Unknown", $"CN={commonName}")
             {
                 KeyType = CertificateKeyType.RsaHsm,
                 KeySize = 4096

src/SignService/Views/KeyVault/CreateCertificate.cshtml

@@ -13,9 +13,14 @@
         <form asp-action="CreateCertificate" asp-antiforgery="true">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <div class="form-group">
-                <label asp-for="CertificateName" class="control-label"></label>
-                <input asp-for="CertificateName" class="form-control" />
-                <span asp-validation-for="CertificateName" class="text-danger"></span>
+                <label asp-for="CertificateId" class="control-label"></label>
+                <input asp-for="CertificateId" class="form-control" />
+                <span asp-validation-for="CertificateId" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="CommonName" class="control-label"></label>
+                <input asp-for="CommonName" class="form-control" />
+                <span asp-validation-for="CommonName" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <input type="submit" value="Create" class="btn btn-default" />