Changeset b6a6206 for fedd/access_to_abac.py

Timestamp:

Oct 6, 2011 3:58:02 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

3df9b33

Parents:

2933343 (diff), f3898f7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://fedd.deterlab.net/fedd

File:

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

fedd/access_to_abac.py

@@ -82 +82 @@
     '''
     right_side_str = '\s*,\s*\(\s*%s\s*,\s*%s\s*,\s*%s\s*\)' % \
-            (id_same_str, id_same_str,id_same_str)
+            (proj_same_str, id_same_str,id_same_str)
 
     m = re.match(right_side_str, l)
@@ -319 +319 @@
 fedid_str = 'fedid:([0-9a-fA-F]{40})'
 id_str = '[a-zA-Z][\w_-]*'
+proj_str = '[a-zA-Z][\w_/-]*'
 path_str = '[a-zA-Z_/\.-]+'
 id_any_str = '(%s|<any>)' % id_str
+proj_any_str = '(%s|<any>)' % proj_str
 id_same_str = '(%s|<same>)' % id_str
+proj_same_str = '(%s|<same>)' % proj_str
 left_side_str = '\(\s*%s\s*,\s*%s\s*,\s*%s\s*\)' % \
-        (fedid_str, id_any_str, id_any_str)
+        (fedid_str, proj_any_str, id_any_str)
 right_side_str = '(%s)(\s*,\s*\(.*\))?' % (id_str)
 line_re = re.compile('%s\s*->\s*%s' % (left_side_str, right_side_str))