From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 9 Apr 2009 20:22:39 +0000 (+0000)
Subject: fix bugs
X-Git-Tag: sfa-0.9-0@14641~506
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e38bf20cef6f16d68a3e0a3db370aeb2493f2a41;p=sfa.git

fix bugs
---

diff --git a/geni/methods/get_credential.py b/geni/methods/get_credential.py
index c324a306..888e8b21 100644
--- a/geni/methods/get_credential.py
+++ b/geni/methods/get_credential.py
@@ -49,18 +49,18 @@ class get_credential(Method):
         # (researchers, pis, etc) be filled in
         self.api.fill_record_info(record)
 
-        self.api.auth.verify_cancreate_credential(self.client_cred, record)
+        self.api.auth.verify_cancreate_credential(self.api.auth.client_cred, record)
 
         # TODO: Check permission that self.client_cred can access the object
 
         object_gid = record.get_gid_object()
         new_cred = Credential(subject = object_gid.get_subject())
-        new_cred.set_gid_caller(self.client_gid)
+        new_cred.set_gid_caller(self.api.auth.client_gid)
         new_cred.set_gid_object(object_gid)
         new_cred.set_issuer(key=auth_info.get_pkey_object(), subject=auth_hrn)
         new_cred.set_pubkey(object_gid.get_pubkey())
 
-        rl = determine_rights(type, name)
+        rl = determine_rights(type,hrn)
         new_cred.set_privileges(rl)
 
         # determine the type of credential that we want to use as a parent for
diff --git a/geni/methods/register.py b/geni/methods/register.py
index e103fea3..2bdc7cf3 100644
--- a/geni/methods/register.py
+++ b/geni/methods/register.py
@@ -28,7 +28,7 @@ class register(Method):
     returns = Parameter(int, "String representation of gid object")
     
     def call(self, cred, record_dict):
-        self.decode_authentication(cred, "register")
+        self.api.auth.check(cred, "register")
         record = GeniRecord(dict = record_dict)
         type = record.get_type()
         name = record.get_name()
diff --git a/geni/methods/remove.py b/geni/methods/remove.py
index bf22d71a..6ab3d76a 100644
--- a/geni/methods/remove.py
+++ b/geni/methods/remove.py
@@ -22,14 +22,14 @@ class remove(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Record type")
+        Parameter(str, "Record type"),
         Parameter(str, "Human readable name (hrn) of record to be removed")
         ]
 
     returns = Parameter(int, "1 if successful")
     
     def call(self, cred, type, hrn):
-        self.api.auth.decode_authentication(cred, "remove")
+        self.api.auth.check(cred, "remove")
         self.api.auth.verify_object_permission(hrn)
         auth_name = self.api.auth.get_authority(hrn)
         table = self.api.auth.get_auth_table(auth_name)