diff --git a/lib/resty/healthcheck.lua b/lib/resty/healthcheck.lua index d7dbf4c8..846db76e 100644 --- a/lib/resty/healthcheck.lua +++ b/lib/resty/healthcheck.lua @@ -39,6 +39,47 @@ local re_find = ngx.re.find local bit = require("bit") local ngx_worker_exiting = ngx.worker.exiting local ssl = require("ngx.ssl") +local escape_uri = ngx.escape_uri + +local new_tab +local nkeys +local is_array + +do + local pcall = pcall + local ok + + ok, new_tab = pcall(require, "table.new") + if not ok then + new_tab = function () return {} end + end + + -- OpenResty branch of LuaJIT New API + ok, nkeys = pcall(require, "table.nkeys") + if not ok then + nkeys = function (tab) + local count = 0 + for _, v in pairs(tab) do + if v ~= nil then + count = count + 1 + end + end + return count + end + end + + ok, is_array = pcall(require, "table.isarray") + if not ok then + is_array = function(t) + for k in pairs(t) do + if type(k) ~= "number" or math.floor(k) ~= k then + return false + end + end + return true + end + end +end -- constants local EVENT_SOURCE_PREFIX = "lua-resty-healthcheck" @@ -919,8 +960,32 @@ function checker:run_single_check(ip, port, hostname, hostheader) end local req_headers = self.checks.active.headers - local headers = table.concat(req_headers, "\r\n") - if #headers > 0 then + local headers + local headers_length = nkeys(req_headers) + if headers_length > 0 then + if is_array(req_headers) then + self:log(WARN, "array headers is deprecated") + headers = table.concat(req_headers, "\r\n") + else + headers = new_tab(0, headers_length) + local idx = 0 + for k, v in pairs(req_headers) do + -- `k` is header name and `v` is header value + idx = idx + 1 + if type(v) == "table" then + for _, item in ipairs(v) do + idx = idx + 1 + headers[idx] = escape_uri(k) .. ":" .. escape_uri(item) + end + else + headers[idx] = escape_uri(k) .. ":" .. escape_uri(v) + end + end + headers = table.concat(headers, "\r\n") + end + end + + if headers and #headers > 0 then headers = headers .. "\r\n" end @@ -1271,7 +1336,7 @@ local defaults = { http_path = "/", https_sni = NO_DEFAULT, https_verify_certificate = true, - headers = {""}, + headers = NO_DEFAULT, healthy = { interval = 0, -- 0 = disabled by default http_statuses = { 200, 302 }, @@ -1347,7 +1412,7 @@ end -- * `checks.active.http_path`: path to use in `GET` HTTP request to run on active checks -- * `checks.active.https_sni`: SNI server name incase of HTTPS -- * `checks.active.https_verify_certificate`: boolean indicating whether to verify the HTTPS certificate --- * `checks.active.hheaders`: an array of headers (no hash-table! must be pre-formatted) +-- * `checks.active.headers`: one or more lists of values indexed by header name -- * `checks.active.healthy.interval`: interval between checks for healthy targets (in seconds) -- * `checks.active.healthy.http_statuses`: which HTTP statuses to consider a success -- * `checks.active.healthy.successes`: number of successes to consider a target healthy diff --git a/t/20-req-headers.t b/t/20-req-headers.t index 304315db..34586568 100644 --- a/t/20-req-headers.t +++ b/t/20-req-headers.t @@ -112,3 +112,53 @@ checking healthy targets: #1 GET /status HTTP/1.0 User-Agent: curl Host: 127.0.0.1 + + + +=== TEST 3: headers: {"User-Agent", "curl"} +--- http_config eval +qq{ + $::HttpConfig + + server { + listen 2112; + location = /status { + return 200; + } + } +} +--- config + location = /t { + content_by_lua_block { + local we = require "resty.worker.events" + assert(we.configure{ shm = "my_worker_events", interval = 0.1 }) + local healthcheck = require("resty.healthcheck") + local checker = healthcheck.new({ + name = "testing", + shm_name = "test_shm", + checks = { + active = { + http_path = "/status", + healthy = { + interval = 0.1 + }, + headers = { ["User-Agent"] = {"curl"} } + } + } + }) + ngx.sleep(0.2) -- wait twice the interval + local ok, err = checker:add_target("127.0.0.1", 2112, nil, true) + ngx.say(ok) + ngx.sleep(0.2) -- wait twice the interval + } + } +--- request +GET /t +--- response_body +true +--- error_log +checking healthy targets: nothing to do +checking healthy targets: #1 +GET /status HTTP/1.0 +User-Agent: curl +Host: 127.0.0.1