Skip to content

ARTEMIS-5949 Clarify manage permission in default broker.xml #6355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anmol-saxena-14 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ARTEMIS-5949 Clarify manage permission in default broker.xml #6355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,15 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
<permission type="consume" roles="${role}"/>
<permission type="browse" roles="${role}"/>
<permission type="send" roles="${role}"/>
<!-- we need this otherwise ./artemis data imp wouldn't work -->
</security-setting>
<security-setting match="activemq.management.#">
<permission type="manage" roles="${role}"/>
<permission type="createNonDurableQueue" roles="${role}"/>
<permission type="deleteNonDurableQueue" roles="${role}"/>
<permission type="createAddress" roles="${role}"/>
<permission type="deleteAddress" roles="${role}"/>
<permission type="consume" roles="${role}"/>
<permission type="send" roles="${role}"/>
</security-setting>
</security-settings>

Expand Down
43 changes: 43 additions & 0 deletions artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;

import org.apache.activemq.artemis.core.security.Role;

import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.artemis.api.core.JsonUtil;
Expand Down Expand Up @@ -2380,6 +2383,46 @@ public String getPropertyTwo() {
}
}

@Test
@Timeout(60)
public void testDefaultSecuritySettings() throws Exception {
FileConfiguration configuration = createFileConfiguration(getTestMethodName(),
"--silent", "--no-web", "--no-autotune");

Map<String, Set<Role>> securityRoles = configuration.getSecurityRoles();

// wildcard match should have all permissions except manage
Set<Role> wildcardRoles = securityRoles.get("#");
assertNotNull(wildcardRoles, "Expected security-setting for '#'");
assertEquals(1, wildcardRoles.size());
Role wildcardRole = wildcardRoles.iterator().next();
assertEquals("amq", wildcardRole.getName());
assertTrue(wildcardRole.isSend());
assertTrue(wildcardRole.isConsume());
assertTrue(wildcardRole.isBrowse());
assertTrue(wildcardRole.isCreateDurableQueue());
assertTrue(wildcardRole.isDeleteDurableQueue());
assertTrue(wildcardRole.isCreateNonDurableQueue());
assertTrue(wildcardRole.isDeleteNonDurableQueue());
assertTrue(wildcardRole.isCreateAddress());
assertTrue(wildcardRole.isDeleteAddress());
assertFalse(wildcardRole.isManage(), "manage permission must not be on the wildcard '#' address");

// management address match should have manage plus supporting permissions
Set<Role> mgmtRoles = securityRoles.get("activemq.management.#");
assertNotNull(mgmtRoles, "Expected security-setting for 'activemq.management.#'");
assertEquals(1, mgmtRoles.size());
Role mgmtRole = mgmtRoles.iterator().next();
assertEquals("amq", mgmtRole.getName());
assertTrue(mgmtRole.isManage());
assertTrue(mgmtRole.isSend());
assertTrue(mgmtRole.isConsume());
assertTrue(mgmtRole.isCreateNonDurableQueue());
assertTrue(mgmtRole.isDeleteNonDurableQueue());
assertTrue(mgmtRole.isCreateAddress());
assertTrue(mgmtRole.isDeleteAddress());
}

private static File newFolder(File root, String subFolder) throws IOException {
File result = new File(root, subFolder);
if (!result.mkdirs()) {
Expand Down
9 changes: 8 additions & 1 deletion artemis-features/src/main/resources/artemis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,15 @@ under the License.
<permission type="consume" roles="manager"/>
<permission type="browse" roles="manager"/>
<permission type="send" roles="manager"/>
<!-- we need this otherwise ./artemis data imp wouldn't work -->
</security-setting>
<security-setting match="activemq.management.#">
<permission type="manage" roles="manager"/>
<permission type="createNonDurableQueue" roles="manager"/>
<permission type="deleteNonDurableQueue" roles="manager"/>
<permission type="createAddress" roles="manager"/>
<permission type="deleteAddress" roles="manager"/>
<permission type="consume" roles="manager"/>
<permission type="send" roles="manager"/>
</security-setting>
</security-settings>

Expand Down
8 changes: 8 additions & 0 deletions tests/smoke-tests/src/main/resources/servers/jmx-rbac-broker-security/broker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,15 @@ under the License.
<permission type="consume" roles="amq"/>
<permission type="browse" roles="amq"/>
<permission type="send" roles="amq"/>
</security-setting>
<security-setting match="activemq.management.#">
<permission type="manage" roles="amq"/>
<permission type="createNonDurableQueue" roles="amq"/>
<permission type="deleteNonDurableQueue" roles="amq"/>
<permission type="createAddress" roles="amq"/>
<permission type="deleteAddress" roles="amq"/>
<permission type="consume" roles="amq"/>
<permission type="send" roles="amq"/>
</security-setting>

<!-- settings for jmx MBean access to management operations -->
Expand Down