From 5ab883396032cd6da58f5097bd75a05beadc10f0 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sat, 2 Aug 2014 16:42:37 +0000 Subject: QPID-5955 : [Java Broker] Add systest and fix isSecure() for HTTPS connections git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1615329 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugin/connector/TcpAndSslSelectChannelConnector.java | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'qpid/java/broker-plugins') diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/connector/TcpAndSslSelectChannelConnector.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/connector/TcpAndSslSelectChannelConnector.java index 4e49003dff..197032398e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/connector/TcpAndSslSelectChannelConnector.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/connector/TcpAndSslSelectChannelConnector.java @@ -136,6 +136,17 @@ public class TcpAndSslSelectChannelConnector extends SelectChannelConnector super.doStart(); } + @Override + public boolean isConfidential(final Request request) + { + if(request.getScheme().equals(HttpSchemes.HTTPS)) + { + final int confidentialPort=getConfidentialPort(); + return confidentialPort==0||confidentialPort==request.getServerPort(); + } + return super.isConfidential(request); + } + enum Protocol { UNKNOWN, TCP , SSL } private class ProtocolIdentifyingEndpoint extends SelectChannelEndPoint -- cgit v1.2.1