Skip to content
Permalink
Browse files
ARTEMIS-3744 NPE with empty security-manager config in bootstrap.xml
  • Loading branch information
jbertram committed Mar 30, 2022
1 parent c3e6ce0 commit dce7ff2ef794bc31b139bdf6708532e43b542336
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 2 deletions.
@@ -34,8 +34,10 @@ public ActiveMQSecurityManager createSecurityManager(SecurityDTO security) {
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);
}
@@ -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);
}
}

0 comments on commit dce7ff2

Please sign in to comment.