Finalize custom certficate support. hook with UI

Kelven Yang · Kelven Yang · commit 160b2e111477 · 2011-04-22T13:45:09.000-07:00
diff --git a/api/src/com/cloud/api/commands/UploadCustomCertificateCmd.java b/api/src/com/cloud/api/commands/UploadCustomCertificateCmd.java
@@ -83,10 +83,10 @@ public long getEntityOwnerId() {
     @Override
     public void execute(){
         String result = _mgr.uploadCertificate(this);
-        if (result != null){
+        if (result != null) {
             CustomCertificateResponse response = new CustomCertificateResponse();
             response.setResponseName(getCommandName());
-            response.setUpdatedConsoleProxyIdList(result);
+            response.setResultMessage(result);
             response.setObjectName("customcertificate");
             this.setResponseObject(response);
         } else {
diff --git a/api/src/com/cloud/api/response/CustomCertificateResponse.java b/api/src/com/cloud/api/response/CustomCertificateResponse.java
@@ -22,15 +22,14 @@
 
 public class CustomCertificateResponse extends BaseResponse {
 
-    @SerializedName("updatedconsoleproxyidlist") @Param(description="the list of the console proxy ids which were successfully updated")
-    private String updatedConsoleProxyIdList;
+    @SerializedName("message") @Param(description="message of the certificate upload operation")
+    private String message;
 
-	public String getUpdatedConsoleProxyIdList() {
-		return updatedConsoleProxyIdList;
+	public String getResultMessage() {
+		return message;
 	}
 
-	public void setUpdatedConsoleProxyIdList(String updatedConsoleProxyIdList) {
-		this.updatedConsoleProxyIdList = updatedConsoleProxyIdList;
+	public void setResultMessage(String msg) {
+		this.message = msg;
 	}
-
 }
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
@@ -225,6 +225,8 @@ label.bytes.received=Bytes Received
 label.bytes.sent=Bytes Sent
 label.cancel=Cancel
 label.certificate=Certificate
+label.privatekey=Private Key
+label.domain.suffix=DNS Domain Suffix
 label.character=Character
 label.cidr.account=CIDR or Account/Security Group
 label.close=Close
diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxy.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxy.java
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-//
 package com.cloud.consoleproxy;
 
 import java.io.File;
diff --git a/server/src/com/cloud/keystore/KeystoreManagerImpl.java b/server/src/com/cloud/keystore/KeystoreManagerImpl.java
@@ -76,7 +76,7 @@ public boolean validateCertificate(String certificate, String key, String domain
 
 		try {
 			String ksPassword = "passwordForValidation";
-			byte[] ksBits = CertificateHelper.buildAndSaveKeystore(domainSuffix, certificate, key, ksPassword);
+			byte[] ksBits = CertificateHelper.buildAndSaveKeystore(domainSuffix, certificate, getKeyContent(key), ksPassword);
 			KeyStore ks = CertificateHelper.loadKeystore(ksBits, ksPassword);
 			if(ks != null)
 				return true;
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -4564,7 +4564,7 @@ public String uploadCertificate(UploadCustomCertificateCmd cmd) {
     	_ksMgr.saveCertificate(ConsoleProxyManager.CERTIFICATE_NAME, cmd.getCertificate(), cmd.getPrivateKey(), cmd.getDomainSuffix());
     	
     	_consoleProxyMgr.setManagementState(ConsoleProxyManagementState.ResetSuspending);
-    	return "Certificate has been updated, we will stop all running console proxy VMs for certificate propagation";
+    	return "Certificate has been updated, we will stop all running console proxy VMs to propagate the new certificate, please give a few minutes for console access service to be up again";
     }
 
     @Override
diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
@@ -644,9 +644,19 @@
 			<ol>
 				<li>
 					<label><fmt:message key="label.certificate"/>:</label>
-					<textarea class="text" name="update_cert" id="update_cert" style="height: 300px; width: 400px" />
+					<textarea class="text" name="update_cert" id="update_cert" style="height: 200px; width: 400px" />
 					<div id="update_cert_errormsg" class="dialog_formcontent_errormsg" style="display:none; width:300px" ></div>
 				</li>
+                <li>
+                    <label><fmt:message key="label.privatekey"/>:</label>
+                    <textarea class="text" name="update_privatekey" id="update_privatekey" style="height: 150px; width: 400px" />
+                    <div id="update_key_errormsg" class="dialog_formcontent_errormsg" style="display:none; width:300px" ></div>
+                </li>
+                <li>
+                    <label><fmt:message key="label.domain.suffix"/>:</label>
+                    <input class="text" name="update_domainsuffix" id="update_domainsuffix" style="width: 400px" />
+                    <div id="update_domainsuffix_errormsg" class="dialog_formcontent_errormsg" style="display:none; width:300px" ></div>
+                </li>
 			</ol>
 		</form>
 	</div>
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
@@ -1596,14 +1596,18 @@ function initUpdateConsoleCertButton($midMenuAddLink2) {
 				
 				var isValid = true;					
 				isValid &= validateString("SSL Certificate", $thisDialog.find("#update_cert"), $thisDialog.find("#update_cert_errormsg"), false, 4096);
+				isValid &= validateString("Private Key for Certificate", $thisDialog.find("#update_privatekey"), $thisDialog.find("#update_key_errormsg"), false, 4096);
+				isValid &= validateString("DNS domain suffix that certificate has been signed for", $thisDialog.find("#update_domainsuffix"), $thisDialog.find("#update_domainsuffix_errormsg"), false, 4096);
 				if (!isValid) return;	
 
 				$spinningWheel = $thisDialog.find("#spinning_wheel").show();
 				
 				var cert = trim($thisDialog.find("#update_cert").val());
+				var privateKey = trim($thisDialog.find("#update_privatekey").val());
+				var domainSuffix = trim($thisDialog.find("#update_domainsuffix").val());
 				
 				$.ajax({
-			        data: createURL("command=uploadCustomCertificate&certificate="+todb(cert)),
+			        data: createURL("command=uploadCustomCertificate&certificate="+todb(cert)+"&privatekey="+todb(privateKey)+"&domainsuffix="+todb(domainSuffix)),
 				    dataType: "json",
 				    success: function(json) {
 						var jobId = json.uploadcustomcertificateresponse.jobid;

Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,14 @@`
`22`	`22`
`23`	`23`	`public class CustomCertificateResponse extends BaseResponse {`
`24`	`24`
`25`		`- @SerializedName("updatedconsoleproxyidlist") @Param(description="the list of the console proxy ids which were successfully updated")`
`26`		`- private String updatedConsoleProxyIdList;`
	`25`	`+ @SerializedName("message") @Param(description="message of the certificate upload operation")`
	`26`	`+ private String message;`
`27`	`27`
`28`		`- public String getUpdatedConsoleProxyIdList() {`
`29`		`- return updatedConsoleProxyIdList;`
	`28`	`+ public String getResultMessage() {`
	`29`	`+ return message;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public void setUpdatedConsoleProxyIdList(String updatedConsoleProxyIdList) {`
`33`		`- this.updatedConsoleProxyIdList = updatedConsoleProxyIdList;`
	`32`	`+ public void setResultMessage(String msg) {`
	`33`	`+ this.message = msg;`
`34`	`34`	`}`
`35`		`-`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`* along with this program. If not, see <http://www.gnu.org/licenses/>.`
`16`	`16`	`*`
`17`	`17`	`*/`
`18`		`-//`
`19`	`18`	`package com.cloud.consoleproxy;`
`20`	`19`
`21`	`20`	`import java.io.File;`
Original file line number	Diff line number	Diff line change
`@@ -4564,7 +4564,7 @@ public String uploadCertificate(UploadCustomCertificateCmd cmd) {`
`4564`	`4564`	`_ksMgr.saveCertificate(ConsoleProxyManager.CERTIFICATE_NAME, cmd.getCertificate(), cmd.getPrivateKey(), cmd.getDomainSuffix());`
`4565`	`4565`
`4566`	`4566`	`_consoleProxyMgr.setManagementState(ConsoleProxyManagementState.ResetSuspending);`
`4567`		`- return "Certificate has been updated, we will stop all running console proxy VMs for certificate propagation";`
	`4567`	`+ return "Certificate has been updated, we will stop all running console proxy VMs to propagate the new certificate, please give a few minutes for console access service to be up again";`
`4568`	`4568`	`}`
`4569`	`4569`
`4570`	`4570`	`@Override`