Author: kwright
Date: Thu Sep 11 20:31:55 2014
New Revision: 1624384
URL: http://svn.apache.org/r1624384
Log:
Fix issues with acls, part of CONNECTORS-977
Modified:
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
Modified:
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1624384&r1=1624383&r2=1624384&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
(original)
+++
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
Thu Sep 11 20:31:55 2014
@@ -1447,6 +1447,7 @@ public class DCTM extends org.apache.man
}
// Handle the forced acls
+ String[] denyAcls = new String[]{denyToken};
String[] acls = sDesc.getAcls();
if (acls != null && acls.length == 0)
{
@@ -1457,18 +1458,17 @@ public class DCTM extends org.apache.man
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("DCTM: Processing document (" + objName
+ ") with ACL=" + strarrACL[0] + " and size=" + object.getContentSize() + "
bytes.");
rval.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,strarrACL);
+
rval.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAcls);
}
else if (acls != null)
{
rval.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,acls);
+
rval.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAcls);
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("DCTM: Processing document (" + objName
+ ") with size=" + object.getContentSize() + " bytes.");
}
- String[] denyAcls = new String[]{denyToken};
-
rval.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAcls);
-
uri = convertToURI(object.getObjectId(),contentType);
}
finally
Modified:
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java?rev=1624384&r1=1624383&r2=1624384&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
Thu Sep 11 20:31:55 2014
@@ -935,10 +935,12 @@ public class DropboxRepositoryConnector
// content ingestion
RepositoryDocument rd = new RepositoryDocument();
- rd.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,acls);
- String[] denyAclArray = new String[]{defaultAuthorityDenyToken};
-
rd.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAclArray);
-
+ if (acls.length > 0) {
+
rd.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,acls);
+ String[] denyAclArray = new String[]{defaultAuthorityDenyToken};
+
rd.setSecurityDenyACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,denyAclArray);
+ }
+
// Length in bytes
long fileLength = dropboxObject.bytes;
//documentURI
