From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 11 Jan 2007 06:01:55 +0000 (+0000)
Subject: - remove PLCCheckLocal functions, be more explicit about the error in
X-Git-Tag: pycurl-7_13_1~124
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=133617ddd73d0bd52791ff23ac2128134f29fcb2;hp=dec2f6cf93e4320722264e185ae8531c467c4692;p=plcapi.git

- remove PLCCheckLocal functions, be more explicit about the error in
  each method
- redact password from events message
---

diff --git a/PLC/Methods/UpdatePerson.py b/PLC/Methods/UpdatePerson.py
index bdca220a..85c4a71a 100644
--- a/PLC/Methods/UpdatePerson.py
+++ b/PLC/Methods/UpdatePerson.py
@@ -40,9 +40,10 @@ class UpdatePerson(Method):
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
-
         person = persons[0]
-	PLCCheckLocalPerson(person,"UpdatePerson")
+
+        if person['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local account"
 
         # Authenticated function
         assert self.caller is not None
@@ -56,9 +57,13 @@ class UpdatePerson(Method):
 	
 	# Logging variables
 	self.object_ids = [person['person_id']]
-	self.message = 'Person %d updated: %s.' % \
-		(person['person_id'], person_fields.keys())
+
+        # Redact password
+        if 'password' in person_fields:
+            person_fields['password'] = "Removed by API"
+        self.message = 'Person %d updated: %s.' % \
+                       (person['person_id'], person_fields.keys())
 	if 'enabled' in person_fields:
-		self.message += ' Person enabled' 	
+            self.message += ' Person enabled' 	
 
         return 1