From ee4d0e00670793e5dfa3e4ea61006a2904e3970e Mon Sep 17 00:00:00 2001 From: Herman Ciechanowiec Date: Sun, 14 Jun 2026 17:26:34 +0200 Subject: [PATCH] OAK-12259: oak-http: fix HTTP Basic credential parsing in OakServlet Split the decoded Authorization header on the first colon only (RFC 7617) so passwords containing colons are preserved instead of being silently truncated, and reject missing/malformed headers with a LoginException (mapped to HTTP 401) instead of throwing an ArrayIndexOutOfBoundsException (HTTP 500). Adds OakServletTest covering the parsing behaviour. --- .../jackrabbit/oak/http/OakServlet.java | 36 +++-- .../jackrabbit/oak/http/OakServletTest.java | 142 ++++++++++++++++++ 2 files changed, 168 insertions(+), 10 deletions(-) create mode 100644 oak-http/src/test/java/org/apache/jackrabbit/oak/http/OakServletTest.java diff --git a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java index c6bcd3bc7cc..ab3487708a4 100644 --- a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java +++ b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java @@ -68,16 +68,8 @@ protected void service( HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { - Credentials credentials = null; - - String authorization = request.getHeader("Authorization"); - if (authorization != null && authorization.startsWith("Basic ")) { - String[] basic = - Base64.decode(authorization.substring("Basic ".length())).split(":"); - credentials = new SimpleCredentials(basic[0], basic[1].toCharArray()); - } else { - throw new LoginException(); - } + Credentials credentials = + parseBasicCredentials(request.getHeader("Authorization")); ContentSession session = repository.login(credentials, null); try { @@ -115,6 +107,30 @@ protected void service( } } + /** + * Parses the credentials from an HTTP {@code Authorization} header using the + * Basic authentication scheme (RFC 7617). The decoded value has the form + * {@code user-id ":" password}; the user-id must not contain a colon, but + * the password may, so only the first colon is treated as the separator. + * Splitting on every colon would silently truncate passwords that contain + * one (weakening authentication), and a missing colon would throw an + * {@link ArrayIndexOutOfBoundsException} instead of failing the login. + */ + private Credentials parseBasicCredentials(String authorization) + throws LoginException { + if (authorization == null || !authorization.startsWith("Basic ")) { + throw new LoginException("Missing or unsupported Authorization header; expected Basic scheme"); + } + String decoded = Base64.decode(authorization.substring("Basic ".length())); + int colon = decoded.indexOf(':'); + if (colon < 0) { + throw new LoginException("Malformed Basic credentials: missing ':' separator"); + } + String userId = decoded.substring(0, colon); + String password = decoded.substring(colon + 1); + return new SimpleCredentials(userId, password.toCharArray()); + } + @Override protected void doGet( HttpServletRequest request, HttpServletResponse response) diff --git a/oak-http/src/test/java/org/apache/jackrabbit/oak/http/OakServletTest.java b/oak-http/src/test/java/org/apache/jackrabbit/oak/http/OakServletTest.java new file mode 100644 index 00000000000..24e0e60c42f --- /dev/null +++ b/oak-http/src/test/java/org/apache/jackrabbit/oak/http/OakServletTest.java @@ -0,0 +1,142 @@ +/* + * 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.jackrabbit.oak.http; + +import javax.jcr.Credentials; +import javax.jcr.NoSuchWorkspaceException; +import javax.jcr.SimpleCredentials; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.jackrabbit.oak.api.ContentRepository; +import org.apache.jackrabbit.util.Base64; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class OakServletTest { + + private static String basicHeader(String userId, String password) { + return "Basic " + Base64.encode(userId + ":" + password); + } + + /** + * Drives {@link OakServlet#service} and captures the credentials it derives + * from the {@code Authorization} header. The repository is stubbed to throw + * {@link NoSuchWorkspaceException} so the request short-circuits (handled as + * a 404) right after the credentials are parsed. + */ + private static SimpleCredentials parsedCredentials(String authorization) + throws Exception { + ContentRepository repository = mock(ContentRepository.class); + ArgumentCaptor captor = + ArgumentCaptor.forClass(Credentials.class); + when(repository.login(captor.capture(), isNull())) + .thenThrow(new NoSuchWorkspaceException()); + + HttpServletRequest request = mock(HttpServletRequest.class); + when(request.getHeader("Authorization")).thenReturn(authorization); + HttpServletResponse response = mock(HttpServletResponse.class); + + new OakServlet(repository).service(request, response); + + verify(response).sendError(HttpServletResponse.SC_NOT_FOUND); + Credentials credentials = captor.getValue(); + assertTrue(credentials instanceof SimpleCredentials); + return (SimpleCredentials) credentials; + } + + /** + * Asserts that a malformed {@code Authorization} header is rejected with a + * 401 challenge and never reaches the repository login. + */ + private static void assertUnauthorized(String authorization) + throws Exception { + ContentRepository repository = mock(ContentRepository.class); + HttpServletRequest request = mock(HttpServletRequest.class); + when(request.getHeader("Authorization")).thenReturn(authorization); + HttpServletResponse response = mock(HttpServletResponse.class); + + new OakServlet(repository).service(request, response); + + verify(response).setHeader("WWW-Authenticate", "Basic realm=\"Oak\""); + verify(response).sendError(HttpServletResponse.SC_UNAUTHORIZED); + verify(repository, never()).login(any(), any()); + } + + @Test + public void parsesSimpleCredentials() throws Exception { + SimpleCredentials credentials = parsedCredentials(basicHeader("admin", "secret")); + assertEquals("admin", credentials.getUserID()); + assertArrayEquals("secret".toCharArray(), credentials.getPassword()); + } + + /** + * Core security regression: a password may contain colons (RFC 7617), and + * the whole password must be preserved. The previous {@code split(":")} + * implementation silently truncated it, weakening authentication. + */ + @Test + public void preservesColonsInPassword() throws Exception { + SimpleCredentials credentials = parsedCredentials(basicHeader("admin", "p4ss:w0rd:!")); + assertEquals("admin", credentials.getUserID()); + assertArrayEquals("p4ss:w0rd:!".toCharArray(), credentials.getPassword()); + } + + @Test + public void acceptsEmptyPassword() throws Exception { + SimpleCredentials credentials = parsedCredentials(basicHeader("admin", "")); + assertEquals("admin", credentials.getUserID()); + assertArrayEquals(new char[0], credentials.getPassword()); + } + + @Test + public void acceptsEmptyUserId() throws Exception { + SimpleCredentials credentials = parsedCredentials(basicHeader("", "secret")); + assertEquals("", credentials.getUserID()); + assertArrayEquals("secret".toCharArray(), credentials.getPassword()); + } + + /** + * A decoded value without a colon must be rejected cleanly (401) rather than + * throwing an unhandled {@link ArrayIndexOutOfBoundsException} that would + * surface as an HTTP 500. + */ + @Test + public void rejectsMissingColon() throws Exception { + assertUnauthorized("Basic " + Base64.encode("nocolon")); + } + + @Test + public void rejectsMissingHeader() throws Exception { + assertUnauthorized(null); + } + + @Test + public void rejectsNonBasicScheme() throws Exception { + assertUnauthorized("Bearer sometoken"); + } +}