-
Notifications
You must be signed in to change notification settings - Fork 0
Implement access token context encoding framework #8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: feature-token-context-baseline
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Copyright 2025 Red Hat, Inc. and/or its affiliates | ||
| * and other 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.keycloak.protocol.oidc.encode; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * Some context info about the token | ||
| * | ||
| * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> | ||
| */ | ||
| public class AccessTokenContext { | ||
|
|
||
| private final SessionType sessionType; | ||
| private final TokenType tokenType; | ||
| private final String grantType; | ||
| private final String rawTokenId; | ||
|
|
||
| public enum SessionType { | ||
| ONLINE("on"), | ||
| OFFLINE("of"), | ||
| TRANSIENT("tr"), | ||
| UNKNOWN("un"); | ||
|
|
||
| private final String shortcut; | ||
|
|
||
| SessionType(String shortcut) { | ||
| this.shortcut = shortcut; | ||
| } | ||
|
|
||
| public String getShortcut() { | ||
| return shortcut; | ||
| } | ||
| } | ||
|
|
||
| public enum TokenType { | ||
| REGULAR("rt"), | ||
| LIGHTWEIGHT("lt"), | ||
| UNKNOWN("un"); | ||
|
|
||
| private final String shortcut; | ||
|
|
||
| TokenType(String shortcut) { | ||
| this.shortcut = shortcut; | ||
| } | ||
|
|
||
| public String getShortcut() { | ||
| return shortcut; | ||
| } | ||
| } | ||
|
|
||
| public AccessTokenContext(SessionType sessionType, TokenType tokenType, String grantType, String rawTokenId) { | ||
| Objects.requireNonNull(sessionType, "Null sessionType not allowed"); | ||
| Objects.requireNonNull(tokenType, "Null tokenType not allowed"); | ||
| Objects.requireNonNull(grantType, "Null grantType not allowed"); | ||
| Objects.requireNonNull(grantType, "Null rawTokenId not allowed"); | ||
| this.sessionType = sessionType; | ||
| this.tokenType = tokenType; | ||
| this.grantType = grantType; | ||
| this.rawTokenId = rawTokenId; | ||
| } | ||
|
|
||
| public SessionType getSessionType() { | ||
| return sessionType; | ||
| } | ||
|
|
||
| public TokenType getTokenType() { | ||
| return tokenType; | ||
| } | ||
|
|
||
| public String getGrantType() { | ||
| return grantType; | ||
| } | ||
|
|
||
| public String getRawTokenId() { | ||
| return rawTokenId; | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| /* | ||
| * Copyright 2025 Red Hat, Inc. and/or its affiliates | ||
| * and other 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.keycloak.protocol.oidc.encode; | ||
|
|
||
| import org.keycloak.models.ClientSessionContext; | ||
| import org.keycloak.models.Constants; | ||
| import org.keycloak.models.KeycloakSession; | ||
| import org.keycloak.models.UserSessionModel; | ||
| import org.keycloak.protocol.oidc.mappers.AbstractOIDCProtocolMapper; | ||
|
|
||
| /** | ||
| * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> | ||
| */ | ||
| public class DefaultTokenContextEncoderProvider implements TokenContextEncoderProvider { | ||
|
|
||
| public static final String UNKNOWN = "na"; | ||
|
|
||
| private final KeycloakSession session; | ||
| private final DefaultTokenContextEncoderProviderFactory factory; | ||
|
|
||
| public DefaultTokenContextEncoderProvider(KeycloakSession session, | ||
| DefaultTokenContextEncoderProviderFactory factory) { | ||
| this.session = session; | ||
| this.factory = factory; | ||
| } | ||
|
|
||
| @Override | ||
| public AccessTokenContext getTokenContextFromClientSessionContext(ClientSessionContext clientSessionContext, String rawTokenId) { | ||
| AccessTokenContext.SessionType sessionType; | ||
| UserSessionModel userSession = clientSessionContext.getClientSession().getUserSession(); | ||
| if (userSession.getPersistenceState() == UserSessionModel.SessionPersistenceState.TRANSIENT) { | ||
| sessionType = AccessTokenContext.SessionType.TRANSIENT; | ||
| } else { | ||
| sessionType = userSession.isOffline() ? AccessTokenContext.SessionType.OFFLINE : AccessTokenContext.SessionType.ONLINE; | ||
| } | ||
|
|
||
| boolean useLightweightToken = AbstractOIDCProtocolMapper.getShouldUseLightweightToken(session); | ||
| AccessTokenContext.TokenType tokenType = useLightweightToken ? AccessTokenContext.TokenType.LIGHTWEIGHT : AccessTokenContext.TokenType.REGULAR; | ||
|
|
||
| String grantType = clientSessionContext.getAttribute(Constants.GRANT_TYPE, String.class); | ||
| if (grantType == null) { | ||
| grantType = UNKNOWN; | ||
| } | ||
|
|
||
| return new AccessTokenContext(sessionType, tokenType, grantType, rawTokenId); | ||
| } | ||
|
Comment on lines
+44
to
+63
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 Analysis chain🏁 Script executed: # Search for calls to getTokenContextFromClientSessionContext
rg -n 'getTokenContextFromClientSessionContext' --type java -B 3 -A 3Repository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 3021 🏁 Script executed: # Find the ClientSessionContext interface to understand the contract
fd -e java | xargs grep -l 'interface ClientSessionContext\|class ClientSessionContext' | head -5Repository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 154 🏁 Script executed: # Check the UserSessionModel interface for getPersistenceState and isOffline nullability
rg -n 'getUserSession\(\)' --type java -B 2 -A 2 | head -40Repository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 6500 🏁 Script executed: # Read the ClientSessionContext interface
cat services/src/main/java/org/keycloak/models/ClientSessionContext.java | head -60Repository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 184 🏁 Script executed: # Check the context in TokenManager where clientSessionCtx is obtained (around line 1053)
sed -n '1030,1070p' services/src/main/java/org/keycloak/protocol/oidc/TokenManager.javaRepository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 2577 🏁 Script executed: # Look for the method that creates or passes clientSessionCtx to understand null checks
rg -n 'clientSessionCtx' services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java -B 5 | head -50Repository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 2799 🏁 Script executed: # Find ClientSessionContext interface
find . -name "*.java" -type f | xargs grep -l 'interface ClientSessionContext' 2>/dev/nullRepository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 158 🏁 Script executed: # Find DefaultClientSessionContext implementation
find . -name "DefaultClientSessionContext.java" -type fRepository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 168 🏁 Script executed: # Search for getClientSession method definition
rg -n 'getClientSession\(\)' --type java -A 2 | grep -E '(interface|class|ClientSession|getClientSession)' | head -30Repository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 4845 🏁 Script executed: # Read the ClientSessionContext interface
cat ./server-spi/src/main/java/org/keycloak/models/ClientSessionContext.javaRepository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 2018 🏁 Script executed: # Read the DefaultClientSessionContext implementation
cat ./services/src/main/java/org/keycloak/services/util/DefaultClientSessionContext.javaRepository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 12539 🏁 Script executed: # Check if there are @Nullable or @NonNull annotations in the interfaces/classes
rg -n '@Nullable|@NonNull|@Nonnull' services/src/main/java/org/keycloak/protocol/oidc/encode/ -A 2 -B 2Repository: AI-Code-Review-Evals/coderabbit-keycloak Length of output: 66 Add null checks for chained calls on potentially null objects. The chained call AuthenticatedClientSessionModel clientSession = clientSessionContext.getClientSession();
if (clientSession == null) {
throw new IllegalArgumentException("clientSessionContext must have a valid client session");
}
UserSessionModel userSession = clientSession.getUserSession();
if (userSession == null) {
throw new IllegalArgumentException("client session must have a user session");
}Alternatively, document the precondition that both 🤖 Prompt for AI Agents |
||
|
|
||
| @Override | ||
| public AccessTokenContext getTokenContextFromTokenId(String encodedTokenId) { | ||
| int indexOf = encodedTokenId.indexOf(':'); | ||
| if (indexOf == -1) { | ||
| return new AccessTokenContext(AccessTokenContext.SessionType.UNKNOWN, AccessTokenContext.TokenType.UNKNOWN, UNKNOWN, encodedTokenId); | ||
| } else { | ||
| String encodedContext = encodedTokenId.substring(0, indexOf); | ||
| String rawId = encodedTokenId.substring(indexOf + 1); | ||
|
|
||
| if (encodedContext.length() != 6) { | ||
| throw new IllegalArgumentException("Incorrect token id: '" + encodedTokenId + "'. Expected length of 6."); | ||
| } | ||
|
|
||
| // First 2 chars are "sessionType", next 2 chars "tokenType", last 2 chars "grantType" | ||
| String stShortcut = encodedContext.substring(0, 2); | ||
| String ttShortcut = encodedContext.substring(2, 4); | ||
| String gtShortcut = encodedContext.substring(4, 6); | ||
|
|
||
| AccessTokenContext.SessionType st = factory.getSessionTypeByShortcut(stShortcut); | ||
| if (st == null) { | ||
| throw new IllegalArgumentException("Incorrect token id: " + encodedTokenId + ". Unknown value '" + stShortcut + "' for session type"); | ||
| } | ||
| AccessTokenContext.TokenType tt = factory.getTokenTypeByShortcut(ttShortcut); | ||
| if (tt == null) { | ||
| throw new IllegalArgumentException("Incorrect token id: " + encodedTokenId + ". Unknown value '" + ttShortcut + "' for token type"); | ||
| } | ||
| String gt = factory.getGrantTypeByShortcut(gtShortcut); | ||
| if (gt == null) { | ||
| throw new IllegalArgumentException("Incorrect token id: " + encodedTokenId + ". Unknown value '" + gtShortcut + "' for grant type"); | ||
| } | ||
|
|
||
| return new AccessTokenContext(st, tt, gt, rawId); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String encodeTokenId(AccessTokenContext tokenContext) { | ||
| if (tokenContext.getSessionType() == AccessTokenContext.SessionType.UNKNOWN) { | ||
| throw new IllegalStateException("Cannot encode token with unknown sessionType"); | ||
| } | ||
| if (tokenContext.getTokenType() == AccessTokenContext.TokenType.UNKNOWN) { | ||
| throw new IllegalStateException("Cannot encode token with unknown tokenType"); | ||
| } | ||
|
|
||
| String grantShort = factory.getShortcutByGrantType(tokenContext.getGrantType()); | ||
| if (grantShort == null) { | ||
| throw new IllegalStateException("Cannot encode token with unknown grantType: " + tokenContext.getGrantType()); | ||
| } | ||
|
|
||
| return tokenContext.getSessionType().getShortcut() + | ||
| tokenContext.getTokenType().getShortcut() + | ||
| grantShort + | ||
| ':' + tokenContext.getRawTokenId(); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
|
|
||
| } | ||
| } | ||
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.
Bug:
rawTokenIdis not validated for null.Line 73 validates
grantTypea second time instead ofrawTokenId. This allows nullrawTokenIdvalues to be stored, which would likely cause NPEs whengetRawTokenId()is used downstream.🐛 Proposed fix
public AccessTokenContext(SessionType sessionType, TokenType tokenType, String grantType, String rawTokenId) { Objects.requireNonNull(sessionType, "Null sessionType not allowed"); Objects.requireNonNull(tokenType, "Null tokenType not allowed"); Objects.requireNonNull(grantType, "Null grantType not allowed"); - Objects.requireNonNull(grantType, "Null rawTokenId not allowed"); + Objects.requireNonNull(rawTokenId, "Null rawTokenId not allowed"); this.sessionType = sessionType; this.tokenType = tokenType; this.grantType = grantType; this.rawTokenId = rawTokenId; }📝 Committable suggestion
🤖 Prompt for AI Agents