add more XLAT_VERIFY, and verify XLAT_TMPL, too

Author: alandekok

src/lib/unlang/xlat_alloc.c

@@ -350,6 +350,63 @@ void xlat_exp_verify(xlat_exp_t const *node)
 		(void)talloc_get_type_abort_const(node->fmt, char);
 		return;
 
+	case XLAT_TMPL: {
+		tmpl_t const *vpt = node->vpt;
+
+		if (node->quote != node->vpt->quote) {
+			if (node->vpt->quote == T_SOLIDUS_QUOTED_STRING) {
+				/*
+				 *	m'foo' versus /foo/
+				 */
+				fr_assert(node->quote != T_BARE_WORD);
+			} else {
+				/*
+				 *	Mismatching quotes are bad.
+				 */
+				fr_assert(node->quote == T_BARE_WORD);
+			}
+		}
+
+		if (tmpl_is_attr(vpt)) {
+			fr_dict_attr_t const *da;
+			da = tmpl_attr_tail_da(node->vpt);
+
+			if (tmpl_rules_cast(node->vpt) != FR_TYPE_NULL) {
+				/*
+				 *	Casts must be omitted, unless we're using a cast as a way to get rid
+				 *	of enum names.
+				 */
+				if (tmpl_rules_cast(node->vpt) == da->type) {
+					fr_assert(da->flags.has_value);
+				}
+
+			} else if (node->quote != T_BARE_WORD) {
+				fr_assert(da->type != FR_TYPE_STRING);
+			}
+
+			return;
+		}
+
+		/*
+		 *	Casts should have been hoisted.
+		 */
+		if (tmpl_is_data(node->vpt)) {
+			fr_assert(tmpl_rules_cast(node->vpt) == FR_TYPE_NULL);
+		}
+
+#if 0
+		/*
+		 *	@todo - xlats SHOULD have been hoisted, unless they're quoted or cast.
+		 */
+		if (tmpl_is_xlat(node->vpt)) {
+			fr_assert((node->vpt->quote != T_BARE_WORD) ||
+				  (tmpl_rules_cast(node->vpt) != FR_TYPE_NULL));
+			return;
+		}
+#endif
+		return;
+	}
+
 	default:
 		break;
 	}

src/lib/unlang/xlat_expr.c

@@ -3271,6 +3271,7 @@ static fr_slen_t xlat_tokenize_expression_internal(TALLOC_CTX *ctx, xlat_exp_hea
 		node = xlat_exists_alloc(head, node);
 	}
 
+	XLAT_VERIFY(node);
 	xlat_exp_insert_tail(head, node);
 
 	*out = head;

src/lib/unlang/xlat_tokenize.c

@@ -2083,6 +2083,7 @@ int xlat_from_tmpl_attr(TALLOC_CTX *ctx, xlat_exp_head_t **out, tmpl_t **vpt_p)
 	fr_assert(!node->flags.pure);
 
 done:
+	XLAT_VERIFY(node);
 	xlat_exp_insert_tail(head, node);
 	*out = head;