Skip to content

Commit

Permalink
[ELY-1745] The AvailableRealmsCallback should not result in a NPE if …
Browse files Browse the repository at this point in the history
…there is no mechanism configuration.
  • Loading branch information
lvydra committed Jan 16, 2023
1 parent d8b1a66 commit bed6480
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 1 deletion.
Expand Up @@ -1492,6 +1492,9 @@ private void transition() {
}

private InitialState selectMechanismConfiguration() {
if (mechanismConfigurationSelector == null) {
throw log.mechanismConfigurationSelectorNotDefined();
}
MechanismConfiguration mechanismConfiguration = mechanismConfigurationSelector.selectConfiguration(mechanismInformation);
if (mechanismConfiguration == null) {
throw log.unableToSelectMechanismConfiguration(mechanismInformation.getMechanismType(),
Expand Down
Expand Up @@ -47,7 +47,7 @@
@ValidIdRanges({
@ValidIdRange(min = 3, max = 3),
@ValidIdRange(min = 8, max = 8),
@ValidIdRange(min = 1000, max = 1156),
@ValidIdRange(min = 1000, max = 1157),
@ValidIdRange(min = 8510, max = 8511),
@ValidIdRange(min = 16000, max = 16999)
})
Expand Down Expand Up @@ -129,6 +129,9 @@ IllegalStateException unableToSelectMechanismConfiguration(String mechanismType,
@Message(id = 1156, value = "Cannot obtain a credential from a security factory")
IOException cannotObtainCredentialFromFactory(@Cause GeneralSecurityException e);

@Message(id = 1157, value = "MechanismConfigurationSelector is not defined.")
IllegalStateException mechanismConfigurationSelectorNotDefined();

@LogMessage(level = ERROR)
@Message(id = 1094, value = "An event handler threw an exception")
void eventHandlerFailed(@Cause Throwable cause);
Expand Down
@@ -0,0 +1,58 @@
/*
* JBoss, Home of Professional Open Source.
* Copyright 2023 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed 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.wildfly.security.server;

import org.junit.Test;
import org.wildfly.security.auth.server.MechanismConfiguration;
import org.wildfly.security.auth.server.MechanismConfigurationSelector;
import org.wildfly.security.auth.server.SecurityDomain;
import org.wildfly.security.auth.server.ServerAuthenticationContext;

import java.io.IOException;

import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

public class AvailableRealmsCallbackTest {

@Test
public void testNullMechanismConfigurationSelector() {
SecurityDomain securityDomain = SecurityDomain.builder().build();
ServerAuthenticationContext sac = securityDomain.createNewAuthenticationContext(null);

try {
sac.setAuthenticationName("user");
fail("The exception should be thrown.");
} catch (Exception e) {
String expectedMessage = "MechanismConfigurationSelector is not defined.";
String actualMessage = e.getMessage();

assertTrue(actualMessage.contains(expectedMessage));
}
}

@Test
public void testEmptyMechanismConfiguration() throws IOException {
SecurityDomain securityDomain = SecurityDomain.builder().build();
MechanismConfigurationSelector mechanismConfigurationSelector = MechanismConfigurationSelector.constantSelector(MechanismConfiguration.EMPTY);
ServerAuthenticationContext sac = securityDomain.createNewAuthenticationContext(mechanismConfigurationSelector);
sac.setAuthenticationName("user");
}
}

0 comments on commit bed6480

Please sign in to comment.