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

Timeout and Base64 encoding support for fileGet

Browse source
This commit is contained in:
shortcutme 2017-01-22 11:09:45 +01:00
parent bf34d95bc1
commit 54c553d13b
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Ui/UiWebsocket.py
View file

@ -512,14 +512,18 @@ class UiWebsocket(object):
return self.response(to, rows) return self.response(to, rows)
# Return file content # Return file content
def actionFileGet(self, to, inner_path, required=True): def actionFileGet(self, to, inner_path, required=True, format="text", timeout=300):
try: try:
if required or inner_path in self.site.bad_files: if required or inner_path in self.site.bad_files:
self.site.needFile(inner_path, priority=6) with gevent.Timeout(timeout):
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.debug("%s fileGet error: %s" % (inner_path, err))
body = None body = None
if body and format == "base64":
import base64
body = base64.b64encode(body)
return self.response(to, body) return self.response(to, body)
def actionFileRules(self, to, inner_path): def actionFileRules(self, to, inner_path):