-
Notifications
You must be signed in to change notification settings - Fork 281
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Saml http metadata resolver refactor #3894
Saml http metadata resolver refactor #3894
Conversation
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #3894 +/- ##
==========================================
- Coverage 66.60% 65.08% -1.52%
==========================================
Files 298 299 +1
Lines 21188 21286 +98
Branches 3453 3463 +10
==========================================
- Hits 14112 13855 -257
- Misses 5361 5709 +348
- Partials 1715 1722 +7
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @MaciejMierzwa. Added some comments.
src/main/java/com/amazon/dlic/auth/http/saml/HTTPMetadataResolver.java
Outdated
Show resolved
Hide resolved
src/main/java/com/amazon/dlic/auth/http/saml/HTTPMetadataResolver.java
Outdated
Show resolved
Hide resolved
src/main/java/com/amazon/dlic/auth/http/saml/HTTPMetadataResolver.java
Outdated
Show resolved
Hide resolved
src/main/java/com/amazon/dlic/auth/http/saml/HTTPMetadataResolver.java
Outdated
Show resolved
Hide resolved
@MaciejMierzwa Can this be backported into 2.x - can you take a look if this is possible? I'm concerned that the Apache Http Client 5 will create some issues in that codebase |
@MaciejMierzwa With this PR can these 3 dependencies (https://github.com/opensearch-project/security/blob/main/build.gradle#L579-L581) be changed to |
Signed-off-by: Maciej Mierzwa <[email protected]>
9a049bf
to
67bd6c3
Compare
@peternied I think it can be backported into 2.x. Currently 2.x doesn't contain dependencies on any of http5 libraries. If the library is allowed I think it's little bit of additional work. @cwperks question: |
@MaciejMierzwa We can accept these changes in the main branch, we would be in striking distance to remove all http client 4 references. There might be other issue aside just importing the library [1], but I'd rather move forward with what you have, just want you to be aware the backport might be a little gross. |
src/main/java/com/amazon/dlic/util/SettingsBasedSSLConfiguratorV5.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Maciej Mierzwa <[email protected]>
Hi I noticed that checkstyle fails for http5 library. Looks like this whole PR could be reversed |
If http 5 is necessary for this PR to resolve, we may need to revert back to http 5 but that would leave this bug unresolved. If the only reason we were not moving to http 5 is due to the saml metadata resolver, we can revert the mentioned PR to move back to http 5 since this PR migrates the resolver to http 5 as well. |
The checkstyle issue is associated with the use of client5 specific status codes, you can use the broader ones
|
Curious, because the changes introduced here refactor the usage from http 4 to http 5 and I believe they are necessary for this PR. Correct me if I'm wrong here @MaciejMierzwa . If they are indeed required to be http5 what should be the path forward? |
@MaciejMierzwa seems like the progress on this PR has stalled. Do you still intend to work on this? Maintainers will be closing this PR out soon if there is no activity. |
Hi @DarshitChanpura sorry, I see that I got mail notifications, must've missed it. Regarding comments from #3894 (comment) onward - I think the idea behind this ticket was to move towards removal of http4 library from the codebase. @cwperks also highlighted in this comment #3581 (comment) that http4 usage was due to opensaml library, causing conflicts. |
@MaciejMierzwa We do not merge unattributed code copied from other code bases, this violates the DCO - developer certificate of origin. I am closing out this PR. |
Description
Refactor SamlHTTPMetadataResolver to remove of HTTP commons 4 lib
Issues Resolved
Testing
No functionality changes, tests refactored a little.
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.