Skip to content

Commit

Permalink
Merge pull request HelloZeroNet#848 from MuxZeroNet/patch-14
Browse files Browse the repository at this point in the history
Log ZeroFrame errors to terminal
  • Loading branch information
HelloZeroNet authored Mar 3, 2017
2 parents 349ee58 + dff261e commit 7d85a10
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/Ui/UiWebsocket.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,9 @@ def actionSiteSign(self, to, privatekey=None, inner_path="content.json", respons
not site.settings["own"] and
self.user.getAuthAddress(self.site.address) not in self.site.content_manager.getValidSigners(inner_path)
):
self.log.error("SiteSign error: you don't own this site & site owner doesn't allow you to do so.")
return self.response(to, {"error": "Forbidden, you can only modify your own sites"})

if privatekey == "stored": # Get privatekey from sites.json
privatekey = self.user.getSiteData(self.site.address).get("privatekey")
if not privatekey: # Get privatekey from users.json auth_address
Expand Down Expand Up @@ -436,7 +438,7 @@ def actionFileWrite(self, to, inner_path, content_base64, ignore_bad_files=False
valid_signers = self.site.content_manager.getValidSigners(inner_path)
auth_address = self.user.getAuthAddress(self.site.address)
if not self.site.settings["own"] and auth_address not in valid_signers:
self.log.debug("FileWrite forbidden %s not in %s" % (auth_address, valid_signers))
self.log.error("FileWrite forbidden %s not in valid_signers %s" % (auth_address, valid_signers))
return self.response(to, {"error": "Forbidden, you can only modify your own files"})

# Try not to overwrite files currently in sync
Expand Down Expand Up @@ -469,6 +471,7 @@ def actionFileWrite(self, to, inner_path, content_base64, ignore_bad_files=False

self.site.storage.write(inner_path, content)
except Exception, err:
self.log.error("File write error: %s" % Debug.formatException(err))
return self.response(to, {"error": "Write error: %s" % Debug.formatException(err)})

if inner_path.endswith("content.json"):
Expand All @@ -486,6 +489,7 @@ def actionFileDelete(self, to, inner_path):
not self.site.settings["own"] and
self.user.getAuthAddress(self.site.address) not in self.site.content_manager.getValidSigners(inner_path)
):
self.log.error("File delete error: you don't own this site & you are not approved by the owner.")
return self.response(to, {"error": "Forbidden, you can only modify your own files"})

file_info = self.site.content_manager.getFileInfo(inner_path)
Expand All @@ -501,6 +505,7 @@ def actionFileDelete(self, to, inner_path):
try:
self.site.storage.delete(inner_path)
except Exception, err:
self.log.error("File delete error: Exception - %s" % err)
return self.response(to, {"error": "Delete error: %s" % err})

self.response(to, "ok")
Expand Down Expand Up @@ -532,6 +537,7 @@ def actionDbQuery(self, to, query, params=None, wait_for=None):
raise Exception("Only SELECT query supported")
res = self.site.storage.query(query, params)
except Exception, err: # Response the error to client
self.log.error("DbQuery error: %s" % error)
return self.response(to, {"error": str(err)})
# Convert result to dict
for row in res:
Expand All @@ -548,7 +554,7 @@ def actionFileGet(self, to, inner_path, required=True, format="text", timeout=30
self.site.needFile(inner_path, priority=6)
body = self.site.storage.read(inner_path)
except Exception, err:
self.log.debug("%s fileGet error: %s" % (inner_path, err))
self.log.error("%s fileGet error: %s" % (inner_path, err))
body = None
if body and format == "base64":
import base64
Expand Down Expand Up @@ -587,6 +593,7 @@ def actionCertAdd(self, to, domain, auth_type, auth_user_name, cert):
else:
self.response(to, "Not changed")
except Exception, err:
self.log.error("CertAdd error: Exception - %s" % err.message)
self.response(to, {"error": err.message})

def cbCertAddConfirm(self, to, domain, auth_type, auth_user_name, cert):
Expand Down

0 comments on commit 7d85a10

Please sign in to comment.