Properly check script functions parameter types with the -c option

Also, do not omit from syntax checking functions that are part of
IF statement experssions.

Closes OpenSIPS#1993

Author: rvlad-patrascu

mod_fix.c

@@ -79,6 +79,72 @@ static inline gparam_p alloc_gp(void)
 	return gp;
 }
 
+int check_cmd(struct cmd_param *params, action_elem_t *elems)
+{
+	int i;
+	struct cmd_param *param;
+	pv_elem_t *pve;
+
+	for (param=params, i=1; param->flags; param++, i++) {
+		pve = NULL;
+
+		if (elems[i].type == NOSUBTYPE || elems[i].type == NULLV_ST) {
+			if (!(param->flags & CMD_PARAM_OPT)) {
+				LM_BUG("Mandatory parameter missing\n");
+				return -1;
+			} else {
+				continue;
+			}
+		}
+
+		if (param->flags & CMD_PARAM_INT) {
+			if (elems[i].type != NUMBER_ST && elems[i].type != SCRIPTVAR_ST) {
+				LM_ERR("Param [%d] expected to be an integer or variable\n", i);
+				return -1;
+			}
+		} else if (param->flags & CMD_PARAM_STR) {
+			if (elems[i].type == STR_ST) {
+				if (!(param->flags & CMD_PARAM_NO_EXPAND) &&
+					pv_parse_format(&elems[i].u.s, &pve) < 0) {
+					LM_ERR("Failed to parse formatted string in param "
+						"[%d]\n",i);
+					return -1;
+				}
+
+				if ((!(param->flags & CMD_PARAM_NO_EXPAND) &&
+				    (pve->next || pve->spec.type != PVT_NONE)) &&
+					(param->flags & CMD_PARAM_STATIC)) {
+					LM_ERR("Param [%d] does not support formatted strings\n",i);
+					return -1;
+				}
+
+				if (pve)
+					pv_elem_free_all(pve);
+			} else if (elems[i].type == SCRIPTVAR_ST) {
+				if (param->flags & CMD_PARAM_STATIC) {
+					LM_ERR("Param [%d] does not support variables\n",i);
+					return -1;
+				}
+			} else {
+				LM_ERR("Param [%d] expected to be a string or variable\n", i);
+				return -1;
+			}
+		} else if (param->flags & CMD_PARAM_VAR) {
+			if (elems[i].type != SCRIPTVAR_ST) {
+				LM_ERR("Param [%d] expected to be a variable\n",i);
+				return -1;
+			}
+		} else if (param->flags & CMD_PARAM_REGEX) {
+			if (elems[i].type != STR_ST && elems[i].type != SCRIPTVAR_ST) {
+				LM_ERR("Param [%d] expected to be an integer or variable\n", i);
+				return -1;
+			}
+		}
+	}
+
+	return 0;
+}
+
 int fix_cmd(struct cmd_param *params, action_elem_t *elems)
 {
 	int i;

mod_fix.h

@@ -45,6 +45,7 @@ typedef struct _gparam
 
 struct cmd_param;
 
+int check_cmd(struct cmd_param *params, action_elem_t *elems);
 int fix_cmd(struct cmd_param *params, action_elem_t *elems);
 int get_cmd_fixups(struct sip_msg* msg, struct cmd_param *params,
 				action_elem_t *elems, void **cmdp, pv_value_t *tmp_val);

route.c

@@ -1475,6 +1475,8 @@ static int rcheck_stack[RT_NO];
 static int rcheck_stack_p = 0;
 static int rcheck_status = 0;
 
+static int check_expr(struct expr* exp, int r_type);
+
 static int check_actions(struct action *a, int r_type)
 {
 	struct action *aitem;
@@ -1502,6 +1504,8 @@ static int check_actions(struct action *a, int r_type)
 				rcheck_stack_p--;
 				break;
 			case IF_T:
+				if (check_expr((struct expr*)a->elem[0].u.data, r_type) < 0)
+					goto error;
 				if (check_actions((struct action*)a->elem[1].u.data, r_type)!=0)
 					goto error;
 				if (check_actions((struct action*)a->elem[2].u.data, r_type)!=0)
@@ -1535,6 +1539,12 @@ static int check_actions(struct action *a, int r_type)
 						LM_ERR("route stack[%d]=%d\n",n,rcheck_stack[n]);
 					}
 				}
+
+				if (check_cmd(fct->params, a->elem) < 0) {
+					LM_ERR("check failed for function <%s>, %s:%d\n", fct->name,
+						a->file, a->line);
+					rcheck_status = -1;
+				}
 				break;
 			default:
 				break;
@@ -1546,6 +1556,57 @@ static int check_actions(struct action *a, int r_type)
 	return -1;
 }
 
+static int check_expr(struct expr* exp, int r_type)
+{
+	int ret = -1;
+
+	if (exp==0) {
+		LM_CRIT("null pointer\n");
+		return -1;
+	}
+
+	if (exp->type==EXP_T){
+		switch(exp->op){
+			case AND_OP:
+			case OR_OP:
+				if (check_expr(exp->left.v.expr, r_type) < 0)
+					return -1;
+				return check_expr(exp->right.v.expr, r_type);
+			case NOT_OP:
+			case EVAL_OP:
+				return check_expr(exp->left.v.expr, r_type);
+			default:
+				LM_CRIT("unknown op %d\n", exp->op);
+				return -1;
+		}
+	} else if (exp->type==ELEM_T){
+			if (exp->left.type==ACTION_O){
+				ret=check_actions((struct action*)exp->right.v.data, r_type);
+				if (ret!=0){
+					LM_CRIT("check_actions error\n");
+					return ret;
+				}
+			}
+			if (exp->left.type==EXPR_O){
+				ret=check_expr(exp->left.v.expr, r_type);
+				if (ret!=0){
+					LM_CRIT("check left exp error\n");
+					return ret;
+				}
+			}
+			if (exp->right.type==EXPR_ST){
+				ret=check_expr(exp->right.v.expr, r_type);
+				if (ret!=0){
+					LM_CRIT("fix right exp error\n");
+					return ret;
+				}
+			}
+			ret=0;
+	}
+
+	return ret;
+}
+
 
 /*! \brief check all parsed routing tables for compatiblity between
  * route types and called module functions;