You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/09/05 21:26:07 UTC
svn commit: r1622768 - in
/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port:
AbstractClientAuthCapablePortWithAuthProvider.java AbstractPort.java
Author: rgodfrey
Date: Fri Sep 5 19:26:07 2014
New Revision: 1622768
URL: http://svn.apache.org/r1622768
Log:
QPID-6068 : Use single mechanism for determining if a port is "using TLS"
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java?rev=1622768&r1=1622767&r2=1622768&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java Fri Sep 5 19:26:07 2014
@@ -25,7 +25,6 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedAttributeField;
-import org.apache.qpid.server.model.Transport;
abstract public class AbstractClientAuthCapablePortWithAuthProvider<X extends AbstractClientAuthCapablePortWithAuthProvider<X>> extends AbstractPortWithAuthProvider<X>
implements ClientAuthCapablePort<X>
@@ -68,7 +67,7 @@ abstract public class AbstractClientAuth
throw new IllegalConfigurationException("Can't create port which requests SSL client certificates but has no trust stores configured.");
}
- boolean useTLSTransport = getTransports().contains(Transport.SSL) || getTransports().contains(Transport.WSS);
+ boolean useTLSTransport = isUsingTLSTransport();
if(useClientAuth && !useTLSTransport)
{
throw new IllegalConfigurationException(
@@ -84,7 +83,7 @@ abstract public class AbstractClientAuth
boolean requiresCertificate = updated.getNeedClientAuth() || updated.getWantClientAuth();
- boolean usesSsl = updated.getTransports().contains(Transport.SSL);
+ boolean usesSsl = isUsingTLSTransport(updated.getTransports());
if (usesSsl)
{
if ((updated.getTrustStores() == null || updated.getTrustStores().isEmpty() ) && requiresCertificate)
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1622768&r1=1622767&r2=1622768&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java Fri Sep 5 19:26:07 2014
@@ -149,7 +149,7 @@ abstract public class AbstractPort<X ext
{
super.onValidate();
- boolean useTLSTransport = getTransports().contains(Transport.SSL) || getTransports().contains(Transport.WSS);
+ boolean useTLSTransport = isUsingTLSTransport();
if(useTLSTransport && getKeyStore() == null)
{
@@ -175,6 +175,28 @@ abstract public class AbstractPort<X ext
}
}
+ protected final boolean isUsingTLSTransport()
+ {
+ return isUsingTLSTransport(getTransports());
+ }
+
+ protected final boolean isUsingTLSTransport(final Collection<Transport> transports)
+ {
+ boolean usesTLS = false;
+ if(transports != null)
+ {
+ for (Transport transport : transports)
+ {
+ if (transport.isSecure())
+ {
+ usesTLS = true;
+ break;
+ }
+ }
+ }
+ return usesTLS;
+ }
+
@Override
protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
{
@@ -215,7 +237,7 @@ abstract public class AbstractPort<X ext
Collection<Protocol> protocols = updated.getProtocols();
- boolean usesSsl = transports != null && transports.contains(Transport.SSL);
+ boolean usesSsl = isUsingTLSTransport(transports);
if (usesSsl)
{
if (updated.getKeyStore() == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org