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
====
[plcapi.git]
/
PLC
/
Methods
/
BlacklistKey.py
diff --git
a/PLC/Methods/BlacklistKey.py
b/PLC/Methods/BlacklistKey.py
index
27339ec
..
2afd664
100644
(file)
--- a/
PLC/Methods/BlacklistKey.py
+++ b/
PLC/Methods/BlacklistKey.py
@@
-2,7
+2,7
@@
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
Password
Auth
+from PLC.Auth import Auth
class BlacklistKey(Method):
"""
class BlacklistKey(Method):
"""
@@
-18,24
+18,25
@@
class BlacklistKey(Method):
roles = ['admin']
accepts = [
roles = ['admin']
accepts = [
-
Password
Auth(),
+ Auth(),
Key.fields['key_id'],
]
returns = Parameter(int, '1 if successful')
Key.fields['key_id'],
]
returns = Parameter(int, '1 if successful')
-
- event_type = 'Update'
- object_type = 'Key'
- object_ids = []
def call(self, auth, key_id):
# Get associated key details
def call(self, auth, key_id):
# Get associated key details
- 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]
+ # N.B.: Can blacklist any key, even foreign ones
+
key.blacklist()
key.blacklist()
- self.object_ids = [key['key_id']]
+
+ # Logging variables
+ self.event_objects = {'Key': [key['key_id']]}
+ self.message = 'Key %d blacklisted' % key['key_id']
return 1
return 1