QPID-8667: [Broker-J] Database connection with client certificate aut…

…hentication exposes keystore / truststore passwords (#240) added UI fix for the issue when creating a JSON Virtual Host Node with BDB Virtual host resulting in "dijit.registry.byId(...) is undefined" error
apache · Feb 8, 2024 · 4551a7e · 4551a7e
1 parent 5662bc5
commit 4551a7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/broker-plugins/management-http/src/main/java/resources/footer.html b/broker-plugins/management-http/src/main/java/resources/footer.html
@@ -19,7 +19,7 @@
  -
  -->
 
-<div class="footer"><p>&#xA9; 2004-<span class="currentYear">2023</span> The Apache Software Foundation.
+<div class="footer"><p>&#xA9; 2004-<span class="currentYear">2024</span> The Apache Software Foundation.
   <br/>
   Apache Qpid, Qpid, Apache, the Apache feather logo, and the Apache Qpid project logo are trademarks of
   The Apache Software Foundation.

diff --git a/...ement-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js b/...ement-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
@@ -397,37 +397,37 @@ define(["dojo/_base/event",
                         virtualHostData["context"] = virtualHostContext;
                     }
 
-                    const keystore = dijit.registry.byId('addVirtualHost.keyStore').get('value');
+                    const keystore = dijit.registry.byId("addVirtualHost.keyStore")?.get('value');
                     if (keystore)
                     {
                         virtualHostData["keyStore"] = keystore;
                     }
 
-                    const keystorePathPropertyName = dijit.registry.byId("addVirtualHost.keyStorePathPropertyName").get("value");
+                    const keystorePathPropertyName = dijit.registry.byId("addVirtualHost.keyStorePathPropertyName")?.get("value");
                     if (keystorePathPropertyName)
                     {
                         virtualHostData["keystorePathPropertyName"] = keystorePathPropertyName;
                     }
 
-                    const keystorePasswordPropertyName = dijit.registry.byId("addVirtualHost.keyStorePasswordPropertyName").get("value");
+                    const keystorePasswordPropertyName = dijit.registry.byId("addVirtualHost.keyStorePasswordPropertyName")?.get("value");
                     if (keystorePasswordPropertyName)
                     {
                         virtualHostData["keystorePasswordPropertyName"] = keystorePasswordPropertyName;
                     }
 
-                    const truststore = dijit.registry.byId("addVirtualHost.trustStore").get("value");
+                    const truststore = dijit.registry.byId("addVirtualHost.trustStore")?.get("value");
                     if (truststore)
                     {
                         virtualHostData["trustStore"] = truststore;
                     }
 
-                    const truststorePathPropertyName = dijit.registry.byId("addVirtualHost.trustStorePathPropertyName").get("value");
+                    const truststorePathPropertyName = dijit.registry.byId("addVirtualHost.trustStorePathPropertyName")?.get("value");
                     if (truststorePathPropertyName)
                     {
                         virtualHostData["truststorePathPropertyName"] = truststorePathPropertyName;
                     }
 
-                    const truststorePasswordPropertyName = dijit.registry.byId("addVirtualHost.trustStorePasswordPropertyName").get("value");
+                    const truststorePasswordPropertyName = dijit.registry.byId("addVirtualHost.trustStorePasswordPropertyName")?.get("value");
                     if (truststorePasswordPropertyName)
                     {
                         virtualHostData["truststorePasswordPropertyName"] = truststorePasswordPropertyName;