Changeset fc5f5b in indico

Timestamp:

08/08/11 12:08:32 (22 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

ca8a8d

Parents:

89502b

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (06/20/11 12:24:09)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/08/11 12:08:32)

Message:

[FIX] Inconsistency domain protection and key

• Checks before the key and after, the domain protection.
• Closes #349.

File:

• indico/MaKaC/conference.py (modified) (2 diffs)

indico/MaKaC/conference.py

@@ -3789 +3789 @@
             not restricted.
         """
-
         # Allow harvesters (Invenio, offline cache) to access
         # protected pages
@@ -3795 +3794 @@
             return True
         #####################################################
-
-        if not self.canIPAccess(aw.getIP()) and not self.canUserModify(aw.getUser()) and not self.isAllowedToAccess( aw.getUser() ):
+        if self.getAccessKey()!= "":
+            if self.canKeyAccess( aw ) and not self.canUserModify(aw.getUser()) and not self.isAllowedToAccess( aw.getUser() ):
+                return False
+        elif not self.canIPAccess(aw.getIP()) and not self.canUserModify(aw.getUser()) and not self.isAllowedToAccess( aw.getUser() ):
             return False
         if not self.isProtected():
             return True
-        flag = self.isAllowedToAccess( aw.getUser() )
-        return flag or self.canKeyAccess( aw )
+        return self.isAllowedToAccess( aw.getUser() )
 
     def canKeyAccess( self, aw, key=None ):