From ce99eaa397d970da98c0d3c92324ef66aba14845 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 31 Mar 2015 12:26:25 +0300 Subject: sanitize_input__rzdoc_name(): retrieve max rzdoc name from global rz_config --- src/server/rz_api.py | 2 +- src/server/rz_api_common.py | 4 ++-- src/server/rz_api_rest.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server') diff --git a/src/server/rz_api.py b/src/server/rz_api.py index 17ab6fa7..84476633 100644 --- a/src/server/rz_api.py +++ b/src/server/rz_api.py @@ -46,7 +46,7 @@ def index(rzdoc_name=None): s_rzdoc_name = current_app.rz_config.rzdoc__mainpage_name else: try: - s_rzdoc_name = sanitize_input__rzdoc_name(rzdoc_name, current_app.rz_config) + s_rzdoc_name = sanitize_input__rzdoc_name(rzdoc_name) except Exception as e: log.exception(e) diff --git a/src/server/rz_api_common.py b/src/server/rz_api_common.py index 073c5c2a..5f2b66a3 100644 --- a/src/server/rz_api_common.py +++ b/src/server/rz_api_common.py @@ -47,12 +47,12 @@ def sanitize_input__topo_diff(topo_diff): def sanitize_input__attr_diff(attr_diff): pass # TODO: impl -def sanitize_input__rzdoc_name(rzdoc_name, cfg): +def sanitize_input__rzdoc_name(rzdoc_name): """ sanitize rzdoc name raw input """ - if None != rzdoc_name and len(rzdoc_name) > cfg.rzdoc__name__max_length: + if None != rzdoc_name and len(rzdoc_name) > current_app.rz_config.rzdoc__name__max_length: raise API_Exception__bad_request('rzdoc: open request: doc name exceeds max doc name limit: %s' % (rzdoc_name)) return rzdoc_name diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py index 90408cc1..030aeea7 100644 --- a/src/server/rz_api_rest.py +++ b/src/server/rz_api_rest.py @@ -56,7 +56,7 @@ def __context__common(rzdoc_name=None): ret.user_name = session['username'] if None != rzdoc_name: - s_rzdoc_name = sanitize_input__rzdoc_name(rzdoc_name, current_app.rz_config) + s_rzdoc_name = sanitize_input__rzdoc_name(rzdoc_name) ret.rzdoc = cache_lookup__rzdoc(s_rzdoc_name) return ret -- cgit v1.3.1