Skip to content

Improve token validation for sub organization applications#3153

Draft
ShanChathusanda93 wants to merge 1 commit intowso2-extensions:masterfrom
ShanChathusanda93:token-validation-impr-branch
Draft

Improve token validation for sub organization applications#3153
ShanChathusanda93 wants to merge 1 commit intowso2-extensions:masterfrom
ShanChathusanda93:token-validation-impr-branch

Conversation

@ShanChathusanda93
Copy link
Copy Markdown
Contributor

Proposed changes in this pull request

[List all changes you want to add here. If you fixed an issue, please
add a reference to that issue as well.]

When should this PR be merged

[Please describe any preconditions that need to be addressed before we
can merge this pull request.]

Follow up actions

[List any possible follow-up actions here; for instance, testing data
migrations, software that we need to install on staging and production
environments.]

Developer Checklist (Mandatory)

  • Complete the Developer Checklist in the related product-is issue to track any behavioral change or migration impact.

Checklist (for reviewing)

General

  • Is this PR explained thoroughly? All code changes must be accounted for in the PR description.
  • Is the PR labeled correctly?

Functionality

  • Are all requirements met? Compare implemented functionality with the requirements specification.
  • Does the UI work as expected? There should be no Javascript errors in the console; all resources should load. There should be no unexpected errors. Deliberately try to break the feature to find out if there are corner cases that are not handled.

Code

  • Do you fully understand the introduced changes to the code? If not ask for clarification, it might uncover ways to solve a problem in a more elegant and efficient way.
  • Does the PR introduce any inefficient database requests? Use the debug server to check for duplicate requests.
  • Are all necessary strings marked for translation? All strings that are exposed to users via the UI must be marked for translation.

Tests

  • Are there sufficient test cases? Ensure that all components are tested individually; models, forms, and serializers should be tested in isolation even if a test for a view covers these components.
  • If this is a bug fix, are tests for the issue in place? There must be a test case for the bug to ensure the issue won’t regress. Make sure that the tests break without the new code to fix the issue.
  • If this is a new feature or a significant change to an existing feature? has the manual testing spreadsheet been updated with instructions for manual testing?

Security

  • Confirm this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets.
  • Are all UI and API inputs run through forms or serializers?
  • Are all external inputs validated and sanitized appropriately?
  • Does all branching logic have a default case?
  • Does this solution handle outliers and edge cases gracefully?
  • Are all external communications secured and restricted to SSL?

Documentation

  • Are changes to the UI documented in the platform docs? If this PR introduces new platform site functionality or changes existing ones, the changes should be documented.
  • Are changes to the API documented in the API docs? If this PR introduces new API functionality or changes existing ones, the changes must be documented.
  • Are reusable components documented? If this PR introduces components that are relevant to other developers (for instance a mixin for a view or a generic form) they should be documented in the Wiki.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 30, 2026

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: bab4a478-252c-4380-a5d7-6028abcf91a9

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Comment on lines 123 to +124
introspectionRequest.setRequiredClaimURIs(claimsUris);
OAuth2TokenValidationRequestDTO.TokenValidationContextParam contextParam =
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log Improvement Suggestion No: 1

Suggested change
introspectionRequest.setRequiredClaimURIs(claimsUris);
OAuth2TokenValidationRequestDTO.TokenValidationContextParam contextParam =
introspectionRequest.setRequiredClaimURIs(claimsUris);
log.debug("Setting introspection context parameter for token validation");
OAuth2TokenValidationRequestDTO.TokenValidationContextParam contextParam =

Comment on lines +129 to 130
new OAuth2TokenValidationRequestDTO.TokenValidationContextParam[]{contextParam});

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log Improvement Suggestion No: 2

Suggested change
new OAuth2TokenValidationRequestDTO.TokenValidationContextParam[]{contextParam});
new OAuth2TokenValidationRequestDTO.TokenValidationContextParam[]{contextParam});
log.info("Initiating OAuth2 token introspection request");

Comment on lines 571 to +573
.getVerifiedAccessToken(validationRequest.getAccessToken().getIdentifier(), false);
OAuth2TokenValidationRequestDTO.TokenValidationContextParam[] validationContextParam =
validationRequest.getContext();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log Improvement Suggestion No: 3

Suggested change
.getVerifiedAccessToken(validationRequest.getAccessToken().getIdentifier(), false);
OAuth2TokenValidationRequestDTO.TokenValidationContextParam[] validationContextParam =
validationRequest.getContext();
OAuth2TokenValidationRequestDTO.TokenValidationContextParam[] validationContextParam =
validationRequest.getContext();
log.debug("Starting token validation for introspection request");

Comment on lines +1068 to +1070
int appResidentTenantId = accessTokenDO.getAppResidentTenantId();
String accessingOrgIdFromPath = PrivilegedCarbonContext.getThreadLocalCarbonContext().
getAccessingOrganizationId();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log Improvement Suggestion No: 4

Suggested change
int appResidentTenantId = accessTokenDO.getAppResidentTenantId();
String accessingOrgIdFromPath = PrivilegedCarbonContext.getThreadLocalCarbonContext().
getAccessingOrganizationId();
int appResidentTenantId = accessTokenDO.getAppResidentTenantId();
String accessingOrgIdFromPath = PrivilegedCarbonContext.getThreadLocalCarbonContext().
getAccessingOrganizationId();
log.debug("Validating introspection for sub-organization tokens. App resident tenant ID: " +
appResidentTenantId);

Copy link
Copy Markdown
Contributor

@wso2-engineering wso2-engineering bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AI Agent Log Improvement Checklist

⚠️ Warning: AI-Generated Review Comments

  • The log-related comments and suggestions in this review were generated by an AI tool to assist with identifying potential improvements. Purpose of reviewing the code for log improvements is to improve the troubleshooting capabilities of our products.
  • Please make sure to manually review and validate all suggestions before applying any changes. Not every code suggestion would make sense or add value to our purpose. Therefore, you have the freedom to decide which of the suggestions are helpful.

✅ Before merging this pull request:

  • Review all AI-generated comments for accuracy and relevance.
  • Complete and verify the table below. We need your feedback to measure the accuracy of these suggestions and the value they add. If you are rejecting a certain code suggestion, please mention the reason briefly in the suggestion for us to capture it.
Comment Accepted (Y/N) Reason
#### Log Improvement Suggestion No: 1
#### Log Improvement Suggestion No: 2
#### Log Improvement Suggestion No: 3
#### Log Improvement Suggestion No: 4

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 30, 2026

Codecov Report

❌ Patch coverage is 45.83333% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 57.07%. Comparing base (7084bd4) to head (acddd84).
⚠️ Report is 8 commits behind head on master.

Files with missing lines Patch % Lines
...tity/oauth2/validators/TokenValidationHandler.java 31.57% 12 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##             master    #3153      +/-   ##
============================================
- Coverage     59.71%   57.07%   -2.65%     
- Complexity    10229    10880     +651     
============================================
  Files           709      709              
  Lines         55689    61666    +5977     
  Branches      13905    15123    +1218     
============================================
+ Hits          33255    35196    +1941     
- Misses        18055    21748    +3693     
- Partials       4379     4722     +343     
Flag Coverage Δ
unit 42.72% <45.83%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant