git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PLC.Shell class
[plcapi.git]
/
PLC
/
Methods
/
UpdateKey.py
diff --git
a/PLC/Methods/UpdateKey.py
b/PLC/Methods/UpdateKey.py
index
7aa21cc
..
15a01ce
100644
(file)
--- a/
PLC/Methods/UpdateKey.py
+++ b/
PLC/Methods/UpdateKey.py
@@
-2,7
+2,10
@@
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Keys import Key, Keys
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):
"""
class UpdateKey(Method):
"""
@@
-16,35
+19,35
@@
class UpdateKey(Method):
roles = ['admin', 'pi', 'tech', 'user']
roles = ['admin', 'pi', 'tech', 'user']
- can_update = lambda (field, value): field in \
- ['key_type', 'key']
- update_fields = dict(filter(can_update, Key.fields.items()))
+ key_fields = dict(filter(can_update, Key.fields.items()))
accepts = [
accepts = [
-
Password
Auth(),
+ Auth(),
Key.fields['key_id'],
Key.fields['key_id'],
-
update
_fields
+
key
_fields
]
returns = Parameter(int, '1 if successful')
def call(self, auth, key_id, key_fields):
]
returns = Parameter(int, '1 if successful')
def call(self, auth, key_id, key_fields):
- # Make sure only valid fields are specified
- if filter(lambda field: field not in self.update_fields, key_fields):
- raise PLCInvalidArgument, "Invalid field specified"
+ key_fields = dict(filter(can_update, key_fields.items()))
# Get key information
# Get key information
- keys = Keys(self.api, [key_id])
.values()
+ keys = Keys(self.api, [key_id])
if not keys:
raise PLCInvalidArgument, "No such key"
key = keys[0]
if not keys:
raise PLCInvalidArgument, "No such key"
key = keys[0]
+ PLCCheckLocalKey(key,"UpdateKey")
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 accounts"
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 accounts"
- assert key['person_id'] == self.caller['person_id']
key.update(key_fields)
key.sync()
key.update(key_fields)
key.sync()
-
+
+ # Logging variables
+ self.object_ids = [key['key_id']]
+ self.message = 'key %d updated: %s' % \
+ (key['key_id'], ", ".join(key_fields.keys()))
return 1
return 1