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

Formatting for better readability

Browse source
This commit is contained in:
shortcutme 2019-08-02 16:06:22 +02:00
parent 3e97c154a0
commit be742c78e7
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/ContentFilter/ContentFilterPlugin.py
View file

@ -56,9 +56,10 @@ class UiWebsocketPlugin(object):
if "ADMIN" in self.getPermissions(to): if "ADMIN" in self.getPermissions(to):
self.cbMuteRemove(to, auth_address) self.cbMuteRemove(to, auth_address)
else: else:
cert_user_id = html.escape(filter_storage.file_content["mutes"][auth_address]["cert_user_id"])
self.cmd( self.cmd(
"confirm", "confirm",
[_["Unmute <b>%s</b>?"] % html.escape(filter_storage.file_content["mutes"][auth_address]["cert_user_id"]), _["Unmute"]], [_["Unmute <b>%s</b>?"] % cert_user_id, _["Unmute"]],
lambda res: self.cbMuteRemove(to, auth_address) lambda res: self.cbMuteRemove(to, auth_address)
) )
@ -180,7 +181,7 @@ class SiteStoragePlugin(object):
@PluginManager.registerTo("UiRequest") @PluginManager.registerTo("UiRequest")
class UiRequestPlugin(object): class UiRequestPlugin(object):
def actionWrapper(self, path, extra_headers=None): def actionWrapper(self, path, extra_headers=None):
match = re.match("/(?P<address>[A-Za-z0-9\._-]+)(?P<inner_path>/.*|$)", path) match = re.match(r"/(?P<address>[A-Za-z0-9\._-]+)(?P<inner_path>/.*|$)", path)
if not match: if not match:
return False return False
address = match.group("address") address = match.group("address")

6
plugins/Cors/CorsPlugin.py
View file

@ -32,7 +32,11 @@ class UiWebsocketPlugin(object):
if super(UiWebsocketPlugin, self).hasSitePermission(address, cmd=cmd): if super(UiWebsocketPlugin, self).hasSitePermission(address, cmd=cmd):
return True return True
if not "Cors:%s" % address in self.site.settings["permissions"] or cmd not in ["fileGet", "fileList", "dirList", "fileRules", "optionalFileInfo", "fileQuery", "dbQuery", "userGetSettings", "siteInfo"]: allowed_commands = [
"fileGet", "fileList", "dirList", "fileRules", "optionalFileInfo",
"fileQuery", "dbQuery", "userGetSettings", "siteInfo"
]
if not "Cors:%s" % address in self.site.settings["permissions"] or cmd not in allowed_commands:
return False return False
else: else:
return True return True