archive-access-cvs Mailing List for Web Archive Access Utilities (Page 40)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2830
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2830&view=rev
Author:   alexoz
Date:     2009-10-23 05:29:09 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
FEATURE: Add convenience methods for checking requests that have multiple groups.

Modified Paths:
--------------
    trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/AccessControlClient.java

Modified: trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/AccessControlClient.java
===================================================================

--- trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/AccessControlClient.java	2009-10-23 05:28:37 UTC (rev 2829)
+++ trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/AccessControlClient.java	2009-10-23 05:29:09 UTC (rev 2830)
@@ -46,6 +46,22 @@
         this(new CachingRuleDao(oracleUrl), new CachingRobotClient());
     }
 
+    private String getPolicy(String url, Rule rule)
+        throws RobotsUnavailableException {
+        if (robotLookupsEnabled && rule != null && "robots".equals(rule.getPolicy())) {
+            try {
+                if (robotClient.isRobotPermitted(url, robotUserAgent)) {
+                    return "allow";
+                } else {
+                    return "block";
+                }
+            } catch (IOException e) {
+                throw new RobotsUnavailableException(e);
+            }
+        }
+        return rule.getPolicy();
+    }
+
     /**
      * Return the best-matching policy for the requested document.
      * 
@@ -63,24 +79,34 @@
      * @throws RuleOracleUnavailableException 
      */
     public String getPolicy(String url, Date captureDate, Date retrievalDate,
-            String who) throws RobotsUnavailableException, RuleOracleUnavailableException {
-        Rule matchingRule = getRule(url, captureDate, retrievalDate, who);
-        
-        if (robotLookupsEnabled && matchingRule != null && "robots".equals(matchingRule.getPolicy())) {
-            try {
-                if (robotClient.isRobotPermitted(url, robotUserAgent)) {
-                    return "allow";
-                } else {
-                    return "block";
-                }
-            } catch (IOException e) {
-                throw new RobotsUnavailableException(e);
-            }
-        }
-        return matchingRule.getPolicy();
+            String who) throws RobotsUnavailableException, 
+                               RuleOracleUnavailableException {
+        return getPolicy(url, getRule(url, captureDate, retrievalDate, who));
     }
 
     /**
+     * Return the best-matching policy for the requested document.
+     * 
+     * @param url
+     *            URL of the requested document.
+     * @param captureDate
+     *            Date the document was archived.
+     * @param retrievalDate
+     *            Date of retrieval (usually now).
+     * @param groups
+     *            Group names of the user accessing the document.
+     * @return Access-control policy that should be enforced. eg "robots",
+     *         "block" or "allow".
+     * @throws RobotsUnavailableException 
+     * @throws RuleOracleUnavailableException 
+     */
+    public String getPolicy(String url, Date captureDate, Date retrievalDate,
+            Collection<String> groups) throws RobotsUnavailableException, 
+                                              RuleOracleUnavailableException {
+        return getPolicy(url, getRule(url, captureDate, retrievalDate, groups));
+    }
+
+    /**
      * Return the most specific matching rule for the requested document.
      * 
      * @param url
@@ -108,7 +134,42 @@
         return matchingRule;
     }
     
+    /**
+     * Return the most specific matching rule for the requested document.
+     * 
+     * @param url
+     *            URL of the requested document.
+     * @param captureDate
+     *            Date the document was archived.
+     * @param retrievalDate
+     *            Date of retrieval (usually now).
+     * @param groups
+     *            Group names of the user accessing the document.
+     * @return
+     * @throws RuleOracleUnavailableException 
+     */
+    public Rule getRule(String url, Date captureDate, Date retrievalDate,
+                        Collection<String> groups) 
+        throws RuleOracleUnavailableException {
+        Rule bestRule = null;
+        for (String who: groups) {
+            Rule rule = getRule(url, captureDate, retrievalDate, who);
+            
+            /* We compare policies not the rules themselves as
+             * a user should have full access to something one of their
+             * groups has access to, even if another group they are
+             * member of does not.
+             */
+            if (bestRule == null || 
+                rule.getPolicyId().compareTo(bestRule.getPolicyId()) < 0) {
+                bestRule = rule;
+            }
+        }
+        return bestRule;
+    }
     
+
+    
     /**
      * This method allows the client to prepare for lookups from a given set of
      * urls. This can warm up a cache and/or enable a mass data transfer to be done in


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2005	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (10)	Sep (36)	Oct (339)	Nov (103)	Dec (152)
2006	Jan (141)	Feb (102)	Mar (125)	Apr (203)	May (57)	Jun (30)	Jul (139)	Aug (46)	Sep (64)	Oct (105)	Nov (34)	Dec (162)
2007	Jan (81)	Feb (57)	Mar (141)	Apr (72)	May (9)	Jun (1)	Jul (144)	Aug (88)	Sep (40)	Oct (43)	Nov (34)	Dec (20)
2008	Jan (44)	Feb (45)	Mar (16)	Apr (36)	May (8)	Jun (77)	Jul (177)	Aug (66)	Sep (8)	Oct (33)	Nov (13)	Dec (37)
2009	Jan (2)	Feb (5)	Mar (8)	Apr	May (36)	Jun (19)	Jul (46)	Aug (8)	Sep (1)	Oct (66)	Nov (61)	Dec (10)
2010	Jan (13)	Feb (16)	Mar (38)	Apr (76)	May (47)	Jun (32)	Jul (35)	Aug (45)	Sep (20)	Oct (61)	Nov (24)	Dec (16)
2011	Jan (22)	Feb (34)	Mar (11)	Apr (8)	May (24)	Jun (23)	Jul (11)	Aug (42)	Sep (81)	Oct (48)	Nov (21)	Dec (20)
2012	Jan (30)	Feb (25)	Mar (4)	Apr (6)	May (1)	Jun (5)	Jul (5)	Aug (8)	Sep (6)	Oct (6)	Nov	Dec

archive-access-cvs Mailing List for Web Archive Access Utilities (Page 40)

archive-access-cvs — CVS commits