Changeset 0f06528

Timestamp:

Feb 20, 2010 12:44:34 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

617592b

Parents:

39ee3cc

Message:

Convert to useing credential strings

File:

• fedd/federation/dragon_access.py (modified) (1 diff)

fedd/federation/dragon_access.py

@@ -309 +309 @@
         rp = access_project(None, ())
         ru = None
-
-        if req.has_key('project'):
-            p = req['project']
-            if p.has_key('name'):
-                project = unpack_id(p['name'])
-            user = self.get_users(p)
-        else:
-            user = self.get_users(req)
+        user_re = re.compile("user:\s(.*)")
+        project_re = re.compile("project:\s(.*)")
+
+        user = [ user_re.findall(x)[0] for x in req.get('credential', []) \
+                if user_re.match(x)]
+        project = [ project_re.findall(x)[0] \
+                for x in req.get('credential', []) \
+                    if project_re.match(x)]
+
+        if len(project) == 1: project = project[0]
+        elif len(project) == 0: project = None
+        else: 
+            raise service_error(service_error.req, 
+                    "More than one project credential")
+
 
         user_fedids = [ u for u in user if isinstance(u, fedid)]
+
         # Determine how the caller is representing itself.  If its fedid shows
         # up as a project or a singleton user, let that stand.  If neither the