fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-07 09:38:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

restrict methods on all endpoints (#1271)

Browse Source 
* restrict methods on all endpoints

* lint
This commit is contained in:
Bruce Martin
2020-03-22 08:23:28 -07:00
committed by GitHub
parent c4731d52e2
commit 1351c8f724
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/app.py
+15 -13
View File
@@ -22,7 +22,7 @@ from functools import wraps
webbp = Blueprint("webapp", "server.common.web", template_folder="templates") webbp = Blueprint("webapp", "server.common.web", template_folder="templates")
@webbp.route("/") @webbp.route("/", methods=["GET"])
def dataset_index(dataset=None): def dataset_index(dataset=None):
config = current_app.app_config config = current_app.app_config
if dataset is None: if dataset is None:
@@ -44,12 +44,12 @@ def dataset_index(dataset=None):
return make_response(f"Invalid dataset {dataset}: {str(e)}", HTTPStatus.BAD_REQUEST) return make_response(f"Invalid dataset {dataset}: {str(e)}", HTTPStatus.BAD_REQUEST)
@webbp.route("/favicon.png") @webbp.route("/favicon.png", methods=["GET"])
def favicon(): def favicon():
return send_from_directory(os.path.join(webbp.root_path, "static/img/"), "favicon.png") return send_from_directory(os.path.join(webbp.root_path, "static/img/"), "favicon.png")
@webbp.route("/health") @webbp.route("/health", methods=["GET"])
def health(): def health():
config = current_app.app_config config = current_app.app_config
return health_check(config) return health_check(config)
@@ -95,8 +95,8 @@ def static_redirect(dataset, therest):
def dataroot_test_index(): def dataroot_test_index():
# the following index page is meant for testing/debugging purposes # the following index page is meant for testing/debugging purposes
data = '<!doctype html><html lang="en">' data = '<!doctype html><html lang="en">'
data += '<head><title>Hosted Cellxgene</title></head>' data += "<head><title>Hosted Cellxgene</title></head>"
data += '<body><H1>Welcome to cellxgene</H1>' data += "<body><H1>Welcome to cellxgene</H1>"
try: try:
config = current_app.app_config config = current_app.app_config
@@ -111,16 +111,16 @@ def dataroot_test_index():
# skip over invalid datasets # skip over invalid datasets
pass pass
data += '<br/>Select one of these datasets...<br/>' data += "<br/>Select one of these datasets...<br/>"
data += '<ul>' data += "<ul>"
datasets.sort() datasets.sort()
for dataset in datasets: for dataset in datasets:
data += f'<li><a href={dataset}>{dataset}</a></li>' data += f"<li><a href={dataset}>{dataset}</a></li>"
data += '</ul>' data += "</ul>"
except Exception as e: except Exception as e:
data += f'<br/>Unable to locate datasets from {config.dataroot}: {str(e)}' data += f"<br/>Unable to locate datasets from {config.dataroot}: {str(e)}"
data += '</body></html>' data += "</body></html>"
return make_response(data) return make_response(data)
@@ -234,8 +234,10 @@ class Server:
bp_api = Blueprint("api_dataset", __name__, url_prefix="/<dataset>" + api_version) bp_api = Blueprint("api_dataset", __name__, url_prefix="/<dataset>" + api_version)
resources = get_api_resources(bp_api) resources = get_api_resources(bp_api)
self.app.register_blueprint(resources.blueprint) self.app.register_blueprint(resources.blueprint)
self.app.add_url_rule("/<dataset>/", "dataset_index", dataset_index) self.app.add_url_rule("/<dataset>/", "dataset_index", dataset_index, methods=["GET"])
self.app.add_url_rule("/<dataset>/static/<path:therest>", "static_redirect", static_redirect) self.app.add_url_rule(
"/<dataset>/static/<path:therest>", "static_redirect", static_redirect, methods=["GET"]
)
self.app.matrix_data_cache_manager = matrix_data_cache_manager self.app.matrix_data_cache_manager = matrix_data_cache_manager
self.app.annotations = annotations self.app.annotations = annotations