Changeset abb87eb for fedd/fedd_access.py

Timestamp:

Oct 17, 2008 9:52:04 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

4700b3b

Parents:

3925b50

Message:

split acces to service and experiment access

File:

• fedd/fedd_access.py (modified) (1 diff)

fedd/fedd_access.py

@@ -435 +435 @@
                             "Access denied (nodetypes %s)" % \
                             str(', ').join(inaccessible))
-
-            ssh = [ x['sshPubkey'] \
-                    for x in req['access'] if x.has_key('sshPubkey')]
+            # XXX: This allocates a single user for both service and creation.
+            # This needs to be made more nuanced.
+            tmp_ssh = [ x['sshPubkey'] \
+                    for x in req['serviceAccess'] + req['createAccess'] \
+                        if x.has_key('sshPubkey')]
+
+            # Converting to a set collapses duplicates
+            ssh = set(tmp_ssh)
 
             if len(ssh) > 0: