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
merge changes from HEAD
[plcapi.git]
/
PLC
/
Methods
/
UpdateKey.py
diff --git
a/PLC/Methods/UpdateKey.py
b/PLC/Methods/UpdateKey.py
index
19acbe3
..
0fb560b
100644
(file)
--- a/
PLC/Methods/UpdateKey.py
+++ b/
PLC/Methods/UpdateKey.py
@@
-33,16
+33,23
@@
class UpdateKey(Method):
key_fields = dict(filter(can_update, key_fields.items()))
# Get key information
key_fields = dict(filter(can_update, key_fields.items()))
# 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]
+ 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 accounts"
key.update(key_fields)
key.sync()
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"
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
return 1