Changeset 9cce15a

Timestamp:

Sep 13, 2010 9:51:35 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

5a721ed

Parents:

5c0d244

Message:

small changes

File:

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

fedd/access_to_abac.py

@@ -45 +45 @@
             else:
                 raise parse_error("Project cannot be decisively mapped: %s" % l)
-                return False
         if user == '<same>':
             if gu is not None:
@@ -51 +50 @@
             else:
                 raise parse_error("User cannot be decisively mapped: %s" % l)
-                return False
         if project and user:
             a = 'project_%s_user_%s' % (project, user)
@@ -60 +58 @@
         else:
             raise parse_error("No mapping for %s/%s!?" % (gp, gu))
-            return False
 
         c = credential(me, a, 
@@ -67 +64 @@
         if a in to_id: to_id[a].append(c)
         else: to_id[a] = [ c ]
-        return True
     else:
         raise parse_error("Badly formatted local mapping: %s" % l)
-        return False
 
 
@@ -85 +80 @@
         if repo in to_id: to_id[repo].append(c)
         else: to_id[repo] = [ c ]
-        return True
     else:
         raise parse_error("Badly formatted local mapping: %s" % l)
-        return False
+
+parse_skel = parse_dragon
+
+def parse_internal(l, creds, me, to_id, p, gp, gu): pass
 
 
 class access_opts(OptionParser):
-    mappers = { 'emulab': parse_emulab, 'dragon': parse_dragon }
+    mappers = { 
+            'emulab': parse_emulab, 
+            'dragon': parse_dragon,
+            'internal': parse_internal,
+            'skel': parse_skel,
+            }
 
     @staticmethod
@@ -120 +122 @@
 comment_re = re.compile('^\s*#|^$')
 fedid_str = 'fedid:([0-9a-fA-F]{40})'
-id_str = '[a-zA-Z][\w-]*'
+id_str = '[a-zA-Z][\w_-]*'
 id_any_str = '(%s|<any>)' % id_str
 id_same_str = '(%s|<same>)' % id_str