-
Notifications
You must be signed in to change notification settings - Fork 641
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12485 from lasanthaS/id-token-fix
Fix accessing API resources using id_token
- Loading branch information
Showing
7 changed files
with
133 additions
and
2 deletions.
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
33 changes: 33 additions & 0 deletions
33
....carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dto/TokenValidationDto.java
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,33 @@ | ||
| /* | ||
| * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved. | ||
| * | ||
| * WSO2 LLC. 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.wso2.carbon.apimgt.impl.dto; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| public class TokenValidationDto implements Serializable { | ||
| private boolean enforceTypeHeaderValidation = false; | ||
|
|
||
| public boolean isEnforceTypeHeaderValidation() { | ||
| return enforceTypeHeaderValidation; | ||
| } | ||
|
|
||
| public void setEnforceTypeHeaderValidation(boolean enforceTypeHeaderValidation) { | ||
| this.enforceTypeHeaderValidation = enforceTypeHeaderValidation; | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
...imgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/jwt/TypeEnforcedJWTValidatorImpl.java
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,60 @@ | ||
| /* | ||
| * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved. | ||
| * | ||
| * WSO2 LLC. 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.wso2.carbon.apimgt.impl.jwt; | ||
|
|
||
| import org.wso2.carbon.apimgt.api.APIManagementException; | ||
| import org.wso2.carbon.apimgt.common.gateway.dto.JWTValidationInfo; | ||
| import org.wso2.carbon.apimgt.impl.APIConstants; | ||
| import org.wso2.carbon.apimgt.impl.APIManagerConfiguration; | ||
| import org.wso2.carbon.apimgt.impl.internal.ServiceReferenceHolder; | ||
|
|
||
| public class TypeEnforcedJWTValidatorImpl extends JWTValidatorImpl { | ||
| @Override | ||
| public JWTValidationInfo validateToken(SignedJWTInfo signedJWTInfo) throws APIManagementException { | ||
| // If this is a refresh token, return an error | ||
| String tokenTypeClaim = (String) signedJWTInfo.getJwtClaimsSet().getClaim( | ||
| APIConstants.JwtTokenConstants.TOKEN_TYPE); | ||
| if (APIConstants.OAuthConstants.REFRESH_TOKEN.equals(tokenTypeClaim)) { | ||
| // Invalid type header | ||
| JWTValidationInfo jwtValidationInfo = new JWTValidationInfo(); | ||
| jwtValidationInfo.setValid(false); | ||
| jwtValidationInfo.setValidationCode(APIConstants.KeyValidationStatus.API_AUTH_INVALID_CREDENTIALS); | ||
| return jwtValidationInfo; | ||
| } | ||
|
|
||
| APIManagerConfiguration apiManagerConfiguration = ServiceReferenceHolder.getInstance() | ||
| .getAPIManagerConfigurationService().getAPIManagerConfiguration(); | ||
| if (apiManagerConfiguration.getTokenValidationDto().isEnforceTypeHeaderValidation()) { | ||
| // JWT type header validation is enforced via the configuration | ||
| if (signedJWTInfo.getSignedJWT().getHeader().getType() != null | ||
| && APIConstants.JWT_HEADER_ACCESS_TOKEN_TYPE.equals( | ||
| signedJWTInfo.getSignedJWT().getHeader().getType().toString())) { | ||
| // The type header present with the value "at+jwt" | ||
| return super.validateToken(signedJWTInfo); | ||
| } else { | ||
| // Invalid type header | ||
| JWTValidationInfo jwtValidationInfo = new JWTValidationInfo(); | ||
| jwtValidationInfo.setValid(false); | ||
| jwtValidationInfo.setValidationCode(APIConstants.KeyValidationStatus.API_AUTH_INVALID_CREDENTIALS); | ||
| return jwtValidationInfo; | ||
| } | ||
| } | ||
| return super.validateToken(signedJWTInfo); | ||
| } | ||
| } |
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