Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Switch JWT library implementations from cxf to nimbus #3421

Merged
merged 37 commits into from
Oct 24, 2023
Merged

Switch JWT library implementations from cxf to nimbus #3421

merged 37 commits into from
Oct 24, 2023

Commits on Aug 29, 2023

  1. Replace JWT library with Nimbus Jose + JWT 

    Looking into an alternative library implementation for the JWT provider

Signed-off-by: Peter Nied <petern@amazon.com>
    @peternied
    peternied committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    1c75b4a View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge remote-tracking branch 'peternied/nimbus-jose-jwt'

    @MaciejMierzwa
    MaciejMierzwa committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    e9e5457 View commit details
    Browse the repository at this point in the history

  2. test jwt content 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    68fb56c View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. swap cxf jwt to nimbus jwt 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    48658dd View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. remove all usages of cxf.rs.security.jose 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    93c1bce View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. tests, encoding fixes 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    5fc3b8b View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. naming, add padding to JwtVendor secret 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1eb397c View commit details
    Browse the repository at this point in the history

  2. small refactor, spotless, tests, use raw settings to create jwk 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    9a2ef33 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into nimbus-jose-jwt 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>

# Conflicts:
#	src/main/java/org/opensearch/security/authtoken/jwt/JwtVendor.java
    @MaciejMierzwa
    MaciejMierzwa committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    0ee2de6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' into nimbus-jose-jwt 

    # Conflicts:
#	src/main/java/com/amazon/dlic/auth/http/saml/AuthTokenProcessorHandler.java
    @MaciejMierzwa
    MaciejMierzwa committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    f52ca23 View commit details
    Browse the repository at this point in the history

  5. test build after merge 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    46eb723 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. revert misc changes 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    10fe305 View commit details
    Browse the repository at this point in the history

  2. correct HMAC padding, escape chars in tests 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    da51bec View commit details
    Browse the repository at this point in the history

  3. PR changes, style 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    c151696 View commit details
    Browse the repository at this point in the history

  4. remove org.apache.cxf:cxf-rt-rs-security-jose import, add rule forbid… 

    …ding import

Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    a597cf5 View commit details
    Browse the repository at this point in the history

  5. PR suggestions, null checks, java.util.Date 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    7e2c6ca View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Merge branch 'main_origin' into nimbus-jose-jwt

    @MaciejMierzwa
    MaciejMierzwa committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    88de2cc View commit details
    Browse the repository at this point in the history

  2. PR suggestions, spotless 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    48c3b5a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main_origin' into nimbus-jose-jwt

    @MaciejMierzwa
    MaciejMierzwa committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    a245f58 View commit details
    Browse the repository at this point in the history

  4. Exception -> IllegalArgumentException 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    3002f11 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Merge remote-tracking branch 'origin/main' into nimbus-jose-jwt 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>

# Conflicts:
#	src/main/java/com/amazon/dlic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java
#	src/main/java/com/amazon/dlic/auth/http/saml/AuthTokenProcessorHandler.java
#	src/main/java/com/amazon/dlic/auth/http/saml/HTTPSamlAuthenticator.java
#	src/test/java/com/amazon/dlic/auth/http/jwt/keybyoidc/HTTPJwtKeyByOpenIdConnectAuthenticatorTest.java
#	src/test/java/com/amazon/dlic/auth/http/saml/HTTPSamlAuthenticatorTest.java
    @MaciejMierzwa
    MaciejMierzwa committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    f0e19bd View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Merge remote-tracking branch 'origin/main' into nimbus-jose-jwt 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>

# Conflicts:
#	src/test/java/org/opensearch/security/authtoken/jwt/JwtVendorTest.java
    @MaciejMierzwa
    MaciejMierzwa committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    0d21bd1 View commit details
    Browse the repository at this point in the history

  2. Class raw use fix 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    8d210a1 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Fix the seconds into milli seconds in jwt vendor 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    480ba8a View commit details
    Browse the repository at this point in the history

  2. Fixed obo integ test 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    f74edd9 View commit details
    Browse the repository at this point in the history

  3. Refactor the matcher library 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    c899710 View commit details
    Browse the repository at this point in the history

  4. Fix saml authenticator test 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    1d5fcb4 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Add padding back but not for obo 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    2848560 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. test cxf, nimbus compability 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    c9fd75f View commit details
    Browse the repository at this point in the history

  2. default encoding fix 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    4402b14 View commit details
    Browse the repository at this point in the history

  3. default encoding fix 

    Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
    @MaciejMierzwa
    MaciejMierzwa committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    de31e00 View commit details
    Browse the repository at this point in the history

  4. Add tests and relocate KeyPaddingUtil 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    2bdd1de View commit details
    Browse the repository at this point in the history

  5. Add comment for cxf code generation 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    85d7eaa View commit details
    Browse the repository at this point in the history

  6. Reloacate the comment for cxf lib 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    2c2560b View commit details
    Browse the repository at this point in the history

  7. Fix testParsePrevGeneratedJwt() 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    78e94fa View commit details
    Browse the repository at this point in the history

  8. Fix the comment description 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    1004595 View commit details
    Browse the repository at this point in the history

  9. Revert the changes for padding test config 

    Signed-off-by: Ryan Liang <jiallian@amazon.com>
    @RyanL1997
    RyanL1997 committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    9c667e4 View commit details
    Browse the repository at this point in the history