diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/rz_api_common.py | 4 | ||||
| -rw-r--r-- | src/server/rz_api_rest.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/rz_api_common.py b/src/server/rz_api_common.py index 3583213d..d5d2510d 100644 --- a/src/server/rz_api_common.py +++ b/src/server/rz_api_common.py @@ -39,9 +39,9 @@ def sanitize_input__topo_diff(topo_diff): def sanitize_input__attr_diff(attr_diff): pass # TODO: impl -def validate_obj__attr_diff(ad, ctx): +def validate_obj__attr_diff(attr_diff): # check for name attr changes, which are currently forbidden - for n_id, node_attr_diff_set in ad['__type_node'].items(): + for n_id, node_attr_diff_set in attr_diff['__type_node'].items(): for attr_name in node_attr_diff_set['__attr_write'].keys(): if 'id' == attr_name: raise Exception('validation error: Attr_Diff: forbidden attribute change: \'id\', n_id: ' + n_id) diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py index 21c92b58..29998128 100644 --- a/src/server/rz_api_rest.py +++ b/src/server/rz_api_rest.py @@ -85,16 +85,16 @@ def diff_commit__attr(): # handle DB ERRORS, eg. name attr change error return common_resp_handle(error='error occurred') - ctx = __context__common() try: attr_diff = sanitize_input(request) - validate_obj__attr_diff(attr_diff, ctx) + validate_obj__attr_diff(attr_diff) except Exception as e: return common_resp_handle(error='malformed input') + ctx = __context__common() try: kernel = flask.current_app.kernel - _, commit_ret = kernel.diff_commit__attr(attr_diff) + _, commit_ret = kernel.diff_commit__attr(attr_diff, ctx) return common_resp_handle(data=commit_ret) except Exception as e: log.error(e.message) |