qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject qpid-broker-j git commit: QPID-7567: [Broker-J] Add UI and documentation for the feature
Date Fri, 23 Mar 2018 20:15:58 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 03b08426e -> a7e105751


QPID-7567: [Broker-J] Add UI and documentation for the feature


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/a7e10575
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/a7e10575
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/a7e10575

Branch: refs/heads/master
Commit: a7e1057513e8f5e369c96fc080ae457c60e2dae5
Parents: 03b0842
Author: Alex Rudyy <orudyy@apache.org>
Authored: Fri Mar 23 20:08:18 2018 +0000
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Fri Mar 23 20:08:18 2018 +0000

----------------------------------------------------------------------
 .../org/apache/qpid/server/security/FileKeyStore.java |  2 +-
 .../js/qpid/management/store/filekeystore/add.js      |  3 +++
 .../main/java/resources/store/filekeystore/add.html   | 14 +++++++++++++-
 .../main/java/resources/store/filekeystore/show.html  |  4 ++++
 .../Java-Broker-Management-Managing-Keystores.xml     |  6 ++++++
 5 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a7e10575/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
index 216dbad..56eede1 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
@@ -68,6 +68,6 @@ public interface FileKeyStore<X extends FileKeyStore<X>> extends
KeyStore<X>
     @ManagedAttribute( secure = true, mandatory = true )
     String getPassword();
 
-    @ManagedAttribute( defaultValue = "true")
+    @ManagedAttribute( defaultValue = "true", description = "Use SNI server name from the
SSL handshake to select the most appropriate certificate for the indicated hostname")
     boolean isUseHostNameMatching();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a7e10575/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
index eb868a7..1ffb105 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
@@ -25,6 +25,9 @@ define(["dojo/dom",
         "qpid/common/util",
         "dojo/parser",
         "dojo/text!store/filekeystore/add.html",
+        "dijit/form/CheckBox",
+        "dijit/form/ValidationTextBox",
+        "qpid/common/ResourceWidget",
         "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
 {
     var addKeyStore = {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a7e10575/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
b/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
index 676ae40..0ac6385 100644
--- a/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
+++ b/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
@@ -81,6 +81,18 @@
                               title: 'Enter the store type known to Java'" />
             </div>
         </div>
-
+        <div class="clear">
+            <div class="formLabel-labelCell tableContainer-labelCell">Use SNI host
name matching:</div>
+            <div class="formLabel-controlCell tableContainer-valueCell">
+                <input type="text" id="addStore.useHostNameMatching"
+                       data-dojo-type="dijit/form/CheckBox"
+                       data-dojo-props="
+                              name: 'useHostNameMatching'" />
+                <div data-dojo-type="dijit/Tooltip"
+                     data-dojo-props="connectId: ['addStore.useHostNameMatching'],
+                                      label: 'If true, SNI server name from the SSL handshake
will be used to select the most appropriate certificate for the indicated hostname'">
+                </div>
+            </div>
+        </div>
     </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a7e10575/broker-plugins/management-http/src/main/java/resources/store/filekeystore/show.html
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/store/filekeystore/show.html
b/broker-plugins/management-http/src/main/java/resources/store/filekeystore/show.html
index 9a1d93d..74284e5 100644
--- a/broker-plugins/management-http/src/main/java/resources/store/filekeystore/show.html
+++ b/broker-plugins/management-http/src/main/java/resources/store/filekeystore/show.html
@@ -34,6 +34,10 @@
         <div class="formLabel-labelCell">Key manager factory algorithm:</div>
         <div><span class="keyManagerFactoryAlgorithm" ></span></div>
     </div>
+    <div class="clear">
+        <div class="formLabel-labelCell">Use SNI host name matching:</div>
+        <div><span class="useHostNameMatching" ></span></div>
+    </div>
     <div class="clear"></div>
 </div>
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a7e10575/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Keystores.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Keystores.xml
b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Keystores.xml
index d6cbe67..bdd2850 100644
--- a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Keystores.xml
+++ b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Keystores.xml
@@ -95,6 +95,12 @@
                 <listitem>
                     <para><emphasis>Key Store Type</emphasis>. Type of
Keystore.</para>
                 </listitem>
+                <listitem>
+                    <para><emphasis>Use SNI host name matching</emphasis>.
If selected, SNI server name from
+                        an SSL handshake will be used to select the most appropriate certificate
+                        by matching an indicated hostname with the certificate hostname specified
in subject or
+                        subject alternatives as CN or DC.</para>
+                </listitem>
             </itemizedlist>
         </para>
         <para>The following attributes apply to <emphasis>Non Java Key Stores</emphasis>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message