diff options
| author | Tarmo Oja <tarmo.oja@cyber.ee> | 2024-09-04 12:07:12 +0300 |
|---|---|---|
| committer | Tarmo Oja <tarmo.oja@cyber.ee> | 2024-09-04 12:07:12 +0300 |
| commit | 2c1114598c49d853f645376a26f5c7276875d2fe (patch) | |
| tree | 29c379538fc0a627e50a9459e6daf43b16cf8f61 | |
| parent | 4b1eab46c1f6466262637d44872a8e9053bb686d (diff) | |
| download | rspamd-2c1114598c49d853f645376a26f5c7276875d2fe.tar.gz rspamd-2c1114598c49d853f645376a26f5c7276875d2fe.zip | |
deduplicate url_encode_string
| -rw-r--r-- | lualib/lua_maps.lua | 16 | ||||
| -rw-r--r-- | lualib/lua_util.lua | 3 |
2 files changed, 5 insertions, 14 deletions
diff --git a/lualib/lua_maps.lua b/lualib/lua_maps.lua index a912039be..2699ea214 100644 --- a/lualib/lua_maps.lua +++ b/lualib/lua_maps.lua @@ -97,18 +97,6 @@ local external_map_schema = ts.shape { local rspamd_http = require "rspamd_http" local ucl = require "ucl" -local function url_encode_string(str) - str = string.gsub(str, "([^%w _%%%-%.~])", - function(c) - return string.format("%%%02X", string.byte(c)) - end) - str = string.gsub(str, " ", "+") - return str -end - -assert(url_encode_string('上海+中國') == '%E4%B8%8A%E6%B5%B7%2B%E4%B8%AD%E5%9C%8B') -assert(url_encode_string('? and the Mysterians') == '%3F+and+the+Mysterians') - local function query_external_map(map_config, upstreams, key, callback, task) local http_method = (map_config.method == 'body' or map_config.method == 'form') and 'POST' or 'GET' local upstream = upstreams:get_upstream_round_robin() @@ -127,7 +115,7 @@ local function query_external_map(map_config, upstreams, key, callback, task) key = key } elseif map_config.method == 'query' then - url = string.format('%s?key=%s', url, url_encode_string(tostring(key))) + url = string.format('%s?key=%s', url, lua_util.url_encode_string(tostring(key))) end elseif type(key) == 'table' then if map_config.method == 'body' then @@ -150,7 +138,7 @@ local function query_external_map(map_config, upstreams, key, callback, task) local params_table = {} for k, v in pairs(key) do if type(v) == 'string' then - table.insert(params_table, string.format('%s=%s', url_encode_string(k), url_encode_string(v))) + table.insert(params_table, string.format('%s=%s', lua_util.url_encode_string(k), lua_util.url_encode_string(v))) end end url = string.format('%s?%s', url, table.concat(params_table, '&')) diff --git a/lualib/lua_util.lua b/lualib/lua_util.lua index 88599407c..470925b95 100644 --- a/lualib/lua_util.lua +++ b/lualib/lua_util.lua @@ -1708,6 +1708,9 @@ local function url_encode_string(str) end exports.url_encode_string = url_encode_string +assert(url_encode_string('上海+中國') == '%E4%B8%8A%E6%B5%B7%2B%E4%B8%AD%E5%9C%8B') +assert(url_encode_string('? and the Mysterians') == '%3F+and+the+Mysterians') + -- Short unit test for sanity if path_sep == '/' then assert(join_path('/path', 'to', 'file') == '/path/to/file') |