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/04/11 17:30:39 UTC
svn commit: r1586683 [2/2] - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/model/adapter/
broker-core/src/ma...
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java Fri Apr 11 15:30:38 2014
@@ -75,7 +75,7 @@ public class PortFactoryTest extends Qpi
setTestSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES, null);
setTestSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES, null);
_portFactory = new PortFactory();
-
+ _attributes.put(Port.NAME, getName());
_attributes.put(Port.PORT, _portNumber);
_attributes.put(Port.TRANSPORTS, _tcpStringSet);
_attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
@@ -309,6 +309,7 @@ public class PortFactoryTest extends Qpi
_attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
_attributes.put(Port.PORT, _portNumber);
_attributes.put(Port.TRANSPORTS, _tcpStringSet);
+ _attributes.put(Port.NAME, getName());
Port port = _portFactory.createPort(_portId, _broker, _attributes);
@@ -334,6 +335,7 @@ public class PortFactoryTest extends Qpi
_attributes.put(Port.PROTOCOLS, nonAmqpStringSet);
_attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
_attributes.put(Port.PORT, _portNumber);
+ _attributes.put(Port.NAME, getName());
Port port = _portFactory.createPort(_portId, _broker, _attributes);
@@ -371,7 +373,7 @@ public class PortFactoryTest extends Qpi
{
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(Port.PORT, 1);
- attributes.put(Port.NAME, getTestName());
+ attributes.put(Port.NAME, getName());
attributes.put(Port.TRANSPORTS, Collections.singleton(Transport.TCP));
attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI));
@@ -396,7 +398,7 @@ public class PortFactoryTest extends Qpi
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(Port.PORT, 1);
- attributes.put(Port.NAME, getTestName());
+ attributes.put(Port.NAME, getName());
attributes.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL));
attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI));
_attributes.put(Port.KEY_STORE, keyStoreName);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Fri Apr 11 15:30:38 2014
@@ -286,7 +286,7 @@ public class MockVirtualHost implements
}
@Override
- public int getHouseKeepingThreadCount()
+ public int getHousekeepingThreadCount()
{
return 0;
}
@@ -660,12 +660,6 @@ public class MockVirtualHost implements
}
@Override
- public org.apache.qpid.server.model.VirtualHost getModel()
- {
- return null;
- }
-
- @Override
public EventLogger getEventLogger()
{
return null;
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java Fri Apr 11 15:30:38 2014
@@ -50,9 +50,6 @@ public class ACLFileAccessControlProvide
@ManagedAttributeField
private String _path;
- @ManagedAttributeField
- private String _type;
-
public ACLFileAccessControlProvider(Broker broker,
Map<String, Object> attributes)
{
@@ -80,12 +77,6 @@ public class ACLFileAccessControlProvide
return _path;
}
- @ManagedAttribute( automate = true )
- public String getType()
- {
- return _type;
- }
-
@Override
public String setName(String currentName, String desiredName) throws IllegalStateException, AccessControlException
{
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Fri Apr 11 15:30:38 2014
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.protocol.v0_10;
+import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.CHANNEL_FORMAT;
+import static org.apache.qpid.util.Serial.gt;
+
import java.security.AccessController;
import java.security.Principal;
import java.security.PrivilegedAction;
@@ -44,16 +47,14 @@ import java.util.concurrent.atomic.Atomi
import javax.security.auth.Subject;
-import org.apache.qpid.server.connection.SessionPrincipal;
-import org.apache.qpid.server.consumer.ConsumerImpl;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.Consumer;
-import org.apache.qpid.server.protocol.ConsumerListener;
-import org.apache.qpid.server.store.StoreException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.TransactionTimeoutHelper;
import org.apache.qpid.server.TransactionTimeoutHelper.CloseAction;
+import org.apache.qpid.server.connection.SessionPrincipal;
+import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.messages.ChannelMessages;
@@ -61,11 +62,16 @@ import org.apache.qpid.server.logging.su
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageInstance;
+import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Consumer;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.protocol.CapacityChecker;
+import org.apache.qpid.server.protocol.ConsumerListener;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.security.AuthorizationHolder;
import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.StoreFuture;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.txn.AlreadyKnownDtxException;
@@ -84,12 +90,21 @@ import org.apache.qpid.server.txn.Unknow
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.Deletable;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-import org.apache.qpid.transport.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.CHANNEL_FORMAT;
-import static org.apache.qpid.util.Serial.gt;
+import org.apache.qpid.transport.Binary;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageFlow;
+import org.apache.qpid.transport.MessageFlowMode;
+import org.apache.qpid.transport.MessageSetFlowMode;
+import org.apache.qpid.transport.MessageStop;
+import org.apache.qpid.transport.MessageTransfer;
+import org.apache.qpid.transport.Method;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.RangeSetFactory;
+import org.apache.qpid.transport.Session;
+import org.apache.qpid.transport.SessionDelegate;
+import org.apache.qpid.transport.Xid;
public class ServerSession extends Session
implements AuthorizationHolder,
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Fri Apr 11 15:30:38 2014
@@ -20,6 +20,24 @@
*/
package org.apache.qpid.server.management.amqp;
+import java.nio.charset.Charset;
+import java.security.AccessControlException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.consumer.ConsumerTarget;
import org.apache.qpid.server.filter.FilterManager;
@@ -32,12 +50,12 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.message.internal.InternalMessageHeader;
-import org.apache.qpid.server.model.ManagedObject;
+import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.plugin.SystemNodeCreator;
import org.apache.qpid.server.protocol.AMQSessionModel;
@@ -50,13 +68,6 @@ import org.apache.qpid.server.util.Actio
import org.apache.qpid.server.util.StateChangeListener;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-import java.nio.charset.Charset;
-import java.security.AccessControlException;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
class ManagementNode implements MessageSource, MessageDestination
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java Fri Apr 11 15:30:38 2014
@@ -27,7 +27,7 @@ public class ManagementNodeCreator imple
@Override
public void register(final SystemNodeRegistry registry)
{
- ManagementNode managementNode = new ManagementNode(registry,registry.getVirtualHostModel());
+ ManagementNode managementNode = new ManagementNode(registry,registry.getVirtualHost());
registry.registerSystemNode(managementNode);
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Fri Apr 11 15:30:38 2014
@@ -20,7 +20,35 @@
*/
package org.apache.qpid.server.management.plugin;
+import java.lang.reflect.Type;
+import java.net.SocketAddress;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import javax.servlet.DispatcherType;
+
import org.apache.log4j.Logger;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.SessionManager;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
import org.apache.qpid.server.management.plugin.filter.ForbiddingAuthorisationFilter;
@@ -28,32 +56,23 @@ import org.apache.qpid.server.management
import org.apache.qpid.server.management.plugin.servlet.DefinedFileServlet;
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
import org.apache.qpid.server.management.plugin.servlet.LogFileServlet;
-import org.apache.qpid.server.management.plugin.servlet.rest.*;
+import org.apache.qpid.server.management.plugin.servlet.rest.HelperServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.LogFileListingServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.LogRecordsServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.LoggedOnUserPreferencesServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.LogoutServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.MessageContentServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.MessageServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.SaslServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.StructureServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.UserPreferencesServlet;
import org.apache.qpid.server.model.*;
-import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.adapter.AbstractPluginAdapter;
+import org.apache.qpid.server.model.port.PortWithAuthProvider;
import org.apache.qpid.server.util.MapValueConverter;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.SessionManager;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import javax.servlet.DispatcherType;
-import java.lang.reflect.Type;
-import java.net.SocketAddress;
-import java.security.GeneralSecurityException;
-import java.util.*;
@ManagedObject( category = false, type = "MANAGEMENT-HTTP" )
public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implements HttpManagementConfiguration<HttpManagement>
@@ -62,12 +81,6 @@ public class HttpManagement extends Abst
// 10 minutes by default
public static final int DEFAULT_TIMEOUT_IN_SECONDS = 60 * 10;
- public static final boolean DEFAULT_HTTP_BASIC_AUTHENTICATION_ENABLED = false;
- public static final boolean DEFAULT_HTTPS_BASIC_AUTHENTICATION_ENABLED = true;
- public static final boolean DEFAULT_HTTP_SASL_AUTHENTICATION_ENABLED = true;
- public static final boolean DEFAULT_HTTPS_SASL_AUTHENTICATION_ENABLED = true;
- public static final String DEFAULT_NAME = "httpManagement";
-
public static final String TIME_OUT = "sessionTimeout";
public static final String HTTP_BASIC_AUTHENTICATION_ENABLED = "httpBasicAuthenticationEnabled";
public static final String HTTPS_BASIC_AUTHENTICATION_ENABLED = "httpsBasicAuthenticationEnabled";
@@ -80,17 +93,6 @@ public class HttpManagement extends Abst
@SuppressWarnings("serial")
- public static final Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>()
- {{
- put(HTTP_BASIC_AUTHENTICATION_ENABLED, DEFAULT_HTTP_BASIC_AUTHENTICATION_ENABLED);
- put(HTTPS_BASIC_AUTHENTICATION_ENABLED, DEFAULT_HTTPS_BASIC_AUTHENTICATION_ENABLED);
- put(HTTP_SASL_AUTHENTICATION_ENABLED, DEFAULT_HTTP_SASL_AUTHENTICATION_ENABLED);
- put(HTTPS_SASL_AUTHENTICATION_ENABLED, DEFAULT_HTTPS_SASL_AUTHENTICATION_ENABLED);
- put(TIME_OUT, DEFAULT_TIMEOUT_IN_SECONDS);
- put(NAME, DEFAULT_NAME);
- }});
-
- @SuppressWarnings("serial")
private static final Map<String, Type> ATTRIBUTE_TYPES = Collections.unmodifiableMap(new HashMap<String, Type>(){{
put(HTTP_BASIC_AUTHENTICATION_ENABLED, Boolean.class);
put(HTTPS_BASIC_AUTHENTICATION_ENABLED, Boolean.class);
@@ -105,9 +107,24 @@ public class HttpManagement extends Abst
private Server _server;
+ @ManagedAttributeField
+ private boolean _httpsSaslAuthenticationEnabled;
+
+ @ManagedAttributeField
+ private boolean _httpSaslAuthenticationEnabled;
+
+ @ManagedAttributeField
+ private boolean _httpsBasicAuthenticationEnabled;
+
+ @ManagedAttributeField
+ private boolean _httpBasicAuthenticationEnabled;
+
+ @ManagedAttributeField
+ private int _sessionTimeout;
+
public HttpManagement(UUID id, Broker broker, Map<String, Object> attributes)
{
- super(id, DEFAULTS, MapValueConverter.convert(attributes, ATTRIBUTE_TYPES), broker);
+ super(id, Collections.<String,Object>emptyMap(), attributes, broker);
}
@Override
@@ -165,7 +182,7 @@ public class HttpManagement extends Abst
public int getSessionTimeout()
{
- return (Integer)getAttribute(TIME_OUT);
+ return _sessionTimeout;
}
@SuppressWarnings("unchecked")
@@ -201,8 +218,8 @@ public class HttpManagement extends Abst
throw new IllegalConfigurationException("Key store is not configured. Cannot start management on HTTPS port without keystore");
}
SslContextFactory factory = new SslContextFactory();
- final boolean needClientAuth = Boolean.valueOf(String.valueOf(port.getAttribute(Port.NEED_CLIENT_AUTH)));
- final boolean wantClientAuth = Boolean.valueOf(String.valueOf(port.getAttribute(Port.WANT_CLIENT_AUTH)));
+ final boolean needClientAuth = port instanceof PortWithAuthProvider && ((PortWithAuthProvider)port).getNeedClientAuth();
+ final boolean wantClientAuth = port instanceof PortWithAuthProvider && ((PortWithAuthProvider)port).getWantClientAuth();
boolean needClientCert = needClientAuth || wantClientAuth;
if (needClientCert && trustStores.isEmpty())
{
@@ -419,25 +436,25 @@ public class HttpManagement extends Abst
@Override
public boolean isHttpsSaslAuthenticationEnabled()
{
- return (Boolean)getAttribute(HTTPS_SASL_AUTHENTICATION_ENABLED);
+ return _httpsSaslAuthenticationEnabled;
}
@Override
public boolean isHttpSaslAuthenticationEnabled()
{
- return (Boolean)getAttribute(HTTP_SASL_AUTHENTICATION_ENABLED);
+ return _httpSaslAuthenticationEnabled;
}
@Override
public boolean isHttpsBasicAuthenticationEnabled()
{
- return (Boolean)getAttribute(HTTPS_BASIC_AUTHENTICATION_ENABLED);
+ return _httpsBasicAuthenticationEnabled;
}
@Override
public boolean isHttpBasicAuthenticationEnabled()
{
- return (Boolean)getAttribute(HTTP_BASIC_AUTHENTICATION_ENABLED);
+ return _httpBasicAuthenticationEnabled;
}
@Override
@@ -475,10 +492,4 @@ public class HttpManagement extends Abst
}
}
-
- @Override
- public String getPluginType()
- {
- return PLUGIN_TYPE;
- }
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java Fri Apr 11 15:30:38 2014
@@ -23,26 +23,24 @@ package org.apache.qpid.server.managemen
import java.net.SocketAddress;
import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedAttribute;
-import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.Plugin;
public interface HttpManagementConfiguration<X extends HttpManagementConfiguration<X>> extends Plugin<X>
{
- @ManagedAttribute
+ @ManagedAttribute( automate = true, defaultValue = "true" )
boolean isHttpsSaslAuthenticationEnabled();
- @ManagedAttribute
+ @ManagedAttribute( automate = true, defaultValue = "true" )
boolean isHttpSaslAuthenticationEnabled();
- @ManagedAttribute
+ @ManagedAttribute( automate = true, defaultValue = "true" )
boolean isHttpsBasicAuthenticationEnabled();
- @ManagedAttribute
+ @ManagedAttribute( automate = true, defaultValue = "false" )
boolean isHttpBasicAuthenticationEnabled();
- @ManagedAttribute
+ @ManagedAttribute( automate = true, defaultValue = "600" )
public int getSessionTimeout();
AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java Fri Apr 11 15:30:38 2014
@@ -18,15 +18,15 @@
*/
package org.apache.qpid.server.management.plugin;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.mockito.Mockito.mock;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import static org.mockito.Mockito.mock;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.test.utils.QpidTestCase;
public class HttpManagementFactoryTest extends QpidTestCase
{
@@ -40,11 +40,13 @@ public class HttpManagementFactoryTest e
public void testCreateInstance() throws Exception
{
+ _attributes.put(ConfiguredObject.NAME, getName());
_attributes.put(ConfiguredObject.TYPE, HttpManagement.PLUGIN_TYPE);
_attributes.put(HttpManagement.TIME_OUT, SESSION_TIMEOUT);
_attributes.put(ConfiguredObject.ID, _id);
HttpManagement management = _pluginFactory.createInstance(_attributes, _broker);
+ management.open();
assertEquals(_broker, management.getParent(Broker.class));
assertEquals(SESSION_TIMEOUT, management.getSessionTimeout());
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java Fri Apr 11 15:30:38 2014
@@ -31,7 +31,6 @@ import java.util.UUID;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.test.utils.QpidTestCase;
public class HttpManagementTest extends QpidTestCase
@@ -54,6 +53,7 @@ public class HttpManagementTest extends
attributes.put(HttpManagement.NAME, getTestName());
attributes.put(HttpManagement.TIME_OUT, 10000l);
_management = new HttpManagement(_id, _broker, attributes);
+ _management.open();
}
public void testGetSessionTimeout()
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java Fri Apr 11 15:30:38 2014
@@ -24,6 +24,7 @@ package org.apache.qpid.server.jmx;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -44,6 +45,7 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedAttribute;
+import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
import org.apache.qpid.server.model.Port;
@@ -71,13 +73,6 @@ public class JMXManagement extends Abstr
public static final boolean DEFAULT_USE_PLATFORM_MBEAN_SERVER = true;
@SuppressWarnings("serial")
- private static final Map<String, Object> DEFAULTS = new HashMap<String, Object>(){{
- put(USE_PLATFORM_MBEAN_SERVER, DEFAULT_USE_PLATFORM_MBEAN_SERVER);
- put(NAME, DEFAULT_NAME);
- put(TYPE, PLUGIN_TYPE);
- }};
-
- @SuppressWarnings("serial")
private static final Map<String, Type> ATTRIBUTE_TYPES = new HashMap<String, Type>(){{
put(USE_PLATFORM_MBEAN_SERVER, Boolean.class);
put(NAME, String.class);
@@ -89,9 +84,12 @@ public class JMXManagement extends Abstr
private final Map<ConfiguredObject, AMQManagedObject> _children = new HashMap<ConfiguredObject, AMQManagedObject>();
+ @ManagedAttributeField
+ private boolean _usePlatformMBeanServer;
+
public JMXManagement(UUID id, Broker broker, Map<String, Object> attributes)
{
- super(id, DEFAULTS, MapValueConverter.convert(attributes, ATTRIBUTE_TYPES), broker);
+ super(id, Collections.<String,Object>emptyMap(), attributes, broker);
}
@Override
@@ -363,15 +361,9 @@ public class JMXManagement extends Abstr
}
}
- @Override
- public String getPluginType()
- {
- return PLUGIN_TYPE;
- }
-
- @ManagedAttribute
+ @ManagedAttribute( automate = true, defaultValue = "true" )
public boolean getUsePlatformMBeanServer()
{
- return (Boolean)getAttribute(USE_PLATFORM_MBEAN_SERVER);
+ return _usePlatformMBeanServer;
}
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java Fri Apr 11 15:30:38 2014
@@ -39,13 +39,13 @@ public class JMXManagementFactoryTest ex
{
_attributes.put(ConfiguredObject.ID,UUID.randomUUID());
_attributes.put(ConfiguredObject.TYPE, JMXManagement.PLUGIN_TYPE);
+ _attributes.put(ConfiguredObject.NAME, getName());
JMXManagement jmxManagement = _jmxManagementFactory.createInstance( _attributes, _broker);
jmxManagement.open();
assertNotNull(jmxManagement);
assertEquals("Unexpected plugin type", JMXManagement.PLUGIN_TYPE, jmxManagement.getType());
assertEquals("Unexpected default mbean platform", JMXManagement.DEFAULT_USE_PLATFORM_MBEAN_SERVER, jmxManagement.getAttribute(JMXManagement.USE_PLATFORM_MBEAN_SERVER));
- assertEquals("Unexpected default name", JMXManagement.DEFAULT_NAME, jmxManagement.getAttribute(JMXManagement.NAME));
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java Fri Apr 11 15:30:38 2014
@@ -44,6 +44,7 @@ import org.apache.qpid.server.model.Auth
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.security.FileTrustStore;
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -199,9 +200,9 @@ public class ExternalAuthenticationTest
//add the peersOnly store to the config
Map<String, Object> sslTrustStoreAttributes = new HashMap<String, Object>();
sslTrustStoreAttributes.put(TrustStore.NAME, peerStoreName);
- sslTrustStoreAttributes.put(TrustStore.PATH, BROKER_PEERSTORE);
- sslTrustStoreAttributes.put(TrustStore.PASSWORD, BROKER_PEERSTORE_PASSWORD);
- sslTrustStoreAttributes.put(TrustStore.PEERS_ONLY, true);
+ sslTrustStoreAttributes.put(FileTrustStore.PATH, BROKER_PEERSTORE);
+ sslTrustStoreAttributes.put(FileTrustStore.PASSWORD, BROKER_PEERSTORE_PASSWORD);
+ sslTrustStoreAttributes.put(FileTrustStore.PEERS_ONLY, true);
getBrokerConfiguration().addObjectConfiguration(TrustStore.class, sslTrustStoreAttributes);
super.setUp();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java Fri Apr 11 15:30:38 2014
@@ -38,11 +38,11 @@ public class HttpManagementRestTest exte
details.get(HttpManagement.TIME_OUT));
assertEquals("Unexpected http basic auth enabled", true,
details.get(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED));
- assertEquals("Unexpected https basic auth enabled", HttpManagement.DEFAULT_HTTPS_BASIC_AUTHENTICATION_ENABLED,
+ assertEquals("Unexpected https basic auth enabled", true,
details.get(HttpManagement.HTTPS_BASIC_AUTHENTICATION_ENABLED));
- assertEquals("Unexpected http sasl auth enabled", HttpManagement.DEFAULT_HTTP_SASL_AUTHENTICATION_ENABLED,
+ assertEquals("Unexpected http sasl auth enabled", true,
details.get(HttpManagement.HTTP_SASL_AUTHENTICATION_ENABLED));
- assertEquals("Unexpected https sasl auth enabled", HttpManagement.DEFAULT_HTTPS_SASL_AUTHENTICATION_ENABLED,
+ assertEquals("Unexpected https sasl auth enabled", true,
details.get(HttpManagement.HTTPS_SASL_AUTHENTICATION_ENABLED));
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java Fri Apr 11 15:30:38 2014
@@ -30,10 +30,11 @@ import org.codehaus.jackson.JsonGenerati
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
+import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.security.AbstractKeyStoreAdapter;
+import org.apache.qpid.server.security.FileKeyStore;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.test.utils.TestSSLConstants;
@@ -107,8 +108,8 @@ public class KeyStoreRestTest extends Qp
//add a new key store config to use
Map<String, Object> sslKeyStoreAttributes = new HashMap<String, Object>();
sslKeyStoreAttributes.put(KeyStore.NAME, name);
- sslKeyStoreAttributes.put(KeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
- sslKeyStoreAttributes.put(KeyStore.PASSWORD, TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
+ sslKeyStoreAttributes.put(FileKeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
+ sslKeyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
getBrokerConfiguration().addObjectConfiguration(KeyStore.class,sslKeyStoreAttributes);
//add the SSL port using it
@@ -152,7 +153,7 @@ public class KeyStoreRestTest extends Qp
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(KeyStore.NAME, name);
- attributes.put(KeyStore.PATH, TestSSLConstants.UNTRUSTED_KEYSTORE);
+ attributes.put(FileKeyStore.PATH, TestSSLConstants.UNTRUSTED_KEYSTORE);
int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes);
assertEquals("Unexpected response code for keystore update", 200, responseCode);
@@ -175,7 +176,7 @@ public class KeyStoreRestTest extends Qp
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(KeyStore.NAME, name);
- attributes.put(KeyStore.PATH, "does.not.exist");
+ attributes.put(FileKeyStore.PATH, "does.not.exist");
int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes);
assertEquals("Unexpected response code for keystore update", 409, responseCode);
@@ -204,7 +205,7 @@ public class KeyStoreRestTest extends Qp
//Update the certAlias from app1 to app2
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(KeyStore.NAME, name);
- attributes.put(KeyStore.CERTIFICATE_ALIAS, "app2");
+ attributes.put(FileKeyStore.CERTIFICATE_ALIAS, "app2");
int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes);
assertEquals("Unexpected response code for keystore update", 200, responseCode);
@@ -217,7 +218,7 @@ public class KeyStoreRestTest extends Qp
//Update the certAlias to clear it (i.e go from from app1 to null)
attributes = new HashMap<String, Object>();
attributes.put(KeyStore.NAME, name);
- attributes.put(KeyStore.CERTIFICATE_ALIAS, null);
+ attributes.put(FileKeyStore.CERTIFICATE_ALIAS, null);
responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes);
assertEquals("Unexpected response code for keystore update", 200, responseCode);
@@ -242,9 +243,9 @@ public class KeyStoreRestTest extends Qp
{
Map<String, Object> keyStoreAttributes = new HashMap<String, Object>();
keyStoreAttributes.put(KeyStore.NAME, name);
- keyStoreAttributes.put(KeyStore.PATH, TestSSLConstants.KEYSTORE);
- keyStoreAttributes.put(KeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
- keyStoreAttributes.put(KeyStore.CERTIFICATE_ALIAS, certAlias);
+ keyStoreAttributes.put(FileKeyStore.PATH, TestSSLConstants.KEYSTORE);
+ keyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
+ keyStoreAttributes.put(FileKeyStore.CERTIFICATE_ALIAS, certAlias);
int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name, "PUT", keyStoreAttributes);
assertEquals("Unexpected response code", 201, responseCode);
@@ -255,17 +256,17 @@ public class KeyStoreRestTest extends Qp
assertEquals("default systests key store is missing",
name, keystore.get(KeyStore.NAME));
assertEquals("unexpected path to key store",
- path, keystore.get(KeyStore.PATH));
+ path, keystore.get(FileKeyStore.PATH));
assertEquals("unexpected (dummy) password of default systests key store",
- AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK, keystore.get(KeyStore.PASSWORD));
+ AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.PASSWORD));
assertEquals("unexpected type of default systests key store",
- java.security.KeyStore.getDefaultType(), keystore.get(KeyStore.KEY_STORE_TYPE));
+ java.security.KeyStore.getDefaultType(), keystore.get(FileKeyStore.KEY_STORE_TYPE));
assertEquals("unexpected certificateAlias value",
- certAlias, keystore.get(KeyStore.CERTIFICATE_ALIAS));
+ certAlias, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
if(certAlias == null)
{
assertFalse("should not be a certificateAlias attribute",
- keystore.containsKey(KeyStore.CERTIFICATE_ALIAS));
+ keystore.containsKey(FileKeyStore.CERTIFICATE_ALIAS));
}
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java Fri Apr 11 15:30:38 2014
@@ -30,10 +30,11 @@ import org.codehaus.jackson.JsonGenerati
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
+import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.security.AbstractKeyStoreAdapter;
+import org.apache.qpid.server.security.FileTrustStore;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.test.utils.TestSSLConstants;
@@ -105,8 +106,8 @@ public class TrustStoreRestTest extends
//add a new trust store config to use
Map<String, Object> sslTrustStoreAttributes = new HashMap<String, Object>();
sslTrustStoreAttributes.put(TrustStore.NAME, name);
- sslTrustStoreAttributes.put(TrustStore.PATH, TestSSLConstants.TRUSTSTORE);
- sslTrustStoreAttributes.put(TrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
+ sslTrustStoreAttributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ sslTrustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
getBrokerConfiguration().addObjectConfiguration(TrustStore.class,sslTrustStoreAttributes);
//add the SSL port using it
@@ -151,7 +152,7 @@ public class TrustStoreRestTest extends
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(TrustStore.NAME, name);
- attributes.put(TrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes);
assertEquals("Unexpected response code for truststore update", 200, responseCode);
@@ -174,7 +175,7 @@ public class TrustStoreRestTest extends
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(TrustStore.NAME, name);
- attributes.put(TrustStore.PATH, "does.not.exist");
+ attributes.put(FileTrustStore.PATH, "does.not.exist");
int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes);
assertEquals("Unexpected response code for trust store update", 409, responseCode);
@@ -199,7 +200,7 @@ public class TrustStoreRestTest extends
//update the peersOnly attribute from false to true
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(TrustStore.NAME, name);
- attributes.put(TrustStore.PEERS_ONLY, true);
+ attributes.put(FileTrustStore.PEERS_ONLY, true);
int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes);
assertEquals("Unexpected response code for trust store update", 200, responseCode);
@@ -212,7 +213,7 @@ public class TrustStoreRestTest extends
//Update peersOnly to clear it (i.e go from from true to null, which will default to false)
attributes = new HashMap<String, Object>();
attributes.put(TrustStore.NAME, name);
- attributes.put(TrustStore.PEERS_ONLY, null);
+ attributes.put(FileTrustStore.PEERS_ONLY, null);
responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes);
assertEquals("Unexpected response code for trust store update", 200, responseCode);
@@ -238,9 +239,9 @@ public class TrustStoreRestTest extends
Map<String, Object> trustStoreAttributes = new HashMap<String, Object>();
trustStoreAttributes.put(TrustStore.NAME, name);
//deliberately using the client trust store to differentiate from the one we are already for broker
- trustStoreAttributes.put(TrustStore.PATH, TestSSLConstants.TRUSTSTORE);
- trustStoreAttributes.put(TrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
- trustStoreAttributes.put(TrustStore.PEERS_ONLY, peersOnly);
+ trustStoreAttributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ trustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
+ trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly);
int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name, "PUT", trustStoreAttributes);
assertEquals("Unexpected response code", 201, responseCode);
@@ -251,12 +252,12 @@ public class TrustStoreRestTest extends
assertEquals("default systests trust store is missing",
name, truststore.get(TrustStore.NAME));
assertEquals("unexpected path to trust store",
- path, truststore.get(TrustStore.PATH));
+ path, truststore.get(FileTrustStore.PATH));
assertEquals("unexpected (dummy) password of default systests trust store",
- AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK, truststore.get(TrustStore.PASSWORD));
+ AbstractConfiguredObject.SECURED_STRING_VALUE, truststore.get(FileTrustStore.PASSWORD));
assertEquals("unexpected type of default systests trust store",
- java.security.KeyStore.getDefaultType(), truststore.get(TrustStore.TRUST_STORE_TYPE));
+ java.security.KeyStore.getDefaultType(), truststore.get(FileTrustStore.TRUST_STORE_TYPE));
assertEquals("unexpected peersOnly value",
- peersOnly, truststore.get(TrustStore.PEERS_ONLY));
+ peersOnly, truststore.get(FileTrustStore.PEERS_ONLY));
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1586683&r1=1586682&r2=1586683&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Fri Apr 11 15:30:38 2014
@@ -41,6 +41,8 @@ import org.apache.qpid.server.model.Port
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.security.FileKeyStore;
+import org.apache.qpid.server.security.FileTrustStore;
import org.apache.qpid.server.security.access.FileAccessControlProviderConstants;
import org.apache.qpid.server.security.acl.AbstractACLTestCase;
import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
@@ -433,16 +435,16 @@ public class BrokerACLTest extends QpidR
assertKeyStoreExistence(keyStoreName, true);
Map<String, Object> keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName);
- assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(KeyStore.CERTIFICATE_ALIAS));
+ assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS));
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(KeyStore.NAME, keyStoreName);
- attributes.put(KeyStore.CERTIFICATE_ALIAS, updatedCertAlias);
+ attributes.put(FileKeyStore.CERTIFICATE_ALIAS, updatedCertAlias);
responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + keyStoreName, "PUT", attributes);
assertEquals("Setting of keystore attributes should be allowed", 200, responseCode);
keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName);
- assertEquals("Unexpected certificateAlias attribute value", updatedCertAlias, keyStore.get(KeyStore.CERTIFICATE_ALIAS));
+ assertEquals("Unexpected certificateAlias attribute value", updatedCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS));
}
public void testSetKeyStoreAttributesDenied() throws Exception
@@ -460,18 +462,18 @@ public class BrokerACLTest extends QpidR
assertKeyStoreExistence(keyStoreName, true);
Map<String, Object> keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName);
- assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(KeyStore.CERTIFICATE_ALIAS));
+ assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS));
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(KeyStore.NAME, keyStoreName);
- attributes.put(KeyStore.CERTIFICATE_ALIAS, updatedCertAlias);
+ attributes.put(FileKeyStore.CERTIFICATE_ALIAS, updatedCertAlias);
responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + keyStoreName, "PUT", attributes);
assertEquals("Setting of keystore attributes should be denied", 403, responseCode);
keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName);
- assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(KeyStore.CERTIFICATE_ALIAS));
+ assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS));
}
/* === TrustStore === */
@@ -561,16 +563,16 @@ public class BrokerACLTest extends QpidR
assertTrustStoreExistence(trustStoreName, true);
Map<String, Object> trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName);
- assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(TrustStore.PEERS_ONLY));
+ assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY));
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(TrustStore.NAME, trustStoreName);
- attributes.put(TrustStore.PEERS_ONLY, updatedPeersOnly);
+ attributes.put(FileTrustStore.PEERS_ONLY, updatedPeersOnly);
responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + trustStoreName, "PUT", attributes);
assertEquals("Setting of truststore attributes should be allowed", 200, responseCode);
trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName);
- assertEquals("Unexpected peersOnly attribute value", updatedPeersOnly, trustStore.get(TrustStore.PEERS_ONLY));
+ assertEquals("Unexpected peersOnly attribute value", updatedPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY));
}
public void testSetTrustStoreAttributesDenied() throws Exception
@@ -588,18 +590,18 @@ public class BrokerACLTest extends QpidR
assertTrustStoreExistence(trustStoreName, true);
Map<String, Object> trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName);
- assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(TrustStore.PEERS_ONLY));
+ assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY));
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(TrustStore.NAME, trustStoreName);
- attributes.put(TrustStore.PEERS_ONLY, updatedPeersOnly);
+ attributes.put(FileTrustStore.PEERS_ONLY, updatedPeersOnly);
responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + trustStoreName, "PUT", attributes);
assertEquals("Setting of truststore attributes should be denied", 403, responseCode);
trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName);
- assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(TrustStore.PEERS_ONLY));
+ assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY));
}
/* === Broker === */
@@ -928,11 +930,11 @@ public class BrokerACLTest extends QpidR
details.get(HttpManagement.TIME_OUT));
assertEquals("Unexpected http basic auth enabled", true,
details.get(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED));
- assertEquals("Unexpected https basic auth enabled", HttpManagement.DEFAULT_HTTPS_BASIC_AUTHENTICATION_ENABLED,
+ assertEquals("Unexpected https basic auth enabled", true,
details.get(HttpManagement.HTTPS_BASIC_AUTHENTICATION_ENABLED));
- assertEquals("Unexpected http sasl auth enabled", HttpManagement.DEFAULT_HTTP_SASL_AUTHENTICATION_ENABLED,
+ assertEquals("Unexpected http sasl auth enabled", true,
details.get(HttpManagement.HTTP_SASL_AUTHENTICATION_ENABLED));
- assertEquals("Unexpected https sasl auth enabled", HttpManagement.DEFAULT_HTTPS_SASL_AUTHENTICATION_ENABLED,
+ assertEquals("Unexpected https sasl auth enabled", true,
details.get(HttpManagement.HTTPS_SASL_AUTHENTICATION_ENABLED));
}
@@ -1041,9 +1043,9 @@ public class BrokerACLTest extends QpidR
{
Map<String, Object> keyStoreAttributes = new HashMap<String, Object>();
keyStoreAttributes.put(KeyStore.NAME, name);
- keyStoreAttributes.put(KeyStore.PATH, TestSSLConstants.KEYSTORE);
- keyStoreAttributes.put(KeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
- keyStoreAttributes.put(KeyStore.CERTIFICATE_ALIAS, certAlias);
+ keyStoreAttributes.put(FileKeyStore.PATH, TestSSLConstants.KEYSTORE);
+ keyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
+ keyStoreAttributes.put(FileKeyStore.CERTIFICATE_ALIAS, certAlias);
return getRestTestHelper().submitRequest("/rest/keystore/" + name, "PUT", keyStoreAttributes);
}
@@ -1052,9 +1054,9 @@ public class BrokerACLTest extends QpidR
{
Map<String, Object> trustStoreAttributes = new HashMap<String, Object>();
trustStoreAttributes.put(TrustStore.NAME, name);
- trustStoreAttributes.put(TrustStore.PATH, TestSSLConstants.KEYSTORE);
- trustStoreAttributes.put(TrustStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
- trustStoreAttributes.put(TrustStore.PEERS_ONLY, peersOnly);
+ trustStoreAttributes.put(FileTrustStore.PATH, TestSSLConstants.KEYSTORE);
+ trustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
+ trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly);
return getRestTestHelper().submitRequest("/rest/truststore/" + name, "PUT", trustStoreAttributes);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org