SNOW-1831099: OAuth Client Credentials Flow Implementation #1993
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
sfc-gh-dheyman
changed the title
| @@ -16,7 +16,7 @@ public class AssertUtil { | |||
| * @param internalErrorMesg The error message to display if condition is false | |||
| * @throws SFException Will be thrown if condition is false | |||
| */ | |||
| static void assertTrue(boolean condition, String internalErrorMesg) throws SFException { | |||
| public static void assertTrue(boolean condition, String internalErrorMesg) throws SFException { | |||
| @@ -842,6 +842,7 @@ private static String executeRequestInternal( | |||
| SnowflakeUtil.logResponseDetails(response, logger); | |||
|
|
|||
| if (response != null) { | |||
|
|
|||
There was a problem hiding this comment.
let's minimize such unnecessary changes
| String oauthAccessToken = accessTokenProvider.getAccessToken(loginInput); | ||
| loginInput.setAuthenticator(AuthenticatorType.OAUTH.name()); | ||
| loginInput.setToken(oauthAccessToken); | ||
| loginInput.setUserName("0oalpyiuy8rmozhjZ5d7"); |
There was a problem hiding this comment.
looks like the secret and git guardian should complain
There was a problem hiding this comment.
It doesn't though 🤷 Removed it.
| @@ -98,10 +97,11 @@ private String exchangeAuthorizationCodeForAccessToken( | |||
| TokenRequest request = buildTokenRequest(loginInput, authorizationCode, pkceVerifier); | |||
| URI requestUri = request.getEndpointURI(); | |||
| logger.debug( | |||
| "Requesting access token from: {}", requestUri.getAuthority() + requestUri.getPath()); | |||
| "Requesting OAuth access token from: {}", | |||
| requestUri.getAuthority() + requestUri.getPath()); | |||
There was a problem hiding this comment.
here also let's use parameters without concatenation
| loginInput.getLoginTimeout(), | ||
| loginInput.getAuthTimeout(), | ||
| loginInput.getSocketTimeoutInMillis(), | ||
| 0, |
There was a problem hiding this comment.
what's the 0 here?
There was a problem hiding this comment.
It's retry count. In case of SAML it's also 0 so I wanted this to be consistent.
sfc-gh-pfus
approved these changes
Dec 10, 2024
| } else if (loginInput | ||
| .getAuthenticator() | ||
| .equalsIgnoreCase(AuthenticatorType.OAUTH_CLIENT_CREDENTIALS.name())) { | ||
| // OAuth authorization code flow authentication |
There was a problem hiding this comment.
Is it accurate? Do we need this?
|
|
||
| private static final SFLogger logger = | ||
| SFLoggerFactory.getLogger(AccessTokenProviderFactory.class); | ||
| private static final AuthenticatorType[] ELIGIBLE_AUTH_TYPES = { |
There was a problem hiding this comment.
Why array? Maybe it can be a set?
| } | ||
|
|
||
| public static Set<AuthenticatorType> getEligible() { | ||
| return new HashSet<>(Arrays.asList(ELIGIBLE_AUTH_TYPES)); |
There was a problem hiding this comment.
We can create this value once, right?
| import org.apache.http.entity.StringEntity; | ||
|
|
||
| @SnowflakeJdbcInternalApi | ||
| public class OAuthUtil { |
There was a problem hiding this comment.
Do we need it to be public?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Overview
SNOW-1831099
Pre-review self checklist
masterbranchmvn -P check-style validate)mvn verifyand inspecttarget/japicmp/japicmp.html)SNOW-XXXX:External contributors - please answer these questions before submitting a pull request. Thanks!
What GitHub issue is this PR addressing? Make sure that there is an accompanying issue to your PR.
Issue: #NNNN
Fill out the following pre-review checklist:
@SnowflakeJdbcInternalApi(note that public/protected methods/fields in classes marked with this annotation are already internal)Please describe how your code solves the related issue.
Please write a short description of how your code change solves the related issue.