You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2021/06/10 10:31:15 UTC
[solr] branch main updated (51fcedb -> 11ce8b8)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git.
from 51fcedb LUCENE-9995: JDK17 generates wbr tags which make javadocs checker angry.
add 11ce8b8 SOLR-15423 JWTAuthPlugin support for custom truststore (#139)
No new revisions were added by this update.
Summary of changes:
.../randomization/policies/solr-tests.policy | 3 +
solr/CHANGES.txt | 4 +-
solr/core/build.gradle | 7 +
.../org/apache/solr/security/JWTAuthPlugin.java | 103 ++++++--
.../org/apache/solr/security/JWTIssuerConfig.java | 105 ++++++--
.../solr/security/JWTVerificationkeyResolver.java | 9 +-
.../src/java/org/apache/solr/util/CryptoKeys.java | 45 +++-
.../solr/security/jwt_plugin_idp_cert.pem | 46 ++++
.../solr/security/jwt_plugin_idp_certs.p12 | Bin 0 -> 3746 bytes
.../solr/security/jwt_plugin_idp_invalidcert.pem | 46 ++++
.../solr/security/jwt_plugin_idp_wrongcert.pem | 21 ++
.../security/JWTAuthPluginIntegrationTest.java | 291 +++++++++++++++------
.../apache/solr/security/JWTAuthPluginTest.java | 106 ++++++--
.../apache/solr/security/JWTIssuerConfigTest.java | 3 -
solr/licenses/accessors-smart-1.2.jar.sha1 | 1 +
...NSE-ASL.txt => accessors-smart-LICENSE-ASL.txt} | 0
solr/licenses/accessors-smart-NOTICE.txt | 1 +
solr/licenses/annotations-13.0.jar.sha1 | 1 +
...LICENSE-ASL.txt => annotations-LICENSE-ASL.txt} | 0
solr/licenses/annotations-NOTICE.txt | 1 +
solr/licenses/content-type-2.1.jar.sha1 | 1 +
...ICENSE-ASL.txt => content-type-LICENSE-ASL.txt} | 0
solr/licenses/content-type-NOTICE.txt | 14 +
solr/licenses/freemarker-2.3.31.jar.sha1 | 1 +
...-LICENSE-ASL.txt => freemarker-LICENSE-ASL.txt} | 0
solr/licenses/freemarker-NOTICE.txt | 5 +
.../licenses/jackson-module-kotlin-2.12.2.jar.sha1 | 1 +
...L.txt => jackson-module-kotlin-LICENSE-ASL.txt} | 0
solr/licenses/jackson-module-kotlin-NOTICE.txt | 96 +++++++
solr/licenses/jcip-annotations-1.0-1.jar.sha1 | 1 +
...SE-ASL.txt => jcip-annotations-LICENSE-ASL.txt} | 0
solr/licenses/jcip-annotations-NOTICE.txt | 1 +
solr/licenses/json-smart-2.3.jar.sha1 | 1 +
...-LICENSE-ASL.txt => json-smart-LICENSE-ASL.txt} | 0
solr/licenses/json-smart-NOTICE.txt | 1 +
...lf4j-LICENSE-ASL.txt => kotlin-LICENSE-ASL.txt} | 0
solr/licenses/kotlin-NOTICE.txt | 2 +
solr/licenses/kotlin-logging-jvm-2.0.6.jar.sha1 | 1 +
solr/licenses/kotlin-reflect-1.4.32.jar.sha1 | 1 +
solr/licenses/kotlin-stdlib-1.4.32.jar.sha1 | 1 +
solr/licenses/kotlin-stdlib-common-1.4.32.jar.sha1 | 1 +
solr/licenses/kotlin-stdlib-jdk7-1.4.10.jar.sha1 | 1 +
solr/licenses/kotlin-stdlib-jdk8-1.4.10.jar.sha1 | 1 +
solr/licenses/lang-tag-1.4.4.jar.sha1 | 1 +
...up-LICENSE-ASL.txt => lang-tag-LICENSE-ASL.txt} | 0
solr/licenses/lang-tag-NOTICE.txt | 14 +
solr/licenses/mock-oauth2-server-0.3.3.jar.sha1 | 1 +
solr/licenses/mock-oauth2-server-LICENSE-MIT.txt | 21 ++
solr/licenses/mockwebserver-4.9.1.jar.sha1 | 1 +
.../mockwebserver-LICENSE-ASL.txt} | 0
solr/licenses/mockwebserver-NOTICE.txt | 13 +
solr/licenses/nimbus-jose-jwt-9.6.1.jar.sha1 | 1 +
.../nimbus-jose-jwt-LICENSE-ASL.txt} | 0
solr/licenses/nimbus-jose-jwt-NOTICE.txt | 14 +
solr/licenses/oauth2-oidc-sdk-9.2.3.jar.sha1 | 1 +
.../oauth2-oidc-sdk-LICENSE-ASL.txt} | 0
solr/licenses/oauth2-oidc-sdk-NOTICE.txt | 14 +
solr/licenses/okhttp-4.9.1.jar.sha1 | 1 +
.../okhttp-LICENSE-ASL.txt} | 0
solr/licenses/okhttp-NOTICE.txt | 13 +
.../LICENSE.txt => licenses/okio-LICENSE-ASL.txt} | 0
solr/licenses/okio-NOTICE.txt | 13 +
solr/licenses/okio-jvm-2.8.0.jar.sha1 | 1 +
solr/server/etc/security.policy | 3 +
.../src/jwt-authentication-plugin.adoc | 13 +-
versions.lock | 29 +-
versions.props | 1 +
67 files changed, 918 insertions(+), 160 deletions(-)
create mode 100644 solr/core/src/test-files/solr/security/jwt_plugin_idp_cert.pem
create mode 100644 solr/core/src/test-files/solr/security/jwt_plugin_idp_certs.p12
create mode 100644 solr/core/src/test-files/solr/security/jwt_plugin_idp_invalidcert.pem
create mode 100644 solr/core/src/test-files/solr/security/jwt_plugin_idp_wrongcert.pem
create mode 100644 solr/licenses/accessors-smart-1.2.jar.sha1
copy solr/licenses/{tagsoup-LICENSE-ASL.txt => accessors-smart-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/accessors-smart-NOTICE.txt
create mode 100644 solr/licenses/annotations-13.0.jar.sha1
copy solr/licenses/{tagsoup-LICENSE-ASL.txt => annotations-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/annotations-NOTICE.txt
create mode 100644 solr/licenses/content-type-2.1.jar.sha1
copy solr/licenses/{randomizedtesting-runner-LICENSE-ASL.txt => content-type-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/content-type-NOTICE.txt
create mode 100644 solr/licenses/freemarker-2.3.31.jar.sha1
copy solr/licenses/{log4j-slf4j-LICENSE-ASL.txt => freemarker-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/freemarker-NOTICE.txt
create mode 100644 solr/licenses/jackson-module-kotlin-2.12.2.jar.sha1
copy solr/licenses/{log4j-slf4j-LICENSE-ASL.txt => jackson-module-kotlin-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/jackson-module-kotlin-NOTICE.txt
create mode 100644 solr/licenses/jcip-annotations-1.0-1.jar.sha1
copy solr/licenses/{log4j-slf4j-LICENSE-ASL.txt => jcip-annotations-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/jcip-annotations-NOTICE.txt
create mode 100644 solr/licenses/json-smart-2.3.jar.sha1
copy solr/licenses/{tagsoup-LICENSE-ASL.txt => json-smart-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/json-smart-NOTICE.txt
copy solr/licenses/{log4j-slf4j-LICENSE-ASL.txt => kotlin-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/kotlin-NOTICE.txt
create mode 100644 solr/licenses/kotlin-logging-jvm-2.0.6.jar.sha1
create mode 100644 solr/licenses/kotlin-reflect-1.4.32.jar.sha1
create mode 100644 solr/licenses/kotlin-stdlib-1.4.32.jar.sha1
create mode 100644 solr/licenses/kotlin-stdlib-common-1.4.32.jar.sha1
create mode 100644 solr/licenses/kotlin-stdlib-jdk7-1.4.10.jar.sha1
create mode 100644 solr/licenses/kotlin-stdlib-jdk8-1.4.10.jar.sha1
create mode 100644 solr/licenses/lang-tag-1.4.4.jar.sha1
copy solr/licenses/{tagsoup-LICENSE-ASL.txt => lang-tag-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/lang-tag-NOTICE.txt
create mode 100644 solr/licenses/mock-oauth2-server-0.3.3.jar.sha1
create mode 100644 solr/licenses/mock-oauth2-server-LICENSE-MIT.txt
create mode 100644 solr/licenses/mockwebserver-4.9.1.jar.sha1
copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/mockwebserver-LICENSE-ASL.txt} (100%)
mode change 100755 => 100644
create mode 100644 solr/licenses/mockwebserver-NOTICE.txt
create mode 100644 solr/licenses/nimbus-jose-jwt-9.6.1.jar.sha1
copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/nimbus-jose-jwt-LICENSE-ASL.txt} (100%)
mode change 100755 => 100644
create mode 100644 solr/licenses/nimbus-jose-jwt-NOTICE.txt
create mode 100644 solr/licenses/oauth2-oidc-sdk-9.2.3.jar.sha1
copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/oauth2-oidc-sdk-LICENSE-ASL.txt} (100%)
mode change 100755 => 100644
create mode 100644 solr/licenses/oauth2-oidc-sdk-NOTICE.txt
create mode 100644 solr/licenses/okhttp-4.9.1.jar.sha1
copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/okhttp-LICENSE-ASL.txt} (100%)
mode change 100755 => 100644
create mode 100644 solr/licenses/okhttp-NOTICE.txt
copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/okio-LICENSE-ASL.txt} (100%)
mode change 100755 => 100644
create mode 100644 solr/licenses/okio-NOTICE.txt
create mode 100644 solr/licenses/okio-jvm-2.8.0.jar.sha1