Author: kwright
Date: Mon Apr 5 23:57:12 2010
New Revision: 930987
URL: http://svn.apache.org/viewvc?rev=930987&view=rev
Log:
Use a standard 'deny' token for all authorities which use one, and change all connectors to
match.
Modified:
incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/AuthorityConnector.java
incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/DCTM.java
incubator/lcf/trunk/modules/connectors/filenet/connector/org/apache/lcf/crawler/connectors/filenet/FilenetConnector.java
incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java
incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java
incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java
incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java
incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java
incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java
incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java
incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/RSSConnector.java
incubator/lcf/trunk/modules/connectors/sharepoint/connector/org/apache/lcf/crawler/connectors/sharepoint/SharePointRepository.java
incubator/lcf/trunk/modules/connectors/webcrawler/connector/org/apache/lcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
Modified: incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/AuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/AuthorityConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/AuthorityConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/AuthorityConnector.java
Mon Apr 5 23:57:12 2010
@@ -51,7 +51,7 @@ public class AuthorityConnector extends
// Documentum has no "deny" tokens, and its document acls cannot be empty, so no local
authority deny token is required.
// However, it is felt that we need to be suspenders-and-belt, so here is the deny token.
// The documentum tokens are of the form xxx:yyy, so they cannot collide with the standard
deny token.
- protected static final String denyToken = "MC_DEAD_AUTHORITY";
+ protected static final String denyToken = "DEAD_AUTHORITY";
protected static final AuthorizationResponse unreachableResponse = new AuthorizationResponse(new
String[]{denyToken},AuthorizationResponse.RESPONSE_UNREACHABLE);
protected static final AuthorizationResponse userNotFoundResponse = new AuthorizationResponse(new
String[]{denyToken},AuthorizationResponse.RESPONSE_USERNOTFOUND);
Modified: incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/DCTM.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/DCTM.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/DCTM.java
(original)
+++ incubator/lcf/trunk/modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/DCTM.java
Mon Apr 5 23:57:12 2010
@@ -60,13 +60,10 @@ public class DCTM extends org.apache.lcf
protected static final long timeToRelease = 300000L;
- /** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
-
- // Documentum has no "deny" tokens, and its document acls cannot be empty, so no local
authority deny token is required.
- // However, it is felt that we need to be suspenders-and-belt, so here is the deny token.
- // The documentum tokens are of the form xxx:yyy, so they cannot collide with the standard
deny token.
- private static final String denyToken = "MC_DEAD_AUTHORITY";
+ /** Documentum has no "deny" tokens, and its document acls cannot be empty, so no local
authority deny token is required.
+ * However, it is felt that we need to be suspenders-and-belt, so here is the deny token.
+ * The documentum tokens are of the form xxx:yyy, so they cannot collide with the standard
deny token. */
+ private static final String denyToken = "DEAD_AUTHORITY";
protected class GetSessionThread extends Thread
{
@@ -1235,11 +1232,7 @@ public class DCTM extends org.apache.lcf
forcedAclString.append('+');
java.util.Arrays.sort(acls);
packList(forcedAclString,acls,'+');
- // KDW: Added 4/21/2008 to allow AD authority failure to disable documents with forced
acls
- if (usesDefaultAuthority)
- pack(forcedAclString,defaultAuthorityDenyToken,'+');
- else
- pack(forcedAclString,denyToken,'+');
+ pack(forcedAclString,denyToken,'+');
}
else
forcedAclString.append('-');
Modified: incubator/lcf/trunk/modules/connectors/filenet/connector/org/apache/lcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filenet/connector/org/apache/lcf/crawler/connectors/filenet/FilenetConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filenet/connector/org/apache/lcf/crawler/connectors/filenet/FilenetConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/filenet/connector/org/apache/lcf/crawler/connectors/filenet/FilenetConnector.java
Mon Apr 5 23:57:12 2010
@@ -102,7 +102,7 @@ public class FilenetConnector extends or
protected String docURIPrefix = null;
/** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
+ private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
protected class GetSessionThread extends Thread
{
Modified: incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/connector/org/apache/lcf/crawler/connectors/sharedrive/SharedDriveConnector.java
Mon Apr 5 23:57:12 2010
@@ -93,7 +93,7 @@ public class SharedDriveConnector extend
private NtlmPasswordAuthentication pa;
/** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
+ private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
/** Constructor.
*/
Modified: incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/connector/org/apache/lcf/crawler/connectors/jdbc/JDBCConnector.java
Mon Apr 5 23:57:12 2010
@@ -73,7 +73,7 @@ public class JDBCConnector extends org.a
protected static final String[] activitiesList = new String[]{ACTIVITY_EXTERNAL_QUERY};
/** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
+ private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
protected JDBCConnection connection = null;
protected String jdbcProvider = null;
@@ -395,7 +395,7 @@ public class JDBCConnector extends org.a
// A real version string! Any acls must be added to the front, if they are present...
sb = new StringBuffer();
packList(sb,acls,'+');
- if (acls.length > 0 && usesDefaultAuthority)
+ if (acls.length > 0)
{
sb.append('+');
pack(sb,defaultAuthorityDenyToken,'+');
@@ -546,9 +546,6 @@ public class JDBCConnector extends org.a
if (specAcls == null)
specAcls = getAcls(spec);
accessAcls = specAcls;
- // Note: This should really depend on whether the connection uses the
default AD authority or not, but most of the time
- // this is true. Unfortunately, without an API change, we don't get
the "usesDefaultAuthority" flag passed into
- // processDocuments() at this time; when that is changed, make the following
conditional on that flag being true.
if (specAcls.length != 0)
denyAcls = new String[]{defaultAuthorityDenyToken};
else
Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java
(original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkAuthority.java
Mon Apr 5 23:57:12 2010
@@ -71,7 +71,7 @@ public class LivelinkAuthority extends o
// Livelink does not have "deny" permissions, and there is no such thing as a document
with no tokens, so it is safe to not have a local "deny" token.
// However, people feel that a suspenders-and-belt approach is called for, so this restriction
has been added.
// Livelink tokens are numbers, "SYSTEM", or "GUEST", so they can't collide with the standard
form.
- private static final String denyToken = "MC_DEAD_AUTHORITY";
+ private static final String denyToken = "DEAD_AUTHORITY";
private static final AuthorizationResponse unreachableResponse = new AuthorizationResponse(new
String[]{denyToken},
AuthorizationResponse.RESPONSE_UNREACHABLE);
private static final AuthorizationResponse userNotFoundResponse = new AuthorizationResponse(new
String[]{denyToken},
Modified: incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/livelink/connector/org/apache/lcf/crawler/connectors/livelink/LivelinkConnector.java
Mon Apr 5 23:57:12 2010
@@ -56,12 +56,12 @@ public class LivelinkConnector extends o
private final static String ACTIVITY_FETCH = "fetch document";
/** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "MCADAuthority_MC_DEAD_AUTHORITY";
+ private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
// Livelink does not have "deny" permissions, and there is no such thing as a document
with no tokens, so it is safe to not have a local "deny" token.
// However, people feel that a suspenders-and-belt approach is called for, so this restriction
has been added.
// Livelink tokens are numbers, "SYSTEM", or "GUEST", so they can't collide with the standard
form.
- private static final String denyToken = "MC_DEAD_AUTHORITY";
+ private static final String denyToken = "DEAD_AUTHORITY";
// A couple of very important points.
// First, the canonical document identifier has the following form:
@@ -991,10 +991,7 @@ public class LivelinkConnector extends o
{
// Forced acls
actualAcls = acls;
- if (usesDefaultAuthority)
- denyAcl = defaultAuthorityDenyToken;
- else
- denyAcl = denyToken;
+ denyAcl = defaultAuthorityDenyToken;
}
else
{
Modified: incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java
(original)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexAuthority.java
Mon Apr 5 23:57:12 2010
@@ -55,7 +55,7 @@ public class MemexAuthority extends org.
private final static long CONNECTION_IDLE_INTERVAL = 900000L;
- private static final String globalDenyToken = "MC_DEAD_AUTHORITY";
+ private static final String globalDenyToken = "DEAD_AUTHORITY";
private static final AuthorizationResponse unreachableResponse = new AuthorizationResponse(new
String[]{globalDenyToken},
AuthorizationResponse.RESPONSE_UNREACHABLE);
private static final AuthorizationResponse userNotFoundResponse = new AuthorizationResponse(new
String[]{globalDenyToken},
@@ -241,11 +241,11 @@ public class MemexAuthority extends org.
if (searchHits < 0) {
//If the number of hits is less than zero, something went wrong
Logging.authorityConnectors.warn("Memex: User search hits < 0! ("+Integer.toString(searchHits)+")");
- return new AuthorizationResponse(new String[] {"DEFAULT-DENY"}, AuthorizationResponse.RESPONSE_UNREACHABLE);
+ return new AuthorizationResponse(new String[] {MemexConnector.defaultAuthorityDenyToken},
AuthorizationResponse.RESPONSE_UNREACHABLE);
}else if(searchHits == 0){
if (Logging.authorityConnectors.isDebugEnabled())
Logging.authorityConnectors.debug("Memex: User '"+userName+"' not found");
- return new AuthorizationResponse(new String[] {"DEFAULT-DENY"}, AuthorizationResponse.RESPONSE_USERNOTFOUND);
+ return new AuthorizationResponse(new String[] {MemexConnector.defaultAuthorityDenyToken},
AuthorizationResponse.RESPONSE_USERNOTFOUND);
}else if(searchHits > 1){
//This shouldn't happen - should only be one entry per user
if (Logging.authorityConnectors.isDebugEnabled())
@@ -386,7 +386,7 @@ public class MemexAuthority extends org.
public AuthorizationResponse getDefaultAuthorizationResponse(String userName)
{
// The default response if the getConnection method fails
- return new AuthorizationResponse(new String[] {"DEFAULT-DENY"}, AuthorizationResponse.RESPONSE_UNREACHABLE);
+ return new AuthorizationResponse(new String[] {MemexConnector.defaultAuthorityDenyToken},
AuthorizationResponse.RESPONSE_UNREACHABLE);
}
//////////////////////////////////////////////////////////////////////
Modified: incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/memex/connector/org/apache/lcf/crawler/connectors/memex/MemexConnector.java
Mon Apr 5 23:57:12 2010
@@ -79,7 +79,7 @@ public class MemexConnector extends org.
private final static long CONNECTION_IDLE_INTERVAL = 900000L;
/** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
+ public final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
// Activities that we know about
protected final static String ACTIVITY_SEARCH_AND_DECODE = "search and decode record";
@@ -1055,10 +1055,7 @@ public class MemexConnector extends org.
Logging.connectors.debug("Memex: Record "+urn+" has forced
acls");
aclarray = forcedAcls;
- if (usesDefaultAuthority)
- acldenyarray = new String[]{defaultAuthorityDenyToken};
- else
- acldenyarray = new String[]{"DEFAULT-DENY"};
+ acldenyarray = new String[]{defaultAuthorityDenyToken};
}
// Third decodeable section: acls
Modified: incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/meridio/connector/org/apache/lcf/crawler/connectors/meridio/MeridioConnector.java
Mon Apr 5 23:57:12 2010
@@ -73,8 +73,8 @@ public class MeridioConnector extends or
/** Deny access token for Meridio */
private final static String denyToken = "DEAD_AUTHORITY";
- /** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
+ /** Deny access token for Active Directory, which is what we expect to be in place for
forced acls */
+ private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
private static final long interruptionRetryTime = 60000L;
@@ -625,14 +625,8 @@ public class MeridioConnector extends or
{
decodeableString.append('+');
packList(decodeableString,acls,'+');
- // KDW: Added this 4/21/2008 to handle the relationship with the global authority
- if (usesDefaultAuthority)
- {
- decodeableString.append('+');
- pack(decodeableString,defaultAuthorityDenyToken,'+');
- }
- else
- decodeableString.append('-');
+ decodeableString.append('+');
+ pack(decodeableString,defaultAuthorityDenyToken,'+');
}
// Calculate the part of the version string that comes from path name and mapping.
Modified: incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/RSSConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/RSSConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/RSSConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/rss/connector/org/apache/lcf/crawler/connectors/rss/RSSConnector.java
Mon Apr 5 23:57:12 2010
@@ -212,7 +212,7 @@ public class RSSConnector extends org.ap
public final static String ACTIVITY_ROBOTSPARSE = "robots parse";
/** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
+ private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
/** Constructor.
*/
@@ -919,7 +919,7 @@ public class RSSConnector extends org.ap
sb.append('+');
packList(sb,acls,'+');
- if (acls.length > 0 && usesDefaultAuthority)
+ if (acls.length > 0)
{
sb.append('+');
pack(sb,defaultAuthorityDenyToken,'+');
@@ -1151,7 +1151,7 @@ public class RSSConnector extends org.ap
sb.append('+');
packList(sb,acls,'+');
- if (acls.length > 0 && usesDefaultAuthority)
+ if (acls.length > 0)
{
sb.append('+');
pack(sb,defaultAuthorityDenyToken,'+');
Modified: incubator/lcf/trunk/modules/connectors/sharepoint/connector/org/apache/lcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/connector/org/apache/lcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/sharepoint/connector/org/apache/lcf/crawler/connectors/sharepoint/SharePointRepository.java
(original)
+++ incubator/lcf/trunk/modules/connectors/sharepoint/connector/org/apache/lcf/crawler/connectors/sharepoint/SharePointRepository.java
Mon Apr 5 23:57:12 2010
@@ -98,7 +98,7 @@ public class SharePointRepository extend
}
/** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
+ private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
/** Constructor.
*/
Modified: incubator/lcf/trunk/modules/connectors/webcrawler/connector/org/apache/lcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/webcrawler/connector/org/apache/lcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=930987&r1=930986&r2=930987&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/webcrawler/connector/org/apache/lcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/webcrawler/connector/org/apache/lcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
Mon Apr 5 23:57:12 2010
@@ -259,7 +259,7 @@ public class WebcrawlerConnector extends
protected static DataCache cache = new DataCache();
/** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "McAdAuthority_MC_DEAD_AUTHORITY";
+ private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
/** Constructor.
*/
@@ -1126,7 +1126,7 @@ public class WebcrawlerConnector extends
// Acls
packList(sb,acls,'+');
- if (acls.length > 0 && usesDefaultAuthority)
+ if (acls.length > 0)
{
sb.append('+');
pack(sb,defaultAuthorityDenyToken,'+');
|