[ELY-2362] Add support for the bearer-only option when using the OIDC HTTP mechanism #1735
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * 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.oidc; | ||
|
|
||
| import static java.nio.charset.StandardCharsets.UTF_8; | ||
| import static org.wildfly.common.array.Arrays2.indexOf; | ||
| import static org.wildfly.security.http.HttpConstants.NO_TOKEN; | ||
| import static org.wildfly.security.http.oidc.ElytronMessages.log; | ||
|
|
||
| import java.nio.ByteBuffer; | ||
| import java.nio.CharBuffer; | ||
| import java.util.List; | ||
|
|
||
| import org.wildfly.common.iteration.ByteIterator; | ||
| import org.wildfly.security.http.HttpConstants; | ||
|
|
||
| /** | ||
| * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> | ||
| * @author <a href="mailto:fjuma@redhat.com">Farah Juma</a> | ||
| */ | ||
| public class BasicAuthRequestAuthenticator extends BearerTokenRequestAuthenticator { | ||
|
|
||
| private static final String CHALLENGE_PREFIX = "Basic "; | ||
|
|
||
| public BasicAuthRequestAuthenticator(OidcHttpFacade facade, OidcClientConfiguration oidcClientConfiguration) { | ||
| super(facade, oidcClientConfiguration); | ||
| } | ||
|
|
||
| public Oidc.AuthOutcome authenticate() { | ||
| List<String> authorizationValues = facade.getRequest().getHeaders(HttpConstants.AUTHORIZATION); | ||
| if (authorizationValues == null || authorizationValues.isEmpty()) { | ||
| challenge = challengeResponse(AuthenticationError.Reason.NO_AUTHORIZATION_HEADER, null, null); | ||
| return Oidc.AuthOutcome.NOT_ATTEMPTED; | ||
| } | ||
|
|
||
| String basicValue = null; | ||
| for (String authorizationValue : authorizationValues) { | ||
| if (authorizationValue.regionMatches(true, 0, CHALLENGE_PREFIX, 0, CHALLENGE_PREFIX.length())) { | ||
| basicValue = authorizationValue.substring(CHALLENGE_PREFIX.length()); | ||
| break; | ||
| } | ||
| } | ||
| if (basicValue == null) { | ||
| challenge = challengeResponse(AuthenticationError.Reason.INVALID_TOKEN, null, null); | ||
| return Oidc.AuthOutcome.NOT_ATTEMPTED; | ||
| } | ||
| byte[] decodedValue = ByteIterator.ofBytes(basicValue.getBytes(UTF_8)).asUtf8String().base64Decode().drain(); | ||
| int colonPos = indexOf(decodedValue, ':'); | ||
| if (colonPos <= 0) { | ||
| log.debug("Failed to obtain token"); | ||
| challenge = challengeResponse(AuthenticationError.Reason.INVALID_TOKEN, NO_TOKEN, null); | ||
| return Oidc.AuthOutcome.FAILED; | ||
| } | ||
|
|
||
| ByteBuffer usernameBytes = ByteBuffer.wrap(decodedValue, 0, colonPos); | ||
| ByteBuffer passwordBytes = ByteBuffer.wrap(decodedValue, colonPos + 1, decodedValue.length - colonPos - 1); | ||
| CharBuffer usernameChars = UTF_8.decode(usernameBytes); | ||
| CharBuffer passwordChars = UTF_8.decode(passwordBytes); | ||
| AccessAndIDTokenResponse tokenResponse; | ||
| try { | ||
| String username = usernameChars.toString(); | ||
| String password = passwordChars.toString(); | ||
| tokenResponse = ServerRequest.getBearerToken(oidcClientConfiguration, username, password); | ||
| } catch (Exception e) { | ||
| log.debug("Failed to obtain token"); | ||
| challenge = challengeResponse(AuthenticationError.Reason.INVALID_TOKEN, NO_TOKEN, e.getMessage()); | ||
| return Oidc.AuthOutcome.FAILED; | ||
| } | ||
| tokenString = tokenResponse.getAccessToken(); | ||
| return verifyToken(tokenString); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it the specs / prior implementation that gives this one a different format?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the format used by the prior adapter.
STALE_TOKENis different because it's a description of the error. As an example,this would look something like:
"error=invalid_token,error_description=Stale token"