SOLR-15439 Upgrade jose4j to v0.7.7 (apache#154)

epugh · May 28, 2021 · f4f84d2 · f4f84d2
1 parent e57de6a
commit f4f84d2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -301,6 +301,8 @@ Other Changes
 
 * SOLR-15416: Remove metrics history collection (and MetricsHistoryHandler). (ab)
 
+* SOLR-15439: Upgrade jose4j library used for JWT authentication processing, to v0.7.7 (janhoy)
+
 Bug Fixes
 ---------------------
 * SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution

diff --git a/solr/core/src/test/org/apache/solr/security/JWTAuthPluginTest.java b/solr/core/src/test/org/apache/solr/security/JWTAuthPluginTest.java
@@ -320,7 +320,7 @@ public void algWhitelist() {
     plugin.init(testConfig);
     JWTAuthPlugin.JWTAuthenticationResponse resp = plugin.authenticate(testHeader);
     assertEquals(JWTAuthPlugin.JWTAuthenticationResponse.AuthCode.JWT_VALIDATION_EXCEPTION, resp.getAuthCode());
-    assertTrue(resp.getErrorMessage().contains("not a whitelisted"));
+    assertTrue(resp.getErrorMessage().contains("not a permitted algorithm"));
   }
 
   @Test

diff --git a/solr/licenses/jose4j-0.6.5.jar.sha1 b/solr/licenses/jose4j-0.6.5.jar.sha1
diff --git a/solr/licenses/jose4j-0.7.7.jar.sha1 b/solr/licenses/jose4j-0.7.7.jar.sha1
@@ -0,0 +1 @@
+cf1a02839a251731e92ba0134268fec3f79d4868
diff --git a/versions.lock b/versions.lock
@@ -173,7 +173,7 @@ org.apache.xmlbeans:xmlbeans:3.1.0 (1 constraints: 0605fd35)
 org.apache.zookeeper:zookeeper:3.7.0 (1 constraints: 0c050f36)
 org.apache.zookeeper:zookeeper-jute:3.7.0 (1 constraints: 8a0d3a28)
 org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836)
-org.bitbucket.b_c:jose4j:0.6.5 (1 constraints: 0d050236)
+org.bitbucket.b_c:jose4j:0.7.7 (1 constraints: 10050736)
 org.bouncycastle:bcmail-jdk15on:1.64 (1 constraints: df04ff30)
 org.bouncycastle:bcpkix-jdk15on:1.64 (1 constraints: df04ff30)
 org.bouncycastle:bcprov-jdk15on:1.64 (1 constraints: df04ff30)

diff --git a/versions.props b/versions.props
@@ -96,7 +96,7 @@ org.apache.xmlbeans:xmlbeans=3.1.0
 org.apache.zookeeper:*=3.7.0
 org.asciidoctor:asciidoctorj=1.6.2
 org.aspectj:aspectjrt=1.8.0
-org.bitbucket.b_c:jose4j=0.6.5
+org.bitbucket.b_c:jose4j=0.7.7
 org.bouncycastle:*=1.64
 org.brotli:dec=0.1.2
 org.carrot2:carrot2-core=4.0.4