Changeset ce14cfda814381decf6cb454e9b996745d37ffe8

Timestamp:

06/07/12 15:13:38 (1 year ago)

Author:

Theo Schlossnagle <jesus@lethargy.org>

git-committer:

Theo Schlossnagle <jesus@lethargy.org> 1339082018 -0700

git-parent:

[76bc8e8991f5ed9e8336b0130c92de4d48def93c], [f291bb5ab0ef376b5f15b11df991efb2cdaeabc1]

git-author:

Theo Schlossnagle <jesus@lethargy.org> 1339082018 -0700

Message:

Merge pull request #81 from TheTeaWeevil?/master

Fixes To Cookies And Redirect In HTTP Checks

Files:

• src/modules-lua/noit/HttpClient.lua (modified) (3 diffs)
• src/modules-lua/noit/module/http.lua (modified) (8 diffs)

src/modules-lua/noit/HttpClient.lua

@@ -86 +86 @@
-    local lasthdr
-    local str = self.e:read("\n");
+    local cookie_count = 1;
-    if str == nil then error("no response") end
-    self.protocol, self.code = string.match(str, "^HTTP/(%d.%d)%s+(%d+)%s+")
@@ -91 +92 @@
-    self.code = tonumber(self.code)
-    self.headers = {}
+    self.cookies = {}
-    while true do
-        local str = self.e:read("\n")
@@ -104 +106 @@
-        else
-            hdr = string.lower(hdr)
-
+
+
+
+
+
+
-            lasthdr = hdr
-        end
-    end
-
+, self.cookies
-end
-

src/modules-lua/noit/module/http.lua

@@ -155 +155 @@
-
-function populate_cookie_jar(cookies, host, hdr)
+    local path = nil
-    if hdr ~= nil then
-        local name, value, trailer =
@@ -160 +161 @@
-        if name ~= nil then
-            local jar = { }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                end
-            end
-
-
-
+
+
+
+
+
+
+
+
-        end
-    end
@@ -187 +199 @@
-
-function apply_cookies(headers, cookies, host, uri)
-
+
+
-        if has_host(h, host) then
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    end
-                end
@@ -202 +235 @@
-        end
-    end
+    for name, value in pairs(use_cookies) do
+        if headers["Cookie"] == nil then
+            headers["Cookie"] = name .. "=" .. value
+        else
+            headers["Cookie"] = headers["Cookie"] .. "; " .. name .. "=" .. value
+        end
+    end
+end
+
+function get_new_uri(old_uri, new_uri)
+    if new_uri == nil then return "/" end
+    if new_uri == "/" then return new_uri end
+    local toReturn = old_uri
+    while string.find(toReturn, "/", -1) ~= nil do
+        toReturn = string.sub(toReturn, 1, -2)
+    end
+    if string.sub(new_uri, 1, 1) == '?' then
+        local rindex = string.match(toReturn, '.*()'.."/")
+        toReturn = string.sub(toReturn, 1, rindex-1)
+        toReturn = toReturn .. new_uri
+    elseif string.sub(new_uri, 1, 1) ~= "." then 
+        toReturn = new_uri
+    else
+        toReturn = string.gsub(toReturn, "%/%?", "?")
+        while string.sub(new_uri, 1, 1) == "." do
+            if string.find(new_uri, "%./") == 1 then
+                new_uri = string.gsub("%./", "", 1)
+            elseif string.find(new_uri, "%.%./") == 1 then
+                --strip out last bit from toReturn
+                local rindex = string.match(toReturn, '.*()'.."/")
+                toReturn = string.sub(toReturn, 1, rindex-1)
+                new_uri = string.gsub(new_uri, "../", "", 1)
+            else
+                -- bad URI... just return /
+                return "/"
+            end
+        end
+        toReturn = toReturn .. "/" .. new_uri
+    end
+    return toReturn
+end
+
+function get_absolute_path(uri)
+    if uri == nil then return "/" end
+    local toReturn = uri
+    local go_back = string.find(toReturn, "%.%./")
+    while go_back ~= nil do
+        local tojoin = go_back + 3
+        go_back = go_back - 2
+        local back_substring = string.sub(toReturn, 1, go_back)
+        local forward_substring = string.sub(toReturn, tojoin)
+        local rindex = string.match(back_substring, '.*()' .. "/")
+        if rindex ~= nil then
+            toReturn = string.sub(toReturn, 1, rindex) .. forward_substring
+        end
+        go_back = string.find(toReturn, "%.%./")
+    end
+    toReturn = string.gsub(toReturn, "%./", "")
+    return toReturn
-end
-
@@ -263 +355 @@
-        output = output .. (str or '')
-    end
-
+, setcookies
-        next_location = hdrs.location
-
-
+
+
+
-    end
-
@@ -363 +456 @@
-            local prev_port = port
-            local prev_host = host
+            local prev_uri = uri
-            method = 'GET'
-            payload = nil
@@ -371 +465 @@
-                port = prev_port
-                host = prev_host
-next_location
+get_new_uri(prev_uri, next_location)
-            elseif schema == 'http' then
-                use_ssl = false
@@ -379 +473 @@
-                if port == "" then port = 443 end
-            end
+            uri = get_absolute_path(uri)
-            if host ~= nil then
-                headers.Host = host
-                local r = dns:lookup(host)
-                if not r or r.a == nil then
-+
+..
-                    return
-                end
-                target = r.a
+            end
+            while string.find(host, "/", -1) ~= nil do
+                host = string.sub(host, 1, -2)
-            end
-            headers["Cookie"] = check.config["header_Cookie"]