Apache Solr open-source search software
SOLR-16934: Give securityManager permission for client TLS (#1857)
Houston Putman6e508802ab8e
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 14bd442a9c1..f3f715df647 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -134,6 +134,8 @@ Bug Fixes* SOLR-16929: SolrStream propagates undecoded error message (Alex Deparvu)+* SOLR-16934: Allow Solr to read client (javax.net.ssl.*) trustStores and keyStores via SecurityManager. (Houston Putman)+Dependency Upgrades---------------------diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.batsindex 9f3fdfe806c..a40d3232a13 100644--- a/solr/packaging/test/test_ssl.bats+++ b/solr/packaging/test/test_ssl.bats@@ -97,3 +97,61 @@ teardown() {run curl --http2 --cacert "$ssl_dir/solr-ssl.pem" 'https://localhost:8983/solr/test/select?q=*:*'assert_output --partial '401 require authentication'}++@test "start solr with client truststore and security manager" {+ # Make a test tmp dir, as the security policy includes TMP, so that might already contain the BATS_TEST_TMPDIR+ test_tmp_dir="${BATS_TEST_TMPDIR}/tmp"+ mkdir -p "${test_tmp_dir}"+ test_tmp_dir="$(cd -P "${test_tmp_dir}" && pwd)"++ export SOLR_SECURITY_MANAGER_ENABLED=true+ export SOLR_OPTS="-Djava.io.tmpdir=${test_tmp_dir}"+ export SOLR_TOOL_OPTS="-Djava.io.tmpdir=${test_tmp_dir}"++ # Create a keystore+ export ssl_dir="${BATS_TEST_TMPDIR}/ssl"+ export client_ssl_dir="${ssl_dir}-client"+ mkdir -p "$ssl_dir"+ (+ cd "$ssl_dir"+ rm -f solr-ssl.keystore.p12+ keytool -genkeypair -alias solr-ssl -keyalg RSA -keysize 2048 -keypass secret -storepass secret -validity 9999 -keystore solr-ssl.keystore.p12 -storetype PKCS12 -ext SAN=DNS:localhost,IP:127.0.0.1 -dname "CN=localhost, OU=Organizational Unit, O=Organization, L=Location, ST=State, C=Country"+ )+ mkdir -p "$client_ssl_dir"+ (+ cd "$client_ssl_dir"+ rm -f *+ keytool -export -alias solr-ssl -file solr-ssl.crt -keystore "$ssl_dir/solr-ssl.keystore.p12" -keypass secret -storepass secret+ keytool -import -v -trustcacerts -alias solr-ssl -file solr-ssl.crt -storetype PKCS12 -keystore solr-ssl.truststore.p12 -keypass secret -storepass secret -noprompt+ )+ cp -R "$ssl_dir" "$client_ssl_dir"++ # Set ENV_VARs so that Solr uses this keystore+ export SOLR_SSL_ENABLED=true+ export SOLR_SSL_KEY_STORE=$ssl_dir/solr-ssl.keystore.p12+ export SOLR_SSL_KEY_STORE_PASSWORD=secret+ export SOLR_SSL_TRUST_STORE=$ssl_dir/solr-ssl.keystore.p12+ export SOLR_SSL_TRUST_STORE_PASSWORD=secret+ export SOLR_SSL_CLIENT_TRUST_STORE=$client_ssl_dir/solr-ssl.truststore.p12+ export SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD=secret+ export SOLR_SSL_NEED_CLIENT_AUTH=false+ export SOLR_SSL_WANT_CLIENT_AUTH=true+ export SOLR_SSL_CHECK_PEER_NAME=true+ export SOLR_HOST=localhost+ export SOLR_SECURITY_MANAGER_ENABLED=true++ run solr start -c++ export SOLR_SSL_KEY_STORE=+ export SOLR_SSL_KEY_STORE_PASSWORD=+ export SOLR_SSL_TRUST_STORE=+ export SOLR_SSL_TRUST_STORE_PASSWORD=++ solr assert --started https://localhost:8983/solr --timeout 5000++ run solr create -c test -s 2+ assert_output --partial "Created collection 'test'"++ run solr api -get 'https://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS'+ assert_output --partial '"urlScheme":"https"'+}diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policyindex 77ac99704c5..aec2e2ddcfe 100644--- a/solr/server/etc/security.policy+++ b/solr/server/etc/security.policy@@ -185,11 +185,13 @@ grant {permission java.io.FilePermission "${hadoop.security.credential.provider.path}", "read,write,delete,readlink";permission java.io.FilePermission "${hadoop.security.credential.provider.path}${/}-", "read,write,delete,readlink";- permission java.io.FilePermission "${solr.jetty.keystore}", "read,write,delete,readlink";- permission java.io.FilePermission "${solr.jetty.keystore}${/}-", "read,write,delete,readlink";+ permission java.io.FilePermission "${solr.jetty.keystore}", "read,readlink";- permission java.io.FilePermission "${solr.jetty.truststore}", "read,write,delete,readlink";- permission java.io.FilePermission "${solr.jetty.truststore}${/}-", "read,write,delete,readlink";+ permission java.io.FilePermission "${solr.jetty.truststore}", "read,readlink";++ permission java.io.FilePermission "${javax.net.ssl.keyStore}", "read,readlink";++ permission java.io.FilePermission "${javax.net.ssl.trustStore}", "read,readlink";permission java.io.FilePermission "${solr.install.dir}", "read,write,delete,readlink";permission java.io.FilePermission "${solr.install.dir}${/}-", "read,write,delete,readlink";