From 82350e259e64d48837f8e8e4c6004f3d502a8443 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Fri, 5 Sep 2014 17:43:14 +0000 Subject: QPID-6068: [Java Broker] Introduce ClientAuthCapablePort into Port hierarchy to avoid validation in terms of getAttributes. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1622747 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/resources/js/qpid/management/addPort.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'qpid/java/broker-plugins') diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js index 88425a6bab..43ccdfff70 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js @@ -90,6 +90,12 @@ define(["dojo/_base/xhr", }; + addPort._isSecure = function(currentTransport) + { + return currentTransport == "SSL" || (lang.isArray(currentTransport) && array.indexOf(currentTransport, "SSL")>=0) + || currentTransport == "WSS" || (lang.isArray(currentTransport) && array.indexOf(currentTransport, "WSS")>=0); + } + addPort._convertToPort = function(formValues) { var newPort = {}; @@ -155,7 +161,7 @@ define(["dojo/_base/xhr", var initialTransport = transportWidget.initialValue; var currentTransport = transportWidget.value; - if (currentTransport == "SSL" || (lang.isArray(currentTransport) && array.indexOf(currentTransport, "SSL")>=0)) + if (addPort._isSecure(currentTransport)) { newPort.needClientAuth = needClientAuth.checked; newPort.wantClientAuth = wantClientAuth.checked @@ -191,7 +197,7 @@ define(["dojo/_base/xhr", var clientAuthPanel = dojo.byId("formAddPort:fieldsClientAuth"); var transportSSLPanelNode = dom.byId("formAddPort:fieldsTransportSSL"); - if (transportType == "SSL" || (lang.isArray(transportType) && array.indexOf(transportType, "SSL")>=0)) + if (addPort._isSecure(transportType)) { var typeMetaData = metadata.getMetaData("Port", portType); var clientAuth = "needClientAuth" in typeMetaData.attributes || "wantClientAuth" in typeMetaData.attributes; -- cgit v1.2.1