fork/cellxgene-gateway
1
0
Fork 0
mirror of https://github.com/Novartis/cellxgene-gateway.git synced 2026-10-07 12:18:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add ProxyFix to gateway.py

Browse Source
This commit is contained in:
Gregor Sturm
2021-01-18 20:01:53 +01:00
parent 8c5a635de9
commit fbc18fb636
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cellxgene_gateway/gateway.py
+19 -10
View File
@@ -50,10 +50,9 @@ def _force_https(app):
app.wsgi_app = _force_https(app.wsgi_app) app.wsgi_app = _force_https(app.wsgi_app)
app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1, x_host=1) app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1, x_host=1, x_prefix=1)
cache = BackendCache() cache = BackendCache()
location = f"{env.external_protocol}://{env.external_host}"
@app.errorhandler(CellxgeneException) @app.errorhandler(CellxgeneException)
@@ -127,7 +126,7 @@ def make_user():
create_dir(env.cellxgene_data, dir_name) create_dir(env.cellxgene_data, dir_name)
return redirect(location, code=302) return redirect(url_for("index"), code=302)
def make_subdir(): def make_subdir():
@@ -136,7 +135,7 @@ def make_subdir():
create_dir(parent_path, dir_name) create_dir(parent_path, dir_name)
return redirect(location, code=302) return redirect(url_for("index"), code=302)
def upload_file(): def upload_file():
@@ -150,8 +149,12 @@ def upload_file():
if "file" in request.files: if "file" in request.files:
f = request.files["file"] f = request.files["file"]
if f and f.filename.endswith(".h5ad"): if f and f.filename.endswith(".h5ad"):
f.save(os.path.join(full_upload_path, secure_filename(f.filename))) f.save(
return redirect("/filecrawl.html", code=302) os.path.join(
full_upload_path, secure_filename(f.filename)
)
)
return redirect(url_for("filecrawl"), code=302)
else: else:
raise CellxgeneException( raise CellxgeneException(
"Uploaded file must be in anndata (.h5ad) format.", "Uploaded file must be in anndata (.h5ad) format.",
@@ -163,15 +166,21 @@ def upload_file():
status.HTTP_400_BAD_REQUEST, status.HTTP_400_BAD_REQUEST,
) )
else: else:
raise CellxgeneException("Invalid directory.", status.HTTP_400_BAD_REQUEST) raise CellxgeneException(
"Invalid directory.", status.HTTP_400_BAD_REQUEST
)
return redirect(location, code=302) return redirect(url_for("index"), code=302)
if env.enable_upload: if env.enable_upload:
app.add_url_rule("/make_user", "make_user", make_user, methods=["POST"]) app.add_url_rule("/make_user", "make_user", make_user, methods=["POST"])
app.add_url_rule("/make_subdir", "make_subdir", make_subdir, methods=["POST"]) app.add_url_rule(
app.add_url_rule("/upload_file", "upload_file", upload_file, methods=["POST"]) "/make_subdir", "make_subdir", make_subdir, methods=["POST"]
)
app.add_url_rule(
"/upload_file", "upload_file", upload_file, methods=["POST"]
)
def set_no_cache(resp): def set_no_cache(resp):