From 2b2292f432a568b037ae06189436ed737aad66a8 Mon Sep 17 00:00:00 2001 From: Sachin Kelkar Date: Sat, 21 Jan 2017 21:48:49 +0530 Subject: [PATCH 1/2] web: Add ~src and ~dst filters --- web/src/js/filt/filt.js | 465 ++++++++++++++++++++++++--------------- web/src/js/filt/filt.peg | 43 +++- 2 files changed, 316 insertions(+), 192 deletions(-) diff --git a/web/src/js/filt/filt.js b/web/src/js/filt/filt.js index f2c5ded2c..92fd87134 100644 --- a/web/src/js/filt/filt.js +++ b/web/src/js/filt/filt.js @@ -92,61 +92,67 @@ module.exports = (function() { peg$c53 = "~d", peg$c54 = { type: "literal", value: "~d", description: "\"~d\"" }, peg$c55 = function(s) { return domain(s); }, - peg$c56 = "~h", - peg$c57 = { type: "literal", value: "~h", description: "\"~h\"" }, - peg$c58 = function(s) { return header(s); }, - peg$c59 = "~hq", - peg$c60 = { type: "literal", value: "~hq", description: "\"~hq\"" }, - peg$c61 = function(s) { return requestHeader(s); }, - peg$c62 = "~hs", - peg$c63 = { type: "literal", value: "~hs", description: "\"~hs\"" }, - peg$c64 = function(s) { return responseHeader(s); }, - peg$c65 = "~m", - peg$c66 = { type: "literal", value: "~m", description: "\"~m\"" }, - peg$c67 = function(s) { return method(s); }, - peg$c68 = "~t", - peg$c69 = { type: "literal", value: "~t", description: "\"~t\"" }, - peg$c70 = function(s) { return contentType(s); }, - peg$c71 = "~tq", - peg$c72 = { type: "literal", value: "~tq", description: "\"~tq\"" }, - peg$c73 = function(s) { return requestContentType(s); }, - peg$c74 = "~ts", - peg$c75 = { type: "literal", value: "~ts", description: "\"~ts\"" }, - peg$c76 = function(s) { return responseContentType(s); }, - peg$c77 = "~u", - peg$c78 = { type: "literal", value: "~u", description: "\"~u\"" }, - peg$c79 = function(s) { return url(s); }, - peg$c80 = { type: "other", description: "integer" }, - peg$c81 = /^['"]/, - peg$c82 = { type: "class", value: "['\"]", description: "['\"]" }, - peg$c83 = /^[0-9]/, - peg$c84 = { type: "class", value: "[0-9]", description: "[0-9]" }, - peg$c85 = function(digits) { return parseInt(digits.join(""), 10); }, - peg$c86 = { type: "other", description: "string" }, - peg$c87 = "\"", - peg$c88 = { type: "literal", value: "\"", description: "\"\\\"\"" }, - peg$c89 = function(chars) { return chars.join(""); }, - peg$c90 = "'", - peg$c91 = { type: "literal", value: "'", description: "\"'\"" }, - peg$c92 = /^["\\]/, - peg$c93 = { type: "class", value: "[\"\\\\]", description: "[\"\\\\]" }, - peg$c94 = { type: "any", description: "any character" }, - peg$c95 = function(char) { return char; }, - peg$c96 = "\\", - peg$c97 = { type: "literal", value: "\\", description: "\"\\\\\"" }, - peg$c98 = /^['\\]/, - peg$c99 = { type: "class", value: "['\\\\]", description: "['\\\\]" }, - peg$c100 = /^['"\\]/, - peg$c101 = { type: "class", value: "['\"\\\\]", description: "['\"\\\\]" }, - peg$c102 = "n", - peg$c103 = { type: "literal", value: "n", description: "\"n\"" }, - peg$c104 = function() { return "\n"; }, - peg$c105 = "r", - peg$c106 = { type: "literal", value: "r", description: "\"r\"" }, - peg$c107 = function() { return "\r"; }, - peg$c108 = "t", - peg$c109 = { type: "literal", value: "t", description: "\"t\"" }, - peg$c110 = function() { return "\t"; }, + peg$c56 = "~dst", + peg$c57 = { type: "literal", value: "~dst", description: "\"~dst\"" }, + peg$c58 = function(s) { return destination(s); }, + peg$c59 = "~h", + peg$c60 = { type: "literal", value: "~h", description: "\"~h\"" }, + peg$c61 = function(s) { return header(s); }, + peg$c62 = "~hq", + peg$c63 = { type: "literal", value: "~hq", description: "\"~hq\"" }, + peg$c64 = function(s) { return requestHeader(s); }, + peg$c65 = "~hs", + peg$c66 = { type: "literal", value: "~hs", description: "\"~hs\"" }, + peg$c67 = function(s) { return responseHeader(s); }, + peg$c68 = "~m", + peg$c69 = { type: "literal", value: "~m", description: "\"~m\"" }, + peg$c70 = function(s) { return method(s); }, + peg$c71 = "~src", + peg$c72 = { type: "literal", value: "~src", description: "\"~src\"" }, + peg$c73 = function(s) { return source(s); }, + peg$c74 = "~t", + peg$c75 = { type: "literal", value: "~t", description: "\"~t\"" }, + peg$c76 = function(s) { return contentType(s); }, + peg$c77 = "~tq", + peg$c78 = { type: "literal", value: "~tq", description: "\"~tq\"" }, + peg$c79 = function(s) { return requestContentType(s); }, + peg$c80 = "~ts", + peg$c81 = { type: "literal", value: "~ts", description: "\"~ts\"" }, + peg$c82 = function(s) { return responseContentType(s); }, + peg$c83 = "~u", + peg$c84 = { type: "literal", value: "~u", description: "\"~u\"" }, + peg$c85 = function(s) { return url(s); }, + peg$c86 = { type: "other", description: "integer" }, + peg$c87 = /^['"]/, + peg$c88 = { type: "class", value: "['\"]", description: "['\"]" }, + peg$c89 = /^[0-9]/, + peg$c90 = { type: "class", value: "[0-9]", description: "[0-9]" }, + peg$c91 = function(digits) { return parseInt(digits.join(""), 10); }, + peg$c92 = { type: "other", description: "string" }, + peg$c93 = "\"", + peg$c94 = { type: "literal", value: "\"", description: "\"\\\"\"" }, + peg$c95 = function(chars) { return chars.join(""); }, + peg$c96 = "'", + peg$c97 = { type: "literal", value: "'", description: "\"'\"" }, + peg$c98 = /^["\\]/, + peg$c99 = { type: "class", value: "[\"\\\\]", description: "[\"\\\\]" }, + peg$c100 = { type: "any", description: "any character" }, + peg$c101 = function(char) { return char; }, + peg$c102 = "\\", + peg$c103 = { type: "literal", value: "\\", description: "\"\\\\\"" }, + peg$c104 = /^['\\]/, + peg$c105 = { type: "class", value: "['\\\\]", description: "['\\\\]" }, + peg$c106 = /^['"\\]/, + peg$c107 = { type: "class", value: "['\"\\\\]", description: "['\"\\\\]" }, + peg$c108 = "n", + peg$c109 = { type: "literal", value: "n", description: "\"n\"" }, + peg$c110 = function() { return "\n"; }, + peg$c111 = "r", + peg$c112 = { type: "literal", value: "r", description: "\"r\"" }, + peg$c113 = function() { return "\r"; }, + peg$c114 = "t", + peg$c115 = { type: "literal", value: "t", description: "\"t\"" }, + peg$c116 = function() { return "\t"; }, peg$currPos = 0, peg$savedPos = 0, @@ -893,9 +899,9 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c56) { + if (input.substr(peg$currPos, 4) === peg$c56) { s1 = peg$c56; - peg$currPos += 2; + peg$currPos += 4; } else { s1 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$c57); } @@ -931,9 +937,9 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 3) === peg$c59) { + if (input.substr(peg$currPos, 2) === peg$c59) { s1 = peg$c59; - peg$currPos += 3; + peg$currPos += 2; } else { s1 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$c60); } @@ -1007,9 +1013,9 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c65) { + if (input.substr(peg$currPos, 3) === peg$c65) { s1 = peg$c65; - peg$currPos += 2; + peg$currPos += 3; } else { s1 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$c66); } @@ -1083,9 +1089,9 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 3) === peg$c71) { + if (input.substr(peg$currPos, 4) === peg$c71) { s1 = peg$c71; - peg$currPos += 3; + peg$currPos += 4; } else { s1 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$c72); } @@ -1121,9 +1127,9 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 3) === peg$c74) { + if (input.substr(peg$currPos, 2) === peg$c74) { s1 = peg$c74; - peg$currPos += 3; + peg$currPos += 2; } else { s1 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$c75); } @@ -1159,9 +1165,9 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c77) { + if (input.substr(peg$currPos, 3) === peg$c77) { s1 = peg$c77; - peg$currPos += 2; + peg$currPos += 3; } else { s1 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$c78); } @@ -1197,12 +1203,90 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - s1 = peg$parseStringLiteral(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c79(s1); + if (input.substr(peg$currPos, 3) === peg$c80) { + s1 = peg$c80; + peg$currPos += 3; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c81); } + } + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parsews(); + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parsews(); + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = peg$parseStringLiteral(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c82(s3); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 2) === peg$c83) { + s1 = peg$c83; + peg$currPos += 2; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c84); } + } + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parsews(); + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parsews(); + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = peg$parseStringLiteral(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c85(s3); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$parseStringLiteral(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c85(s1); + } + s0 = s1; + } } - s0 = s1; } } } @@ -1222,53 +1306,53 @@ module.exports = (function() { peg$silentFails++; s0 = peg$currPos; - if (peg$c81.test(input.charAt(peg$currPos))) { + if (peg$c87.test(input.charAt(peg$currPos))) { s1 = input.charAt(peg$currPos); peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c82); } + if (peg$silentFails === 0) { peg$fail(peg$c88); } } if (s1 === peg$FAILED) { s1 = null; } if (s1 !== peg$FAILED) { s2 = []; - if (peg$c83.test(input.charAt(peg$currPos))) { + if (peg$c89.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c84); } + if (peg$silentFails === 0) { peg$fail(peg$c90); } } if (s3 !== peg$FAILED) { while (s3 !== peg$FAILED) { s2.push(s3); - if (peg$c83.test(input.charAt(peg$currPos))) { + if (peg$c89.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c84); } + if (peg$silentFails === 0) { peg$fail(peg$c90); } } } } else { s2 = peg$FAILED; } if (s2 !== peg$FAILED) { - if (peg$c81.test(input.charAt(peg$currPos))) { + if (peg$c87.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c82); } + if (peg$silentFails === 0) { peg$fail(peg$c88); } } if (s3 === peg$FAILED) { s3 = null; } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c85(s2); + s1 = peg$c91(s2); s0 = s1; } else { peg$currPos = s0; @@ -1285,7 +1369,7 @@ module.exports = (function() { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c80); } + if (peg$silentFails === 0) { peg$fail(peg$c86); } } return s0; @@ -1297,11 +1381,11 @@ module.exports = (function() { peg$silentFails++; s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 34) { - s1 = peg$c87; + s1 = peg$c93; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c88); } + if (peg$silentFails === 0) { peg$fail(peg$c94); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1312,15 +1396,15 @@ module.exports = (function() { } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s3 = peg$c87; + s3 = peg$c93; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c88); } + if (peg$silentFails === 0) { peg$fail(peg$c94); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c89(s2); + s1 = peg$c95(s2); s0 = s1; } else { peg$currPos = s0; @@ -1337,11 +1421,11 @@ module.exports = (function() { if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 39) { - s1 = peg$c90; + s1 = peg$c96; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c91); } + if (peg$silentFails === 0) { peg$fail(peg$c97); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1352,15 +1436,15 @@ module.exports = (function() { } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 39) { - s3 = peg$c90; + s3 = peg$c96; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c91); } + if (peg$silentFails === 0) { peg$fail(peg$c97); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c89(s2); + s1 = peg$c95(s2); s0 = s1; } else { peg$currPos = s0; @@ -1399,7 +1483,7 @@ module.exports = (function() { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c89(s2); + s1 = peg$c95(s2); s0 = s1; } else { peg$currPos = s0; @@ -1414,7 +1498,7 @@ module.exports = (function() { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c86); } + if (peg$silentFails === 0) { peg$fail(peg$c92); } } return s0; @@ -1423,74 +1507,6 @@ module.exports = (function() { function peg$parseDoubleStringChar() { var s0, s1, s2; - s0 = peg$currPos; - s1 = peg$currPos; - peg$silentFails++; - if (peg$c92.test(input.charAt(peg$currPos))) { - s2 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c93); } - } - peg$silentFails--; - if (s2 === peg$FAILED) { - s1 = void 0; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - if (input.length > peg$currPos) { - s2 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c94); } - } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c95(s2); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c96; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c97); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parseEscapeSequence(); - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c95(s2); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } - - return s0; - } - - function peg$parseSingleStringChar() { - var s0, s1, s2; - s0 = peg$currPos; s1 = peg$currPos; peg$silentFails++; @@ -1514,11 +1530,11 @@ module.exports = (function() { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c94); } + if (peg$silentFails === 0) { peg$fail(peg$c100); } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c95(s2); + s1 = peg$c101(s2); s0 = s1; } else { peg$currPos = s0; @@ -1531,17 +1547,85 @@ module.exports = (function() { if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c96; + s1 = peg$c102; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c97); } + if (peg$silentFails === 0) { peg$fail(peg$c103); } } if (s1 !== peg$FAILED) { s2 = peg$parseEscapeSequence(); if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c95(s2); + s1 = peg$c101(s2); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } + + return s0; + } + + function peg$parseSingleStringChar() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = peg$currPos; + peg$silentFails++; + if (peg$c104.test(input.charAt(peg$currPos))) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c105); } + } + peg$silentFails--; + if (s2 === peg$FAILED) { + s1 = void 0; + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + if (input.length > peg$currPos) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c100); } + } + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c101(s2); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 92) { + s1 = peg$c102; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c103); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parseEscapeSequence(); + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c101(s2); s0 = s1; } else { peg$currPos = s0; @@ -1576,11 +1660,11 @@ module.exports = (function() { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c94); } + if (peg$silentFails === 0) { peg$fail(peg$c100); } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c95(s2); + s1 = peg$c101(s2); s0 = s1; } else { peg$currPos = s0; @@ -1597,53 +1681,53 @@ module.exports = (function() { function peg$parseEscapeSequence() { var s0, s1; - if (peg$c100.test(input.charAt(peg$currPos))) { + if (peg$c106.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c101); } + if (peg$silentFails === 0) { peg$fail(peg$c107); } } if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 110) { - s1 = peg$c102; + s1 = peg$c108; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c103); } + if (peg$silentFails === 0) { peg$fail(peg$c109); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c104(); + s1 = peg$c110(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 114) { - s1 = peg$c105; + s1 = peg$c111; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c106); } + if (peg$silentFails === 0) { peg$fail(peg$c112); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c107(); + s1 = peg$c113(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 116) { - s1 = peg$c108; + s1 = peg$c114; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c109); } + if (peg$silentFails === 0) { peg$fail(peg$c115); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c110(); + s1 = peg$c116(); } s0 = s1; } @@ -1730,6 +1814,16 @@ module.exports = (function() { domainFilter.desc = "domain matches " + regex; return domainFilter; } + function destination(regex){ + regex = new RegExp(regex, "i"); + function destinationFilter(flow){ + return (!!flow.server_conn.address) + && + regex.test(flow.server_conn.address.address[0] + ":" + flow.server_conn.address.address[1]); + } + destinationFilter.desc = "destination address matches " + regex; + return destinationFilter; + } function errorFilter(flow){ return !!flow.error; } @@ -1786,7 +1880,16 @@ module.exports = (function() { return !!flow.response; } responseFilter.desc = "has response"; - + function source(regex){ + regex = new RegExp(regex, "i"); + function sourceFilter(flow){ + return (!!flow.client_conn.address) + && + regex.test(flow.client_conn.address.address[0] + ":" + flow.client_conn.address.address[1]); + } + sourceFilter.desc = "source address matches " + regex; + return sourceFilter; + } function contentType(regex){ regex = new RegExp(regex, "i"); function contentTypeFilter(flow){ diff --git a/web/src/js/filt/filt.peg b/web/src/js/filt/filt.peg index f3235ccda..70cb4f655 100644 --- a/web/src/js/filt/filt.peg +++ b/web/src/js/filt/filt.peg @@ -77,6 +77,16 @@ function domain(regex){ domainFilter.desc = "domain matches " + regex; return domainFilter; } +function destination(regex){ + regex = new RegExp(regex, "i"); + function destinationFilter(flow){ + return (!!flow.server_conn.address) + && + regex.test(flow.server_conn.address.address[0] + ":" + flow.server_conn.address.address[1]); + } + destinationFilter.desc = "destination address matches " + regex; + return destinationFilter; +} function errorFilter(flow){ return !!flow.error; } @@ -133,7 +143,16 @@ function responseFilter(flow){ return !!flow.response; } responseFilter.desc = "has response"; - +function source(regex){ + regex = new RegExp(regex, "i"); + function sourceFilter(flow){ + return (!!flow.client_conn.address) + && + regex.test(flow.client_conn.address.address[0] + ":" + flow.client_conn.address.address[1]); + } + sourceFilter.desc = "source address matches " + regex; + return sourceFilter; +} function contentType(regex){ regex = new RegExp(regex, "i"); function contentTypeFilter(flow){ @@ -225,16 +244,18 @@ BooleanLiteral / "false" { return falseFilter; } UnaryExpr - = "~c" ws+ s:IntegerLiteral { return responseCode(s); } - / "~d" ws+ s:StringLiteral { return domain(s); } - / "~h" ws+ s:StringLiteral { return header(s); } - / "~hq" ws+ s:StringLiteral { return requestHeader(s); } - / "~hs" ws+ s:StringLiteral { return responseHeader(s); } - / "~m" ws+ s:StringLiteral { return method(s); } - / "~t" ws+ s:StringLiteral { return contentType(s); } - / "~tq" ws+ s:StringLiteral { return requestContentType(s); } - / "~ts" ws+ s:StringLiteral { return responseContentType(s); } - / "~u" ws+ s:StringLiteral { return url(s); } + = "~c" ws+ s:IntegerLiteral { return responseCode(s); } + / "~d" ws+ s:StringLiteral { return domain(s); } + / "~dst" ws+ s:StringLiteral { return destination(s); } + / "~h" ws+ s:StringLiteral { return header(s); } + / "~hq" ws+ s:StringLiteral { return requestHeader(s); } + / "~hs" ws+ s:StringLiteral { return responseHeader(s); } + / "~m" ws+ s:StringLiteral { return method(s); } + / "~src" ws+ s:StringLiteral { return source(s); } + / "~t" ws+ s:StringLiteral { return contentType(s); } + / "~tq" ws+ s:StringLiteral { return requestContentType(s); } + / "~ts" ws+ s:StringLiteral { return responseContentType(s); } + / "~u" ws+ s:StringLiteral { return url(s); } / s:StringLiteral { return url(s); } IntegerLiteral "integer" From 981329485429e2a3e10309250b8d2772094d52db Mon Sep 17 00:00:00 2001 From: Sachin Kelkar Date: Mon, 23 Jan 2017 18:38:49 +0530 Subject: [PATCH 2/2] Merge NullaryExpr, UnaryExpr and BooleanLiteral --- web/src/js/filt/filt.js | 770 +++++++++++++++++++-------------------- web/src/js/filt/filt.peg | 49 ++- 2 files changed, 395 insertions(+), 424 deletions(-) diff --git a/web/src/js/filt/filt.js b/web/src/js/filt/filt.js index 92fd87134..a15f5f9fa 100644 --- a/web/src/js/filt/filt.js +++ b/web/src/js/filt/filt.js @@ -59,60 +59,60 @@ module.exports = (function() { peg$c20 = ")", peg$c21 = { type: "literal", value: ")", description: "\")\"" }, peg$c22 = function(expr) { return binding(expr); }, - peg$c23 = "~a", - peg$c24 = { type: "literal", value: "~a", description: "\"~a\"" }, - peg$c25 = function() { return assetFilter; }, - peg$c26 = "~e", - peg$c27 = { type: "literal", value: "~e", description: "\"~e\"" }, - peg$c28 = function() { return errorFilter; }, - peg$c29 = "~http", - peg$c30 = { type: "literal", value: "~http", description: "\"~http\"" }, - peg$c31 = function() { return httpFilter; }, - peg$c32 = "~marked", - peg$c33 = { type: "literal", value: "~marked", description: "\"~marked\"" }, - peg$c34 = function() { return markedFilter; }, - peg$c35 = "~q", - peg$c36 = { type: "literal", value: "~q", description: "\"~q\"" }, - peg$c37 = function() { return noResponseFilter; }, - peg$c38 = "~s", - peg$c39 = { type: "literal", value: "~s", description: "\"~s\"" }, - peg$c40 = function() { return responseFilter; }, - peg$c41 = "~tcp", - peg$c42 = { type: "literal", value: "~tcp", description: "\"~tcp\"" }, - peg$c43 = function() { return tcpFilter; }, - peg$c44 = "true", - peg$c45 = { type: "literal", value: "true", description: "\"true\"" }, - peg$c46 = function() { return trueFilter; }, - peg$c47 = "false", - peg$c48 = { type: "literal", value: "false", description: "\"false\"" }, - peg$c49 = function() { return falseFilter; }, - peg$c50 = "~c", - peg$c51 = { type: "literal", value: "~c", description: "\"~c\"" }, - peg$c52 = function(s) { return responseCode(s); }, - peg$c53 = "~d", - peg$c54 = { type: "literal", value: "~d", description: "\"~d\"" }, - peg$c55 = function(s) { return domain(s); }, - peg$c56 = "~dst", - peg$c57 = { type: "literal", value: "~dst", description: "\"~dst\"" }, - peg$c58 = function(s) { return destination(s); }, - peg$c59 = "~h", - peg$c60 = { type: "literal", value: "~h", description: "\"~h\"" }, - peg$c61 = function(s) { return header(s); }, - peg$c62 = "~hq", - peg$c63 = { type: "literal", value: "~hq", description: "\"~hq\"" }, - peg$c64 = function(s) { return requestHeader(s); }, - peg$c65 = "~hs", - peg$c66 = { type: "literal", value: "~hs", description: "\"~hs\"" }, - peg$c67 = function(s) { return responseHeader(s); }, - peg$c68 = "~m", - peg$c69 = { type: "literal", value: "~m", description: "\"~m\"" }, - peg$c70 = function(s) { return method(s); }, - peg$c71 = "~src", - peg$c72 = { type: "literal", value: "~src", description: "\"~src\"" }, - peg$c73 = function(s) { return source(s); }, - peg$c74 = "~t", - peg$c75 = { type: "literal", value: "~t", description: "\"~t\"" }, - peg$c76 = function(s) { return contentType(s); }, + peg$c23 = "true", + peg$c24 = { type: "literal", value: "true", description: "\"true\"" }, + peg$c25 = function() { return trueFilter; }, + peg$c26 = "false", + peg$c27 = { type: "literal", value: "false", description: "\"false\"" }, + peg$c28 = function() { return falseFilter; }, + peg$c29 = "~a", + peg$c30 = { type: "literal", value: "~a", description: "\"~a\"" }, + peg$c31 = function() { return assetFilter; }, + peg$c32 = "~c", + peg$c33 = { type: "literal", value: "~c", description: "\"~c\"" }, + peg$c34 = function(s) { return responseCode(s); }, + peg$c35 = "~d", + peg$c36 = { type: "literal", value: "~d", description: "\"~d\"" }, + peg$c37 = function(s) { return domain(s); }, + peg$c38 = "~dst", + peg$c39 = { type: "literal", value: "~dst", description: "\"~dst\"" }, + peg$c40 = function(s) { return destination(s); }, + peg$c41 = "~e", + peg$c42 = { type: "literal", value: "~e", description: "\"~e\"" }, + peg$c43 = function() { return errorFilter; }, + peg$c44 = "~h", + peg$c45 = { type: "literal", value: "~h", description: "\"~h\"" }, + peg$c46 = function(s) { return header(s); }, + peg$c47 = "~hq", + peg$c48 = { type: "literal", value: "~hq", description: "\"~hq\"" }, + peg$c49 = function(s) { return requestHeader(s); }, + peg$c50 = "~hs", + peg$c51 = { type: "literal", value: "~hs", description: "\"~hs\"" }, + peg$c52 = function(s) { return responseHeader(s); }, + peg$c53 = "~http", + peg$c54 = { type: "literal", value: "~http", description: "\"~http\"" }, + peg$c55 = function() { return httpFilter; }, + peg$c56 = "~m", + peg$c57 = { type: "literal", value: "~m", description: "\"~m\"" }, + peg$c58 = function(s) { return method(s); }, + peg$c59 = "~marked", + peg$c60 = { type: "literal", value: "~marked", description: "\"~marked\"" }, + peg$c61 = function() { return markedFilter; }, + peg$c62 = "~q", + peg$c63 = { type: "literal", value: "~q", description: "\"~q\"" }, + peg$c64 = function() { return noResponseFilter; }, + peg$c65 = "~src", + peg$c66 = { type: "literal", value: "~src", description: "\"~src\"" }, + peg$c67 = function(s) { return source(s); }, + peg$c68 = "~s", + peg$c69 = { type: "literal", value: "~s", description: "\"~s\"" }, + peg$c70 = function() { return responseFilter; }, + peg$c71 = "~t", + peg$c72 = { type: "literal", value: "~t", description: "\"~t\"" }, + peg$c73 = function(s) { return contentType(s); }, + peg$c74 = "~tcp", + peg$c75 = { type: "literal", value: "~tcp", description: "\"~tcp\"" }, + peg$c76 = function() { return tcpFilter; }, peg$c77 = "~tq", peg$c78 = { type: "literal", value: "~tq", description: "\"~tq\"" }, peg$c79 = function(s) { return requestContentType(s); }, @@ -661,288 +661,57 @@ module.exports = (function() { } function peg$parseExpr() { - var s0; - - s0 = peg$parseNullaryExpr(); - if (s0 === peg$FAILED) { - s0 = peg$parseUnaryExpr(); - } - - return s0; - } - - function peg$parseNullaryExpr() { - var s0, s1; - - s0 = peg$parseBooleanLiteral(); - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c23) { - s1 = peg$c23; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c24); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c25(); - } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c26) { - s1 = peg$c26; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c27); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c28(); - } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.substr(peg$currPos, 5) === peg$c29) { - s1 = peg$c29; - peg$currPos += 5; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c30); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c31(); - } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.substr(peg$currPos, 7) === peg$c32) { - s1 = peg$c32; - peg$currPos += 7; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c33); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c34(); - } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c35) { - s1 = peg$c35; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c36); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c37(); - } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c38) { - s1 = peg$c38; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c39); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c40(); - } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.substr(peg$currPos, 4) === peg$c41) { - s1 = peg$c41; - peg$currPos += 4; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c42); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c43(); - } - s0 = s1; - } - } - } - } - } - } - } - - return s0; - } - - function peg$parseBooleanLiteral() { - var s0, s1; + var s0, s1, s2, s3; s0 = peg$currPos; - if (input.substr(peg$currPos, 4) === peg$c44) { - s1 = peg$c44; + if (input.substr(peg$currPos, 4) === peg$c23) { + s1 = peg$c23; peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c45); } + if (peg$silentFails === 0) { peg$fail(peg$c24); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c46(); + s1 = peg$c25(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 5) === peg$c47) { - s1 = peg$c47; + if (input.substr(peg$currPos, 5) === peg$c26) { + s1 = peg$c26; peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c48); } + if (peg$silentFails === 0) { peg$fail(peg$c27); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c49(); + s1 = peg$c28(); } s0 = s1; - } - - return s0; - } - - function peg$parseUnaryExpr() { - var s0, s1, s2, s3; - - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c50) { - s1 = peg$c50; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c51); } - } - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$parsews(); - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$parsews(); - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$parseIntegerLiteral(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c52(s3); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c53) { - s1 = peg$c53; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c54); } - } - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$parsews(); - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$parsews(); - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$parseStringLiteral(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c55(s3); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 4) === peg$c56) { - s1 = peg$c56; - peg$currPos += 4; + if (input.substr(peg$currPos, 2) === peg$c29) { + s1 = peg$c29; + peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c57); } + if (peg$silentFails === 0) { peg$fail(peg$c30); } } if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$parsews(); - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$parsews(); - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$parseStringLiteral(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c58(s3); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; + peg$savedPos = s0; + s1 = peg$c31(); } + s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c59) { - s1 = peg$c59; + if (input.substr(peg$currPos, 2) === peg$c32) { + s1 = peg$c32; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c60); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } if (s1 !== peg$FAILED) { s2 = []; @@ -956,10 +725,10 @@ module.exports = (function() { s2 = peg$FAILED; } if (s2 !== peg$FAILED) { - s3 = peg$parseStringLiteral(); + s3 = peg$parseIntegerLiteral(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c61(s3); + s1 = peg$c34(s3); s0 = s1; } else { peg$currPos = s0; @@ -975,12 +744,12 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 3) === peg$c62) { - s1 = peg$c62; - peg$currPos += 3; + if (input.substr(peg$currPos, 2) === peg$c35) { + s1 = peg$c35; + peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c63); } + if (peg$silentFails === 0) { peg$fail(peg$c36); } } if (s1 !== peg$FAILED) { s2 = []; @@ -997,7 +766,7 @@ module.exports = (function() { s3 = peg$parseStringLiteral(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c64(s3); + s1 = peg$c37(s3); s0 = s1; } else { peg$currPos = s0; @@ -1013,12 +782,12 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 3) === peg$c65) { - s1 = peg$c65; - peg$currPos += 3; + if (input.substr(peg$currPos, 4) === peg$c38) { + s1 = peg$c38; + peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c66); } + if (peg$silentFails === 0) { peg$fail(peg$c39); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1035,7 +804,7 @@ module.exports = (function() { s3 = peg$parseStringLiteral(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c67(s3); + s1 = peg$c40(s3); s0 = s1; } else { peg$currPos = s0; @@ -1051,50 +820,26 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c68) { - s1 = peg$c68; + if (input.substr(peg$currPos, 2) === peg$c41) { + s1 = peg$c41; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c69); } + if (peg$silentFails === 0) { peg$fail(peg$c42); } } if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$parsews(); - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$parsews(); - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$parseStringLiteral(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c70(s3); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; + peg$savedPos = s0; + s1 = peg$c43(); } + s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 4) === peg$c71) { - s1 = peg$c71; - peg$currPos += 4; + if (input.substr(peg$currPos, 2) === peg$c44) { + s1 = peg$c44; + peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c72); } + if (peg$silentFails === 0) { peg$fail(peg$c45); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1111,7 +856,7 @@ module.exports = (function() { s3 = peg$parseStringLiteral(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c73(s3); + s1 = peg$c46(s3); s0 = s1; } else { peg$currPos = s0; @@ -1127,12 +872,12 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c74) { - s1 = peg$c74; - peg$currPos += 2; + if (input.substr(peg$currPos, 3) === peg$c47) { + s1 = peg$c47; + peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c75); } + if (peg$silentFails === 0) { peg$fail(peg$c48); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1149,7 +894,7 @@ module.exports = (function() { s3 = peg$parseStringLiteral(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c76(s3); + s1 = peg$c49(s3); s0 = s1; } else { peg$currPos = s0; @@ -1165,12 +910,12 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 3) === peg$c77) { - s1 = peg$c77; + if (input.substr(peg$currPos, 3) === peg$c50) { + s1 = peg$c50; peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c78); } + if (peg$silentFails === 0) { peg$fail(peg$c51); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1187,7 +932,7 @@ module.exports = (function() { s3 = peg$parseStringLiteral(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c79(s3); + s1 = peg$c52(s3); s0 = s1; } else { peg$currPos = s0; @@ -1203,50 +948,26 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 3) === peg$c80) { - s1 = peg$c80; - peg$currPos += 3; + if (input.substr(peg$currPos, 5) === peg$c53) { + s1 = peg$c53; + peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c81); } + if (peg$silentFails === 0) { peg$fail(peg$c54); } } if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$parsews(); - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$parsews(); - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$parseStringLiteral(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c82(s3); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; + peg$savedPos = s0; + s1 = peg$c55(); } + s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c83) { - s1 = peg$c83; + if (input.substr(peg$currPos, 2) === peg$c56) { + s1 = peg$c56; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c84); } + if (peg$silentFails === 0) { peg$fail(peg$c57); } } if (s1 !== peg$FAILED) { s2 = []; @@ -1263,7 +984,7 @@ module.exports = (function() { s3 = peg$parseStringLiteral(); if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c85(s3); + s1 = peg$c58(s3); s0 = s1; } else { peg$currPos = s0; @@ -1279,12 +1000,267 @@ module.exports = (function() { } if (s0 === peg$FAILED) { s0 = peg$currPos; - s1 = peg$parseStringLiteral(); + if (input.substr(peg$currPos, 7) === peg$c59) { + s1 = peg$c59; + peg$currPos += 7; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c60); } + } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c85(s1); + s1 = peg$c61(); } s0 = s1; + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 2) === peg$c62) { + s1 = peg$c62; + peg$currPos += 2; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c63); } + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c64(); + } + s0 = s1; + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 4) === peg$c65) { + s1 = peg$c65; + peg$currPos += 4; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c66); } + } + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parsews(); + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parsews(); + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = peg$parseStringLiteral(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c67(s3); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 2) === peg$c68) { + s1 = peg$c68; + peg$currPos += 2; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c69); } + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c70(); + } + s0 = s1; + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 2) === peg$c71) { + s1 = peg$c71; + peg$currPos += 2; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c72); } + } + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parsews(); + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parsews(); + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = peg$parseStringLiteral(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c73(s3); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 4) === peg$c74) { + s1 = peg$c74; + peg$currPos += 4; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c75); } + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c76(); + } + s0 = s1; + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 3) === peg$c77) { + s1 = peg$c77; + peg$currPos += 3; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c78); } + } + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parsews(); + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parsews(); + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = peg$parseStringLiteral(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c79(s3); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 3) === peg$c80) { + s1 = peg$c80; + peg$currPos += 3; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c81); } + } + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parsews(); + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parsews(); + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = peg$parseStringLiteral(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c82(s3); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.substr(peg$currPos, 2) === peg$c83) { + s1 = peg$c83; + peg$currPos += 2; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c84); } + } + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$parsews(); + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$parsews(); + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = peg$parseStringLiteral(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c85(s3); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$parseStringLiteral(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c85(s1); + } + s0 = s1; + } + } + } + } + } + } + } + } + } } } } diff --git a/web/src/js/filt/filt.peg b/web/src/js/filt/filt.peg index 70cb4f655..64780d8a4 100644 --- a/web/src/js/filt/filt.peg +++ b/web/src/js/filt/filt.peg @@ -224,38 +224,33 @@ BindingExpr { return binding(expr); } / Expr +/* All the filters except "~s" and "~src" are arranged in the ascending order as + given in the docs(http://docs.mitmproxy.org/en/latest/features/filters.html). + "~s" and "~src" are so arranged as "~s" caused problems in the evaluation of + "~src". */ + Expr - = NullaryExpr - / UnaryExpr - -NullaryExpr - = BooleanLiteral - / "~a" { return assetFilter; } - / "~e" { return errorFilter; } - / "~http" { return httpFilter; } - / "~marked" { return markedFilter; } - / "~q" { return noResponseFilter; } - / "~s" { return responseFilter; } - / "~tcp" { return tcpFilter; } - - -BooleanLiteral = "true" { return trueFilter; } / "false" { return falseFilter; } - -UnaryExpr - = "~c" ws+ s:IntegerLiteral { return responseCode(s); } - / "~d" ws+ s:StringLiteral { return domain(s); } + / "~a" { return assetFilter; } + / "~c" ws+ s:IntegerLiteral { return responseCode(s); } + / "~d" ws+ s:StringLiteral { return domain(s); } / "~dst" ws+ s:StringLiteral { return destination(s); } - / "~h" ws+ s:StringLiteral { return header(s); } - / "~hq" ws+ s:StringLiteral { return requestHeader(s); } - / "~hs" ws+ s:StringLiteral { return responseHeader(s); } - / "~m" ws+ s:StringLiteral { return method(s); } + / "~e" { return errorFilter; } + / "~h" ws+ s:StringLiteral { return header(s); } + / "~hq" ws+ s:StringLiteral { return requestHeader(s); } + / "~hs" ws+ s:StringLiteral { return responseHeader(s); } + / "~http" { return httpFilter; } + / "~m" ws+ s:StringLiteral { return method(s); } + / "~marked" { return markedFilter; } + / "~q" { return noResponseFilter; } / "~src" ws+ s:StringLiteral { return source(s); } - / "~t" ws+ s:StringLiteral { return contentType(s); } - / "~tq" ws+ s:StringLiteral { return requestContentType(s); } - / "~ts" ws+ s:StringLiteral { return responseContentType(s); } - / "~u" ws+ s:StringLiteral { return url(s); } + / "~s" { return responseFilter; } + / "~t" ws+ s:StringLiteral { return contentType(s); } + / "~tcp" { return tcpFilter; } + / "~tq" ws+ s:StringLiteral { return requestContentType(s); } + / "~ts" ws+ s:StringLiteral { return responseContentType(s); } + / "~u" ws+ s:StringLiteral { return url(s); } / s:StringLiteral { return url(s); } IntegerLiteral "integer"