Skip to content

ARTEMIS-5795 Set security config using system properties #6100

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

Merged
jbertram merged 1 commit into from
Dec 11, 2025
+653 −2
Merged

ARTEMIS-5795 Set security config using system properties #6100

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
50 changes: 49 additions & 1 deletion artemis-cli/src/main/java/org/apache/activemq/artemis/cli/factory/BrokerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,30 @@

import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;

import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.cli.ConfigurationException;
import org.apache.activemq.artemis.core.server.ActivateCallback;
import org.apache.activemq.artemis.dto.BrokerDTO;
import org.apache.activemq.artemis.dto.JaasSecurityDTO;
import org.apache.activemq.artemis.dto.PropertyDTO;
import org.apache.activemq.artemis.dto.SecurityManagerDTO;
import org.apache.activemq.artemis.dto.ServerDTO;
import org.apache.activemq.artemis.integration.Broker;
import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import org.apache.activemq.artemis.utils.FactoryFinder;

public class BrokerFactory {

private static final String SECURITY_JAAS_DOMAIN_PROP_NAME = "domain";
private static final String SECURITY_JAAS_CERTIFICATE_DOMAIN_PROP_NAME = "certificateDomain";
private static final String SECURITY_MANAGER_CLASS_NAME_PROP_NAME = "className";
private static final String SECURITY_MANAGER_PROPERTIES_PREFIX = "properties.";

private static BrokerDTO createBrokerConfiguration(URI configURI,
String artemisHome,
String artemisInstance,
Expand All @@ -44,7 +57,42 @@ private static BrokerDTO createBrokerConfiguration(URI configURI,
} catch (IOException ioe) {
throw new ConfigurationException("Invalid configuration URI, can't find configuration scheme: " + configURI.getScheme());
}
return factory.createBroker(configURI, artemisHome, artemisInstance, artemisURIInstance);
BrokerDTO broker = factory.createBroker(configURI, artemisHome, artemisInstance, artemisURIInstance);

populateSecurityWithSystemProperties(broker);

return broker;
}

private static void populateSecurityWithSystemProperties(BrokerDTO broker) {
Properties systemProperties = System.getProperties();
String systemSecurityJaasPropertyPrefix = ActiveMQDefaultConfiguration.getDefaultSystemSecurityJaasPropertyPrefix();
String systemSecurityManagerPropertyPrefix = ActiveMQDefaultConfiguration.getDefaultSystemSecurityManagerPropertyPrefix();

if (systemProperties.containsKey(systemSecurityJaasPropertyPrefix + SECURITY_JAAS_DOMAIN_PROP_NAME)) {
broker.security = broker.security instanceof JaasSecurityDTO ?
(JaasSecurityDTO) broker.security : new JaasSecurityDTO();
} else if (systemProperties.containsKey(systemSecurityManagerPropertyPrefix + SECURITY_MANAGER_CLASS_NAME_PROP_NAME)) {
broker.security = broker.security instanceof SecurityManagerDTO ?
(SecurityManagerDTO) broker.security : new SecurityManagerDTO();
}

if (broker.security instanceof JaasSecurityDTO security) {
security.domain = Optional.ofNullable((String)systemProperties.get(
systemSecurityJaasPropertyPrefix + SECURITY_JAAS_DOMAIN_PROP_NAME)).orElse(security.domain);
security.certificateDomain = Optional.ofNullable((String)systemProperties.get(
systemSecurityJaasPropertyPrefix + SECURITY_JAAS_CERTIFICATE_DOMAIN_PROP_NAME)).orElse(security.certificateDomain);
} else if (broker.security instanceof SecurityManagerDTO security) {
security.className = Optional.ofNullable((String)systemProperties.get(
systemSecurityManagerPropertyPrefix + SECURITY_MANAGER_CLASS_NAME_PROP_NAME)).orElse(security.className);
security.properties = Objects.requireNonNullElse(security.properties, new ArrayList<>());
systemProperties.forEach((key, value) -> {
if (((String)key).startsWith(systemSecurityManagerPropertyPrefix + SECURITY_MANAGER_PROPERTIES_PREFIX)) {
security.properties.add(new PropertyDTO(((String)key).substring(
systemSecurityManagerPropertyPrefix.length() + SECURITY_MANAGER_PROPERTIES_PREFIX.length()), (String)value));
}
});
}
}

public static BrokerDTO createBrokerConfiguration(String configuration,
Expand Down
Loading