Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ESI conditions #160

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

ESI conditions #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da210bd
Unit tests for _esi_condition_lexer
hamishforbes Sep 5, 2017
ec0a000
Unit tests for _esi_evaluate_condition
hamishforbes Sep 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/ledge/esi/processor_1_0.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ local function _esi_condition_lexer(condition)
)
if not re then
ngx_log(ngx_INFO,
"Parse error: could not parse regular expression",
"Parse error: could not parse regular expression ",
"in: \"", condition, "\""
)
return nil
Expand Down Expand Up @@ -345,6 +345,7 @@ local function _esi_evaluate_condition(condition)
return false
end
end
_M._esi_evaluate_condition = _esi_evaluate_condition


-- Replaces all variables in <esi:vars> blocks, or inline within other esi:tags.
Expand Down
235 changes: 235 additions & 0 deletions t/01-unit/processor_1_0.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,3 +508,238 @@ GET /t?test_param=test
--- response_body
OK

=== TEST 10: _esi_condition_lexer
--- http_config eval: $::HttpConfig
--- config
location /t {
content_by_lua_block {
local processor = require("ledge.esi.processor_1_0")
local tests = {
-- Basic operators
{
["condition"] = [[1 == 1]],
["res"] = [[1 == 1]],
["msg"] = "equality"
},
{
["condition"] = [[1 != 1]],
["res"] = [[1 ~= 1]],
["msg"] = "negative equality"
},
{
["condition"] = [[1 | 2]],
["res"] = [[1 or 2]],
["msg"] = "or"
},
{
["condition"] = [[1 || 2]],
["res"] = [[1 or 2]],
["msg"] = "double or"
},
{
["condition"] = [[1 & 2]],
["res"] = [[1 and 2]],
["msg"] = "and"
},
{
["condition"] = [[1 && 2]],
["res"] = [[1 and 2]],
["msg"] = "double and"
},
{
["condition"] = [[!1]],
["res"] = [[ not 1]],
["msg"] = "boolean not"
},
-- regex operator
{
["condition"] = [['foo' =~ '/(foo|bar)/']],
["res"] = [[find('foo', '(foo|bar)', 'oj')]],
["msg"] = "regex"
},
}
for _, t in pairs(tests) do
local ok, output = processor._esi_condition_lexer(t["condition"])
ngx.log(ngx.DEBUG, "'", output, "'")
assert(ok == true and output == t["res"], "_esi_condition_lexer mismatch: "..t["msg"] )
end

-- Failure cases
local tests = {
{
["condition"] = [[1 'foo']],
["msg"] = "string after number"
},
{
["condition"] = [['foo' 1]],
["msg"] = "string before number"
},
{
["condition"] = [[== =~ '/(foo|bar)/']],
["msg"] = "regex against operatpr"
},
{
["condition"] = [['/(foo|bar)/' =~ 'foo']],
["msg"] = "inverse regex"
},
{
["condition"] = [['/foo|bar)/' =~ 'foo']],
["msg"] = "invalid regex"
},

}
for _, t in pairs(tests) do
local ok, output = processor._esi_condition_lexer(t["condition"])
ngx.log(ngx.DEBUG, "'", output, "'")
assert( not ok, "_esi_condition_lexer should fail: "..t["msg"] )
end
ngx.say("OK")
}
}

--- request
GET /t
--- no_error_log
[error]
--- error_log eval
[
"Parse error: found string after number",
"Parse error: found number after string",
"Parse error: regular expression attempting against non-string",
"Parse error: could not parse regular expression in: \"'/foo|bar)/'",
]
--- response_body
OK

=== TEST 11: _esi_evaluate_condition
--- http_config eval: $::HttpConfig
--- config
location /t {
content_by_lua_block {
local processor = require("ledge.esi.processor_1_0")
local tests = {
-- Basic operators
{
["condition"] = [[1 == 1]],
["res"] = true,
["msg"] = "equality"
},
{
["condition"] = [[1 == 2]],
["res"] = false,
["msg"] = "equality - negative"
},
{
["condition"] = [['foo' == 'foo']],
["res"] = true,
["msg"] = "equality string"
},
{
["condition"] = [['foo' == 'bar']],
["res"] = false,
["msg"] = "equality string - negative"
},

{
["condition"] = [[1 != 1]],
["res"] = false,
["msg"] = "inverse equality"
},
{
["condition"] = [[1 != 2]],
["res"] = true,
["msg"] = "inverse equality - negative"
},
{
["condition"] = [['foo' != 'foo']],
["res"] = false,
["msg"] = "inverse equality string"
},
{
["condition"] = [['foo' != 'bar']],
["res"] = true,
["msg"] = "inverse equality string - negative"
},

{
["condition"] = [[1 | 2]],
--["res"] = true,
["res"] = 1,
["msg"] = "or"
},
{
["condition"] = [['foo' | 'bar']],
--["res"] = true,
["res"] = 'foo',
["msg"] = "string or"
},
--[===[
{
["condition"] = [[false | false]],
["res"] = false,
["msg"] = "or - negative"
},
--]===]


{
["condition"] = [[1 && 2]],
--["res"] = true,
["res"] = 2,
["msg"] = "and"
},
{
["condition"] = [['foo' && 'bar']],
--["res"] = true,
["res"] = 'bar',
["msg"] = "and string"
},
--[===[ {
["condition"] = [[1 && false]],
["res"] = false,
["msg"] = "and - negative"
},
--]===]

--[===[ {
["condition"] = [[!true]],
--["res"] = true,
["res"] = nil,
["msg"] = "boolean not"
},

{
["condition"] = [[ ! false]],
["res"] = false,
["msg"] = "boolean not - negative"
},
--]===]
-- regex operator
{
["condition"] = [['foo' =~ '/(foo|bar)/']],
--["res"] = true,
["res"] = 1,
["msg"] = "regex"
},
{
["condition"] = [['foo' =~ '/(qux|baz)/']],
--["res"] = false,
["res"] = nil,
["msg"] = "regex"
},
}
for _, t in pairs(tests) do
local ok = processor._esi_evaluate_condition(t["condition"])
ngx.log(ngx.DEBUG, "'", t["condition"], "' = ", ok)
assert(ok == t["res"], "_esi_evaluate_condition mismatch: "..t["msg"] )
end
ngx.say("OK")
}
}

--- request
GET /t
--- no_error_log
[error]
--- response_body
OK