Add Opaque Token Validation Support for Servlet Web Application Type #185
Conversation
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
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-COMBEUST-174815
bdemers
reviewed
Sep 10, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/OktaOAuth2Configurer.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Sep 10, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/OktaOAuth2Configurer.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Sep 10, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/config/OktaOAuth2Properties.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Sep 10, 2020
bdemers
reviewed
Sep 10, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/OktaOAuth2AutoConfig.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Sep 10, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/OktaOpaqueTokenIntrospector.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Sep 10, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/config/OktaOAuth2Properties.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Sep 10, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/config/OktaOAuth2Properties.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Sep 10, 2020
...java/com/okta/spring/boot/oauth/env/OktaOAuth2PropertiesMappingEnvironmentPostProcessor.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Oct 8, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/OktaOAuth2ResourceServerAutoConfig.java
Outdated
Show resolved
Hide resolved
bdemers
reviewed
Oct 8, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/OktaOAuth2ResourceServerAutoConfig.java
Outdated
Show resolved
Hide resolved
|
Are there changes to support WebFlux in this PR? |
arvindkrishnakumar-okta
force-pushed
the
add_opaque_token_validation_support
branch
from
49fe956 to
8476284
Compare
I would introduce them as part of a separate JIRA/PR (OKTA-336738). |
arvindkrishnakumar-okta
changed the title
arvindkrishnakumar-okta
changed the title
|
Ready for review! |
bdemers
suggested changes
Oct 12, 2020
oauth2/src/main/java/com/okta/spring/boot/oauth/OktaOAuth2Configurer.java
Outdated
Show resolved
Hide resolved
oauth2/src/main/java/com/okta/spring/boot/oauth/WebClientUtil.java
Outdated
Show resolved
Hide resolved
| @@ -265,7 +261,8 @@ class AutoConfigConditionalTest implements HttpMock { | |||
| webContextRunner().withPropertyValues( | |||
| "okta.oauth2.issuer=https://test.example.com/", | |||
| "spring.security.oauth2.client.provider.okta.issuerUri=${mockBaseUrl()}", // work around to not validate the https url | |||
| "okta.oauth2.client-id=test-client-id") | |||
| "okta.oauth2.client-id=test-client-id", | |||
| "okta.oauth2.client-secret=test-client-secret") | |||
There was a problem hiding this comment.
update the test propertyokta.oauth2.issuer to be something that the previous code was expected (so the test functions the same way), then add a new test (if needed for the newer code)
This will ensure the previous functionality continues to work unchanged
...om/okta/spring/boot/oauth/env/OktaOAuth2PropertiesMappingEnvironmentPostProcessorTest.groovy
Outdated
Show resolved
Hide resolved
...om/okta/spring/boot/oauth/env/OktaOAuth2PropertiesMappingEnvironmentPostProcessorTest.groovy
Show resolved
Hide resolved
oauth2/src/main/java/com/okta/spring/boot/oauth/OktaOAuth2Configurer.java
Outdated
Show resolved
Hide resolved
Updated conditional property logic to take a list of strings, this ensures that BOTH issuer and secret are set before remapping properties
arvindkrishnakumar-okta
force-pushed
the
add_opaque_token_validation_support
branch
from
bb6cbba to
dc6cd54
Compare
fixed. |
This probably isn't any better, but there were a couple that said `withIssuer` but didn't mention client id & secret
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue:
OKTA-323350
Expected behavior implemented in this PR:
ℹ️ Note: When the server is configured/set to start in Opaque Token mode, if the property
okta.oauth2.client-secretis not set (empty), then the startup would fail with error and this is the desired behavior. This is because, we will need the client-secret at runtime to hit the introspection endpoint to validate the Opaque token and we do not want the user to see a 401 error at that stage with a missing client-secret. To prevent that, we are validating that before the server startup and would not let the server to start in such a case.Note: This covers only Servlet web application type (does not cover "Reactive/Webflux" applications).