RANGER-5643: address review comments for Solr URL host rewrite

Use URI API for SPNEGO hostname rewrite, clearer variable names, public
test class, and fix site XML description for HTTP/<host>@realm.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ramk

agents-audit/dest-solr/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java

@@ -60,6 +60,7 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -377,48 +378,58 @@ static String resolveSolrUrls(String urls, Properties props, String propPrefix)
             return urls;
         }
 
-        String solrHost = MiscUtil.getStringProperty(props, propPrefix + "." + PROP_SOLR_HOST);
+        String configuredSolrHost = MiscUtil.getStringProperty(props, propPrefix + "." + PROP_SOLR_HOST);
 
-        if (StringUtils.isBlank(solrHost)) {
+        if (StringUtils.isBlank(configuredSolrHost)) {
             return urls;
         }
 
-        solrHost = solrHost.trim();
-        List<String> resolved = new ArrayList<>();
-        boolean      changed  = false;
+        configuredSolrHost = configuredSolrHost.trim();
+        List<String> urlEntries   = MiscUtil.toArray(urls, ",");
+        List<String> resolvedUrls = new ArrayList<>(urlEntries.size());
+        boolean hostRewritten     = false;
 
-        for (String entry : MiscUtil.toArray(urls, ",")) {
-            if (StringUtils.isBlank(entry)) {
+        for (String urlEntry : urlEntries) {
+            if (StringUtils.isBlank(urlEntry)) {
                 continue;
             }
 
-            entry = entry.trim();
+            String trimmedUrl   = urlEntry.trim();
+            String resolvedUrl  = rewriteSolrUrlHostForSpnego(trimmedUrl, configuredSolrHost);
 
-            try {
-                URI uri = URI.create(entry);
+            if (!trimmedUrl.equals(resolvedUrl)) {
+                hostRewritten = true;
+            }
 
-                if (uri.getHost() != null && !uri.getHost().equalsIgnoreCase(solrHost)) {
-                    int    port    = uri.getPort() > 0 ? uri.getPort() : 8983;
-                    String scheme  = StringUtils.isNotBlank(uri.getScheme()) ? uri.getScheme() : "http";
-                    String path    = uri.getRawPath() != null ? uri.getRawPath() : "";
-                    String query   = uri.getRawQuery() != null ? "?" + uri.getRawQuery() : "";
-                    String fragment = uri.getRawFragment() != null ? "#" + uri.getRawFragment() : "";
-                    String updated = scheme + "://" + solrHost + ":" + port + path + query + fragment;
+            resolvedUrls.add(resolvedUrl);
+        }
 
-                    LOG.info("Solr audit URL host rewritten for Kerberos SPNEGO: {} -> {} (configured host={})",
-                            entry, updated, solrHost);
+        return hostRewritten ? String.join(",", resolvedUrls) : urls;
+    }
 
-                    entry   = updated;
-                    changed = true;
-                }
-            } catch (IllegalArgumentException e) {
-                LOG.warn("Unable to parse Solr audit URL [{}]; leaving unchanged", entry, e);
+    private static String rewriteSolrUrlHostForSpnego(String solrUrl, String configuredSolrHost) {
+        try {
+            URI parsedUri    = URI.create(solrUrl);
+            String currentHost = parsedUri.getHost();
+
+            if (currentHost == null || currentHost.equalsIgnoreCase(configuredSolrHost)) {
+                return solrUrl;
             }
 
-            resolved.add(entry);
-        }
+            URI rewrittenUri = new URI(parsedUri.getScheme(), parsedUri.getUserInfo(), configuredSolrHost,
+                    parsedUri.getPort(), parsedUri.getPath(), parsedUri.getQuery(), parsedUri.getFragment());
+
+            String rewrittenUrl = rewrittenUri.toASCIIString();
 
-        return changed ? String.join(",", resolved) : urls;
+            LOG.info("Solr audit URL host rewritten for Kerberos SPNEGO: {} -> {} (configured host={})",
+                    solrUrl, rewrittenUrl, configuredSolrHost);
+
+            return rewrittenUrl;
+        } catch (IllegalArgumentException | URISyntaxException ex) {
+            LOG.warn("Unable to parse Solr audit URL [{}]; leaving unchanged", solrUrl, ex);
+
+            return solrUrl;
+        }
     }
 
     private String resolveSolrUrls(String urls) {

agents-audit/dest-solr/src/test/java/org/apache/ranger/audit/destination/SolrAuditDestinationTest.java

@@ -25,7 +25,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-class SolrAuditDestinationTest {
+public class SolrAuditDestinationTest {
 
     private static final String PROP_PREFIX = AuditProviderFactory.AUDIT_DEST_BASE + ".solr";
 

audit-server/audit-dispatcher/dispatcher-solr/src/main/resources/conf/ranger-audit-dispatcher-solr-site.xml

@@ -125,10 +125,10 @@
     <property>
         <name>xasecure.audit.destination.solr.host</name>
         <value>ranger-solr.rangernw</value>
-        <description>
-            FQDN for Kerberos SPNEGO to Solr (must match HTTP/&lt;host&gt;@REALM).
+        <description><![CDATA[
+            FQDN for Kerberos SPNEGO to Solr (must match HTTP/<host>@REALM).
             Rewrites xasecure.audit.destination.solr.urls hostname when they differ.
-        </description>
+        ]]></description>
     </property>
 
     <property>

dev-support/ranger-docker/scripts/audit-dispatcher/ranger-audit-dispatcher-solr-site.xml

@@ -107,7 +107,10 @@
     <property>
         <name>xasecure.audit.destination.solr.host</name>
         <value>ranger-solr.rangernw</value>
-        <description>FQDN for Kerberos SPNEGO to Solr (rewrites urls hostname when needed)</description>
+        <description><![CDATA[
+            FQDN for Kerberos SPNEGO to Solr (must match HTTP/<host>@REALM).
+            Rewrites xasecure.audit.destination.solr.urls hostname when they differ.
+        ]]></description>
     </property>
 
     <property>