1 files changed, 96 insertions, 5 deletions

diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c
index 5653b9eb..bee82dd4 100644
--- a/src/nxt_conf_validation.c
+++ b/src/nxt_conf_validation.c
@@ -66,6 +66,12 @@ static nxt_int_t nxt_conf_vldt_match_patterns(nxt_conf_validation_t *vldt,
     nxt_conf_value_t *value, void *data);
 static nxt_int_t nxt_conf_vldt_match_pattern(nxt_conf_validation_t *vldt,
     nxt_conf_value_t *value);
+static nxt_int_t nxt_conf_vldt_match_patterns_sets(nxt_conf_validation_t *vldt,
+    nxt_conf_value_t *value, void *data);
+static nxt_int_t nxt_conf_vldt_match_patterns_set(nxt_conf_validation_t *vldt,
+    nxt_conf_value_t *value);
+static nxt_int_t nxt_conf_vldt_match_patterns_set_member(
+    nxt_conf_validation_t *vldt, nxt_str_t *name, nxt_conf_value_t *value);
 static nxt_int_t nxt_conf_vldt_app_name(nxt_conf_validation_t *vldt,
     nxt_conf_value_t *value, void *data);
 static nxt_int_t nxt_conf_vldt_app(nxt_conf_validation_t *vldt,
@@ -218,6 +224,21 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_match_members[] = {
       &nxt_conf_vldt_match_patterns,
       NULL },
 
+    { nxt_string("arguments"),
+      NXT_CONF_VLDT_OBJECT | NXT_CONF_VLDT_ARRAY,
+      &nxt_conf_vldt_match_patterns_sets,
+      NULL },
+
+    { nxt_string("headers"),
+      NXT_CONF_VLDT_OBJECT | NXT_CONF_VLDT_ARRAY,
+      &nxt_conf_vldt_match_patterns_sets,
+      NULL },
+
+    { nxt_string("cookies"),
+      NXT_CONF_VLDT_OBJECT | NXT_CONF_VLDT_ARRAY,
+      &nxt_conf_vldt_match_patterns_sets,
+      NULL },
+
     NXT_CONF_VLDT_END
 };
 
@@ -741,9 +762,15 @@ nxt_conf_vldt_match_pattern(nxt_conf_validation_t *vldt,
     nxt_str_t   pattern;
     nxt_uint_t  i, first, last;
 
+    enum {
+        sw_none,
+        sw_side,
+        sw_middle
+    } state;
+
     if (nxt_conf_type(value) != NXT_CONF_STRING) {
-        return nxt_conf_vldt_error(vldt,
-                                   "The \"match\" patterns must be strings.");
+        return nxt_conf_vldt_error(vldt, "The \"match\" patterns for \"host\", "
+                                   "\"uri\", and \"method\" must be strings.");
     }
 
     nxt_conf_get_string(value, &pattern);
@@ -754,17 +781,37 @@ nxt_conf_vldt_match_pattern(nxt_conf_validation_t *vldt,
 
     first = (pattern.start[0] == '!');
     last = pattern.length - 1;
+    state = sw_none;
 
     for (i = first; i != pattern.length; i++) {
+
         ch = pattern.start[i];
 
         if (ch != '*') {
             continue;
         }
 
-        if (i != first && i != last) {
-            return nxt_conf_vldt_error(vldt, "The \"match\" patterns can only "
-                                       "contain \"*\" markers at the sides.");
+        switch (state) {
+        case sw_none:
+            state = (i == first) ? sw_side : sw_middle;
+            break;
+
+        case sw_side:
+            if (i == last) {
+                if (last - first != 1) {
+                    break;
+                }
+
+                return nxt_conf_vldt_error(vldt, "The \"match\" pattern must "
+                                           "not contain double \"*\" markers.");
+            }
+
+            /* Fall through. */
+
+        case sw_middle:
+            return nxt_conf_vldt_error(vldt, "The \"match\" patterns can "
+                                       "either contain \"*\" markers at "
+                                       "the sides or only one in the middle.");
         }
     }
 
@@ -772,6 +819,49 @@ nxt_conf_vldt_match_pattern(nxt_conf_validation_t *vldt,
 }
 
 
+static nxt_int_t
+nxt_conf_vldt_match_patterns_sets(nxt_conf_validation_t *vldt,
+    nxt_conf_value_t *value, void *data)
+{
+    if (nxt_conf_type(value) == NXT_CONF_ARRAY) {
+        return nxt_conf_vldt_array_iterator(vldt, value,
+                                            &nxt_conf_vldt_match_patterns_set);
+    }
+
+    /* NXT_CONF_OBJECT */
+
+    return nxt_conf_vldt_match_patterns_set(vldt, value);
+}
+
+
+static nxt_int_t
+nxt_conf_vldt_match_patterns_set(nxt_conf_validation_t *vldt,
+    nxt_conf_value_t *value)
+{
+    if (nxt_conf_type(value) != NXT_CONF_OBJECT) {
+        return nxt_conf_vldt_error(vldt, "The \"match\" patterns for "
+                                   "\"arguments\", \"cookies\", and "
+                                   "\"headers\" must be objects.");
+    }
+
+    return nxt_conf_vldt_object_iterator(vldt, value,
+                                     &nxt_conf_vldt_match_patterns_set_member);
+}
+
+
+static nxt_int_t
+nxt_conf_vldt_match_patterns_set_member(nxt_conf_validation_t *vldt,
+    nxt_str_t *name, nxt_conf_value_t *value)
+{
+    if (name->length == 0) {
+        return nxt_conf_vldt_error(vldt, "The \"match\" pattern objects must "
+                                   "not contain empty member names.");
+    }
+
+    return nxt_conf_vldt_match_patterns(vldt, value, NULL);
+}
+
+
 #if (NXT_TLS)
 
 static nxt_int_t
@@ -1268,6 +1358,7 @@ nxt_conf_vldt_java_classpath(nxt_conf_validation_t *vldt, nxt_conf_value_t *valu
     return NXT_OK;
 }
 
+
 static nxt_int_t
 nxt_conf_vldt_java_option(nxt_conf_validation_t *vldt, nxt_conf_value_t *value)
 {