diff options
Diffstat (limited to 'qpid/java/broker-plugins/jdbc-store/src')
10 files changed, 149 insertions, 14 deletions
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java index 7945ae3b46..a96d46af18 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java @@ -27,16 +27,27 @@ import java.sql.SQLException; class DefaultConnectionProvider implements ConnectionProvider { private final String _connectionUrl; + private final String _username; + private final String _password; - public DefaultConnectionProvider(String connectionUrl) + public DefaultConnectionProvider(String connectionUrl, String username, String password) { _connectionUrl = connectionUrl; + _username = username; + _password = password; } @Override public Connection getConnection() throws SQLException { - return DriverManager.getConnection(_connectionUrl); + if (_username == null) + { + return DriverManager.getConnection(_connectionUrl); + } + else + { + return DriverManager.getConnection(_connectionUrl, _username, _password); + } } @Override diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java index 2d8eec2021..9e10c54f7e 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java @@ -20,14 +20,16 @@ */ package org.apache.qpid.server.store.jdbc; -import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory; import org.apache.qpid.server.plugin.PluggableService; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + @PluggableService public class DefaultConnectionProviderFactory implements JDBCConnectionProviderFactory { - public static final String TYPE = "DEFAULT"; @Override @@ -37,9 +39,15 @@ public class DefaultConnectionProviderFactory implements JDBCConnectionProviderF } @Override - public ConnectionProvider getConnectionProvider(ConfiguredObject<?> parent, String connectionUrl) + public ConnectionProvider getConnectionProvider(String connectionUrl, String username, String password, Map<String, String> providerAttributes) + { + return new DefaultConnectionProvider(connectionUrl, username, password); + } + + @Override + public Set<String> getProviderAttributeNames() { - return new DefaultConnectionProvider(connectionUrl); + return Collections.emptySet(); } } diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java index 479ebd953b..ed25d97af0 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java @@ -20,18 +20,24 @@ package org.apache.qpid.server.store.jdbc; import java.nio.charset.Charset; +import java.security.PrivilegedAction; import java.sql.Blob; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.log4j.Logger; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory; +import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.store.*; +import javax.security.auth.Subject; + /** * Implementation of a DurableConfigurationStore backed by Generic JDBC Database * that also provides a MessageStore. @@ -93,11 +99,18 @@ public class GenericJDBCConfigurationStore extends AbstractJDBCConfigurationStor try { - _connectionProvider = connectionProviderFactory.getConnectionProvider(parent, _connectionURL); + Map<String, String> providerAttributes = new HashMap(_parent.getContext()); + providerAttributes.keySet().retainAll(connectionProviderFactory.getProviderAttributeNames()); + + _connectionProvider = connectionProviderFactory.getConnectionProvider(_connectionURL, + settings.getUsername(), + getPlainTextPassword(settings), + providerAttributes); } catch (SQLException e) { - throw new StoreException("Failed to create connection provider for " + _connectionURL); + throw new StoreException("Failed to create connection provider for connectionUrl: " + _connectionURL + + " and username: " + settings.getUsername()); } _blobType = details.getBlobType(); _varBinaryType = details.getVarBinaryType(); @@ -212,6 +225,18 @@ public class GenericJDBCConfigurationStore extends AbstractJDBCConfigurationStor return _providedMessageStore; } + protected String getPlainTextPassword(final JDBCSettings settings) + { + return Subject.doAs(SecurityManager.getSubjectWithAddedSystemRights(), new PrivilegedAction<String>() + { + @Override + public String run() + { + return settings.getPassword(); + } + }); + } + private class ProvidedMessageStore extends GenericAbstractJDBCMessageStore { @Override diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java index aa8964f84f..4fde0a44c7 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java @@ -21,17 +21,23 @@ package org.apache.qpid.server.store.jdbc; +import java.security.PrivilegedAction; import java.sql.Blob; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; import org.apache.log4j.Logger; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory; +import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.store.StoreException; +import javax.security.auth.Subject; + /** * Implementation of a MessageStore backed by a Generic JDBC Database. */ @@ -84,12 +90,19 @@ public class GenericJDBCMessageStore extends GenericAbstractJDBCMessageStore try { - // TODO: Pass parent to the connenction provider? - _connectionProvider = connectionProviderFactory.getConnectionProvider(parent, _connectionURL); + Map<String, String> providerAttributes = new HashMap(parent.getContext()); + providerAttributes.keySet().retainAll(connectionProviderFactory.getProviderAttributeNames()); + + + _connectionProvider = connectionProviderFactory.getConnectionProvider(_connectionURL, + settings.getUsername(), + getPlainTextPassword(settings), + providerAttributes); } catch (SQLException e) { - throw new StoreException("Failed to create connection provider for " + _connectionURL); + throw new StoreException("Failed to create connection provider for connectionUrl: " + _connectionURL + + " and username: " + settings.getUsername()); } } @@ -158,4 +171,15 @@ public class GenericJDBCMessageStore extends GenericAbstractJDBCMessageStore return _connectionURL; } + protected String getPlainTextPassword(final JDBCSettings settings) + { + return Subject.doAs(SecurityManager.getSubjectWithAddedSystemRights(), new PrivilegedAction<String>() + { + @Override + public String run() + { + return settings.getPassword(); + } + }); + } } diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java index 3f3b53eb06..d784ece0e4 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java @@ -26,4 +26,8 @@ public interface JDBCSettings extends Settings String getConnectionUrl(); String getConnectionPoolType(); + + String getUsername(); + + String getPassword(); } diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java index 9f794ac707..8608848d98 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java @@ -32,7 +32,12 @@ public interface JDBCVirtualHost<X extends JDBCVirtualHost<X>> extends VirtualHo @ManagedAttribute(mandatory=true) String getConnectionUrl(); - @ManagedAttribute(defaultValue= DefaultConnectionProviderFactory.TYPE) + @ManagedAttribute(defaultValue=DefaultConnectionProviderFactory.TYPE) String getConnectionPoolType(); + @ManagedAttribute + String getUsername(); + + @ManagedAttribute(secure=true) + String getPassword(); } diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java index f4e597c6a1..434e887596 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java @@ -41,6 +41,12 @@ public class JDBCVirtualHostImpl extends AbstractVirtualHost<JDBCVirtualHostImpl @ManagedAttributeField private String _connectionPoolType; + @ManagedAttributeField + private String _username; + + @ManagedAttributeField + private String _password; + @ManagedObjectFactoryConstructor public JDBCVirtualHostImpl(final Map<String, Object> attributes, final VirtualHostNode<?> virtualHostNode) @@ -65,4 +71,25 @@ public class JDBCVirtualHostImpl extends AbstractVirtualHost<JDBCVirtualHostImpl { return _connectionPoolType; } + + @Override + public String getUsername() + { + return _username; + } + + @Override + public String getPassword() + { + return _password; + } + + @Override + public String toString() + { + return getClass().getSimpleName() + " [id=" + getId() + ", name=" + getName() + + ", connectionUrl=" + getConnectionUrl() + + ", connectionPoolType=" + getConnectionPoolType() + + ", username=" + getUsername() + "]"; + } } diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java index a649dc1048..0ac75b3877 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java @@ -27,12 +27,15 @@ import org.apache.qpid.server.store.jdbc.JDBCSettings; public interface JDBCVirtualHostNode<X extends JDBCVirtualHostNode<X>> extends VirtualHostNode<X>, JDBCSettings { - //TODO: Split this attribute into connectionUrl, username and password. Make the password attribute secure. @ManagedAttribute(mandatory=true) String getConnectionUrl(); @ManagedAttribute(defaultValue=DefaultConnectionProviderFactory.TYPE) String getConnectionPoolType(); - //add username and passwd managed attrs + @ManagedAttribute + String getUsername(); + + @ManagedAttribute(secure=true) + String getPassword(); } diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java index 0c51d397bf..01acb9e0b5 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java @@ -41,6 +41,12 @@ public class JDBCVirtualHostNodeImpl extends AbstractStandardVirtualHostNode<JDB @ManagedAttributeField private String _connectionPoolType; + @ManagedAttributeField + private String _username; + + @ManagedAttributeField + private String _password; + @ManagedObjectFactoryConstructor public JDBCVirtualHostNodeImpl(Map<String, Object> attributes, Broker<?> parent) { @@ -70,4 +76,24 @@ public class JDBCVirtualHostNodeImpl extends AbstractStandardVirtualHostNode<JDB return _connectionPoolType; } + @Override + public String getUsername() + { + return _username; + } + + @Override + public String getPassword() + { + return _password; + } + + @Override + public String toString() + { + return getClass().getSimpleName() + " [id=" + getId() + ", name=" + getName() + + ", connectionUrl=" + getConnectionUrl() + + ", connectionPoolType=" + getConnectionPoolType() + + ", username=" + getUsername() + "]"; + } } diff --git a/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java b/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java index 3f48a8fc5a..207c5a8325 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java +++ b/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java @@ -70,6 +70,8 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase final JDBCVirtualHost jdbcVirtualHost = mock(JDBCVirtualHost.class); when(jdbcVirtualHost.getConnectionUrl()).thenReturn(_connectionURL); + when(jdbcVirtualHost.getUsername()).thenReturn("test"); + when(jdbcVirtualHost.getPassword()).thenReturn("pass"); return jdbcVirtualHost; } |