jeena/hass-configurator
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Use relative paths for reverse proxy support

Browse source
This commit is contained in:
Daniel Perna 2018-01-24 23:45:05 +01:00
parent 7141cb799e
commit 6c81687261
2 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

56
configurator.py
View file

@ -2674,7 +2674,7 @@ INDEX = Template(r"""<!DOCTYPE html>
} }
function download_file(filepath) { function download_file(filepath) {
window.open("/api/download?filename="+encodeURI(filepath)); window.open("api/download?filename="+encodeURI(filepath));
} }
function delete_file() { function delete_file() {
@ -3214,7 +3214,7 @@ class RequestHandler(BaseHTTPRequestHandler):
req = urlparse(self.path) req = urlparse(self.path)
query = parse_qs(req.query) query = parse_qs(req.query)
self.send_response(200) self.send_response(200)
if req.path == '/api/file': if req.path.endswith('/api/file'):
content = "" content = ""
self.send_header('Content-type', 'text/text') self.send_header('Content-type', 'text/text')
self.end_headers() self.end_headers()
@ -3232,7 +3232,7 @@ class RequestHandler(BaseHTTPRequestHandler):
content = str(err) content = str(err)
self.wfile.write(bytes(content, "utf8")) self.wfile.write(bytes(content, "utf8"))
return return
elif req.path == '/api/download': elif req.path.endswith('/api/download'):
content = "" content = ""
filename = query.get('filename', None) filename = query.get('filename', None)
try: try:
@ -3254,7 +3254,7 @@ class RequestHandler(BaseHTTPRequestHandler):
self.send_header('Content-type', 'text/text') self.send_header('Content-type', 'text/text')
self.wfile.write(bytes(content, "utf8")) self.wfile.write(bytes(content, "utf8"))
return return
elif req.path == '/api/listdir': elif req.path.endswith('/api/listdir'):
content = "" content = ""
self.send_header('Content-type', 'text/json') self.send_header('Content-type', 'text/json')
self.end_headers() self.end_headers()
@ -3290,7 +3290,7 @@ class RequestHandler(BaseHTTPRequestHandler):
content = str(err) content = str(err)
self.wfile.write(bytes(content, "utf8")) self.wfile.write(bytes(content, "utf8"))
return return
elif req.path == '/api/abspath': elif req.path.endswith('/api/abspath'):
content = "" content = ""
self.send_header('Content-type', 'text/text') self.send_header('Content-type', 'text/text')
self.end_headers() self.end_headers()
@ -3303,7 +3303,7 @@ class RequestHandler(BaseHTTPRequestHandler):
if os.path.isdir(dirpath): if os.path.isdir(dirpath):
self.wfile.write(os.path.abspath(dirpath)) self.wfile.write(os.path.abspath(dirpath))
return return
elif req.path == '/api/parent': elif req.path.endswith('/api/parent'):
content = "" content = ""
self.send_header('Content-type', 'text/text') self.send_header('Content-type', 'text/text')
self.end_headers() self.end_headers()
@ -3316,7 +3316,7 @@ class RequestHandler(BaseHTTPRequestHandler):
if os.path.isdir(dirpath): if os.path.isdir(dirpath):
self.wfile.write(os.path.abspath(os.path.dirname(dirpath))) self.wfile.write(os.path.abspath(os.path.dirname(dirpath)))
return return
elif req.path == '/api/netstat': elif req.path.endswith('/api/netstat'):
content = "" content = ""
self.send_header('Content-type', 'text/json') self.send_header('Content-type', 'text/json')
self.end_headers() self.end_headers()
@ -3326,7 +3326,7 @@ class RequestHandler(BaseHTTPRequestHandler):
} }
self.wfile.write(bytes(json.dumps(res), "utf8")) self.wfile.write(bytes(json.dumps(res), "utf8"))
return return
elif req.path == '/api/restart': elif req.path.endswith('/api/restart'):
LOG.info("/api/restart") LOG.info("/api/restart")
self.send_header('Content-type', 'text/json') self.send_header('Content-type', 'text/json')
self.end_headers() self.end_headers()
@ -3346,7 +3346,7 @@ class RequestHandler(BaseHTTPRequestHandler):
res['restart'] = str(err) res['restart'] = str(err)
self.wfile.write(bytes(json.dumps(res), "utf8")) self.wfile.write(bytes(json.dumps(res), "utf8"))
return return
elif req.path == '/api/check_config': elif req.path.endswith('/api/check_config'):
LOG.info("/api/check_config") LOG.info("/api/check_config")
self.send_header('Content-type', 'text/json') self.send_header('Content-type', 'text/json')
self.end_headers() self.end_headers()
@ -3366,7 +3366,7 @@ class RequestHandler(BaseHTTPRequestHandler):
res['restart'] = str(err) res['restart'] = str(err)
self.wfile.write(bytes(json.dumps(res), "utf8")) self.wfile.write(bytes(json.dumps(res), "utf8"))
return return
elif req.path == '/api/reload_automations': elif req.path.endswith('/api/reload_automations'):
LOG.info("/api/reload_automations") LOG.info("/api/reload_automations")
self.send_header('Content-type', 'text/json') self.send_header('Content-type', 'text/json')
self.end_headers() self.end_headers()
@ -3386,7 +3386,7 @@ class RequestHandler(BaseHTTPRequestHandler):
res['restart'] = str(err) res['restart'] = str(err)
self.wfile.write(bytes(json.dumps(res), "utf8")) self.wfile.write(bytes(json.dumps(res), "utf8"))
return return
elif req.path == '/api/reload_scripts': elif req.path.endswith('/api/reload_scripts'):
LOG.info("/api/reload_scripts") LOG.info("/api/reload_scripts")
self.send_header('Content-type', 'text/json') self.send_header('Content-type', 'text/json')
self.end_headers() self.end_headers()
@ -3406,7 +3406,7 @@ class RequestHandler(BaseHTTPRequestHandler):
res['restart'] = str(err) res['restart'] = str(err)
self.wfile.write(bytes(json.dumps(res), "utf8")) self.wfile.write(bytes(json.dumps(res), "utf8"))
return return
elif req.path == '/api/reload_groups': elif req.path.endswith('/api/reload_groups'):
LOG.info("/api/reload_groups") LOG.info("/api/reload_groups")
self.send_header('Content-type', 'text/json') self.send_header('Content-type', 'text/json')
self.end_headers() self.end_headers()
@ -3426,7 +3426,7 @@ class RequestHandler(BaseHTTPRequestHandler):
res['restart'] = str(err) res['restart'] = str(err)
self.wfile.write(bytes(json.dumps(res), "utf8")) self.wfile.write(bytes(json.dumps(res), "utf8"))
return return
elif req.path == '/api/reload_core': elif req.path.endswith('/api/reload_core'):
LOG.info("/api/reload_core") LOG.info("/api/reload_core")
self.send_header('Content-type', 'text/json') self.send_header('Content-type', 'text/json')
self.end_headers() self.end_headers()
@ -3446,7 +3446,7 @@ class RequestHandler(BaseHTTPRequestHandler):
res['restart'] = str(err) res['restart'] = str(err)
self.wfile.write(bytes(json.dumps(res), "utf8")) self.wfile.write(bytes(json.dumps(res), "utf8"))
return return
elif req.path == '/': elif req.path.endswith('/'):
self.send_header('Content-type', 'text/html') self.send_header('Content-type', 'text/html')
self.end_headers() self.end_headers()
@ -3514,7 +3514,7 @@ class RequestHandler(BaseHTTPRequestHandler):
} }
length = int(self.headers['content-length']) length = int(self.headers['content-length'])
if req.path == '/api/save': if req.path.endswith('/api/save'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3540,7 +3540,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning(err) LOG.warning(err)
else: else:
response['message'] = "Missing filename or text" response['message'] = "Missing filename or text"
elif req.path == '/api/upload': elif req.path.endswith('/api/upload'):
if length > 104857600: #100 MB for now if length > 104857600: #100 MB for now
read = 0 read = 0
while read < length: while read < length:
@ -3570,7 +3570,7 @@ class RequestHandler(BaseHTTPRequestHandler):
response['message'] = "Upload successful" response['message'] = "Upload successful"
self.wfile.write(bytes(json.dumps(response), "utf8")) self.wfile.write(bytes(json.dumps(response), "utf8"))
return return
elif req.path == '/api/delete': elif req.path.endswith('/api/delete'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3604,7 +3604,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning(err) LOG.warning(err)
else: else:
response['message'] = "Missing filename or text" response['message'] = "Missing filename or text"
elif req.path == '/api/exec_command': elif req.path.endswith('/api/exec_command'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3651,7 +3651,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning(err) LOG.warning(err)
else: else:
response['message'] = "Missing command" response['message'] = "Missing command"
elif req.path == '/api/gitadd': elif req.path.endswith('/api/gitadd'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3684,7 +3684,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning(err) LOG.warning(err)
else: else:
response['message'] = "Missing filename" response['message'] = "Missing filename"
elif req.path == '/api/commit': elif req.path.endswith('/api/commit'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3717,7 +3717,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning("Exception (no repo): %s" % str(err)) LOG.warning("Exception (no repo): %s" % str(err))
else: else:
response['message'] = "Missing path" response['message'] = "Missing path"
elif req.path == '/api/checkout': elif req.path.endswith('/api/checkout'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3751,7 +3751,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning("Exception (no repo): %s" % str(err)) LOG.warning("Exception (no repo): %s" % str(err))
else: else:
response['message'] = "Missing path or branch" response['message'] = "Missing path or branch"
elif req.path == '/api/newbranch': elif req.path.endswith('/api/newbranch'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3784,7 +3784,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning("Exception (no repo): %s" % str(err)) LOG.warning("Exception (no repo): %s" % str(err))
else: else:
response['message'] = "Missing path or branch" response['message'] = "Missing path or branch"
elif req.path == '/api/init': elif req.path.endswith('/api/init'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3815,7 +3815,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning("Exception (no repo): %s" % str(err)) LOG.warning("Exception (no repo): %s" % str(err))
else: else:
response['message'] = "Missing path or branch" response['message'] = "Missing path or branch"
elif req.path == '/api/push': elif req.path.endswith('/api/push'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3855,7 +3855,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning("Exception (no repo): %s" % str(err)) LOG.warning("Exception (no repo): %s" % str(err))
else: else:
response['message'] = "Missing path or branch" response['message'] = "Missing path or branch"
elif req.path == '/api/newfolder': elif req.path.endswith('/api/newfolder'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3884,7 +3884,7 @@ class RequestHandler(BaseHTTPRequestHandler):
except Exception as err: except Exception as err:
response['message'] = "%s" % (str(err)) response['message'] = "%s" % (str(err))
LOG.warning(err) LOG.warning(err)
elif req.path == '/api/newfile': elif req.path.endswith('/api/newfile'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3916,7 +3916,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning(err) LOG.warning(err)
else: else:
response['message'] = "Missing filename or text" response['message'] = "Missing filename or text"
elif req.path == '/api/allowed_networks': elif req.path.endswith('/api/allowed_networks'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:
@ -3953,7 +3953,7 @@ class RequestHandler(BaseHTTPRequestHandler):
LOG.warning(err) LOG.warning(err)
else: else:
response['message'] = "Missing network" response['message'] = "Missing network"
elif req.path == '/api/banned_ips': elif req.path.endswith('/api/banned_ips'):
try: try:
postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1) postvars = parse_qs(self.rfile.read(length).decode('utf-8'), keep_blank_values=1)
except Exception as err: except Exception as err:

2
dev.html
View file

@ -2595,7 +2595,7 @@
} }
function download_file(filepath) { function download_file(filepath) {
window.open("/api/download?filename="+encodeURI(filepath)); window.open("api/download?filename="+encodeURI(filepath));
} }
function delete_file() { function delete_file() {