Author: orudyy
Date: Thu Feb 5 22:53:16 2015
New Revision: 1657708
URL: http://svn.apache.org/r1657708
Log:
QPID-6364: Add a secure attribute 'storeUrl' into Keystore for specifying store
content location and make attribute 'path' derived. Rename Trsuststore
attribute 'path' into 'storeUrl' for consistency.
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html
qpid/trunk/qpid/java/systests/etc/config-systests.json
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
Thu Feb 5 22:53:16 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.security;
import javax.net.ssl.KeyManagerFactory;
+import org.apache.qpid.server.model.DerivedAttribute;
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedContextDefault;
@@ -35,7 +36,8 @@ public interface FileKeyStore<X extends
String CERTIFICATE_ALIAS = "certificateAlias";
String KEY_STORE_TYPE = "keyStoreType";
String PASSWORD = "password";
- String PATH = "path";
+ String STORE_URL = "storeUrl";
+
@ManagedContextDefault(name = "keyStoreFile.keyStoreType")
RuntimeDefault<String> DEFAULT_KEYSTORE_TYPE =
new RuntimeDefault<String>()
@@ -60,7 +62,10 @@ public interface FileKeyStore<X extends
@ManagedAttribute(defaultValue = "${this:path}")
String getDescription();
- @ManagedAttribute( mandatory = true)
+ @ManagedAttribute( mandatory = true, secure = true)
+ String getStoreUrl();
+
+ @DerivedAttribute
String getPath();
@ManagedAttribute
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
Thu Feb 5 22:53:16 2015
@@ -68,7 +68,8 @@ public class FileKeyStoreImpl extends Ab
private String _certificateAlias;
@ManagedAttributeField
private String _keyManagerFactoryAlgorithm;
- @ManagedAttributeField
+ @ManagedAttributeField(afterSet = "postSetStoreUrl")
+ private String _storeUrl;
private String _path;
@ManagedAttributeField
private String _password;
@@ -162,7 +163,7 @@ public class FileKeyStoreImpl extends Ab
java.security.KeyStore keyStore;
try
{
- URL url = getUrlFromString(fileKeyStore.getPath());
+ URL url = getUrlFromString(fileKeyStore.getStoreUrl());
String password = fileKeyStore.getPassword();
String keyStoreType = fileKeyStore.getKeyStoreType();
keyStore = SSLUtil.getInitializedKeyStore(url, password,
keyStoreType);
@@ -173,11 +174,11 @@ public class FileKeyStoreImpl extends Ab
final String message;
if (e instanceof IOException && e.getCause() != null &&
e.getCause() instanceof UnrecoverableKeyException)
{
- message = "Check key store password. Cannot instantiate key
store from '" + fileKeyStore.getPath() + "'.";
+ message = "Check key store password. Cannot instantiate key
store from '" + fileKeyStore.getStoreUrl() + "'.";
}
else
{
- message = "Cannot instantiate key store from '" +
fileKeyStore.getPath() + "'.";
+ message = "Cannot instantiate key store from '" +
fileKeyStore.getStoreUrl() + "'.";
}
throw new IllegalConfigurationException(message, e);
@@ -198,7 +199,7 @@ public class FileKeyStoreImpl extends Ab
if (cert == null)
{
throw new IllegalConfigurationException("Cannot find a
certificate with alias '" + fileKeyStore.getCertificateAlias()
- + "' in key store : " + fileKeyStore.getPath());
+ + "' in key store : " + fileKeyStore.getStoreUrl());
}
}
@@ -219,6 +220,12 @@ public class FileKeyStoreImpl extends Ab
}
@Override
+ public String getStoreUrl()
+ {
+ return _storeUrl;
+ }
+
+ @Override
public String getPath()
{
return _path;
@@ -258,7 +265,7 @@ public class FileKeyStoreImpl extends Ab
try
{
- URL url = getUrlFromString(_path);
+ URL url = getUrlFromString(_storeUrl);
if (_certificateAlias != null)
{
return new KeyManager[] {
@@ -301,4 +308,18 @@ public class FileKeyStoreImpl extends Ab
}
return url;
}
+
+ @SuppressWarnings(value = "unused")
+ private void postSetStoreUrl()
+ {
+ try
+ {
+ new URL(_storeUrl);
+ _path = null;
+ }
+ catch (MalformedURLException e)
+ {
+ _path = _storeUrl;
+ }
+ }
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
Thu Feb 5 22:53:16 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.security;
import javax.net.ssl.KeyManagerFactory;
+import org.apache.qpid.server.model.DerivedAttribute;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedContextDefault;
import org.apache.qpid.server.model.ManagedObject;
@@ -35,7 +36,7 @@ public interface FileTrustStore<X extend
String PEERS_ONLY = "peersOnly";
String TRUST_STORE_TYPE = "trustStoreType";
String PASSWORD = "password";
- String PATH = "path";
+ String STORE_URL = "storeUrl";
@ManagedContextDefault(name = "trustStoreFile.trustStoreType")
RuntimeDefault<String> DEFAULT_TRUSTSTORE_TYPE =
new RuntimeDefault<String>()
@@ -58,10 +59,13 @@ public interface FileTrustStore<X extend
};
- @ManagedAttribute(defaultValue = "${this:path}")
+ @ManagedAttribute(defaultValue = "${this:storeUrl}")
String getDescription();
@ManagedAttribute( mandatory = true )
+ String getStoreUrl();
+
+ @DerivedAttribute
String getPath();
@ManagedAttribute( defaultValue =
"${trustStoreFile.trustManagerFactoryAlgorithm}")
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
Thu Feb 5 22:53:16 2015
@@ -64,7 +64,8 @@ public class FileTrustStoreImpl extends
private String _trustStoreType;
@ManagedAttributeField
private String _trustManagerFactoryAlgorithm;
- @ManagedAttributeField
+ @ManagedAttributeField(afterSet = "postSetStoreUrl")
+ private String _storeUrl;
private String _path;
@ManagedAttributeField
private boolean _peersOnly;
@@ -193,7 +194,7 @@ public class FileTrustStoreImpl extends
{
try
{
- URL trustStoreUrl = getUrlFromString(trustStore.getPath());
+ URL trustStoreUrl = getUrlFromString(trustStore.getStoreUrl());
SSLUtil.getInitializedKeyStore(trustStoreUrl,
trustStore.getPassword(), trustStore.getTrustStoreType());
}
catch (Exception e)
@@ -201,11 +202,11 @@ public class FileTrustStoreImpl extends
final String message;
if (e instanceof IOException && e.getCause() != null &&
e.getCause() instanceof UnrecoverableKeyException)
{
- message = "Check trust store password. Cannot instantiate
trust store from '" + trustStore.getPath() + "'.";
+ message = "Check trust store password. Cannot instantiate
trust store from '" + trustStore.getStoreUrl() + "'.";
}
else
{
- message = "Cannot instantiate trust store from '" +
trustStore.getPath() + "'.";
+ message = "Cannot instantiate trust store from '" +
trustStore.getStoreUrl() + "'.";
}
throw new IllegalConfigurationException(message, e);
@@ -222,6 +223,12 @@ public class FileTrustStoreImpl extends
}
@Override
+ public String getStoreUrl()
+ {
+ return _storeUrl;
+ }
+
+ @Override
public String getPath()
{
return _path;
@@ -263,7 +270,7 @@ public class FileTrustStoreImpl extends
try
{
- URL trustStoreUrl = getUrlFromString(_path);
+ URL trustStoreUrl = getUrlFromString(_storeUrl);
KeyStore ts = SSLUtil.getInitializedKeyStore(trustStoreUrl,
trustStorePassword, trustStoreType);
final TrustManagerFactory tmf = TrustManagerFactory
@@ -328,4 +335,17 @@ public class FileTrustStoreImpl extends
return url;
}
+ @SuppressWarnings(value = "unused")
+ private void postSetStoreUrl()
+ {
+ try
+ {
+ new URL(_storeUrl);
+ _path = null;
+ }
+ catch (MalformedURLException e)
+ {
+ _path = _storeUrl;
+ }
+ }
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
Thu Feb 5 22:53:16 2015
@@ -245,10 +245,28 @@ public class BrokerStoreUpgraderAndRecov
{
record = upgradeRootRecord(record);
}
+ else if("KeyStore".equals(record.getType()))
+ {
+ record = upgradeKeyStore(record);
+ }
+ else if("TrustStore".equals(record.getType()))
+ {
+ record = upgradeKeyStore(record);
+ }
getNextUpgrader().configuredObject(record);
}
+ private ConfiguredObjectRecord upgradeKeyStore(ConfiguredObjectRecord
record)
+ {
+ Map<String, Object> attributes = new
HashMap<>(record.getAttributes());
+ Object path = attributes.remove("path");
+ attributes.put("storeUrl", path);
+ record = new ConfiguredObjectRecordImpl(record.getId(),
record.getType(), attributes, record.getParents());
+ getUpdateMap().put(record.getId(), record);
+ return record;
+ }
+
private boolean isAmqpPort(final Map<String, Object> attributes)
{
Object type = attributes.get(ConfiguredObject.TYPE);
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
Thu Feb 5 22:53:16 2015
@@ -69,7 +69,7 @@ public class FileKeyStoreTest extends Qp
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
+ attributes.put(FileKeyStore.STORE_URL,
TestSSLConstants.BROKER_KEYSTORE);
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
FileKeyStoreImpl fileKeyStore = (FileKeyStoreImpl)
_factory.create(KeyStore.class, attributes, _broker);
@@ -84,7 +84,7 @@ public class FileKeyStoreTest extends Qp
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
+ attributes.put(FileKeyStore.STORE_URL,
TestSSLConstants.BROKER_KEYSTORE);
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
attributes.put(FileKeyStore.CERTIFICATE_ALIAS,
TestSSLConstants.BROKER_KEYSTORE_ALIAS);
@@ -100,7 +100,7 @@ public class FileKeyStoreTest extends Qp
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
+ attributes.put(FileKeyStore.STORE_URL,
TestSSLConstants.BROKER_KEYSTORE);
attributes.put(FileKeyStore.PASSWORD, "wrong");
try
@@ -119,7 +119,7 @@ public class FileKeyStoreTest extends Qp
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, TestSSLConstants.KEYSTORE);
+ attributes.put(FileKeyStore.STORE_URL, TestSSLConstants.KEYSTORE);
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.KEYSTORE_PASSWORD);
attributes.put(FileKeyStore.CERTIFICATE_ALIAS, "notknown");
@@ -141,7 +141,7 @@ public class FileKeyStoreTest extends Qp
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, trustStoreAsDataUrl);
+ attributes.put(FileKeyStore.STORE_URL, trustStoreAsDataUrl);
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
FileKeyStoreImpl fileKeyStore = (FileKeyStoreImpl)
_factory.create(KeyStore.class, attributes, _broker);
@@ -158,7 +158,7 @@ public class FileKeyStoreTest extends Qp
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, trustStoreAsDataUrl);
+ attributes.put(FileKeyStore.STORE_URL, trustStoreAsDataUrl);
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
attributes.put(FileKeyStore.CERTIFICATE_ALIAS,
TestSSLConstants.BROKER_KEYSTORE_ALIAS);
@@ -177,7 +177,7 @@ public class FileKeyStoreTest extends Qp
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
attributes.put(FileKeyStore.PASSWORD, "wrong");
- attributes.put(FileKeyStore.PATH, keyStoreAsDataUrl);
+ attributes.put(FileKeyStore.STORE_URL, keyStoreAsDataUrl);
try
{
@@ -198,7 +198,7 @@ public class FileKeyStoreTest extends Qp
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
- attributes.put(FileKeyStore.PATH, keyStoreAsDataUrl);
+ attributes.put(FileKeyStore.STORE_URL, keyStoreAsDataUrl);
try
{
@@ -220,7 +220,7 @@ public class FileKeyStoreTest extends Qp
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
- attributes.put(FileKeyStore.PATH, keyStoreAsDataUrl);
+ attributes.put(FileKeyStore.STORE_URL, keyStoreAsDataUrl);
attributes.put(FileKeyStore.CERTIFICATE_ALIAS, "notknown");
try
@@ -242,7 +242,7 @@ public class FileKeyStoreTest extends Qp
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
+ attributes.put(FileKeyStore.STORE_URL,
TestSSLConstants.BROKER_KEYSTORE);
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
FileKeyStoreImpl fileKeyStore = (FileKeyStoreImpl)
_factory.create(KeyStore.class, attributes, _broker);
@@ -283,7 +283,7 @@ public class FileKeyStoreTest extends Qp
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
+ attributes.put(FileKeyStore.STORE_URL,
TestSSLConstants.BROKER_KEYSTORE);
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
FileKeyStoreImpl fileKeyStore = (FileKeyStoreImpl)
_factory.create(KeyStore.class, attributes, _broker);
@@ -299,7 +299,7 @@ public class FileKeyStoreTest extends Qp
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileKeyStore.NAME, "myFileKeyStore");
- attributes.put(FileKeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
+ attributes.put(FileKeyStore.STORE_URL,
TestSSLConstants.BROKER_KEYSTORE);
attributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
FileKeyStoreImpl fileKeyStore = (FileKeyStoreImpl)
_factory.create(KeyStore.class, attributes, _broker);
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
Thu Feb 5 22:53:16 2015
@@ -73,7 +73,7 @@ public class FileTrustStoreTest extends
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
- attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.TRUSTSTORE);
attributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.TRUSTSTORE_PASSWORD);
FileTrustStoreImpl fileTrustStore =
@@ -89,7 +89,7 @@ public class FileTrustStoreTest extends
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
- attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.TRUSTSTORE);
attributes.put(FileTrustStore.PASSWORD, "wrong");
try
@@ -108,7 +108,7 @@ public class FileTrustStoreTest extends
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
- attributes.put(FileTrustStore.PATH, TestSSLConstants.BROKER_PEERSTORE);
+ attributes.put(FileTrustStore.STORE_URL,
TestSSLConstants.BROKER_PEERSTORE);
attributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.BROKER_PEERSTORE_PASSWORD);
attributes.put(FileTrustStore.PEERS_ONLY, true);
@@ -129,7 +129,7 @@ public class FileTrustStoreTest extends
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
- attributes.put(FileTrustStore.PATH, trustStoreAsDataUrl);
+ attributes.put(FileTrustStore.STORE_URL, trustStoreAsDataUrl);
attributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.TRUSTSTORE_PASSWORD);
FileTrustStoreImpl fileTrustStore =
@@ -148,7 +148,7 @@ public class FileTrustStoreTest extends
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
attributes.put(FileTrustStore.PASSWORD, "wrong");
- attributes.put(FileTrustStore.PATH, trustStoreAsDataUrl);
+ attributes.put(FileTrustStore.STORE_URL, trustStoreAsDataUrl);
try
{
@@ -169,7 +169,7 @@ public class FileTrustStoreTest extends
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
attributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.TRUSTSTORE_PASSWORD);
- attributes.put(FileTrustStore.PATH, trustStoreAsDataUrl);
+ attributes.put(FileTrustStore.STORE_URL, trustStoreAsDataUrl);
try
{
@@ -191,18 +191,18 @@ public class FileTrustStoreTest extends
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
- attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.TRUSTSTORE);
attributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.TRUSTSTORE_PASSWORD);
FileTrustStoreImpl fileTrustStore =
(FileTrustStoreImpl) _factory.create(TrustStore.class,
attributes, _broker);
- assertEquals("Unexpected path value before change",
TestSSLConstants.TRUSTSTORE, fileTrustStore.getPath());
+ assertEquals("Unexpected path value before change",
TestSSLConstants.TRUSTSTORE, fileTrustStore.getStoreUrl());
try
{
Map<String,Object> unacceptableAttributes = new HashMap<>();
- unacceptableAttributes.put(FileTrustStore.PATH,
"/not/a/truststore");
+ unacceptableAttributes.put(FileTrustStore.STORE_URL,
"/not/a/truststore");
fileTrustStore.setAttributes(unacceptableAttributes);
fail("Exception not thrown");
@@ -213,17 +213,17 @@ public class FileTrustStoreTest extends
assertTrue("Exception text not as unexpected:" + message,
message.contains("Cannot instantiate trust store"));
}
- assertEquals("Unexpected path value after failed change",
TestSSLConstants.TRUSTSTORE, fileTrustStore.getPath());
+ assertEquals("Unexpected path value after failed change",
TestSSLConstants.TRUSTSTORE, fileTrustStore.getStoreUrl());
Map<String,Object> changedAttributes = new HashMap<>();
- changedAttributes.put(FileTrustStore.PATH,
TestSSLConstants.BROKER_TRUSTSTORE);
+ changedAttributes.put(FileTrustStore.STORE_URL,
TestSSLConstants.BROKER_TRUSTSTORE);
changedAttributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD);
fileTrustStore.setAttributes(changedAttributes);
assertEquals("Unexpected path value after change that is expected to
be successful",
TestSSLConstants.BROKER_TRUSTSTORE,
- fileTrustStore.getPath());
+ fileTrustStore.getStoreUrl());
}
public void testDeleteTrustStore_Success() throws Exception
@@ -233,7 +233,7 @@ public class FileTrustStoreTest extends
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
- attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.TRUSTSTORE);
attributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.TRUSTSTORE_PASSWORD);
FileTrustStoreImpl fileTrustStore =
@@ -250,7 +250,7 @@ public class FileTrustStoreTest extends
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
- attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.TRUSTSTORE);
attributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.TRUSTSTORE_PASSWORD);
FileTrustStoreImpl fileTrustStore =
@@ -281,7 +281,7 @@ public class FileTrustStoreTest extends
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
- attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.TRUSTSTORE);
attributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.TRUSTSTORE_PASSWORD);
FileTrustStoreImpl fileTrustStore =
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
Thu Feb 5 22:53:16 2015
@@ -22,10 +22,10 @@
<div class="clear">
<div id="addStore.serverPathLabel" class="formLabel-labelCell
tableContainer-labelCell">Server path or upload*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
- <input type="text" id="addStore.path"
+ <input type="text" id="addStore.storeUrl"
data-dojo-type="qpid/common/ResourceWidget"
data-dojo-props="
- name: 'path',
+ name: 'storeUrl',
placeHolder: 'key store file server path',
required: true,
promptMessage: 'Location of the key store file
on the server',
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html
Thu Feb 5 22:53:16 2015
@@ -22,10 +22,10 @@
<div class="clear">
<div id="addStore.serverPathLabel" class="formLabel-labelCell
tableContainer-labelCell">Server path or upload*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
- <input type="text" id="addStore.path"
+ <input type="text" id="addStore.storeUrl"
data-dojo-type="qpid/common/ResourceWidget"
data-dojo-props="
- name: 'path',
+ name: 'storeUrl',
placeHolder: 'trust store file server path',
required: true,
promptMessage: 'Location of the trust store file
on the server',
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html
Thu Feb 5 22:53:16 2015
@@ -19,8 +19,8 @@
<div>
<div class="clear">
- <div class="formLabel-labelCell">Path:</div>
- <div ><span class="path" ></span></div>
+ <div class="formLabel-labelCell">Store Url:</div>
+ <div ><span class="storeUrl" ></span></div>
</div>
<div class="clear">
<div class="formLabel-labelCell">Peers only:</div>
Modified: qpid/trunk/qpid/java/systests/etc/config-systests.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests.json?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests.json (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests.json Thu Feb 5 22:53:16
2015
@@ -29,12 +29,12 @@
} ],
"keystores" : [ {
"name" : "systestsKeyStore",
- "path" :
"${QPID_HOME}${file.separator}..${file.separator}test-profiles${file.separator}test_resources${file.separator}ssl${file.separator}java_broker_keystore.jks",
+ "storeUrl" :
"${QPID_HOME}${file.separator}..${file.separator}test-profiles${file.separator}test_resources${file.separator}ssl${file.separator}java_broker_keystore.jks",
"password" : "password"
} ],
"truststores" : [ {
"name" : "systestsTrustStore",
- "path" :
"${QPID_HOME}${file.separator}..${file.separator}test-profiles${file.separator}test_resources${file.separator}ssl${file.separator}java_broker_truststore.jks",
+ "storeUrl" :
"${QPID_HOME}${file.separator}..${file.separator}test-profiles${file.separator}test_resources${file.separator}ssl${file.separator}java_broker_truststore.jks",
"password" : "password"
} ],
"ports" : [ {
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
Thu Feb 5 22:53:16 2015
@@ -203,7 +203,7 @@ 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(FileTrustStore.PATH, BROKER_PEERSTORE);
+ sslTrustStoreAttributes.put(FileTrustStore.STORE_URL,
BROKER_PEERSTORE);
sslTrustStoreAttributes.put(FileTrustStore.PASSWORD,
BROKER_PEERSTORE_PASSWORD);
sslTrustStoreAttributes.put(FileTrustStore.PEERS_ONLY, true);
getBrokerConfiguration().addObjectConfiguration(TrustStore.class,
sslTrustStoreAttributes);
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
Thu Feb 5 22:53:16 2015
@@ -52,8 +52,12 @@ public class KeyStoreRestTest extends Qp
List<Map<String, Object>> keyStores = assertNumberOfKeyStores(1);
Map<String, Object> keystore = keyStores.get(0);
- assertKeyStoreAttributes(keystore,
TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE,
- QPID_HOME + "/../" + TestSSLConstants.BROKER_KEYSTORE, null);
+
+ assertEquals("Unexpected name",
TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE, keystore.get(KeyStore.NAME));
+ assertEquals("unexpected path to key store",
AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.STORE_URL));
+ assertEquals("unexpected (dummy) password of default systests key
store", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.PASSWORD));
+ assertEquals("unexpected type of default systests key store",
java.security.KeyStore.getDefaultType(),
keystore.get(FileKeyStore.KEY_STORE_TYPE));
+ assertFalse("should not be a certificateAlias attribute",
keystore.containsKey(FileKeyStore.CERTIFICATE_ALIAS));
}
public void testCreate() throws Exception
@@ -67,10 +71,14 @@ public class KeyStoreRestTest extends Qp
createKeyStore(name, certAlias, TestSSLConstants.KEYSTORE,
TestSSLConstants.KEYSTORE_PASSWORD);
assertNumberOfKeyStores(2);
- List<Map<String, Object>> keyStores =
getRestTestHelper().getJsonAsList("keystore/" + name);
+ List<Map<String, Object>> keyStores =
getRestTestHelper().getJsonAsList("keystore/" + name + "?actuals=true");
assertNotNull("details cannot be null", keyStores);
- assertKeyStoreAttributes(keyStores.get(0), name,
TestSSLConstants.KEYSTORE, certAlias);
+ Map<String, Object> keystore = keyStores.get(0);
+ assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
+ assertEquals("unexpected path to key store",
TestSSLConstants.KEYSTORE, keystore.get(FileKeyStore.STORE_URL));
+ assertEquals("unexpected password",
TestSSLConstants.KEYSTORE_PASSWORD, keystore.get(FileKeyStore.PASSWORD));
+ assertEquals("unexpected alias", certAlias,
keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
}
public void testCreateWithDataUrl() throws Exception
@@ -85,10 +93,14 @@ public class KeyStoreRestTest extends Qp
createKeyStore(name, null, dataUrlForKeyStore,
TestSSLConstants.KEYSTORE_PASSWORD);
assertNumberOfKeyStores(2);
- List<Map<String, Object>> keyStores =
getRestTestHelper().getJsonAsList("keystore/" + name);
+ List<Map<String, Object>> keyStores =
getRestTestHelper().getJsonAsList("keystore/" + name + "?actuals=true");
assertNotNull("details cannot be null", keyStores);
- assertKeyStoreAttributes(keyStores.get(0), name, dataUrlForKeyStore,
null);
+ Map<String, Object> keystore = keyStores.get(0);
+ assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
+ assertEquals("unexpected data", dataUrlForKeyStore,
keystore.get(FileKeyStore.STORE_URL));
+ assertEquals("unexpected password",
TestSSLConstants.KEYSTORE_PASSWORD, keystore.get(FileKeyStore.PASSWORD));
+ assertEquals("unexpected alias", null,
keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
}
public void testDelete() throws Exception
@@ -104,15 +116,17 @@ public class KeyStoreRestTest extends Qp
getRestTestHelper().submitRequest("keystore/" + name, "DELETE",
HttpServletResponse.SC_OK);
- List<Map<String, Object>> keyStore =
getRestTestHelper().getJsonAsList("keystore/" + name);
+ List<Map<String, Object>> keyStore =
getRestTestHelper().getJsonAsList("keystore/" + name + "?actuals=true");
assertNotNull("details should not be null", keyStore);
assertTrue("details should be empty as the keystore no longer exists",
keyStore.isEmpty());
//check only the default systests key store remains
List<Map<String, Object>> keyStores = assertNumberOfKeyStores(1);
Map<String, Object> keystore = keyStores.get(0);
- assertKeyStoreAttributes(keystore,
TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE,
- QPID_HOME + "/../" + TestSSLConstants.BROKER_KEYSTORE, null);
+ assertEquals("Unexpected name",
TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE, keystore.get(KeyStore.NAME));
+ assertEquals("unexpected path to key store",
AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.STORE_URL));
+ assertEquals("unexpected (dummy) password of default systests key
store", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.PASSWORD));
+ assertFalse("should not be a certificateAlias attribute",
keystore.containsKey(FileKeyStore.CERTIFICATE_ALIAS));
}
public void testUpdate() throws Exception
@@ -127,14 +141,18 @@ public class KeyStoreRestTest extends Qp
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(KeyStore.NAME, name);
- attributes.put(FileKeyStore.PATH, TestSSLConstants.UNTRUSTED_KEYSTORE);
+ attributes.put(FileKeyStore.STORE_URL,
TestSSLConstants.UNTRUSTED_KEYSTORE);
getRestTestHelper().submitRequest("keystore/" + name, "PUT",
attributes, HttpServletResponse.SC_OK);
- List<Map<String, Object>> keyStore =
getRestTestHelper().getJsonAsList("keystore/" + name);
- assertNotNull("details should not be null", keyStore);
+ List<Map<String, Object>> keyStores =
getRestTestHelper().getJsonAsList("keystore/" + name + "?actuals=true");
+ assertNotNull("details should not be null", keyStores);
- assertKeyStoreAttributes(keyStore.get(0), name,
TestSSLConstants.UNTRUSTED_KEYSTORE, null);
+ Map<String, Object> keystore = keyStores.get(0);
+ assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
+ assertEquals("unexpected data", TestSSLConstants.UNTRUSTED_KEYSTORE,
keystore.get(FileKeyStore.STORE_URL));
+ assertEquals("unexpected password",
TestSSLConstants.KEYSTORE_PASSWORD, keystore.get(FileKeyStore.PASSWORD));
+ assertEquals("unexpected alias", null,
keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
}
@@ -151,7 +169,7 @@ public class KeyStoreRestTest extends Qp
{
Map<String, Object> keyStoreAttributes = new HashMap<>();
keyStoreAttributes.put(KeyStore.NAME, name);
- keyStoreAttributes.put(FileKeyStore.PATH, keyStorePath);
+ keyStoreAttributes.put(FileKeyStore.STORE_URL, keyStorePath);
keyStoreAttributes.put(FileKeyStore.PASSWORD, keystorePassword);
if (certAlias != null)
{
@@ -161,26 +179,4 @@ public class KeyStoreRestTest extends Qp
getRestTestHelper().submitRequest("keystore/" + name, "PUT",
keyStoreAttributes, HttpServletResponse.SC_CREATED);
}
- private void assertKeyStoreAttributes(Map<String, Object> keystore, String
name, String path, String certAlias)
- {
- assertEquals("default systests key store is missing",
- name, keystore.get(KeyStore.NAME));
- assertEquals("unexpected path to key store",
- path, keystore.get(FileKeyStore.PATH));
- assertEquals("unexpected (dummy) password of default systests key
store",
- AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.PASSWORD));
- assertEquals("unexpected type of default systests key store",
- java.security.KeyStore.getDefaultType(),
keystore.get(FileKeyStore.KEY_STORE_TYPE));
- if(certAlias == null)
- {
- assertFalse("should not be a certificateAlias attribute",
-
keystore.containsKey(FileKeyStore.CERTIFICATE_ALIAS));
- }
- else
- {
- assertEquals("unexpected certificateAlias value",
- certAlias,
keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
-
- }
- }
}
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
Thu Feb 5 22:53:16 2015
@@ -127,7 +127,7 @@ public class TrustStoreRestTest extends
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(TrustStore.NAME, name);
- attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+ attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.TRUSTSTORE);
getRestTestHelper().submitRequest("truststore/" + name , "PUT",
attributes, HttpServletResponse.SC_OK);
@@ -151,7 +151,7 @@ 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(FileTrustStore.PATH, truststorePath);
+ trustStoreAttributes.put(FileTrustStore.STORE_URL, truststorePath);
trustStoreAttributes.put(FileTrustStore.PASSWORD, truststorePassword);
trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly);
@@ -163,7 +163,7 @@ 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(FileTrustStore.PATH));
+ path, truststore.get(FileTrustStore.STORE_URL));
assertEquals("unexpected (dummy) password of default systests trust
store",
AbstractConfiguredObject.SECURED_STRING_VALUE,
truststore.get(FileTrustStore.PASSWORD));
assertEquals("unexpected type of default systests trust store",
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1657708&r1=1657707&r2=1657708&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Thu Feb 5 22:53:16 2015
@@ -183,7 +183,7 @@ public class BrokerACLTest extends QpidR
assertEquals("Setting of provider attribites should be allowed", 403,
responseCode);
Map<String, Object> provider =
getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" +
providerName);
- assertEquals("Unexpected PATH attribute value",
+ assertEquals("Unexpected STORE_URL attribute value",
providerData.get(ExternalFileBasedAuthenticationManager.PATH),
provider.get(ExternalFileBasedAuthenticationManager.PATH));
}
@@ -922,7 +922,7 @@ public class BrokerACLTest extends QpidR
{
Map<String, Object> keyStoreAttributes = new HashMap<String, Object>();
keyStoreAttributes.put(KeyStore.NAME, name);
- keyStoreAttributes.put(FileKeyStore.PATH, TestSSLConstants.KEYSTORE);
+ keyStoreAttributes.put(FileKeyStore.STORE_URL,
TestSSLConstants.KEYSTORE);
keyStoreAttributes.put(FileKeyStore.PASSWORD,
TestSSLConstants.KEYSTORE_PASSWORD);
keyStoreAttributes.put(FileKeyStore.CERTIFICATE_ALIAS, certAlias);
@@ -933,7 +933,7 @@ public class BrokerACLTest extends QpidR
{
Map<String, Object> trustStoreAttributes = new HashMap<String,
Object>();
trustStoreAttributes.put(TrustStore.NAME, name);
- trustStoreAttributes.put(FileTrustStore.PATH,
TestSSLConstants.KEYSTORE);
+ trustStoreAttributes.put(FileTrustStore.STORE_URL,
TestSSLConstants.KEYSTORE);
trustStoreAttributes.put(FileTrustStore.PASSWORD,
TestSSLConstants.KEYSTORE_PASSWORD);
trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
