修复辖区id验证机制提高健壮性

app/cross_evaluate_worker.py

@@ -30,8 +30,8 @@ def query_cross_list(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(4, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(5, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
     # 查询路口列表
     cross_list = db_tmnet.query_cross_list_sql(nodeid, area_id)
@@ -79,8 +79,8 @@ def query_cross_usable_date(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
     row_list = db_cross.query_cross_usable_date_sql(crossid, nodeid)
     date_list = [row['day'] for row in row_list]
@@ -107,8 +107,8 @@ def query_cross_delay_info_controller(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     date_list = check_param(params, 'date_list')
     if not date_list or len(date_list) < 1:
         return json.dumps(make_common_res(7, '缺少日期参数，请最少选择一天作为查询日期'))
@@ -187,8 +187,8 @@ def query_cross_problems(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     date_list = check_param(params, 'date_list')
     if not date_list or len(date_list) < 1:
         return json.dumps(make_common_res(7, '缺少日期参数，请最少选择一天作为查询日期'))
@@ -244,8 +244,8 @@ def query_cross_index_trend_controller(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     date_list = check_param(params, 'date_list')
     if not date_list or len(date_list) < 1:
         return json.dumps(make_common_res(7, '缺少日期参数，请最少选择一天作为查询日期'))
@@ -334,8 +334,8 @@ def query_cross_examine_records_detail(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     date_list = check_param(params, 'date_list')
     if not date_list:
         return json.dumps(make_common_res(7, '缺少查询日期，请选择查询日期'))
@@ -428,8 +428,8 @@ def update_cross_examine_record_state(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     final_state = check_param(params, 'final_state')
     if not final_state:
         return json.dumps(make_common_res(7, '缺少需要修改的状态， 请刷新后重试'))

app/phasetable_worker.py

@@ -26,8 +26,8 @@ def phase_cross_list(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(4, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(5, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
 
     cross_road_list, error = db_tmnet.query_cross_list_road(str(nodeid), str(area_id))

app/task_worker.py

@@ -27,8 +27,8 @@ def do_query_task_list_parameter(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
     res = make_common_res(0, 'ok')
     res['data'] = {}
@@ -83,8 +83,8 @@ def do_query_task_list(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
     #任务名称`task_name` varchar(300) DEFAULT NULL COMMENT '任务名称',
     #任务类型`task_type` varchar(300) DEFAULT NULL COMMENT '任务类型',
@@ -241,8 +241,8 @@ def do_remove_task(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     tasknos = check_param(params, 'tasknos')
     if not tasknos or len(tasknos) < 1:
         return json.dumps(make_common_res(2, '任务id缺失，请检查后重试'))
@@ -272,8 +272,8 @@ def do_distribute_task(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     taskno = check_param(params, 'taskno')
     if not taskno:
         return json.dumps(make_common_res(2, '任务id缺失，请检查后重试'))
@@ -340,8 +340,8 @@ def do_approval(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     taskno = check_param(params, 'taskno')
     if not taskno:
         return json.dumps(make_common_res(2, '任务id缺失，请检查后重试'))
@@ -399,8 +399,8 @@ def do_complete_task(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     taskno = check_param(params, 'taskno')
     if not taskno:
         return json.dumps(make_common_res(2, '任务id缺失，请检查后重试'))
@@ -450,8 +450,8 @@ def do_add_task(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
     task_type = check_param(params, 'task_type')
     if not task_type:
@@ -572,8 +572,8 @@ def do_query_completed_task_cross_list(params):
         return json.dumps(make_common_res(5, '用户信息异常'))
 
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
     task_list = db_task.query_completed_task_cross_list(nodeid, area_id)
 
@@ -603,8 +603,8 @@ def do_query_completed_task_by_cross(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     crossid = check_param(params, 'crossid')
     if not crossid:
         return json.dumps(make_common_res(2, '缺少crossid， 请刷新后重试'))
@@ -678,8 +678,8 @@ def do_update_task(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     taskno = check_param(params, 'taskno')
     if not taskno:
         return json.dumps(make_common_res(2, '任务id缺失，请检查后重试'))
@@ -788,8 +788,8 @@ def do_task_file_download(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     taskno = check_param(params, 'taskno')
     if not taskno:
         return json.dumps(make_common_res(2, '任务id异常，请检查后重试'))
@@ -819,8 +819,8 @@ def do_query_task_history(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     taskno = check_param(params, 'taskno')
     if not taskno:
         return json.dumps(make_common_res(2, '任务id异常，请检查后重试'))
@@ -854,8 +854,8 @@ def del_task_file_api(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     taskno = check_param(params, 'taskno')
     if not taskno:
         return json.dumps(make_common_res(2, '任务id异常，请检查后重试'))
@@ -889,8 +889,8 @@ def do_query_task_progress_history(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     # taskno = params.get('taskno')
     yesterday_date = check_param(params, 'yesterday_date')
     task_history_list = db_task.query_task_progress_history(yesterday_date, nodeid, area_id)
@@ -920,8 +920,8 @@ def do_query_task_detail(params):
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
     area_list = map(int, area_list)
-    if int(area_id) not in area_list:
-        return json.dumps(make_common_res(6, '用户信息异常'))
+    if not area_id.lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
     res = make_common_res(0, 'ok')
     taskno = check_param(params, 'taskno')