You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2026/05/28 03:13:06 UTC
(ranger) branch master updated: RANGER-5603: Docker setup updated to use Solr 9.4.1 (#981)
This is an automated email from the ASF dual-hosted git repository.
pradeepagrawal8184 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new d319fb99b RANGER-5603: Docker setup updated to use Solr 9.4.1 (#981)
d319fb99b is described below
commit d319fb99b89fe1035b1a09626b7c5fe9e1ea8756
Author: PradeeP AgrawaL <pr...@apache.org>
AuthorDate: Thu May 28 08:43:00 2026 +0530
RANGER-5603: Docker setup updated to use Solr 9.4.1 (#981)
* RANGER-5603: Docker setup updated to use Solr 9.4.1
* RANGER-5603: Solr 9 Docker Kerberos keytabs, audit core mounts, Admin FQDN audit URL
---------
Co-authored-by: Madhan Neethiraj <ma...@apache.org>
---
.../plugin/util/RangerJersey2ClientBuilder.java | 5 ++--
dev-support/ranger-docker/.env | 2 +-
dev-support/ranger-docker/Dockerfile.ranger-solr | 5 ++--
.../ranger-docker/docker-compose.ranger.yml | 9 ++++++-
.../admin/ranger-admin-install-postgres.properties | 8 +++---
.../solr/ranger-solr-plugin-install.properties | 1 +
.../ranger-docker/scripts/solr/ranger-solr.sh | 31 ++++++++++++++++++++--
.../scripts/solr/ranger_audits/core.properties | 5 ++++
.../ranger-docker/scripts/solr/solr-jaas.conf | 1 -
.../scripts/solr/solr-ranger_audits/solrconfig.xml | 12 ++++-----
.../ranger-docker/scripts/solr/solr-security.json | 2 +-
distro/src/main/assembly/plugin-solr.xml | 20 +++++---------
.../solr/authorizer/RangerSolrAuthorizer.java | 9 ++++---
13 files changed, 73 insertions(+), 37 deletions(-)
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerJersey2ClientBuilder.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerJersey2ClientBuilder.java
index 714412c88..43800d87f 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerJersey2ClientBuilder.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerJersey2ClientBuilder.java
@@ -30,6 +30,8 @@
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
+import java.util.stream.Collectors;
+
/**
* Comprehensive Jersey client utility for Ranger components.
*
@@ -355,8 +357,7 @@ public static boolean validateAntiMoxyConfiguration(ClientConfig config) {
boolean jacksonRegistered = config.getClasses().contains(JacksonJaxbJsonProvider.class) || config.getInstances().stream().anyMatch(instance -> instance instanceof JacksonJaxbJsonProvider);
if (!jacksonRegistered) {
- LOG.error("CRITICAL: Jackson JSON provider is not registered! Default JSON processing may fail.");
- isValid = false;
+ LOG.error("CRITICAL: Jackson JSON provider is not registered! Default JSON processing may fail. Classes={}", config.getClasses().stream().map(Class::getCanonicalName).collect(Collectors.toList()));
}
if (isValid) {
diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env
index 12d2777ec..144b698ab 100644
--- a/dev-support/ranger-docker/.env
+++ b/dev-support/ranger-docker/.env
@@ -54,7 +54,7 @@ TAGSYNC_VERSION=3.0.0-SNAPSHOT
PDP_VERSION=3.0.0-SNAPSHOT
# Solr Configuration
-SOLR_VERSION=8.11.3
+SOLR_VERSION=9.4.1
SOLR_PLUGIN_VERSION=3.0.0-SNAPSHOT
# Zookeeper Configuration
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-solr b/dev-support/ranger-docker/Dockerfile.ranger-solr
index 2bb4fa824..472e890a8 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-solr
+++ b/dev-support/ranger-docker/Dockerfile.ranger-solr
@@ -16,7 +16,7 @@
ARG RANGER_BASE_IMAGE=apache/ranger-base
ARG RANGER_BASE_VERSION=20260123-2-8
-ARG SOLR_VERSION=8.11.3
+ARG SOLR_VERSION=9.4.1
FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION} AS ranger-base
FROM solr:${SOLR_VERSION}
@@ -39,7 +39,8 @@ RUN tar xvfz /home/ranger/dist/ranger-${SOLR_PLUGIN_VERSION}-solr-plugin.tar.gz
ln -s /opt/ranger/ranger-${SOLR_PLUGIN_VERSION}-solr-plugin /opt/ranger/ranger-solr-plugin && \
rm -f /home/ranger/dist/ranger-${SOLR_PLUGIN_VERSION}-solr-plugin.tar.gz && \
rm -f /opt/ranger/ranger-solr-plugin/install.properties && \
- chown -R solr:solr /opt/ranger
+ mkdir -p /var/solr/data /etc/ranger && \
+ chown -R solr:solr /opt/ranger /var/solr /etc/ranger
ENTRYPOINT [ "/opt/ranger/ranger-solr.sh" ]
CMD ["solr-foreground"]
diff --git a/dev-support/ranger-docker/docker-compose.ranger.yml b/dev-support/ranger-docker/docker-compose.ranger.yml
index e37469c10..3e263fecc 100644
--- a/dev-support/ranger-docker/docker-compose.ranger.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger.yml
@@ -110,9 +110,14 @@ services:
volumes:
- ./dist/keytabs/ranger-solr:/etc/keytabs
- ./scripts/solr/solr-ranger_audits:/opt/solr/server/solr/configsets/ranger_audits/conf
+ # Core conf is copied once by solr-precreate; mount so Solr 9 cache updates apply without recreating the core
+ - ./scripts/solr/solr-ranger_audits:/var/solr/data/ranger_audits/conf
+ - ./scripts/solr/ranger_audits/core.properties:/var/solr/data/ranger_audits/core.properties
- ./scripts/solr/ranger-solr-plugin-install.properties:/opt/ranger/ranger-solr-plugin/install.properties
+ # Keep enable templates in sync with repo (image tarball may be stale)
+ - ../../plugin-solr/conf/ranger-solr-security-changes.cfg:/opt/ranger/ranger-solr-plugin/install/conf.templates/enable/ranger-solr-security-changes.cfg:ro
- ./scripts/solr/core-site.xml:/opt/solr/server/resources/core-site.xml
- - ./scripts/solr/solr-jaas.conf:/opt/solr/server/etc/jaas.conf
+ - ./scripts/solr/solr-jaas.conf:/var/solr/data/jaas.conf
- ./scripts/solr/solr-security.json:/var/solr/data/security.json
- ./scripts/solr/ranger-solr.sh:/opt/ranger/ranger-solr.sh
- ./scripts/kdc/krb5.conf:/etc/krb5.conf
@@ -128,6 +133,8 @@ services:
environment:
- KERBEROS_ENABLED
- KRB5_CONFIG=/etc/krb5.conf
+ # Solr 9 enables Java SecurityManager by default; Ranger keytab login and policy cache need broader access
+ - SOLR_SECURITY_MANAGER_ENABLED=false
command:
- solr-precreate
- ranger_audits
diff --git a/dev-support/ranger-docker/scripts/admin/ranger-admin-install-postgres.properties b/dev-support/ranger-docker/scripts/admin/ranger-admin-install-postgres.properties
index cf8a58fec..e8d28825f 100644
--- a/dev-support/ranger-docker/scripts/admin/ranger-admin-install-postgres.properties
+++ b/dev-support/ranger-docker/scripts/admin/ranger-admin-install-postgres.properties
@@ -44,7 +44,8 @@ keyadmin_password=rangerR0cks!
audit_store=solr
-audit_solr_urls=http://ranger-solr:8983/solr/ranger_audits
+# FQDN required for SPNEGO to Solr (HTTP/ranger-solr.rangernw@REALM)
+audit_solr_urls=http://ranger-solr.rangernw:8983/solr/ranger_audits
audit_solr_collection_name=ranger_audits
# audit_store=elasticsearch
@@ -103,7 +104,8 @@ audit_jaas_client_loginModuleName=com.sun.security.auth.module.Krb5LoginModule
audit_jaas_client_loginModuleControlFlag=required
audit_jaas_client_option_useKeyTab=true
audit_jaas_client_option_storeKey=true
-audit_jaas_client_option_useTicketCache=true
-audit_jaas_client_option_serviceName=ranger
+# Leave empty: SolrJ derives HTTP service from audit URL host (must be FQDN)
+audit_jaas_client_option_serviceName=
+audit_jaas_client_option_useTicketCache=false
audit_jaas_client_option_keyTab=/etc/keytabs/rangeradmin.keytab
audit_jaas_client_option_principal=rangeradmin/ranger.rangernw@EXAMPLE.COM
diff --git a/dev-support/ranger-docker/scripts/solr/ranger-solr-plugin-install.properties b/dev-support/ranger-docker/scripts/solr/ranger-solr-plugin-install.properties
index fbb1670e1..bf1482144 100644
--- a/dev-support/ranger-docker/scripts/solr/ranger-solr-plugin-install.properties
+++ b/dev-support/ranger-docker/scripts/solr/ranger-solr-plugin-install.properties
@@ -19,6 +19,7 @@ COMPONENT_INSTALL_DIR_NAME=/opt/solr/server
UGI_INITIALIZE=true
UGI_LOGIN_TYPE=jaas
UGI_JAAS_APPCONFIG=Client
+POLICY_CACHE_FILE_PATH=/etc/ranger/dev_solr/policycache
XAAUDIT.SOLR.IS_ENABLED=false
XAAUDIT.SOLR.MAX_QUEUE_SIZE=1
diff --git a/dev-support/ranger-docker/scripts/solr/ranger-solr.sh b/dev-support/ranger-docker/scripts/solr/ranger-solr.sh
index 719e2bee1..7284de9ac 100755
--- a/dev-support/ranger-docker/scripts/solr/ranger-solr.sh
+++ b/dev-support/ranger-docker/scripts/solr/ranger-solr.sh
@@ -26,7 +26,9 @@ then
${RANGER_SCRIPTS}/wait_for_keytab.sh solr.keytab
${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh
- JAAS_CONFIG="-Djava.security.auth.login.config=/opt/solr/server/etc/jaas.conf"
+ # Use KDC-generated keytabs from the volume mount (/etc/keytabs); do not copy into
+ # /var/solr/data or they go stale after KDC restart (Checksum failed on login).
+ JAAS_CONFIG="-Djava.security.auth.login.config=/var/solr/data/jaas.conf"
JAAS_APPNAME="-Dsolr.kerberos.jaas.appname=Client"
KRB5_CONF="-Djava.security.krb5.conf=/etc/krb5.conf"
KERBEROS_KEYTAB="-Dsolr.kerberos.keytab=/etc/keytabs/HTTP.keytab"
@@ -39,14 +41,39 @@ DEFAULT"
export SOLR_AUTHENTICATION_OPTS="${JAAS_CONFIG} ${JAAS_APPNAME} ${KRB5_CONF} ${KERBEROS_KEYTAB} ${KERBEROS_PRINCIPAL} ${COOKIE_DOMAIN} ${KERBEROS_NAME_RULES}"
export SOLR_AUTH_TYPE=kerberos
+ export HADOOP_CONF_DIR=/opt/solr/server/resources
+ export SOLR_AUTHENTICATION_OPTS="${SOLR_AUTHENTICATION_OPTS} -Dhadoop.security.authentication=kerberos"
+ export SOLR_OPTS="${SOLR_OPTS} ${SOLR_AUTHENTICATION_OPTS}"
fi
+# Ranger policy cache, keytabs (Solr 9 SecurityManager; allowPaths used when SM is enabled)
+export SOLR_OPTS="${SOLR_OPTS} -Dsolr.allowPaths=/etc/ranger,/etc/keytabs,/var/solr/data"
+export SOLR_SECURITY_MANAGER_ENABLED="${SOLR_SECURITY_MANAGER_ENABLED:-false}"
+# Solr 9.4+: KerberosPlugin lives in the hadoop-auth module
+export SOLR_MODULES="${SOLR_MODULES:+$SOLR_MODULES,}hadoop-auth"
+
if [ ! -e ${SOLR_INSTALL_DIR}/.setupDone ]
then
+ POLICY_CACHE_DIR=/etc/ranger/dev_solr/policycache
+ mkdir -p "${POLICY_CACHE_DIR}"
+ chmod a+rx /etc/ranger /etc/ranger/dev_solr "${POLICY_CACHE_DIR}" 2>/dev/null || true
+
cd /opt/ranger/ranger-solr-plugin
./enable-solr-plugin.sh
touch "${SOLR_INSTALL_DIR}"/.setupDone
fi
-su -p -c "export PATH=${PATH} && /opt/docker-solr/scripts/docker-entrypoint.sh $*" solr
+# conf/ and core.properties are bind-mounted; bootstrap if solr-precreate left an empty file
+RANGER_AUDITS_CORE_DIR=/var/solr/data/ranger_audits
+if [ -d "${RANGER_AUDITS_CORE_DIR}/conf" ]; then
+ if [ ! -s "${RANGER_AUDITS_CORE_DIR}/core.properties" ]; then
+ printf '%s\n' 'name=ranger_audits' 'config=solrconfig.xml' 'schema=managed-schema' 'dataDir=data' > "${RANGER_AUDITS_CORE_DIR}/core.properties"
+ mkdir -p "${RANGER_AUDITS_CORE_DIR}/data"
+ fi
+ chown -R solr:solr "${RANGER_AUDITS_CORE_DIR}" 2>/dev/null || true
+fi
+
+export PATH="/opt/solr/bin:/opt/solr/docker/scripts:/opt/solr/prometheus-exporter/bin:${PATH}"
+export HADOOP_CONF_DIR="${HADOOP_CONF_DIR:-/opt/solr/server/resources}"
+su -p -c "export PATH=${PATH} HADOOP_CONF_DIR=${HADOOP_CONF_DIR} SOLR_SECURITY_MANAGER_ENABLED=${SOLR_SECURITY_MANAGER_ENABLED:-false} SOLR_OPTS=\"${SOLR_OPTS}\" SOLR_AUTHENTICATION_OPTS=\"${SOLR_AUTHENTICATION_OPTS}\" && /opt/solr/docker/scripts/docker-entrypoint.sh $*" solr
diff --git a/dev-support/ranger-docker/scripts/solr/ranger_audits/core.properties b/dev-support/ranger-docker/scripts/solr/ranger_audits/core.properties
new file mode 100644
index 000000000..090fe4a98
--- /dev/null
+++ b/dev-support/ranger-docker/scripts/solr/ranger_audits/core.properties
@@ -0,0 +1,5 @@
+# Solr 9 instance dir marker (required for CorePropertiesLocator)
+name=ranger_audits
+config=solrconfig.xml
+schema=managed-schema
+dataDir=data
diff --git a/dev-support/ranger-docker/scripts/solr/solr-jaas.conf b/dev-support/ranger-docker/scripts/solr/solr-jaas.conf
index 586230b5e..b91dfd603 100644
--- a/dev-support/ranger-docker/scripts/solr/solr-jaas.conf
+++ b/dev-support/ranger-docker/scripts/solr/solr-jaas.conf
@@ -24,4 +24,3 @@ Client {
useTicketCache=false
principal="solr/ranger-solr.rangernw@EXAMPLE.COM";
};
-
diff --git a/dev-support/ranger-docker/scripts/solr/solr-ranger_audits/solrconfig.xml b/dev-support/ranger-docker/scripts/solr/solr-ranger_audits/solrconfig.xml
index 33891833c..da9464ef9 100644
--- a/dev-support/ranger-docker/scripts/solr/solr-ranger_audits/solrconfig.xml
+++ b/dev-support/ranger-docker/scripts/solr/solr-ranger_audits/solrconfig.xml
@@ -417,7 +417,7 @@
to occupy. Note that when this option is specified, the size
and initialSize parameters are ignored.
-->
- <filterCache class="solr.FastLRUCache"
+ <filterCache class="solr.CaffeineCache"
size="512"
initialSize="512"
autowarmCount="0"/>
@@ -429,7 +429,7 @@
maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
to occupy
-->
- <queryResultCache class="solr.LRUCache"
+ <queryResultCache class="solr.CaffeineCache"
size="512"
initialSize="512"
autowarmCount="0"/>
@@ -439,14 +439,14 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
- <documentCache class="solr.LRUCache"
+ <documentCache class="solr.CaffeineCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<!-- custom cache currently used by block join -->
<cache name="perSegFilter"
- class="solr.search.LRUCache"
+ class="solr.search.CaffeineCache"
size="10"
initialSize="0"
autowarmCount="10"
@@ -458,7 +458,7 @@
even if not configured here.
-->
<!--
- <fieldValueCache class="solr.FastLRUCache"
+ <fieldValueCache class="solr.CaffeineCache"
size="512"
autowarmCount="128"
showItems="32" />
@@ -474,7 +474,7 @@
-->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
+ class="solr.CaffeineCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
diff --git a/dev-support/ranger-docker/scripts/solr/solr-security.json b/dev-support/ranger-docker/scripts/solr/solr-security.json
index 6cf993156..cf2d07cf0 100644
--- a/dev-support/ranger-docker/scripts/solr/solr-security.json
+++ b/dev-support/ranger-docker/scripts/solr/solr-security.json
@@ -1,6 +1,6 @@
{
"authentication": {
- "class": "solr.KerberosPlugin",
+ "class": "org.apache.solr.security.hadoop.KerberosPlugin",
"kerberos.principal": "HTTP/ranger-solr.rangernw@EXAMPLE.COM",
"kerberos.keytab": "/etc/keytabs/HTTP.keytab",
"kerberos.name.rules": "RULE:[2:$1@$0](.*@EXAMPLE.COM)s/@.*//\nRULE:[1:$1@$0](.*@EXAMPLE.COM)s/@.*//\nDEFAULT",
diff --git a/distro/src/main/assembly/plugin-solr.xml b/distro/src/main/assembly/plugin-solr.xml
index d1b43ae36..97975beac 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -54,17 +54,11 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
- <include>com.carrotsearch:hppc</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.google.code.gson:gson</include>
<include>commons-collections:commons-collections</include>
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
- <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
<include>javax.inject:javax.inject</include>
<include>joda-time:joda-time</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
@@ -72,18 +66,16 @@
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
<include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.lucene:lucene-core</include>
- <include>org.glassfish.hk2.external:jakarta.inject</include>
<include>org.glassfish.hk2:class-model</include>
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-core</include>
- <include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:hk2-utils</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.graalvm.js:js:jar:${graalvm.version}</include>
+ <include>org.graalvm.js:js-scriptengine:jar:${graalvm.version}</include>
+ <include>org.graalvm.regex:regex:jar:${graalvm.version}</include>
+ <include>org.graalvm.sdk:graal-sdk:jar:${graalvm.version}</include>
+ <include>org.graalvm.truffle:truffle-api:jar:${graalvm.version}</include>
+ <include>com.ibm.icu:icu4j</include>
</includes>
</binaries>
</moduleSet>
diff --git a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
index 2206efedc..0c1e5fc71 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
@@ -164,10 +164,11 @@ public AuthorizationResponse authorize(AuthorizationContext context) {
// At the end will we iterate this list and invoke Ranger to check for privileges.
List<RangerAccessRequestImpl> rangerRequests = new ArrayList<>();
- // The following logic is taken from Sentry See in SentrySolrPluginImpl.java.
+ Object handler = context.getHandler();
- if (context.getHandler() instanceof PermissionNameProvider) {
- PermissionNameProvider.Name perm = ((PermissionNameProvider) context.getHandler()).getPermissionName(context);
+ // The following logic is taken from Sentry See in SentrySolrPluginImpl.java.
+ if (handler instanceof PermissionNameProvider) {
+ PermissionNameProvider.Name perm = ((PermissionNameProvider) handler).getPermissionName(context);
switch (perm) {
case READ_PERM:
@@ -251,7 +252,7 @@ public AuthorizationResponse authorize(AuthorizationContext context) {
}
}
} else {
- logger.warn("Request Handler: {} is not an instance of PermissionNameProvider and so we are not able to authenticate the request. Check SOLR-11623 for more information.", context.getHandler().getClass().getName());
+ logger.warn("Request Handler: {} is not an instance of PermissionNameProvider and so we are not able to authenticate the request. Check SOLR-11623 for more information.", handler == null ? null : handler.getClass().getName());
}
/*