Revize dd7fb7a3

Re #8706 - Rebased to current master

static/create_certificate.html

@@ -185 +185 @@
                     <label class="form-check-label" for="isSSL_TLS">SSL/TLS</label><br>
                 </td>
             </tr>
+            <tr>
+                <div class="form-group form-check">
+                    <td><label class="form-check-label" for="specifyPasswordCheckbox" style="margin-top: 15px">Custom key:</label></td>
+                    <td class="pl-3">
+                        <input type="checkbox" v-model="customKey" id="specifyPasswordCheckbox" name="specifyPassword" class="mb-2 form-check-input form-check">
+                    </td>
+                </div>
+            </tr>
+            <tr v-if="customKey">
+                <div class="form-group">
+                    <td class="pl-5"><label for="key_password">Password:</label></td>
+                    <td class="pl-3">
+                        <input type="text" v-model:value="key.password" id="key_password" name="key_password" class="form-control">
+                    </td>
+                </div>
+            </tr>
+            <tr v-if="customKey">
+                <div class="form-group">
+                    <td class="pl-5"><label for="key_pem">Private key:</label></td>
+                    <td class="pl-3">
+                        <input type="file" v-on:change="onKeyFileChange" id="key_pem" name="key_pem" class="form-control-file">
+                    </td>
+                </div>
+            </tr>
             <tr>
                 <td align="center">
                     <button class="btn btn-success mt-3 w-auto" v-on:click="onCreateCertificate()">Create certificate</button>

static/js/create_certificate.js

@@ -6 +6 @@
         notAfter: "",
         isSelfSigned: false,
         invalidCN: false,
+        customKey: false,
         // available certificate authorities
         authorities: [],
         // data of the selected certificate authorities to be displayed in the form
@@ -38 +39 @@
             },
             CA: null
         },
+        key: {
+            password: null,
+            key_pem: null,
+        },
         errorMessage: ""
     },
     // actions to be performed when the page is loaded
@@ -66 +71 @@
         }
     },
     methods: {
+        onKeyFileChange: function (event) {
+            var file = event.target.files[0];
+            var reader = new FileReader();
+            reader.readAsText(file, "UTF-8");
+            reader.onload = function (evt) {
+                createCertificateApp.key.key_pem = evt.target.result;
+            }
+            reader.onerror = function (evt) {
+                this.showError("Error occurred while reading custom private key file.");
+            }
+
+        },
         showError: function (message) {
             document.body.scrollTop = 0;
             document.documentElement.scrollTop = 0;
@@ -84 +101 @@
                 this.invalidCN = true;
                 return;
             }
+
+            // populate optional key field in the request body
+            if (this.key.password != null && this.key.password !== "") {
+                this.certificateData.key.password = this.key.password;
+            }
+            if (this.key.key_pem != null) {
+                this.certificateData.key.key_pem = this.key.key_pem;
+            }
+
             this.certificateData.validityDays = parseInt(this.certificateData.validityDays);
             try {
                 // create a deep copy of the certificate dataa
@@ -106 +132 @@
                     createCertificateApp.showError(response.data["data"]);
                 }
             } catch (error) {
-                this.showError("An error occurred while creating a certificate. For more details, see console.")
+                createCertificateApp.showError(response.data["data"]);
                 console.log(error);
             }
         }