svn commit: r1684299 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/security/AuthorizationContext.java core/src/java/org/apache/solr/servlet/HttpSolrCall.java

[an...@apache.org]

Author: anshum
Date: Tue Jun  9 00:29:27 2015
New Revision: 1684299

URL: http://svn.apache.org/r1684299
Log:
SOLR-7648: Expose remote IP and Host via the AuthorizationContext to be used by the authorization plugin.

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1684299&r1=1684298&r2=1684299&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Jun  9 00:29:27 2015
@@ -174,6 +174,12 @@ Bug Fixes
 * SOLR-7588: Fix javascript bug introduced by SOLR-7409 that breaks the
   dataimport screen in the admin UI. (Bill Bell via Shawn Heisey)
 
+Other Changes
+----------------------
+
+* SOLR-7648: Expose remote IP and Host via the AuthorizationContext to be used by the authorization plugin.
+  (Ishan Chattopadhyaya via Anshum Gupta)
+
 ==================  5.2.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java?rev=1684299&r1=1684298&r2=1684299&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java Tue Jun  9 00:29:27 2015
@@ -44,6 +44,10 @@ public abstract class AuthorizationConte
   
   public abstract Enumeration getHeaderNames();
 
+  public abstract String getRemoteAddr();
+
+  public abstract String getRemoteHost();
+
   public abstract List<CollectionRequest> getCollectionRequests() ;
   
   public abstract RequestType getRequestType();

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java?rev=1684299&r1=1684298&r2=1684299&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java Tue Jun  9 00:29:27 2015
@@ -50,6 +50,7 @@ import java.util.Set;
  * limitations under the License.
  */
 
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -982,6 +983,16 @@ public class HttpSolrCall {
         response.append("], Path: [").append(resource).append("]");
         return response.toString();
       }
+
+      @Override
+      public String getRemoteAddr() {
+        return getReq().getRemoteAddr();
+      }
+
+      @Override
+      public String getRemoteHost() {
+        return getReq().getRemoteHost();
+      }
     };
 
   }