Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-12848: SolrJ: HTTP proxy configuration via system properties (#287)

David Smileydf3d8975e0c5
diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy
index 6aabbb66e7f..ed8313f47d3 100644
--- a/gradle/testing/randomization/policies/solr-tests.policy
+++ b/gradle/testing/randomization/policies/solr-tests.policy
@@ -168,6 +168,10 @@ grant {
// used by solr to create sandboxes (e.g. script execution)
permission java.security.SecurityPermission "createAccessControlContext";
+
+ // for Apache HttpClient useSystemProperties
+ permission java.net.NetPermission "getProxySelector";
+ permission java.net.NetPermission "requestPasswordAuthentication";
};
// additional permissions based on system properties set by /bin/solr
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 744c63bdac0..f048534c047 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -150,6 +150,9 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)
* SOLR-15650: Choosing lucene defType in Solr Admin now is passed explicitly through UI, not relying on default solrconfig.xml behavior. (Eric Pugh)
+* SOL4-12848: SolrJ and the server can now recognize some standard Java system properties like
+ for an HTTP proxy. This is only for the Apache HttpClient based SolrJ communication, not Jetty.
+ (Shawn Heisey, David Smiley)
Build
---------------------
diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policy
index cd7ec9d16ef..18e56dfc5f9 100644
--- a/solr/server/etc/security.policy
+++ b/solr/server/etc/security.policy
@@ -172,6 +172,10 @@ grant {
// used by solr to create sandboxes (e.g. script execution)
permission java.security.SecurityPermission "createAccessControlContext";
+
+ // for Apache HttpClient useSystemProperties
+ permission java.net.NetPermission "getProxySelector";
+ permission java.net.NetPermission "requestPasswordAuthentication";
};
// additional permissions based on system properties set by /bin/solr
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
index cdc838199a0..5d69833d71a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
@@ -387,6 +387,7 @@ public class HttpClientUtil {
retBuilder.disableContentCompression();
}
+ retBuilder.useSystemProperties();
return retBuilder;
}