[plugin-web-app] Move credentials from user info to http context in page steps #4161
Conversation
This file contains hidden or 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
Codecov Report
@@ Coverage Diff @@
## master #4161 +/- ##
============================================
+ Coverage 88.79% 97.19% +8.40%
+ Complexity 6672 6449 -223
============================================
Files 899 899
Lines 18555 18570 +15
Branches 1220 1223 +3
============================================
+ Hits 16475 18050 +1575
+ Misses 1951 411 -1540
+ Partials 129 109 -20
... and 74 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
valfirst
requested changes
Jul 21, 2023
Comment on lines
342
to
347
| URI uriToRequest = pageUrl; | ||
| if (uriToRequest.getUserInfo() != null) | ||
| { | ||
| uriToRequest = moveUserInfoCredentialsToHttpContext(uriToRequest, context); | ||
| } | ||
| httpClient.doHttpHead(uriToRequest, context); |
There was a problem hiding this comment.
Suggested change
| URI uriToRequest = pageUrl; | |
| if (uriToRequest.getUserInfo() != null) | |
| { | |
| uriToRequest = moveUserInfoCredentialsToHttpContext(uriToRequest, context); | |
| } | |
| httpClient.doHttpHead(uriToRequest, context); | |
| URI pageUriToCheck = pageUrl; | |
| UserInfo userInfo = UriUtils.getUserInfo(pageUriToCheck); | |
| if (userInfo != null) | |
| { | |
| addBasicAuthToContext(userInfo, context); | |
| pageUriToCheck = UriUtils.removeUserInfo(pageUriToCheck); | |
| } | |
| httpClient.doHttpHead(pageUriToCheck, context); |
Comment on lines
369
to
381
| private URI moveUserInfoCredentialsToHttpContext(URI pageUrl, HttpClientContext httpContext) | ||
| { | ||
| UserInfo userInfo = UriUtils.getUserInfo(pageUrl); | ||
| Credentials credentials = new UsernamePasswordCredentials(userInfo.getUser(), | ||
| userInfo.getPassword().toCharArray()); | ||
| BasicScheme scheme = new BasicScheme(); | ||
| scheme.initPreemptive(credentials); | ||
| AuthCache authCache = new BasicAuthCache(); | ||
| HttpHost host = HttpHost.create(pageUrl); | ||
| authCache.put(host, scheme); | ||
| httpContext.setAuthCache(authCache); | ||
| return UriUtils.removeUserInfo(pageUrl); | ||
| } |
There was a problem hiding this comment.
Suggested change
| private URI moveUserInfoCredentialsToHttpContext(URI pageUrl, HttpClientContext httpContext) | |
| { | |
| UserInfo userInfo = UriUtils.getUserInfo(pageUrl); | |
| Credentials credentials = new UsernamePasswordCredentials(userInfo.getUser(), | |
| userInfo.getPassword().toCharArray()); | |
| BasicScheme scheme = new BasicScheme(); | |
| scheme.initPreemptive(credentials); | |
| AuthCache authCache = new BasicAuthCache(); | |
| HttpHost host = HttpHost.create(pageUrl); | |
| authCache.put(host, scheme); | |
| httpContext.setAuthCache(authCache); | |
| return UriUtils.removeUserInfo(pageUrl); | |
| } | |
| private void addBasicAuthToContext(UserInfo userInfo, HttpClientContext httpContext) | |
| { | |
| Credentials credentials = new UsernamePasswordCredentials(userInfo.getUser(), | |
| userInfo.getPassword().toCharArray()); | |
| BasicScheme scheme = new BasicScheme(); | |
| scheme.initPreemptive(credentials); | |
| AuthCache authCache = new BasicAuthCache(); | |
| HttpHost host = HttpHost.create(pageUrl); | |
| authCache.put(host, scheme); | |
| httpContext.setAuthCache(authCache); | |
| } |
There was a problem hiding this comment.
Also does it make sense to use org.apache.hc.client5.http.ContextBuilder#preemptiveBasicAuth?
There was a problem hiding this comment.
Also does it make sense to use
org.apache.hc.client5.http.ContextBuilder#preemptiveBasicAuth?
Yep, this way looks pretty easier.
899ff3b to
169a5a8
Compare
169a5a8 to
f07974b
Compare
valfirst
approved these changes
Jul 21, 2023
valfirst
approved these changes
Jul 24, 2023
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.
Fixes #4134