Skip to content

Commit

Permalink
[ELY-2144] null 'error page' can cause NPE from web component
Browse files Browse the repository at this point in the history
  • Loading branch information
petrberan committed Jul 25, 2022
1 parent 21bb95c commit f9e1cbb
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 3 deletions.
Expand Up @@ -395,7 +395,9 @@ private String getCompleteRedirectLocation(HttpServerRequest request, String loc
sb.append(':').append(port);
}
sb.append(contextPath);
sb.append(location);
if (location != null) {
sb.append(location);
}

return sb.toString();
}
Expand Down
Expand Up @@ -51,6 +51,9 @@ public FormMechanismFactory() {
public FormMechanismFactory(final Provider provider) {
}

public FormMechanismFactory(final Provider... providers) {
}

/**
* @see org.wildfly.security.http.HttpServerAuthenticationMechanismFactory#getMechanismNames(java.util.Map)
*/
Expand Down
@@ -0,0 +1,83 @@
/*
* JBoss, Home of Professional Open Source.
* Copyright 2022 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.http.form;

import mockit.integration.junit4.JMockit;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.wildfly.security.http.HttpConstants;
import org.wildfly.security.http.HttpServerAuthenticationMechanism;
import org.wildfly.security.http.impl.AbstractBaseHttpTest;

import java.net.URI;
import java.util.HashMap;
import java.util.Map;

/**
* Test of server side of the Form HTTP mechanism.
*
* @author <a href="mailto:pberan@redhat.com">Petr Beran</a>
*/
@RunWith(JMockit.class)
public class FormAuthenticationMechanismTest extends AbstractBaseHttpTest {

/**
* Tests proper redirect in case of invalid credentials if the error page is missing
*/
@Test
public void testFormWithoutErrorPage() throws Exception {
Map<String, String> properties = new HashMap<>();
properties.put(HttpConstants.CONFIG_REALM, "Realm");
properties.put(HttpConstants.CONFIG_CONTEXT_PATH, "/application");
properties.put(HttpConstants.CONFIG_LOGIN_PAGE, "/login.jsp");
HttpServerAuthenticationMechanism mechanism = formFactory.createAuthenticationMechanism(HttpConstants.FORM_NAME,
properties, getCallbackHandler("username", "Realm", "password"));

TestingHttpServerRequest request = new TestingHttpServerRequest(new String[]{"", "password"}, HttpConstants.POST,
new URI("http://localhost:8080/application/j_security_check"));
mechanism.evaluateRequest(request);
TestingHttpServerResponse response = request.getResponse();

Assert.assertEquals(response.getStatusCode(), HttpConstants.FOUND);
Assert.assertEquals("http://localhost:8080/application", response.getLocation());
}

/**
* Tests proper redirect in case of invalid credentials if the error page is configured
*/
@Test
public void testFormWithErrorPage() throws Exception {
Map<String, String> properties = new HashMap<>();
properties.put(HttpConstants.CONFIG_REALM, "Realm");
properties.put(HttpConstants.CONFIG_CONTEXT_PATH, "/application");
properties.put(HttpConstants.CONFIG_LOGIN_PAGE, "/login.jsp");
properties.put(HttpConstants.CONFIG_ERROR_PAGE, "/error.jsp");
HttpServerAuthenticationMechanism mechanism = formFactory.createAuthenticationMechanism(HttpConstants.FORM_NAME,
properties, getCallbackHandler("username", "Realm", "password"));

TestingHttpServerRequest request = new TestingHttpServerRequest(new String[]{"", "password"}, HttpConstants.POST,
new URI("http://localhost:8080/application/j_security_check"));
mechanism.evaluateRequest(request);
TestingHttpServerResponse response = request.getResponse();

Assert.assertEquals(response.getStatusCode(), HttpConstants.FOUND);
Assert.assertEquals("http://localhost:8080/application/error.jsp", response.getLocation());
}
}
Expand Up @@ -76,6 +76,7 @@
import org.wildfly.security.http.digest.DigestMechanismFactory;
import org.wildfly.security.http.digest.NonceManager;
import org.wildfly.security.http.external.ExternalMechanismFactory;
import org.wildfly.security.http.form.FormMechanismFactory;
import org.wildfly.security.password.Password;
import org.wildfly.security.password.PasswordFactory;
import org.wildfly.security.password.interfaces.ClearPassword;
Expand All @@ -88,6 +89,7 @@
public class AbstractBaseHttpTest {

protected HttpServerAuthenticationMechanismFactory basicFactory = new BasicMechanismFactory(ELYTRON_PASSWORD_PROVIDERS.get());
protected HttpServerAuthenticationMechanismFactory formFactory = new FormMechanismFactory(ELYTRON_PASSWORD_PROVIDERS.get());
protected HttpServerAuthenticationMechanismFactory digestFactory = new DigestMechanismFactory(ELYTRON_PASSWORD_PROVIDERS.get());
protected final HttpServerAuthenticationMechanismFactory externalFactory = new ExternalMechanismFactory(ELYTRON_PASSWORD_PROVIDERS.get());
protected HttpServerAuthenticationMechanismFactory statefulBasicFactory = new org.wildfly.security.http.sfbasic.BasicMechanismFactory(ELYTRON_PASSWORD_PROVIDERS.get());
Expand Down Expand Up @@ -130,13 +132,22 @@ protected static class TestingHttpServerRequest implements HttpServerRequest {
private String remoteUser;
private URI requestURI;
private List<HttpServerCookie> cookies;
private String method;

public TestingHttpServerRequest(String[] authorization) {
this.authorization = authorization;
this.remoteUser = null;
this.cookies = new ArrayList<>();
}

public TestingHttpServerRequest(String[] authorization, String method, URI requestURI) {
this.authorization = authorization;
this.remoteUser = null;
this.requestURI = requestURI;
this.cookies = new ArrayList<>();
this.method = method;
}

public TestingHttpServerRequest(String[] authorization, URI requestURI) {
this.authorization = authorization;
this.remoteUser = null;
Expand Down Expand Up @@ -263,7 +274,10 @@ public void badRequest(HttpAuthenticationException failure, HttpServerMechanisms
}

public String getRequestMethod() {
return "GET";
if (method == null){
return "GET";
}
return method;
}

public URI getRequestURI() {
Expand All @@ -287,6 +301,12 @@ public List<String> getParameterValues(String name) {
}

public String getFirstParameterValue(String name) {
if (name == "j_username"){
return authorization[0];
}
if (name == "j_password"){
return authorization[1];
}
throw new IllegalStateException();
}

Expand Down Expand Up @@ -411,7 +431,7 @@ public OutputStream getOutputStream() {
}

public boolean forward(String path) {
throw new IllegalStateException();
return false;
}
}

Expand Down

0 comments on commit f9e1cbb

Please sign in to comment.