svn keywords

[plcapi.git] / PLC / Methods / UpdateKey.py

diff --git a/PLC/Methods/UpdateKey.py b/PLC/Methods/UpdateKey.py
index e269a99..1294fc0 100644 (file)
--- a/PLC/Methods/UpdateKey.py
+++ b/PLC/Methods/UpdateKey.py
@@ -1,56 +1,57 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Keys import Key, Keys
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
+
+can_update = lambda (field, value): field in \
+             ['key_type', 'key']
 
 class UpdateKey(Method):
     """
     Updates the parameters of an existing key with the values in
     key_fields.
 
-    Non admins may only update their own keys.
+    Non-admins may only update their own keys.
 
     Returns 1 if successful, faults otherwise.
     """
 
     roles = ['admin', 'pi', 'tech', 'user']
 
-    can_update = lambda (field, value): field in \
-                 ['key_type', 'key', 'is_blacklisted', 'is_primary']
-    update_fields = dict(filter(can_update, Key.fields.items()))
+    key_fields = dict(filter(can_update, Key.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Key.fields['key_id'],
-        update_fields
+        key_fields
         ]
 
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, key_id, key_fields):
-        
-       valid_fields = self.update_fields
-       # Remove admin only fields
-        if 'admin' not in self.caller['roles']:
-                for key in ['is_blacklisted']:
-                        valid_fields.remove(key)
-
-       # Make sure only valid fields are specified
-       if filter(lambda field: field not in valid_fields, key_fields):
-            raise PLCInvalidArgument, "Invalid field specified"
+        key_fields = dict(filter(can_update, key_fields.items()))
 
-        # Get Key Information
-        keys = Keys(self.api, [key_id]).values()
+        # Get key information
+        keys = Keys(self.api, [key_id])
         if not keys:
             raise PLCInvalidArgument, "No such key"
         key = keys[0]
 
+        if key['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local key"
+
         if 'admin' not in self.caller['roles']:
             if key['key_id'] not in self.caller['key_ids']:
-                raise PLCPermissionDenied, "Key must be associated with one of your account"
+                raise PLCPermissionDenied, "Key must be associated with one of your accounts"
 
         key.update(key_fields)
         key.sync()
-
+       
+       # Logging variables
+       self.event_objects = {'Key': [key['key_id']]}
+       self.message = 'key %d updated: %s' % \
+               (key['key_id'], ", ".join(key_fields.keys()))
         return 1