fix(conditions): relax stickyness rules

src/Condition.js

@@ -133,6 +133,11 @@ class BooleanCondition {
   toJSON() {
     return this._entry.jsonGen(this._items);
   }
+
+  sticky() {
+    const items = Array.isArray(this._items) ? this._items : [this._items];
+    return items.some((item) => item.sticky());
+  }
 }
 
 /**
@@ -212,6 +217,10 @@ class PropertyCondition {
     return json;
   }
 
+  sticky() {
+    return !!this._prop.sticky;
+  }
+
   evaluate(req) {
     if (!this._prop.evaluate) {
       return true;
@@ -316,6 +325,7 @@ const propertyMap = {
     evaluate: (req) => req.get('referer'),
     type: 'string',
     allowed_ops: '=~',
+    sticky: true,
   },
   client_city: {
     vcl: 'client.geo.city',
@@ -400,6 +410,7 @@ const propertyMap = {
     },
     evaluate: (req, property) => req.params[property.name],
     allowed_ops: '~<=>',
+    sticky: true,
   },
 };
 
@@ -443,7 +454,6 @@ class Condition {
     return '';
   }
 
-  /* eslint-disable no-underscore-dangle */
   match(req) {
     if (this._top && this._top.evaluate) {
       req.headers = req.headers || {};
@@ -456,6 +466,13 @@ class Condition {
     return true;
   }
 
+  sticky() {
+    if (this._top && this._top.sticky) {
+      return this._top.sticky();
+    }
+    return false;
+  }
+
   toJSON(opts) {
     const json = this._top ? this._top.toJSON() : null;
     if (json && opts && opts.minimal) {

test/condition.test.js

@@ -121,6 +121,9 @@ set req.url = regsub(req.url, "^/oldpath", "${subpath}");
         if (cfg.json !== undefined) {
           assert.equal(cfg.json, cond.toJSON());
         }
+        const sticky = cfg.sticky || false;
+        assert.equal(cond.sticky(), sticky);
+
         const actual = cond.toJSON();
         const expected = cfg.condition;
         assert.deepEqual(actual, expected);

test/specs/conditions/null.yaml

@@ -2,6 +2,7 @@ condition:
 
 vcl: ''
 vcl_path: ''
+sticky: false
 
 samples:
   - match: true

test/specs/conditions/referer.yaml

@@ -2,6 +2,7 @@ condition:
   referer=: www.example.com
 
 vcl: 'req.http.referer == "www.example.com"'
+sticky: true
 
 samples:
   - headers:

test/specs/conditions/url_param_number.yaml

@@ -4,6 +4,7 @@ condition:
   - url_param.a<: 10
 
 vcl: '(std.atoi(subfield(req.url.qs, "a", "&")) > 5 && std.atoi(subfield(req.url.qs, "a", "&")) < 10)'
+sticky: true
 
 samples:
   - uri: https://www.example.com/index.html?a=7

test/specs/conditions/url_param_string.yaml

@@ -2,6 +2,7 @@ condition:
   url_param.foo: bar
 
 vcl: 'subfield(req.url.qs, "foo", "&") ~ "^bar"'
+sticky: true
 
 samples:
   - uri: https://www.example.com/index.html?foo=bar