Skip to content

Fix RFC 9068 compliance: set typ header to at+jwt for JWT access tokens #2948

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.

Sign up for GitHub

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

Open
gnodet wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix RFC 9068 compliance: set typ header to at+jwt for JWT access tokens #2948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public final class JoseConstants extends RSSecurityConstants {
public static final String JWS_HEADER_B64_STATUS_HEADER = "b64";

public static final String TYPE_JWT = "JWT";
public static final String TYPE_AT_JWT = "at+jwt";
public static final String TYPE_JOSE = "JOSE";
public static final String TYPE_JOSE_JSON = "JOSE+JSON";
public static final String MEDIA_TYPE_JOSE = "application/jose";
Expand Down
5 changes: 4 additions & 1 deletion ...urity/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
public enum JoseType {
JOSE(JoseConstants.TYPE_JOSE),
JOSE_JSON(JoseConstants.TYPE_JOSE_JSON),
JWT(JoseConstants.TYPE_JWT);
JWT(JoseConstants.TYPE_JWT),
AT_JWT(JoseConstants.TYPE_AT_JWT);

private final String type;
JoseType(String type) {
Expand All @@ -33,6 +34,8 @@ public static JoseType getType(String type) {
return null;
} else if (JoseConstants.TYPE_JOSE_JSON.equals(type)) {
return JOSE_JSON;
} else if (JoseConstants.TYPE_AT_JWT.equals(type)) {
return AT_JWT;
} else {
return valueOf(type);
}
Expand Down
7 changes: 6 additions & 1 deletion ...2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import jakarta.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.rs.security.jose.common.JoseConstants;
import org.apache.cxf.rs.security.jose.common.JoseType;
import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
import org.apache.cxf.rs.security.jose.jwt.JwtConstants;
import org.apache.cxf.rs.security.jose.jwt.JwtToken;
Expand Down Expand Up @@ -669,7 +670,11 @@ protected String processJwtAccessToken(JwtClaims jwtCliams) {
// It will JWS-sign (default) and/or JWE-encrypt
OAuthJoseJwtProducer processor =
getJwtAccessTokenProducer() == null ? new OAuthJoseJwtProducer() : getJwtAccessTokenProducer();
return processor.processJwt(new JwtToken(jwtCliams));
JwtToken jwt = new JwtToken(jwtCliams);
// RFC 9068 Section 2.1: JWT access tokens MUST set typ to "at+jwt"
jwt.getJwsHeaders().setType(JoseType.AT_JWT);
jwt.getJweHeaders().setType(JoseType.AT_JWT);
return processor.processJwt(jwt);
}

public Map<String, String> getJwtAccessTokenClaimMap() {
Expand Down