From d421bf898ec5504494c9b5e0c43580479b99cfe9 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 23 Dec 2014 13:33:43 +0200 Subject: moving incoming link validations, using x.get('x') convention --- src/server/rhizi_api.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/server/rhizi_api.py') diff --git a/src/server/rhizi_api.py b/src/server/rhizi_api.py index 8e38e6a3..1bc16ab8 100644 --- a/src/server/rhizi_api.py +++ b/src/server/rhizi_api.py @@ -37,15 +37,21 @@ def sanitize_input__node(n): """ provide a control point as to which node fields are persisted """ - assert None != n['id'], 'invalid input: node: missing id' + assert None != n.get('id'), 'invalid input: node: missing id' def sanitize_input__link(l): """ - provide a control point as to which node fields are persisted + provide a control point as to which link fields are persisted """ - assert None != l['id'], 'invalid input: link: missing id' - assert None != l['__src_id'], 'invalid input: link: missing src id' - assert None != l['__dst_id'], 'invalid input: link: missing dst id' + + # expected prop assertions + assert None != l.get('id'), 'invalid input: link: missing id' + assert None != l.get('__src_id'), 'invalid input: link: missing src id' + assert None != l.get('__dst_id'), 'invalid input: link: missing dst id' + + # unexpected prop assertions + assert None == l.get('__type'), 'client is sending us __type link property, it should not' + assert None == l.get('name'), 'client is sending us name link property, it should not' def sanitize_input__topo_diff(topo_diff): for n in topo_diff.node_set_add: -- cgit v1.3.1