[selenium-crawler] Fix sitemap transformer to work with basic auth #4658
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
e359af7 to
fa3cbe0
Compare
fa3cbe0 to
9581295
Compare
valfirst
reviewed
Dec 13, 2023
Comment on lines
72
to
101
| HttpClientContext context = new HttpClientContext(); | ||
| HttpResponse response = httpClient.doHttpGet(siteMapUrl, context); | ||
| HttpGet request = new HttpGet(siteMapUrl); | ||
| URIAuthority currentAuthority = request.getAuthority(); | ||
| String authorityUserInfo = currentAuthority.getUserInfo(); | ||
| if (authorityUserInfo != null) | ||
| { | ||
| URIAuthority newAuthority = new URIAuthority(null, currentAuthority.getHostName(), | ||
| currentAuthority.getPort()); | ||
| request.setAuthority(newAuthority); | ||
|
|
||
| UriUtils.UserInfo userInfo = UriUtils.parseUserInfo(URLDecoder.decode(authorityUserInfo, | ||
| StandardCharsets.UTF_8)); | ||
| Credentials credentials = new UsernamePasswordCredentials(userInfo.user(), | ||
| userInfo.password().toCharArray()); | ||
| BasicScheme scheme = new BasicScheme(); | ||
| scheme.initPreemptive(credentials); | ||
| AuthCache authCache = new BasicAuthCache(); | ||
| try | ||
| { | ||
| HttpHost host = HttpHost.create(request.getUri()); | ||
| authCache.put(host, scheme); | ||
| } | ||
| catch (URISyntaxException e) | ||
| { | ||
| throw new IllegalArgumentException(e); | ||
| } | ||
| context.setAuthCache(authCache); | ||
| } | ||
| HttpResponse response = httpClient.execute(request, context); | ||
| URI cleanSiteMapUrl = UriUtils.removeUserInfo(getBaseUri(context, siteMapUrl)); |
There was a problem hiding this comment.
ContextBuilder contextBuilder = ContextBuilder.create();
UserInfo userInfo = UriUtils.getUserInfo(siteMapUrl);
URI targetSiteMapUrl;
if (userInfo != null)
{
targetSiteMapUrl = UriUtils.removeUserInfo(siteMapUrl);
contextBuilder.preemptiveBasicAuth(
HttpHost.create(targetSiteMapUrl),
new UsernamePasswordCredentials(userInfo.user(), userInfo.password().toCharArray())
);
}
else
{
targetSiteMapUrl = siteMapUrl;
}
HttpClientContext context = contextBuilder.build();
HttpResponse response = httpClient.doHttpGet(targetSiteMapUrl, context);
URI cleanSiteMapUrl = getBaseUri(context, targetSiteMapUrl);
valfirst
reviewed
Dec 13, 2023
| Credentials credentials = new UsernamePasswordCredentials(userInfo.user(), | ||
| userInfo.password().toCharArray()); | ||
| BasicScheme scheme = new BasicScheme(); | ||
| scheme.initPreemptive(credentials); |
There was a problem hiding this comment.
Do you really need preemptive basic auth?
There was a problem hiding this comment.
changed to CredentialsProvider
9581295 to
7c0171d
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4658 +/- ##
=========================================
Coverage 97.39% 97.39%
- Complexity 6775 6783 +8
=========================================
Files 914 915 +1
Lines 18818 18843 +25
Branches 1252 1254 +2
=========================================
+ Hits 18327 18352 +25
Misses 384 384
Partials 107 107 ☔ View full report in Codecov by Sentry. |
7c0171d to
c52bac7
Compare
valfirst
approved these changes
Dec 14, 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.
No description provided.