Skip to content
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

Add support to send PAT JWT to backend #3597

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Add support to send PAT JWT to backend #3597

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
5 changes: 2 additions & 3 deletions ...ent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ public static String generateAPIKeyHash(String apiKey) {
/**
* This function exchanges a given API key to an JWT token.
*
* @param pat PAT
* @param keyHash Key Hash
* @return JWT corresponding to given PAT.
*/
public static Optional<String> exchangePATToJWT(String pat) {
public static Optional<String> exchangePATToJWT(String keyHash) {

URL url = null;
try {
Expand All @@ -115,7 +115,6 @@ public static Optional<String> exchangePATToJWT(String pat) {
// Create a request to exchange API key to JWT.
HttpPost exchangeRequest = new HttpPost(url.toURI());
exchangeRequest.addHeader("Content-Type", ContentType.APPLICATION_JSON.toString());
String keyHash = generateAPIKeyHash(pat);
exchangeRequest.setEntity(new StringEntity(createPATExchangeRequest(keyHash)));
try (CloseableHttpResponse response = httpClient.execute(exchangeRequest)) {
if (response.getStatusLine().getStatusCode() == 200) {
Expand Down
8 changes: 5 additions & 3 deletions ...nforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public AuthenticationContext authenticate(RequestContext requestContext) throws
}
// Handle PAT logic
if (isPATEnabled && token.startsWith(APIKeyConstants.PAT_PREFIX)) {
token = exchangeJWTForPAT(token);
token = exchangeJWTForPAT(requestContext, token);
}
String context = requestContext.getMatchedAPI().getBasePath();
String name = requestContext.getMatchedAPI().getName();
Expand Down Expand Up @@ -806,7 +806,7 @@ private String getJWTTokenIdentifier(SignedJWTInfo signedJWTInfo) {
return signedJWTInfo.getSignedJWT().getSignature().toString();
}

private String exchangeJWTForPAT(String pat) throws APISecurityException {
private String exchangeJWTForPAT(RequestContext requestContext, String pat) throws APISecurityException {
if (!APIKeyUtils.isValidAPIKey(pat)) {
throw new APISecurityException(APIConstants.StatusCodes.UNAUTHENTICATED.getCode(),
APISecurityConstants.API_AUTH_INVALID_CREDENTIALS,
Expand All @@ -820,13 +820,15 @@ private String exchangeJWTForPAT(String pat) throws APISecurityException {
}
return (String) cachedJWT;
}
Optional<String> jwt = APIKeyUtils.exchangePATToJWT(pat);
Optional<String> jwt = APIKeyUtils.exchangePATToJWT(keyHash);
if (jwt.isEmpty()) {
throw new APISecurityException(APIConstants.StatusCodes.UNAUTHENTICATED.getCode(),
APISecurityConstants.API_AUTH_INVALID_CREDENTIALS,
APISecurityConstants.API_AUTH_INVALID_CREDENTIALS_MESSAGE);
}
CacheProvider.getGatewayAPIKeyJWTCache().put(keyHash, jwt.get());
// Add jwt to x-forwarded-authorization header.
requestContext.addOrModifyHeaders("x-forwarded-authorization", jwt.get());
return jwt.get();
}

Expand Down
Loading