You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/05/24 20:29:47 UTC
[32/33] activemq-artemis git commit: ARTEMIS-1872 fix security tests
ARTEMIS-1872 fix security tests
After the new authn change for creating addresses a bunch of tests need
to be updated to include the proper permissions.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cd2f544b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cd2f544b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cd2f544b
Branch: refs/heads/2.6.x
Commit: cd2f544b7ec991c317929b7e4500621f77624347
Parents: fd3baf1
Author: Justin Bertram <jb...@apache.org>
Authored: Thu May 24 11:34:34 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu May 24 14:37:35 2018 -0400
----------------------------------------------------------------------
.../integration/openwire/OpenWireTestBase.java | 2 +-
.../integration/security/SecurityTest.java | 32 ++++++++++----------
.../integration/server/ResourceLimitTest.java | 2 +-
.../integration/ssl/DualAuthenticationTest.java | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cd2f544b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
index 2a07aa9..831887f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
@@ -94,7 +94,7 @@ public class OpenWireTestBase extends ActiveMQTestBase {
securityManager.getConfiguration().addRole("openwireDestinationManager", "manager");
securityManager.getConfiguration().addUser("openwireDestinationManager", "DeStInAtIoN");
- Role destRole = new Role("manager", false, false, false, false, true, true, false, false, false, false);
+ Role destRole = new Role("manager", false, false, false, false, true, true, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(senderRole);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cd2f544b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
index 21b4d08..3bc924a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
@@ -1006,7 +1006,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1050,7 +1050,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, true, false, false, false, false, false, true);
+ Role role = new Role("arole", false, false, true, true, false, false, false, false, true, true);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1069,7 +1069,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1096,7 +1096,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, false, false, true, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1140,7 +1140,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, true, true, false, false, false, true);
+ Role role = new Role("arole", false, false, false, false, true, true, false, false, true, true);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1159,7 +1159,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, false, false, true, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1190,7 +1190,7 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", true, true, true, false, false, false, false, false, false, false);
+ Role role = new Role("arole", true, true, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
@@ -1249,7 +1249,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1277,7 +1277,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1304,7 +1304,7 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
Role role = new Role("arole", false, true, false, false, false, false, false, false, false, false);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
roles.add(role);
@@ -1332,7 +1332,7 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
Role role = new Role("arole", false, false, false, false, false, false, false, false, false, false);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
roles.add(role);
@@ -1367,7 +1367,7 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
Role role = new Role("arole", false, false, false, false, false, false, false, false, false, false);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, true, false);
Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
@@ -1416,7 +1416,7 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
Role role = new Role("arole", false, false, false, false, false, false, false, false, false, false);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, true, false);
Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
@@ -1473,7 +1473,7 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().setDefaultUser("guest");
Role role = new Role("arole", false, false, false, false, false, false, false, false, false, false);
System.out.println("guest:" + role);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, true, false);
System.out.println("guest:" + sendRole);
Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false, false, false);
System.out.println("guest:" + receiveRole);
@@ -1577,7 +1577,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(configuration.getManagementAddress().toString(), roles);
@@ -1606,7 +1606,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, true, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(configuration.getManagementAddress().toString(), roles);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cd2f544b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java
index 5294b1e..b178525 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java
@@ -60,7 +60,7 @@ public class ResourceLimitTest extends ActiveMQTestBase {
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("myUser", "password");
securityManager.getConfiguration().addRole("myUser", "arole");
- Role role = new Role("arole", false, false, false, false, true, true, false, true, false, true);
+ Role role = new Role("arole", false, false, false, false, true, true, false, true, true, true);
Set<Role> roles = new HashSet<>();
roles.add(role);
server.getSecurityRepository().addMatch("#", roles);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cd2f544b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java
index 6716e45..6e94504 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java
@@ -128,7 +128,7 @@ public class DualAuthenticationTest extends ActiveMQTestBase {
server = addServer(ActiveMQServers.newActiveMQServer(config, ManagementFactory.getPlatformMBeanServer(), securityManager, false));
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
- Role sendRole = new Role("producers", true, false, true, false, true, false, false, false, false, false);
+ Role sendRole = new Role("producers", true, false, true, false, true, false, false, false, true, false);
Role receiveRole = new Role("consumers", false, true, false, false, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);