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

Get action permissions from flag db

Browse source
This commit is contained in:
shortcutme 2019-08-26 03:02:30 +02:00
parent adffbd1973
commit ed7a3b2356
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Ui/UiWebsocket.py
View file

@ -18,6 +18,7 @@ from Plugin import PluginManager
from Translate import translate as _ from Translate import translate as _
from util import helper from util import helper
from util import SafeRe from util import SafeRe
from util.Flag import flag
from Content.ContentManager import VerifyError, SignError from Content.ContentManager import VerifyError, SignError
@ -117,9 +118,8 @@ class UiWebsocket(object):
# Has permission to run the command # Has permission to run the command
def hasCmdPermission(self, cmd): def hasCmdPermission(self, cmd):
cmd = cmd[0].lower() + cmd[1:] flags = flag.db.get(self.getCmdFuncName(cmd), ())
if "admin" in flags and "ADMIN" not in self.permissions:
if cmd in self.admin_commands and "ADMIN" not in self.permissions:
return False return False
else: else:
return True return True
@ -205,6 +205,10 @@ class UiWebsocket(object):
gevent.spawn(asyncErrorWatcher, func, *args, **kwargs) gevent.spawn(asyncErrorWatcher, func, *args, **kwargs)
return wrapper return wrapper
def getCmdFuncName(self, cmd):
func_name = "action" + cmd[0].upper() + cmd[1:]
return func_name
# Handle incoming messages # Handle incoming messages
def handleRequest(self, req): def handleRequest(self, req):
@ -214,14 +218,14 @@ class UiWebsocket(object):
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 not self.hasCmdPermission(cmd): # Admin commands
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 = self.getCmdFuncName(cmd)
func = getattr(self, func_name, None) func = getattr(self, func_name, None)
if not func: # Unknown command if not func: # Unknown command
self.response(req["id"], {"error": "Unknown command: %s" % cmd}) return self.response(req["id"], {"error": "Unknown command: %s" % cmd})
return
if not self.hasCmdPermission(cmd): # Admin commands
return self.response(req["id"], {"error": "You don't have permission to run %s" % cmd})
# Execute in parallel # Execute in parallel
if cmd in self.async_commands: if cmd in self.async_commands: