Changeset f77a256 for fedd/access_to_abac.py

Timestamp:

Jan 11, 2012 4:02:07 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

6886c5a

Parents:

ee950c2

Message:

DETER plugin can act as users now

File:

• fedd/access_to_abac.py (modified) (4 diffs)

fedd/access_to_abac.py

@@ -71 +71 @@
 #  All the local parsing functions get the unparsed remainder of the line
 #  (after the three-name and the attribute it maps to), the credential list to
-#  add the new ABAC credential(s) that will be mapped into the loacl
+#  add the new ABAC credential(s) that will be mapped into the local
 #  credentials, the fedid of this entity, a dict mapping the local credentials
 #  to ABAC credentials that are required to exercise those local rights and the
@@ -77 +77 @@
 def parse_emulab(l, creds, me, to_id, p, gp, gu, lr):
     '''
-    Parse the emulab (project, allocation_user, access_user) format.  Access
-    users are deprecates and allocation users used for both.  This fuction
-    collapses them.
-    '''
-    right_side_str = '\s*,\s*\(\s*%s\s*,\s*%s\s*,\s*%s\s*\)' % \
-            (proj_same_str, id_same_str,id_same_str)
+    Parse the emulab (project, allocation_user, cert_file) format. 
+    '''
+    right_side_str = '\s*,\s*\(\s*%s\s*,\s*%s\s*,\s*(%s)\s*\)' % \
+            (proj_same_str, id_same_str,path_str)
 
     m = re.match(right_side_str, l)
     if m:
-        project, user = m.group(1,2)
+        project, user, cert = m.group(1,2,3)
         # Resolve "<same>"s in project and user
         if project == '<same>':
@@ -114 +112 @@
                 [attribute(p, x, lr) for x in (gp, gu) if x is not None])
         creds.add(c)
-        if (project, user) in to_id: to_id[(project,user)].append(c)
-        else: to_id[(project,user)] = [ c ]
+        if (project, user,cert) in to_id: to_id[(project,user,cert)].append(c)
+        else: to_id[(project,user,cert)] = [ c ]
     else:
         raise parse_error("Badly formatted local mapping: %s" % l)
@@ -320 +318 @@
 id_str = '[a-zA-Z][\w_-]*'
 proj_str = '[a-zA-Z][\w_/-]*'
-path_str = '[a-zA-Z_/\.-]+'
+path_str = '[a-zA-Z0-9_/\.-]+'
 id_any_str = '(%s|<any>)' % id_str
 proj_any_str = '(%s|<any>)' % proj_str