You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2019/05/14 07:54:14 UTC
[tomee] branch master updated (83adfac -> 76a6bb4)
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 83adfac Yank unused import to make checkstyle happy.
new 2d27465 Remove JWTCallerPrincipleFactory concept
new b8b619c Remove JWTCallerPrinciple abstraction
new 2c3fd6b Remove "Default" prefix as it's no longer needed.
new 2002a28 Rename "singerKey" variables to publicKey -- technically it's the "verification" key "IssuedBy" becomes "issuer" to more directly map to the JWT
new ccfc340 Rename JWTAUthContextInfo to JWTAuthConfiguration to clearly state it isn't a request context object, but app scoped configuration.
new cf24bc7 Split publickey resolving to a dedicated class for better testing
new dff60e2 Rename ConfigurableJWTAuthContextInfo JWTAuthConfigurationProperties Make it clearer that this is equivalent to JWTAuthConfiguration but created via MP-JWT standard properties.
new 5d99adb Move parse method into JsonWebTokenValidator class. Start of builder. Favor "verificationKey" over "publicKey" when possible.
new 16f072e Start of an MP-JWT and BeanValidation prototype
new dd9d1d5 MP-JWT and BeanValidation :: Javadoc and rename
new daaa1e3 TOMEE-2517: MP-JWT and BeanValidation :: Functional validation library Still not wired up to an interceptor
new 125cdc6 TOMEE-2517: MP-JWT and BeanValidation :: JAX-RS wiring. All now functional. Needs tests, logging and documentation
new eb1626c TOMEE-2519: MP JWT Logging Improvements
new ec42b3f TOMEE-2520: MP-JWT and BeanValidation Example
new fcb41fb TOMEE-2521: Apache BVal 2.0.3-SNAPSHOT
new 2a9ba39 TOMEE-2519: Start of tests for MP-JWT logging
new 09d4d4e Support RSA 1024bit keys
new d984f72 Support SHA384 and SHA512
new 9877ca0 TOMEE-2519 MP-JWT Logging improvements
new 551400e Restore JWTAuthConfiguration logic to get TCK passing again. Will come back and attempt to fix builder pattern in JsonWebTokenValidator
new d0aff8f Momentarily comment out these tests till JsonWebTokenValidator is fixed.
new cd5d062 Fill out the readme a bit
new ee94da3 Roll back to BVal 2.0.2 April 8th, with patch for MP JWT feature
new 76a6bb4 Merge pull request #465 from dblevins/jwtimprovements
The 12384 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arquillian/arquillian-tomee-common/pom.xml | 2 +-
arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +-
container/openejb-core/pom.xml | 2 +-
.../org/apache/openejb/dyni/DynamicSubclass.java | 2 +-
examples/mp-jwt-bean-validation/README.adoc | 46 +++
examples/mp-jwt-bean-validation/pom.xml | 207 ++++++++++++
.../src/main/java/org/superbiz/Api.java | 27 ++
.../src/main/java/org/superbiz/Movie.java | 57 ++++
.../src/main/java/org/superbiz/MovieService.java | 58 ++++
.../src/main/java/org/superbiz/val/Audience.java | 62 ++++
.../src/main/java/org/superbiz/val/Issuer.java | 63 ++++
.../META-INF/microprofile-config.properties | 4 +
.../test/java/org/superbiz/MovieServiceTest.java | 188 +++++++++++
.../src/test/java/org/superbiz/Tokens.java | 98 ++++++
.../META-INF/microprofile-config.properties | 8 +
.../src/test/resources/arquillian.xml | 0
.../src/test/resources/testkey.pem} | 0
.../rest/MoviesMPJWTConfigurationProvider.java | 8 +-
examples/pom.xml | 1 +
itests/microprofile-jwt-itests/pom.xml | 99 ++++++
.../jwt/itest/InvalidSignatureTest.java | 116 +++++++
.../jwt/itest/MinimumRequiredClaimsTest.java | 110 +++++++
.../jwt/itest/MissingRequiredClaimsTest.java | 151 +++++++++
.../microprofile/jwt/itest/RsaKeySizesTest.java | 114 +++++++
.../microprofile/jwt/itest/ShaHashSizesTest.java | 114 +++++++
.../tomee/microprofile/jwt/itest/Tokens.java | 80 +++++
.../src/test/resources/testkey.pem | 0
itests/pom.xml | 3 +
itests/tomee-server-composer/README.adoc | 4 +
itests/tomee-server-composer/pom.xml | 79 +++++
.../org/apache/tomee/server/composer/Archive.java | 227 +++++++++++++
.../apache/tomee/server/composer/CleanOnExit.java | 90 +++++
.../apache/tomee/server/composer/Components.java | 95 ++++++
.../org/apache/tomee/server/composer/Excludes.java | 28 ++
.../org/apache/tomee/server/composer/Jars.java | 39 +++
.../org/apache/tomee/server/composer/Main.java | 20 ++
.../java/org/apache/tomee/server/composer/Mvn.java | 84 +++++
.../org/apache/tomee/server/composer/Pipe.java | 65 ++++
.../org/apache/tomee/server/composer/Ports.java | 171 ++++++++++
.../tomee/server/composer/ServerBuilder.java | 184 +++++++++++
.../server/composer/StartupFailedException.java | 32 ++
.../org/apache/tomee/server/composer/TarGzs.java | 103 ++++++
.../org/apache/tomee/server/composer/TomEE.java | 221 +++++++++++++
.../org/apache/tomee/server/composer/Zips.java | 89 +++++
itests/tomee-server-version/pom.xml | 90 +++++
.../org/apache/tomee/server/version/Version.java | 21 ++
mp-jwt/pom.xml | 17 +
.../tomee/microprofile/jwt/ConstraintAdapter.java | 23 ++
.../apache/tomee/microprofile/jwt/Directory.java | 48 +++
.../tomee/microprofile/jwt/JWTLogCategories.java | 71 ++++
.../microprofile/jwt/JsonWebTokenValidator.java | 166 ++++++++++
.../apache/tomee/microprofile/jwt/MPJWTFilter.java | 212 ++++++++----
.../ConstraintsClassInstantiationException.java | 34 ++
.../jwt/bval/JWTValidationGenerationException.java | 31 ++
.../apache/tomee/microprofile/jwt/bval/Name.java | 28 ++
.../jwt/bval/ValidationConstraintException.java | 33 ++
.../jwt/bval/ValidationConstraints.java | 110 +++++++
.../microprofile/jwt/bval/ValidationGenerator.java | 171 ++++++++++
.../jwt/bval/ValidationInterceptor.java | 104 ++++++
.../jwt/bval/ValidationInterceptorsFeature.java | 40 +++
.../microprofile/jwt/cdi/MPJWTCDIExtension.java | 6 +-
...hContextInfo.java => JWTAuthConfiguration.java} | 48 +--
.../jwt/config/JWTAuthConfigurationProperties.java | 94 ++++++
...AuthContextInfo.java => PublicKeyResolver.java} | 121 ++-----
.../jwt/jaxrs/MPJWPProviderRegistration.java | 2 +
.../jwt/principal/DefaultJWTCallerPrincipal.java | 362 ---------------------
.../DefaultJWTCallerPrincipalFactory.java | 97 ------
.../jwt/principal/JWTCallerPrincipal.java | 345 +++++++++++++++++++-
.../jwt/principal/JWTCallerPrincipalFactory.java | 128 --------
...profile.jwt.principal.JWTCallerPrincipalFactory | 1 -
.../jwt/JsonWebTokenValidatorTest.java | 33 ++
.../org/apache/tomee/microprofile/jwt/Tokens.java | 102 ++++++
.../tomee/microprofile/jwt/bval/Asmifier.java | 131 ++++++++
.../jwt/bval/ValidationConstraintsTest.java | 78 +++++
.../jwt/bval/ValidationGeneratorTest.java | 34 ++
.../tomee/microprofile/jwt/bval/ann/Audience.java | 64 ++++
.../tomee/microprofile/jwt/bval/ann/Issuer.java | 63 ++++
.../jwt/bval/data/Colors$$JwtConstraints.java | 39 +++
.../tomee/microprofile/jwt/bval/data/Colors.java | 32 ++
.../tomee/microprofile/jwt/bval/data/Shapes.java | 35 ++
.../src/test/resources/testkey.pem | 0
pom.xml | 4 +-
.../tck/jwt/JWTAuthContextInfoProvider.java | 8 +-
.../tck/jwt/jwk/PublicKeyAsJWKSTest.java | 26 +-
tomee/pom.xml | 2 +-
utils/openejb-core-hibernate/pom.xml | 2 +-
86 files changed, 5399 insertions(+), 810 deletions(-)
create mode 100644 examples/mp-jwt-bean-validation/README.adoc
create mode 100644 examples/mp-jwt-bean-validation/pom.xml
create mode 100644 examples/mp-jwt-bean-validation/src/main/java/org/superbiz/Api.java
create mode 100644 examples/mp-jwt-bean-validation/src/main/java/org/superbiz/Movie.java
create mode 100644 examples/mp-jwt-bean-validation/src/main/java/org/superbiz/MovieService.java
create mode 100644 examples/mp-jwt-bean-validation/src/main/java/org/superbiz/val/Audience.java
create mode 100644 examples/mp-jwt-bean-validation/src/main/java/org/superbiz/val/Issuer.java
create mode 100644 examples/mp-jwt-bean-validation/src/main/resources/META-INF/microprofile-config.properties
create mode 100644 examples/mp-jwt-bean-validation/src/test/java/org/superbiz/MovieServiceTest.java
create mode 100644 examples/mp-jwt-bean-validation/src/test/java/org/superbiz/Tokens.java
create mode 100644 examples/mp-jwt-bean-validation/src/test/resources/META-INF/microprofile-config.properties
copy examples/{mp-rest-jwt-public-key => mp-jwt-bean-validation}/src/test/resources/arquillian.xml (100%)
copy examples/{mp-rest-jwt/src/test/resources/privateKey.pem => mp-jwt-bean-validation/src/test/resources/testkey.pem} (100%)
create mode 100644 itests/microprofile-jwt-itests/pom.xml
create mode 100644 itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/InvalidSignatureTest.java
create mode 100644 itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/MinimumRequiredClaimsTest.java
create mode 100644 itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/MissingRequiredClaimsTest.java
create mode 100644 itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/RsaKeySizesTest.java
create mode 100644 itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/ShaHashSizesTest.java
create mode 100644 itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/Tokens.java
copy examples/mp-rest-jwt/src/test/resources/privateKey.pem => itests/microprofile-jwt-itests/src/test/resources/testkey.pem (100%)
create mode 100644 itests/tomee-server-composer/README.adoc
create mode 100644 itests/tomee-server-composer/pom.xml
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Archive.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/CleanOnExit.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Components.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Excludes.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Jars.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Main.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Mvn.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Pipe.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Ports.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/ServerBuilder.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/StartupFailedException.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TarGzs.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java
create mode 100644 itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/Zips.java
create mode 100644 itests/tomee-server-version/pom.xml
create mode 100644 itests/tomee-server-version/src/main/java-templates/org/apache/tomee/server/version/Version.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/ConstraintAdapter.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/Directory.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/JWTLogCategories.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/JsonWebTokenValidator.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ConstraintsClassInstantiationException.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/JWTValidationGenerationException.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/Name.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraintException.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationInterceptor.java
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationInterceptorsFeature.java
rename mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/{JWTAuthContextInfo.java => JWTAuthConfiguration.java} (60%)
create mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
rename mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/{ConfigurableJWTAuthContextInfo.java => PublicKeyResolver.java} (65%)
delete mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/DefaultJWTCallerPrincipal.java
delete mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/DefaultJWTCallerPrincipalFactory.java
delete mode 100644 mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipalFactory.java
delete mode 100644 mp-jwt/src/main/resources/META-INF/services/org.apache.tomee.microprofile.jwt.principal.JWTCallerPrincipalFactory
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/JsonWebTokenValidatorTest.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/Tokens.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/Asmifier.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraintsTest.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ValidationGeneratorTest.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ann/Audience.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ann/Issuer.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/data/Colors$$JwtConstraints.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/data/Colors.java
create mode 100644 mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/data/Shapes.java
copy examples/mp-rest-jwt/src/test/resources/privateKey.pem => mp-jwt/src/test/resources/testkey.pem (100%)