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

Use current user cert to query file rules for non-existent files

Browse source
This commit is contained in:
shortcutme 2018-03-29 02:41:30 +02:00
parent 049d326836
commit 0c985a5fda
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Ui/UiWebsocket.py
View file

@ -645,12 +645,23 @@ class UiWebsocket(object):
return self.response(to, {"error": str(err)}) return self.response(to, {"error": str(err)})
return self.response(to, "ok") return self.response(to, "ok")
def actionFileRules(self, to, inner_path): def actionFileRules(self, to, inner_path, use_my_cert=False, content=None):
rules = self.site.content_manager.getRules(inner_path) if not content: # No content defined by function call
if inner_path.endswith("content.json") and rules:
content = self.site.content_manager.contents.get(inner_path) content = self.site.content_manager.contents.get(inner_path)
if not content: # File not created yet
cert = self.user.getCert(self.site.address)
if cert and cert["auth_address"] in self.site.content_manager.getValidSigners(inner_path):
# Current selected cert if valid for this site, add it to query rules
content = {}
content["cert_auth_type"] = cert["auth_type"]
content["cert_user_id"] = self.user.getCertUserId(self.site.address)
content["cert_sign"] = cert["cert_sign"]
rules = self.site.content_manager.getRules(inner_path, content)
if inner_path.endswith("content.json") and rules:
if content: if content:
rules["current_size"] = len(json.dumps(content)) + sum([file["size"] for file in content["files"].values()]) rules["current_size"] = len(json.dumps(content)) + sum([file["size"] for file in content.get("files", {}).values()])
else: else:
rules["current_size"] = 0 rules["current_size"] = 0
return self.response(to, rules) return self.response(to, rules)