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

Merge pull request #848 from MuxZeroNet/patch-14

Browse source 
Log ZeroFrame errors to terminal
This commit is contained in:
ZeroNet 2017-03-03 14:37:39 +01:00 committed by GitHub
commit 7d85a10e82
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Ui/UiWebsocket.py
View file

@ -329,7 +329,9 @@ class UiWebsocket(object):
not site.settings["own"] and not site.settings["own"] and
self.user.getAuthAddress(self.site.address) not in self.site.content_manager.getValidSigners(inner_path) 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"}) return self.response(to, {"error": "Forbidden, you can only modify your own sites"})
if privatekey == "stored": # Get privatekey from sites.json if privatekey == "stored": # Get privatekey from sites.json
privatekey = self.user.getSiteData(self.site.address).get("privatekey") privatekey = self.user.getSiteData(self.site.address).get("privatekey")
if not privatekey: # Get privatekey from users.json auth_address if not privatekey: # Get privatekey from users.json auth_address
@ -436,7 +438,7 @@ class UiWebsocket(object):
valid_signers = self.site.content_manager.getValidSigners(inner_path) valid_signers = self.site.content_manager.getValidSigners(inner_path)
auth_address = self.user.getAuthAddress(self.site.address) auth_address = self.user.getAuthAddress(self.site.address)
if not self.site.settings["own"] and auth_address not in valid_signers: 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"}) return self.response(to, {"error": "Forbidden, you can only modify your own files"})
# Try not to overwrite files currently in sync # Try not to overwrite files currently in sync
@ -469,6 +471,7 @@ class UiWebsocket(object):
self.site.storage.write(inner_path, content) self.site.storage.write(inner_path, content)
except Exception, err: except Exception, err:
self.log.error("File write error: %s" % Debug.formatException(err))
return self.response(to, {"error": "Write error: %s" % Debug.formatException(err)}) return self.response(to, {"error": "Write error: %s" % Debug.formatException(err)})
if inner_path.endswith("content.json"): if inner_path.endswith("content.json"):
@ -486,6 +489,7 @@ class UiWebsocket(object):
not self.site.settings["own"] and not self.site.settings["own"] and
self.user.getAuthAddress(self.site.address) not in self.site.content_manager.getValidSigners(inner_path) 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"}) return self.response(to, {"error": "Forbidden, you can only modify your own files"})
file_info = self.site.content_manager.getFileInfo(inner_path) file_info = self.site.content_manager.getFileInfo(inner_path)
@ -501,6 +505,7 @@ class UiWebsocket(object):
try: try:
self.site.storage.delete(inner_path) self.site.storage.delete(inner_path)
except Exception, err: except Exception, err:
self.log.error("File delete error: Exception - %s" % err)
return self.response(to, {"error": "Delete error: %s" % err}) return self.response(to, {"error": "Delete error: %s" % err})
self.response(to, "ok") self.response(to, "ok")
@ -532,6 +537,7 @@ class UiWebsocket(object):
raise Exception("Only SELECT query supported") raise Exception("Only SELECT query supported")
res = self.site.storage.query(query, params) res = self.site.storage.query(query, params)
except Exception, err: # Response the error to client except Exception, err: # Response the error to client
self.log.error("DbQuery error: %s" % error)
return self.response(to, {"error": str(err)}) return self.response(to, {"error": str(err)})
# Convert result to dict # Convert result to dict
for row in res: for row in res:
@ -548,7 +554,7 @@ class UiWebsocket(object):
self.site.needFile(inner_path, priority=6) self.site.needFile(inner_path, priority=6)
body = self.site.storage.read(inner_path) body = self.site.storage.read(inner_path)
except Exception, err: 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 body = None
if body and format == "base64": if body and format == "base64":
import base64 import base64
@ -587,6 +593,7 @@ class UiWebsocket(object):
else: else:
self.response(to, "Not changed") self.response(to, "Not changed")
except Exception, err: except Exception, err:
self.log.error("CertAdd error: Exception - %s" % err.message)
self.response(to, {"error": err.message}) self.response(to, {"error": err.message})
def cbCertAddConfirm(self, to, domain, auth_type, auth_user_name, cert): def cbCertAddConfirm(self, to, domain, auth_type, auth_user_name, cert):