Changeset 25bf6cc

Timestamp:

Jul 8, 2012 7:43:41 AM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

df35876

Parents:

b15ecc6

Message:

Grouper updates

File:

• fedd/federation/experiment_control.py (modified) (7 diffs)

fedd/federation/experiment_control.py

@@ -13 +13 @@
 import signal
 import time
+import shutil
+import zipfile
 
 import os.path
@@ -125 +127 @@
         self.store_url = config.get("experiment_control", "store_url")
         self.splitter_url = config.get("experiment_control", "ns2topdl_uri")
+        self.grouper_url = config.get("experiment_control", "grouper_url")
         self.fedkit = parse_tarfile_list(\
                 config.get("experiment_control", "fedkit"))
@@ -183 +186 @@
             self.get_access = self.legacy_get_access
         elif self.auth_type == 'abac':
-            self.auth = abac_authorizer(load=self.auth_dir)
+            self.auth = abac_authorizer(load=self.auth_dir, 
+                    update=os.path.join(self.auth_dir,'update'))
         else:
             raise service_error(service_error.internal, 
@@ -394 +398 @@
         except TypeError, e:
             self.log.error("Pickling problem (TypeError): %s" % e)
+
+    # XXX this may belong somewhere else
+
+    def get_grouper_updates(self, fid):
+        if self.grouper_url is None: return
+        d = tempfile.mkdtemp()
+        try:
+            fstr = "%s" % fid
+            # XXX locking
+            zipname = os.path.join(d, 'grouper.zip')
+            dest = os.path.join(self.auth_dir, 'update')
+            resp = urlopen('%s?uid=%s' % (self.grouper_url, fstr))
+            f = open(zipname, 'w')
+            f.write(resp.read())
+            f.close()
+            zf = zipfile.ZipFile(zipname, 'r')
+            zf.extractall(dest)
+            zf.close()
+        finally:
+            shutil.rmtree(d)
 
 
@@ -1622 +1646 @@
         if not self.auth.import_credentials(data_list=req.get('credential', [])):
             self.log.debug("Failed to import delegation credentials(!)")
+        self.get_grouper_updates(fid)
+        self.auth.update()
         self.auth.save()
 
@@ -2122 +2148 @@
         # Import information from the requester
         # import may partially succeed so always save credentials and warn
-        if not self.auth.import_credentials(data_list=req.get('credential', [])):
+        if not self.auth.import_credentials(data_list=req.get('credential',[])):
             self.log.debug("Failed to import delegation credentials(!)")
+        self.get_grouper_updates(fid)
+        self.auth.update()
         self.auth.save()
 
@@ -2563 +2591 @@
 
         self.log.info("Multi Info call started for %s" %  fid)
+        self.get_grouper_updates(fid)
+        self.auth.update()
+        self.auth.save()
         self.state_lock.acquire()
         for key in [ k for k in self.state.keys() if isinstance(k, fedid)]: