Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3744 NPE with empty security-manager config in bootstrap.xml

This commit is contained in:
Justin Bertram 2022-03-24 14:43:53 -05:00
parent c3e6ce075c
commit dce7ff2ef7
No known key found for this signature in database
GPG Key ID: F41830B875BB8633
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/factory/security/SecurityManagerHandler.java
View File

@ -34,8 +34,10 @@ public class SecurityManagerHandler implements SecurityHandler {
SecurityManagerDTO customSecurity = (SecurityManagerDTO) security;
String clazz = customSecurity.className;
Map<String, String> properties = new HashMap<>();
for (PropertyDTO property : customSecurity.properties) {
properties.put(property.key, property.value);
if (customSecurity.properties != null) {
for (PropertyDTO property : customSecurity.properties) {
properties.put(property.key, property.value);
}
}
return AccessController.doPrivileged((PrivilegedAction<ActiveMQSecurityManager>) () -> (ActiveMQSecurityManager) ClassloadingUtil.newInstanceFromClassLoader(SecurityManagerHandler.class, clazz)).init(properties);
}

32
artemis-cli/src/test/java/org/apache/activemq/SecurityManagerHandlerTest.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq;
import org.apache.activemq.artemis.cli.factory.security.SecurityManagerHandler;
import org.apache.activemq.artemis.dto.SecurityManagerDTO;
import org.apache.activemq.artemis.spi.core.security.ActiveMQBasicSecurityManager;
import org.junit.Test;
public class SecurityManagerHandlerTest {
@Test
public void testSecurityManagerHandler() {
SecurityManagerDTO securityManagerDTO = new SecurityManagerDTO();
securityManagerDTO.className = ActiveMQBasicSecurityManager.class.getName();
new SecurityManagerHandler().createSecurityManager(securityManagerDTO);
}
}