date:20190725

[activemq] branch master updated: Remove default "secret" password from the LDAPAuthorizationMap

2019-07-25 Thread jbonofre

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new 75023f2  Remove default "secret" password from the LDAPAuthorizationMap
 new c3d9b38  Merge pull request #374 from coheigea/ldap_passwords
75023f2 is described below

commit 75023f2bedb9f7587736ca63f59565f669d09214
Author: Colm O hEigeartaigh 
AuthorDate: Mon Jul 15 18:24:48 2019 +0100

Remove default "secret" password from the LDAPAuthorizationMap
---
 .../main/java/org/apache/activemq/security/LDAPAuthorizationMap.java   | 3 +--
 .../org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java | 2 +-
 .../activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java | 1 +
 .../apache/activemq/security/CachedLDAPAuthorizationModuleTest.java| 1 +
 .../java/org/apache/activemq/security/LDAPAuthorizationMapTest.java| 1 +
 .../org/apache/activemq/security/activemq-apacheds-legacy.xml  | 2 +-
 .../test/resources/org/apache/activemq/security/activemq-apacheds.xml  | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
 
b/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
index 2b89d12..1b90e00 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
@@ -102,7 +102,6 @@ public class LDAPAuthorizationMap implements 
AuthorizationMap {
 initialContextFactory = "com.sun.jndi.ldap.LdapCtxFactory";
 connectionURL = "ldap://localhost:10389";;
 connectionUsername = "uid=admin,ou=system";
-connectionPassword = "secret";
 connectionProtocol = "s";
 authentication = "simple";
 
@@ -491,4 +490,4 @@ public class LDAPAuthorizationMap implements 
AuthorizationMap {
 return context;
 }
 
-}
\ No newline at end of file
+}
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
 
b/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
index 44c23f6..77cbb20 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
@@ -64,7 +64,7 @@ public class SimpleCachedLDAPAuthorizationMap implements 
AuthorizationMap {
 private final String initialContextFactory = 
"com.sun.jndi.ldap.LdapCtxFactory";
 private String connectionURL = "ldap://localhost:1024";;
 private String connectionUsername = "uid=admin,ou=system";
-private String connectionPassword = "secret";
+private String connectionPassword;
 private String connectionProtocol = "s";
 private String authentication = "simple";
 
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
index f696cb3..2f00eff 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
@@ -41,6 +41,7 @@ public class CachedLDAPAuthorizationModuleLegacyTest extends 
AbstractCachedLDAPA
 protected SimpleCachedLDAPAuthorizationMap createMap() {
 SimpleCachedLDAPAuthorizationMap map = super.createMap();
 map.setConnectionURL("ldap://localhost:"; + getLdapServer().getPort());
+map.setConnectionPassword("secret");
 return map;
 }
 
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
index 5d6f2e7..5098b25 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
@@ -39,6 +39,7 @@ public class CachedLDAPAuthorizationModuleTest extends 
AbstractCachedLDAPAuthori
 protected SimpleCachedLDAPAuthorizationMap createMap() {
 SimpleCachedLDAPAuthorizationMap map = super.createMap();
 map.setConnectionURL("ldap://localhost:"; + getLdapServer().getPort());
+map.setConnectionPassword("secret");
 return map;
 }
 
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq

[activemq] branch activemq-5.15.x updated: Remove default "secret" password from the LDAPAuthorizationMap

2019-07-25 Thread jbonofre

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new 0207edc  Remove default "secret" password from the LDAPAuthorizationMap
0207edc is described below

commit 0207edce8efe8accb717dfdc6055ee5caef4c57e
Author: Colm O hEigeartaigh 
AuthorDate: Mon Jul 15 18:24:48 2019 +0100

Remove default "secret" password from the LDAPAuthorizationMap
---
 .../main/java/org/apache/activemq/security/LDAPAuthorizationMap.java   | 3 +--
 .../org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java | 2 +-
 .../activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java | 1 +
 .../apache/activemq/security/CachedLDAPAuthorizationModuleTest.java| 1 +
 .../java/org/apache/activemq/security/LDAPAuthorizationMapTest.java| 1 +
 .../org/apache/activemq/security/activemq-apacheds-legacy.xml  | 2 +-
 .../test/resources/org/apache/activemq/security/activemq-apacheds.xml  | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
 
b/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
index 2b89d12..1b90e00 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
@@ -102,7 +102,6 @@ public class LDAPAuthorizationMap implements 
AuthorizationMap {
 initialContextFactory = "com.sun.jndi.ldap.LdapCtxFactory";
 connectionURL = "ldap://localhost:10389";;
 connectionUsername = "uid=admin,ou=system";
-connectionPassword = "secret";
 connectionProtocol = "s";
 authentication = "simple";
 
@@ -491,4 +490,4 @@ public class LDAPAuthorizationMap implements 
AuthorizationMap {
 return context;
 }
 
-}
\ No newline at end of file
+}
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
 
b/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
index 44c23f6..77cbb20 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
@@ -64,7 +64,7 @@ public class SimpleCachedLDAPAuthorizationMap implements 
AuthorizationMap {
 private final String initialContextFactory = 
"com.sun.jndi.ldap.LdapCtxFactory";
 private String connectionURL = "ldap://localhost:1024";;
 private String connectionUsername = "uid=admin,ou=system";
-private String connectionPassword = "secret";
+private String connectionPassword;
 private String connectionProtocol = "s";
 private String authentication = "simple";
 
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
index f696cb3..2f00eff 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
@@ -41,6 +41,7 @@ public class CachedLDAPAuthorizationModuleLegacyTest extends 
AbstractCachedLDAPA
 protected SimpleCachedLDAPAuthorizationMap createMap() {
 SimpleCachedLDAPAuthorizationMap map = super.createMap();
 map.setConnectionURL("ldap://localhost:"; + getLdapServer().getPort());
+map.setConnectionPassword("secret");
 return map;
 }
 
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
index 5d6f2e7..5098b25 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
@@ -39,6 +39,7 @@ public class CachedLDAPAuthorizationModuleTest extends 
AbstractCachedLDAPAuthori
 protected SimpleCachedLDAPAuthorizationMap createMap() {
 SimpleCachedLDAPAuthorizationMap map = super.createMap();
 map.setConnectionURL("ldap://localhost:"; + getLdapServer().getPort());
+map.setConnectionPassword("secret");
 return map;
 }
 
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
index 130a0da