incubator-connectors-commits mailing list archives

Author: kwright
Date: Thu Jan  6 17:47:56 2011
New Revision: 1055960

URL: http://svn.apache.org/viewvc?rev=1055960&view=rev
Log:
Fix for CONNECTORS-130.  Block the Solr output connector from accepting documents that have
folder security enabled.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1055960&r1=1055959&r2=1055960&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu Jan  6 17:47:56 2011
@@ -3,6 +3,10 @@ $Id$
 
 ==================  0.2-dev ==================
 
+CONNECTORS-130: Block the Solr output connector from accepting documents
+that have folder-level security.
+(Karl Wright)
+
 CONNECTORS-129: Add an API reset/outputconnections/xxx command, to 
 forget the index state for an output connection.
 (Karl Wright)

Modified: incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1055960&r1=1055959&r2=1055960&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
(original)
+++ incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Thu Jan  6 17:47:56 2011
@@ -266,6 +266,10 @@ public class HttpPoster
     if (Logging.ingest.isDebugEnabled())
       Logging.ingest.debug("indexPost(): '" + documentURI + "'");
 
+    // The SOLR connector cannot deal with folder-level security at this time.  If they are
seen, reject the document.
+    if (document.countDirectoryACLs() != 0)
+      return false;
+    
     // Convert the incoming acls to qualified forms
     String[] shareAcls = convertACL(document.getShareACL(),authorityNameString,activities);
     String[] shareDenyAcls = convertACL(document.getShareDenyACL(),authorityNameString,activities);