honeymoose
/
jjwt
mirror of https://github.com/jwtk/jjwt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for testing with JDK11 

There were a couple issues preventing running the build with Java 11
- A groovy bug - fixed with a version bump https://issues.apache.org/jira/browse/GROOVY-8727
- The ASM version that is embedded in easymock does NOT support Java 11 classes - worked around by stubbing out those usages instead
- javadoc modules issue - fixed by setting the Javadoc source version to 1.7
This commit is contained in:
Brian Demers 2019-09-24 18:57:06 -04:00
parent 50fc773eb9
commit b327aeab7e
3 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -8,6 +8,7 @@ jdk:
- oraclejdk8 - oraclejdk8
- oraclejdk9 - oraclejdk9
- openjdk10 - openjdk10
- openjdk11
before_install: before_install:
- echo "TRAVIS_JDK_VERSION is ${TRAVIS_JDK_VERSION}" - echo "TRAVIS_JDK_VERSION is ${TRAVIS_JDK_VERSION}"

88
api/src/test/groovy/io/jsonwebtoken/SignatureAlgorithmTest.groovy
View File

@ -207,11 +207,10 @@ class SignatureAlgorithmTest {
void testForSigningKeyRSAWeakKey() { void testForSigningKeyRSAWeakKey() {
RSAPrivateKey key = createMock(RSAPrivateKey) RSAPrivateKey key = createMock(RSAPrivateKey)
BigInteger modulus = createMock(BigInteger) BigInteger modulus = bigInteger(1024)
expect(key.getModulus()).andStubReturn(modulus) expect(key.getModulus()).andStubReturn(modulus)
expect(modulus.bitLength()).andStubReturn(1024)
replay key, modulus replay key
try { try {
SignatureAlgorithm.forSigningKey(key) SignatureAlgorithm.forSigningKey(key)
@ -219,7 +218,7 @@ class SignatureAlgorithmTest {
} catch (WeakKeyException expected) { } catch (WeakKeyException expected) {
} }
verify key, modulus verify key
} }
@Test @Test
@ -230,15 +229,14 @@ class SignatureAlgorithmTest {
int heuristicKeyLength = (alg == SignatureAlgorithm.RS512 ? 4096 : (alg == SignatureAlgorithm.RS384 ? 3072 : 2048)) int heuristicKeyLength = (alg == SignatureAlgorithm.RS512 ? 4096 : (alg == SignatureAlgorithm.RS384 ? 3072 : 2048))
RSAPrivateKey key = createMock(RSAPrivateKey) RSAPrivateKey key = createMock(RSAPrivateKey)
BigInteger modulus = createMock(BigInteger) BigInteger modulus = bigInteger(heuristicKeyLength)
expect(key.getModulus()).andStubReturn(modulus) expect(key.getModulus()).andStubReturn(modulus)
expect(modulus.bitLength()).andStubReturn(heuristicKeyLength)
replay key, modulus replay key
assertEquals alg, SignatureAlgorithm.forSigningKey(key) assertEquals alg, SignatureAlgorithm.forSigningKey(key)
verify key, modulus verify key
} }
} }
@ -247,12 +245,11 @@ class SignatureAlgorithmTest {
ECPrivateKey key = createMock(ECPrivateKey) ECPrivateKey key = createMock(ECPrivateKey)
ECParameterSpec spec = createMock(ECParameterSpec) ECParameterSpec spec = createMock(ECParameterSpec)
BigInteger order = createMock(BigInteger) BigInteger order = bigInteger(128)
expect(key.getParams()).andStubReturn(spec) expect(key.getParams()).andStubReturn(spec)
expect(spec.getOrder()).andStubReturn(order) expect(spec.getOrder()).andStubReturn(order)
expect(order.bitLength()).andReturn(128)
replay key, spec, order replay key, spec
try { try {
SignatureAlgorithm.forSigningKey(key) SignatureAlgorithm.forSigningKey(key)
@ -260,7 +257,7 @@ class SignatureAlgorithmTest {
} catch (WeakKeyException expected) { } catch (WeakKeyException expected) {
} }
verify key, spec, order verify key, spec
} }
@Test @Test
@ -270,16 +267,15 @@ class SignatureAlgorithmTest {
ECPrivateKey key = createMock(ECPrivateKey) ECPrivateKey key = createMock(ECPrivateKey)
ECParameterSpec spec = createMock(ECParameterSpec) ECParameterSpec spec = createMock(ECParameterSpec)
BigInteger order = createMock(BigInteger) BigInteger order = bigInteger(alg.minKeyLength)
expect(key.getParams()).andStubReturn(spec) expect(key.getParams()).andStubReturn(spec)
expect(spec.getOrder()).andStubReturn(order) expect(spec.getOrder()).andStubReturn(order)
expect(order.bitLength()).andStubReturn(alg.minKeyLength)
replay key, spec, order replay key, spec
assertEquals alg, SignatureAlgorithm.forSigningKey(key) assertEquals alg, SignatureAlgorithm.forSigningKey(key)
verify key, spec, order verify key, spec
} }
} }
@ -452,16 +448,15 @@ class SignatureAlgorithmTest {
ECPrivateKey key = createMock(ECPrivateKey) ECPrivateKey key = createMock(ECPrivateKey)
ECParameterSpec spec = createMock(ECParameterSpec) ECParameterSpec spec = createMock(ECParameterSpec)
BigInteger order = createMock(BigInteger) BigInteger order = bigInteger(alg.minKeyLength)
expect(key.getParams()).andStubReturn(spec) expect(key.getParams()).andStubReturn(spec)
expect(spec.getOrder()).andStubReturn(order) expect(spec.getOrder()).andStubReturn(order)
expect(order.bitLength()).andStubReturn(alg.minKeyLength)
replay key, spec, order replay key, spec
alg.assertValidSigningKey(key) alg.assertValidSigningKey(key)
verify key, spec, order verify key, spec
} }
} }
@ -508,12 +503,11 @@ class SignatureAlgorithmTest {
ECPrivateKey key = createMock(ECPrivateKey) ECPrivateKey key = createMock(ECPrivateKey)
ECParameterSpec spec = createMock(ECParameterSpec) ECParameterSpec spec = createMock(ECParameterSpec)
BigInteger order = createMock(BigInteger) BigInteger order = bigInteger(alg.minKeyLength - 8) //one less byte
expect(key.getParams()).andStubReturn(spec) expect(key.getParams()).andStubReturn(spec)
expect(spec.getOrder()).andStubReturn(order) expect(spec.getOrder()).andStubReturn(order)
expect(order.bitLength()).andStubReturn(alg.minKeyLength - 8) //1 byte less than expected
replay key, spec, order replay key, spec
try { try {
alg.assertValidSigningKey(key) alg.assertValidSigningKey(key)
@ -528,7 +522,7 @@ class SignatureAlgorithmTest {
"https://tools.ietf.org/html/rfc7518#section-3.4 for more information." as String, expected.message "https://tools.ietf.org/html/rfc7518#section-3.4 for more information." as String, expected.message
} }
verify key, spec, order verify key, spec
} }
} }
@ -538,15 +532,14 @@ class SignatureAlgorithmTest {
for (SignatureAlgorithm alg : SignatureAlgorithm.values().findAll { it.isRsa() }) { for (SignatureAlgorithm alg : SignatureAlgorithm.values().findAll { it.isRsa() }) {
RSAPrivateKey key = createMock(RSAPrivateKey) RSAPrivateKey key = createMock(RSAPrivateKey)
BigInteger modulus = createMock(BigInteger) BigInteger modulus = bigInteger(alg.minKeyLength)
expect(key.getModulus()).andStubReturn(modulus) expect(key.getModulus()).andStubReturn(modulus)
expect(modulus.bitLength()).andStubReturn(alg.minKeyLength)
replay key, modulus replay key
alg.assertValidSigningKey(key) alg.assertValidSigningKey(key)
verify key, modulus verify key
} }
} }
@ -594,11 +587,10 @@ class SignatureAlgorithmTest {
String section = alg.name().startsWith("P") ? "3.5" : "3.3" String section = alg.name().startsWith("P") ? "3.5" : "3.3"
RSAPrivateKey key = createMock(RSAPrivateKey) RSAPrivateKey key = createMock(RSAPrivateKey)
BigInteger modulus = createMock(BigInteger) BigInteger modulus = bigInteger(alg.minKeyLength - 8) // 1 less byte
expect(key.getModulus()).andStubReturn(modulus) expect(key.getModulus()).andStubReturn(modulus)
expect(modulus.bitLength()).andStubReturn(alg.minKeyLength - 8) // 1 less byte
replay key, modulus replay key
try { try {
alg.assertValidSigningKey(key) alg.assertValidSigningKey(key)
@ -613,7 +605,7 @@ class SignatureAlgorithmTest {
"https://tools.ietf.org/html/rfc7518#section-${section} for more information." as String, expected.message "https://tools.ietf.org/html/rfc7518#section-${section} for more information." as String, expected.message
} }
verify key, modulus verify key
} }
} }
@ -767,16 +759,15 @@ class SignatureAlgorithmTest {
ECPrivateKey key = createMock(ECPrivateKey) ECPrivateKey key = createMock(ECPrivateKey)
ECParameterSpec spec = createMock(ECParameterSpec) ECParameterSpec spec = createMock(ECParameterSpec)
BigInteger order = createMock(BigInteger) BigInteger order = bigInteger(alg.minKeyLength)
expect(key.getParams()).andStubReturn(spec) expect(key.getParams()).andStubReturn(spec)
expect(spec.getOrder()).andStubReturn(order) expect(spec.getOrder()).andStubReturn(order)
expect(order.bitLength()).andStubReturn(alg.minKeyLength)
replay key, spec, order replay key, spec
alg.assertValidVerificationKey(key) alg.assertValidVerificationKey(key)
verify key, spec, order verify key, spec
} }
} }
@ -803,12 +794,11 @@ class SignatureAlgorithmTest {
ECPrivateKey key = createMock(ECPrivateKey) ECPrivateKey key = createMock(ECPrivateKey)
ECParameterSpec spec = createMock(ECParameterSpec) ECParameterSpec spec = createMock(ECParameterSpec)
BigInteger order = createMock(BigInteger) BigInteger order = bigInteger(alg.minKeyLength - 8) // 1 less byte
expect(key.getParams()).andStubReturn(spec) expect(key.getParams()).andStubReturn(spec)
expect(spec.getOrder()).andStubReturn(order) expect(spec.getOrder()).andStubReturn(order)
expect(order.bitLength()).andStubReturn(alg.minKeyLength - 8) // 1 less byte
replay key, spec, order replay key, spec
try { try {
alg.assertValidVerificationKey(key) alg.assertValidVerificationKey(key)
@ -823,7 +813,7 @@ class SignatureAlgorithmTest {
"https://tools.ietf.org/html/rfc7518#section-3.4 for more information." as String, expected.message "https://tools.ietf.org/html/rfc7518#section-3.4 for more information." as String, expected.message
} }
verify key, spec, order verify key, spec
} }
} }
@ -833,15 +823,14 @@ class SignatureAlgorithmTest {
for (SignatureAlgorithm alg : SignatureAlgorithm.values().findAll { it.isRsa() }) { for (SignatureAlgorithm alg : SignatureAlgorithm.values().findAll { it.isRsa() }) {
RSAPrivateKey key = createMock(RSAPrivateKey) RSAPrivateKey key = createMock(RSAPrivateKey)
BigInteger modulus = createMock(BigInteger) BigInteger modulus = bigInteger(alg.minKeyLength)
expect(key.getModulus()).andStubReturn(modulus) expect(key.getModulus()).andStubReturn(modulus)
expect(modulus.bitLength()).andStubReturn(alg.minKeyLength)
replay key, modulus replay key
alg.assertValidVerificationKey(key) alg.assertValidVerificationKey(key)
verify key, modulus verify key
} }
} }
@ -869,11 +858,10 @@ class SignatureAlgorithmTest {
String section = alg.name().startsWith("P") ? "3.5" : "3.3" String section = alg.name().startsWith("P") ? "3.5" : "3.3"
RSAPrivateKey key = createMock(RSAPrivateKey) RSAPrivateKey key = createMock(RSAPrivateKey)
BigInteger modulus = createMock(BigInteger) BigInteger modulus = bigInteger(alg.minKeyLength - 8) //one less byte
expect(key.getModulus()).andStubReturn(modulus) expect(key.getModulus()).andStubReturn(modulus)
expect(modulus.bitLength()).andStubReturn(alg.minKeyLength - 8) //one less byte
replay key, modulus replay key
try { try {
alg.assertValidVerificationKey(key) alg.assertValidVerificationKey(key)
@ -888,7 +876,11 @@ class SignatureAlgorithmTest {
"https://tools.ietf.org/html/rfc7518#section-${section} for more information." as String, expected.message "https://tools.ietf.org/html/rfc7518#section-${section} for more information." as String, expected.message
} }
verify key, modulus verify key
} }
} }
private static BigInteger bigInteger(int bitLength) {
return new BigInteger(bitLength, 0, Random.newInstance())
}
} }

12
pom.xml
View File

@ -102,7 +102,7 @@
<bouncycastle.version>1.60</bouncycastle.version> <bouncycastle.version>1.60</bouncycastle.version>
<!-- Test Dependencies: Only required for testing when building. Not required by users at runtime: --> <!-- Test Dependencies: Only required for testing when building. Not required by users at runtime: -->
<groovy.version>2.5.1</groovy.version> <groovy.version>2.5.8</groovy.version>
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<easymock.version>3.6</easymock.version> <easymock.version>3.6</easymock.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
@ -261,6 +261,14 @@
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
<source>${jdk.version}</source>
</configuration>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
@ -460,7 +468,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
@ -542,7 +549,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>