oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move admin_commands to class variable

Browse source
This commit is contained in:
shortcutme 2017-01-22 11:08:41 +01:00
parent 50acc6b55f
commit b6644887bd
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Ui/UiWebsocket.py
View file

@ -32,6 +32,11 @@ class UiWebsocket(object):
self.channels = [] # Channels joined to self.channels = [] # Channels joined to
self.sending = False # Currently sending to client self.sending = False # Currently sending to client
self.send_queue = [] # Messages to send to client self.send_queue = [] # Messages to send to client
self.admin_commands = (
"sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteClone",
"channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "certSet", "configSet",
"actionPermissionAdd", "actionPermissionRemove"
)
# Start listener loop # Start listener loop
def start(self): def start(self):
@ -160,15 +165,9 @@ class UiWebsocket(object):
params = req.get("params") params = req.get("params")
self.permissions = self.getPermissions(req["id"]) self.permissions = self.getPermissions(req["id"])
admin_commands = (
"sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteClone",
"channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "certSet", "configSet",
"actionPermissionAdd", "actionPermissionRemove"
)
if cmd == "response": # It's a response to a command if cmd == "response": # It's a response to a command
return self.actionResponse(req["to"], req["result"]) return self.actionResponse(req["to"], req["result"])
elif cmd in admin_commands and "ADMIN" not in self.permissions: # Admin commands elif cmd in self.admin_commands and "ADMIN" not in self.permissions: # Admin commands
return self.response(req["id"], {"error": "You don't have permission to run %s" % cmd}) return self.response(req["id"], {"error": "You don't have permission to run %s" % cmd})
else: # Normal command else: # Normal command
func_name = "action" + cmd[0].upper() + cmd[1:] func_name = "action" + cmd[0].upper() + cmd[1:]