Changeset b6a6206 for fedd/fedd_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/fedd_to_abac.py (modified) (3 diffs)

fedd/fedd_to_abac.py

@@ -65 +65 @@
     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/_-]*'
     single_re = re.compile('\s*%s\s*->\s*(%s)' % (fedid_str, id_str))
     double_re = re.compile('\s*%s\s*->\s*\((%s)\s*,\s*(%s)\)' % \
@@ -109 +109 @@
                     (creds_dir or 'new_cert_dir', id.name, i)
 
-            cid = Creddy.ID(cert)
-            cid.load_privkey(key)
-            cattr = Creddy.Attribute(cid, r, 3600 * 24 * 365 * 10)
-            cattr.principal(k)
 
             if debug:
@@ -118 +114 @@
                         (cert, key, r, k, cf)
             else:
+                cid = Creddy.ID(cert)
+                cid.load_privkey(key)
+                cattr = Creddy.Attribute(cid, r, 3600 * 24 * 365 * 10)
+                cattr.principal(k)
                 cattr.bake()
                 cattr.write_name(cf)