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

Don't Fail Silently When Cert is Not Selected

Browse source 
When Site doesn't have cert selected but has userdata, signing userdata fails silently without proper error message
This commit is contained in:
canewsin 2022-06-11 01:18:02 +05:30
parent 016cfe9e16
commit 3ac677c9a7
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Ui/UiWebsocket.py
View file

@ -419,10 +419,15 @@ class UiWebsocket(object):
is_user_content = file_info and ("cert_signers" in file_info or "cert_signers_pattern" in file_info) is_user_content = file_info and ("cert_signers" in file_info or "cert_signers_pattern" in file_info)
if is_user_content and privatekey is None: if is_user_content and privatekey is None:
cert = self.user.getCert(self.site.address) cert = self.user.getCert(self.site.address)
extend["cert_auth_type"] = cert["auth_type"] if not cert:
extend["cert_user_id"] = self.user.getCertUserId(site.address) error = "Site sign failed: No certificate selected for %s, Try Adding/Selecting User Cert via Site Login" % self.site.address
extend["cert_sign"] = cert["cert_sign"] self.log.error(error)
self.log.debug("Extending content.json with cert %s" % extend["cert_user_id"]) return self.response(to, {"error": error})
else:
extend["cert_auth_type"] = cert["auth_type"]
extend["cert_user_id"] = self.user.getCertUserId(site.address)
extend["cert_sign"] = cert["cert_sign"]
self.log.debug("Extending content.json with cert %s" % extend["cert_user_id"])
if not self.hasFilePermission(inner_path): if not self.hasFilePermission(inner_path):
self.log.error("SiteSign error: you don't own this site & site owner doesn't allow you to do so.") self.log.error("SiteSign error: you don't own this site & site owner doesn't allow you to do so.")