Changeset 2f6820c

Timestamp:

May 28, 2010 3:40:47 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

2c1fd21

Parents:

5bf359d

Message:

Explicit access attributes in the format

File:

• fedd/federation/access.py (modified) (4 diffs)

fedd/federation/access.py

@@ -129 +129 @@
         """
         Read an access DB with filename config  of the form:
-            (id, id, id) -> something
-        where the ids can be fedids, strings, or <any> or <none> and somthing
-        is any set of charcters.  The hash self.access is populated with
-        mappings from those triples to the results of access_obj being called
-        on the remainder of the line.  If access_obj is not given, the string
-        itself is entered in the hash.  Additionally, a triple with <any> and
-        <none> mapped to None is entered in self.auth with the attribute
-        "access".
+            (id, id, id) -> attribute, something
+        where the ids can be fedids, strings, or <any> or <none>, attribute is
+        the attribute to assign , and something is any set of charcters.  The
+        hash self.access is populated with mappings from those triples to the
+        results of access_obj being called on the remainder of the line (if
+        present).  If access_obj is not given, the string itself is entered in
+        the hash.  Additionally, a triple with <any> and <none> mapped to None
+        is entered in self.auth with the attribute given.
 
         Parsing errors result in a self.parse_error exception being raised.
@@ -146 +146 @@
         key_name = "(<ANY>|<NONE>|"+fedid_expr + "|"+ name_expr + ")"
         access_re = re.compile('\('+key_name+'\s*,\s*'+key_name+'\s*,\s*'+
-                key_name+'\s*\)\s*->\s*(.*)', re.IGNORECASE)
+                key_name+'\s*\)\s*->\s*([^,]+)\s*(.*)', re.IGNORECASE)
 
         def parse_name(n):
@@ -158 +158 @@
             else:
                 return n
+        def strip_comma(s):
+            s = s.strip()
+            if s.startswith(','):
+                s = s[1:].strip()
+            return s
 
         if access_obj is None:
@@ -175 +180 @@
                     access_key = tuple([ parse_name(x) \
                             for x in m.group(1,2,3)])
+                    attribute = m.group(4)
                     auth_key = tuple([ auth_name(x) for x in access_key])
-                    access_val = access_obj(m.group(4))
-
-                    self.access[access_key] = access_val
-                    self.auth.set_attribute(auth_key, "access")
+                    self.auth.set_attribute(auth_key, attribute)
+                    if len(m.group(5)) > 0:
+                        access_val = access_obj(strip_comma(m.group(5)))
+                        self.access[access_key] = access_val
                     continue