aboutsummaryrefslogtreecommitdiffstats
path: root/test/lua/unit
diff options
context:
space:
mode:
Diffstat (limited to 'test/lua/unit')
-rw-r--r--test/lua/unit/logger.lua95
-rw-r--r--test/lua/unit/rspamd_resolver.lua62
2 files changed, 133 insertions, 24 deletions
diff --git a/test/lua/unit/logger.lua b/test/lua/unit/logger.lua
index dc0120709..c28d8bb09 100644
--- a/test/lua/unit/logger.lua
+++ b/test/lua/unit/logger.lua
@@ -3,17 +3,17 @@ context("Logger unit tests", function()
local log = require "rspamd_logger"
local cases = {
- {'string', 'string'},
- {'%1', 'string', 'string'},
- {'%1', '1.1', 1.1},
- {'%1', '1', 1},
- {'%1', 'true', true},
- {'%1', '{[1] = 1, [2] = test}', {1, 'test'}},
- {'%1', '{[1] = 1, [2] = 2.1, [k2] = test}', {1, 2.1, k2='test'}},
- {'%s', 'true', true},
+ { 'string', 'string' },
+ { '%1', 'string', 'string' },
+ { '%1', '1.1', 1.1 },
+ { '%1', '1', 1 },
+ { '%1', 'true', true },
+ { '%1', '{[1] = 1, [2] = test}', { 1, 'test' } },
+ { '%1', '{[1] = 1, [2] = 2.1, [k2] = test}', { 1, 2.1, k2 = 'test' } },
+ { '%s', 'true', true },
}
- for _,c in ipairs(cases) do
+ for _, c in ipairs(cases) do
local s
if c[3] then
s = log.slog(c[1], c[3])
@@ -21,7 +21,82 @@ context("Logger unit tests", function()
s = log.slog(c[1])
end
assert_equal(s, c[2], string.format("'%s' doesn't match with '%s'",
- c[2], s))
+ c[2], s))
+ end
+ end)
+
+ test("Logger graceful error handling", function()
+ local log = require "rspamd_logger"
+
+ -- Test missing arguments
+ local missing_arg_cases = {
+ { '%1', '<MISSING ARGUMENT>' },
+ { '%0', '<MISSING ARGUMENT>' }, -- %0 is invalid since Lua args are 1-indexed
+ { '%2', '<MISSING ARGUMENT>', 'arg1' },
+ { '%1 %2', 'arg1 <MISSING ARGUMENT>', 'arg1' },
+ { 'prefix %1 %3 suffix', 'prefix arg1 <MISSING ARGUMENT> suffix', 'arg1' },
+ }
+
+ for _, c in ipairs(missing_arg_cases) do
+ local s
+ if c[3] then
+ s = log.slog(c[1], c[3])
+ else
+ s = log.slog(c[1])
+ end
+ assert_equal(s, c[2], string.format("Missing arg test: '%s' doesn't match with '%s'",
+ c[2], s))
+ end
+
+ -- Test extra arguments
+ local extra_arg_cases = {
+ { '%1', 'arg1 <EXTRA 1 ARGUMENTS>', 'arg1', 'extra1' },
+ { '%1', 'arg1 <EXTRA 2 ARGUMENTS>', 'arg1', 'extra1', 'extra2' },
+ { '%s', 'arg1 <EXTRA 1 ARGUMENTS>', 'arg1', 'extra1' },
+ { 'prefix %1 suffix', 'prefix arg1 suffix <EXTRA 1 ARGUMENTS>', 'arg1', 'extra1' },
+ }
+
+ for _, c in ipairs(extra_arg_cases) do
+ local s
+ if c[4] and c[5] then
+ s = log.slog(c[1], c[3], c[4], c[5])
+ elseif c[4] then
+ s = log.slog(c[1], c[3], c[4])
+ else
+ s = log.slog(c[1], c[3])
+ end
+ assert_equal(s, c[2], string.format("Extra arg test: '%s' doesn't match with '%s'",
+ c[2], s))
+ end
+
+ -- Test literal percent sequences (should pass through as-is)
+ local literal_cases = {
+ { '%-1', '%-1' },
+ { '%abc', '%abc' }, -- Should pass through as literal since it's not a valid number
+ { '%', '%' }, -- Single percent should pass through
+ }
+
+ for _, c in ipairs(literal_cases) do
+ local s = log.slog(c[1])
+ assert_equal(s, c[2], string.format("Literal test: '%s' doesn't match with '%s'",
+ c[2], s))
+ end
+
+ -- Test mixed scenarios
+ local mixed_cases = {
+ { '%1 %3', 'arg1 <MISSING ARGUMENT> <EXTRA 1 ARGUMENTS>', 'arg1', 'extra1' },
+ { '%2 %4', 'extra1 <MISSING ARGUMENT> <EXTRA 1 ARGUMENTS>', 'arg1', 'extra1' },
+ }
+
+ for _, c in ipairs(mixed_cases) do
+ local s
+ if c[4] then
+ s = log.slog(c[1], c[3], c[4])
+ else
+ s = log.slog(c[1], c[3])
+ end
+ assert_equal(s, c[2], string.format("Mixed test: '%s' doesn't match with '%s'",
+ c[2], s))
end
end)
end) \ No newline at end of file
diff --git a/test/lua/unit/rspamd_resolver.lua b/test/lua/unit/rspamd_resolver.lua
index e987ff00b..2fdec2c4b 100644
--- a/test/lua/unit/rspamd_resolver.lua
+++ b/test/lua/unit/rspamd_resolver.lua
@@ -6,24 +6,58 @@ context("Check punycoding UTF-8 URL", function()
local resolver = rspamd_resolver.init(rspamd_util.create_event_base(), rspamd_config)
- local cases = {
- -- https://unicode.org/reports/tr46/#Deviations
- ['faß.de'] = 'fass.de', -- IDNA2008 result: xn--fa-hia.de
- ['βόλος.com'] = 'xn--nxasmq6b.com', -- IDNA2008 result: xn--nxasmm1c.com
- ['نامه‌ای.com'] = 'xn--mgba3gch31f.com', -- IDNA2008 result: xn--mgba3gch31f060k.com
- ['ශ්‍රී.com'] = 'xn--10cl1a0b.com', -- IDNA2008 result: xn--10cl1a0b660p.com
-
- -- https://unicode.org/reports/tr46/#Table_Example_Processing
- ['日本語。ＪＰ'] = 'xn--wgv71a119e.jp', -- Fullwidth characters are remapped, including 。
- --['u¨.com'] = 'xn--tda.com', -- Normalize changes u + umlaut to ü
- ['☕.us'] = 'xn--53h.us', -- Post-Unicode 3.2 characters are allowed
-
- -- Other
+ -- Helper function to detect IDNA behavior by testing a known conversion
+ local function detect_idna_behavior()
+ -- Use faß.de as a test case - different results in IDNA2003 vs IDNA2008
+ local test_result = resolver:idna_convert_utf8('faß.de')
+ if test_result == 'fass.de' then
+ return 'transitional' -- IDNA2003/transitional behavior
+ elseif test_result == 'xn--fa-hia.de' then
+ return 'nontransitional' -- IDNA2008/nontransitional behavior
+ else
+ return 'unknown'
+ end
+ end
+
+ local idna_behavior = detect_idna_behavior()
+
+ -- Define test cases with both expected results
+ local cases_transitional = {
+ -- IDNA2003/transitional results (ICU < 76 default)
+ ['faß.de'] = 'fass.de',
+ ['βόλος.com'] = 'xn--nxasmq6b.com',
+ ['نامه‌ای.com'] = 'xn--mgba3gch31f.com',
+ ['ශ්‍රී.com'] = 'xn--10cl1a0b.com',
+ ['日本語。ＪＰ'] = 'xn--wgv71a119e.jp',
+ ['☕.us'] = 'xn--53h.us',
+ ['example.рф'] = 'example.xn--p1ai',
+ }
+
+ local cases_nontransitional = {
+ -- IDNA2008/nontransitional results (ICU >= 76 default)
+ ['faß.de'] = 'xn--fa-hia.de',
+ ['βόλος.com'] = 'xn--nxasmm1c.com',
+ ['نامه‌ای.com'] = 'xn--mgba3gch31f060k.com',
+ ['ශ්‍රී.com'] = 'xn--10cl1a0b660p.com',
+ ['日本語。ＪＰ'] = 'xn--wgv71a119e.jp',
+ ['☕.us'] = 'xn--53h.us',
['example.рф'] = 'example.xn--p1ai',
}
+ -- Choose appropriate test cases based on detected behavior
+ local cases
+ if idna_behavior == 'transitional' then
+ cases = cases_transitional
+ print("Detected IDNA transitional behavior (ICU < 76 or configured for IDNA2003)")
+ elseif idna_behavior == 'nontransitional' then
+ cases = cases_nontransitional
+ print("Detected IDNA nontransitional behavior (ICU >= 76 default)")
+ else
+ error("Could not detect IDNA behavior - unexpected result for test case")
+ end
+
for k, v in pairs(cases) do
- test(string.format("punycode %s -> %s", k, v), function()
+ test(string.format("punycode %s -> %s (%s)", k, v, idna_behavior), function()
local res = resolver:idna_convert_utf8(k)
assert_equal(res, v)
end)
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-16 02:07:01 +0000