Skip to content

Conversation

@cwperks
Copy link
Member

@cwperks cwperks commented Jun 13, 2023

ylwu-amzn and others added 19 commits May 25, 2023 11:31
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: zhichao-aws <zhichaog@amazon.com>
…w has one. (opensearch-project#2801)

This resolves "JAR hell" issues when installing the plugin.

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
…ject#2808)

* [FEATURE] usage of JWKS with JWT (w/o OpenID connect)

Signed-off-by: Sebastian Michalski <shekerama@gmail.com>

* Change issuer to audience

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Switch to OCT_2 and use String instead of var

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Only check required issuer and required audience if set

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix test cases

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unused import

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Sebastian Michalski <shekerama@gmail.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: Sebastian Michalski <shekerama@gmail.com>
* Isolate spotless config changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* update dlic/auth package style

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update formatterConfig.xml

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Ryan Liang <jiallian@amazon.com>
…search-project#2823)

* rebase

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update java style under **/auth

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Util dir

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* readd formatting

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
* Match version of zstd-jni from core

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add zstd version from core to force resolutions section

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
…security/m* (opensearch-project#2826)

* Update Sec/action to Sec/Filter

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Security/*

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Security/* and test/opensearch/security/*

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Half sec test changes

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Half sec test changes

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
* Update test/security/s* java files

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update test/security/s* java files

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
…#2837)

* Update test/security/s* java files

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update test/security/s* java files

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update all tests under security

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
…t#2843)

* Add Andrey to Maintainers

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update MAINTAINERS.md

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update codeowners

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
…roject#2840)

* Update all tests

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* spotless

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@RyanL1997 RyanL1997 changed the title Merge latest from main into feature/extensions Sync up security/extensions feature branch with main on 06/13/2023 Jun 13, 2023
@codecov
Copy link

codecov bot commented Jun 13, 2023

Codecov Report

Merging #2854 (1691ca7) into feature/extensions (56e77fe) will increase coverage by 0.15%.
The diff coverage is 57.44%.

@@                   Coverage Diff                    @@
##             feature/extensions    #2854      +/-   ##
========================================================
+ Coverage                 61.49%   61.65%   +0.15%     
- Complexity                 3428     3442      +14     
========================================================
  Files                       269      269              
  Lines                     19096    19148      +52     
  Branches                   3327     3328       +1     
========================================================
+ Hits                      11744    11806      +62     
+ Misses                     5740     5733       -7     
+ Partials                   1612     1609       -3     
Impacted Files Coverage Δ
...ic/auth/http/kerberos/HTTPSpnegoAuthenticator.java 0.00% <0.00%> (ø)
...azon/dlic/auth/http/kerberos/util/JaasKrbUtil.java 0.00% <0.00%> (ø)
...zon/dlic/auth/http/kerberos/util/KrbConstants.java 0.00% <0.00%> (ø)
.../dlic/auth/http/saml/SamlHTTPMetadataResolver.java 62.96% <ø> (ø)
.../main/java/com/amazon/dlic/auth/ldap/LdapUser.java 85.71% <ø> (ø)
...on/dlic/auth/ldap2/LDAPAuthenticationBackend2.java 68.26% <ø> (+0.30%) ⬆️
...zon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java 31.22% <ø> (-0.26%) ⬇️
.../dlic/auth/ldap2/LDAPConnectionFactoryFactory.java 58.99% <ø> (+1.53%) ⬆️
...a/com/amazon/dlic/auth/ldap2/LDAPUserSearcher.java 85.96% <ø> (-0.48%) ⬇️
...amazon/dlic/util/SettingsBasedSSLConfigurator.java 62.75% <ø> (+0.45%) ⬆️
... and 123 more

... and 1 file with indirect coverage changes

@cwperks
Copy link
Member Author

cwperks commented Jun 13, 2023

This has now been synchronized. Closing this PR.

@cwperks cwperks closed this Jun 13, 2023
@cwperks cwperks reopened this Jun 13, 2023
@cwperks cwperks merged commit 26244e9 into opensearch-project:feature/extensions Jun 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants