Merge branch 'master' into hjelmeland-patch-1hjelmeland-patch-1

1 files changed, 157 insertions, 54 deletions

diff --git a/test/urltest.lua b/test/urltest.lua
index 32cb348..9a3c470 100644
--- a/test/urltest.lua
+++ b/test/urltest.lua
@@ -60,8 +60,8 @@ end
 
 local check_absolute_url = function(base, relative, absolute)
     local res = socket.url.absolute(base, relative)
-    if res ~= absolute then 
-        io.write("absolute: In test for '", relative, "' expected '", 
+    if res ~= absolute then
+        io.write("absolute: In test for base='", base, "', rel='", relative, "' expected '",
             absolute, "' but got '", res, "'\n")
         os.exit()
     end
@@ -73,7 +73,7 @@ local check_parse_url = function(gaba)
     local parsed = socket.url.parse(url)
     for i, v in pairs(gaba) do
         if v ~= parsed[i] then
-            io.write("parse: In test for '", url, "' expected ", i, " = '", 
+            io.write("parse: In test for '", url, "' expected ", i, " = '",
                    v, "' but got '", tostring(parsed[i]), "'\n")
             for i,v in pairs(parsed) do print(i,v) end
             os.exit()
@@ -81,7 +81,7 @@ local check_parse_url = function(gaba)
     end
     for i, v in pairs(parsed) do
         if v ~= gaba[i] then
-            io.write("parse: In test for '", url, "' expected ", i, " = '", 
+            io.write("parse: In test for '", url, "' expected ", i, " = '",
                    tostring(gaba[i]), "' but got '", v, "'\n")
             for i,v in pairs(parsed) do print(i,v) end
             os.exit()
@@ -91,9 +91,78 @@ end
 
 print("testing URL parsing")
 check_parse_url{
+    url = "scheme://user:pass$%?#wd@host:port/path;params?query#fragment",
+    scheme = "scheme",
+    authority = "user:pass$%?#wd@host:port",
+    host = "host",
+    port = "port",
+    userinfo = "user:pass$%?#wd",
+    password = "pass$%?#wd",
+    user = "user",
+    path = "/path",
+    params = "params",
+    query = "query",
+    fragment = "fragment"
+}
+check_parse_url{
+    url = "scheme://user:pass?#wd@host:port/path;params?query#fragment",
+    scheme = "scheme",
+    authority = "user:pass?#wd@host:port",
+    host = "host",
+    port = "port",
+    userinfo = "user:pass?#wd",
+    password = "pass?#wd",
+    user = "user",
+    path = "/path",
+    params = "params",
+    query = "query",
+    fragment = "fragment"
+}
+check_parse_url{
+    url = "scheme://user:pass-wd@host:port/path;params?query#fragment",
+    scheme = "scheme",
+    authority = "user:pass-wd@host:port",
+    host = "host",
+    port = "port",
+    userinfo = "user:pass-wd",
+    password = "pass-wd",
+    user = "user",
+    path = "/path",
+    params = "params",
+    query = "query",
+    fragment = "fragment"
+}
+check_parse_url{
+    url = "scheme://user:pass#wd@host:port/path;params?query#fragment",
+    scheme = "scheme",
+    authority = "user:pass#wd@host:port",
+    host = "host",
+    port = "port",
+    userinfo = "user:pass#wd",
+    password = "pass#wd",
+    user = "user",
+    path = "/path",
+    params = "params",
+    query = "query",
+    fragment = "fragment"
+}
+check_parse_url{
+    url = "scheme://user:pass#wd@host:port/path;params?query",
+    scheme = "scheme",
+    authority = "user:pass#wd@host:port",
+    host = "host",
+    port = "port",
+    userinfo = "user:pass#wd",
+    password = "pass#wd",
+    user = "user",
+    path = "/path",
+    params = "params",
+    query = "query",
+}
+check_parse_url{
     url = "scheme://userinfo@host:port/path;params?query#fragment",
-    scheme = "scheme", 
-    authority = "userinfo@host:port", 
+    scheme = "scheme",
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -106,8 +175,8 @@ check_parse_url{
 
 check_parse_url{
     url = "scheme://user:password@host:port/path;params?query#fragment",
-    scheme = "scheme", 
-    authority = "user:password@host:port", 
+    scheme = "scheme",
+    authority = "user:password@host:port",
     host = "host",
     port = "port",
     userinfo = "user:password",
@@ -121,8 +190,8 @@ check_parse_url{
 
 check_parse_url{
     url = "scheme://userinfo@host:port/path;params?query#",
-    scheme = "scheme", 
-    authority = "userinfo@host:port", 
+    scheme = "scheme",
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -135,8 +204,8 @@ check_parse_url{
 
 check_parse_url{
     url = "scheme://userinfo@host:port/path;params?#fragment",
-    scheme = "scheme", 
-    authority = "userinfo@host:port", 
+    scheme = "scheme",
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -149,8 +218,8 @@ check_parse_url{
 
 check_parse_url{
     url = "scheme://userinfo@host:port/path;params#fragment",
-    scheme = "scheme", 
-    authority = "userinfo@host:port", 
+    scheme = "scheme",
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -162,8 +231,8 @@ check_parse_url{
 
 check_parse_url{
     url = "scheme://userinfo@host:port/path;?query#fragment",
-    scheme = "scheme", 
-    authority = "userinfo@host:port", 
+    scheme = "scheme",
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -176,8 +245,8 @@ check_parse_url{
 
 check_parse_url{
     url = "scheme://userinfo@host:port/path?query#fragment",
-    scheme = "scheme", 
-    authority = "userinfo@host:port", 
+    scheme = "scheme",
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -189,8 +258,8 @@ check_parse_url{
 
 check_parse_url{
     url = "scheme://userinfo@host:port/;params?query#fragment",
-    scheme = "scheme", 
-    authority = "userinfo@host:port", 
+    scheme = "scheme",
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -203,8 +272,8 @@ check_parse_url{
 
 check_parse_url{
     url = "scheme://userinfo@host:port",
-    scheme = "scheme", 
-    authority = "userinfo@host:port", 
+    scheme = "scheme",
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -213,7 +282,7 @@ check_parse_url{
 
 check_parse_url{
     url = "//userinfo@host:port/path;params?query#fragment",
-    authority = "userinfo@host:port", 
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -226,7 +295,7 @@ check_parse_url{
 
 check_parse_url{
     url = "//userinfo@host:port/path",
-    authority = "userinfo@host:port", 
+    authority = "userinfo@host:port",
     host = "host",
     port = "port",
     userinfo = "userinfo",
@@ -236,7 +305,7 @@ check_parse_url{
 
 check_parse_url{
     url = "//userinfo@host/path",
-    authority = "userinfo@host", 
+    authority = "userinfo@host",
     host = "host",
     userinfo = "userinfo",
     user = "userinfo",
@@ -245,7 +314,7 @@ check_parse_url{
 
 check_parse_url{
     url = "//user:password@host/path",
-    authority = "user:password@host", 
+    authority = "user:password@host",
     host = "host",
     userinfo = "user:password",
     password = "password",
@@ -255,7 +324,7 @@ check_parse_url{
 
 check_parse_url{
     url = "//user:@host/path",
-    authority = "user:@host", 
+    authority = "user:@host",
     host = "host",
     userinfo = "user:",
     password = "",
@@ -265,7 +334,7 @@ check_parse_url{
 
 check_parse_url{
     url = "//user@host:port/path",
-    authority = "user@host:port", 
+    authority = "user@host:port",
     host = "host",
     userinfo = "user",
     user = "user",
@@ -275,7 +344,7 @@ check_parse_url{
 
 check_parse_url{
     url = "//host:port/path",
-    authority = "host:port", 
+    authority = "host:port",
     port = "port",
     host = "host",
     path = "/path",
@@ -283,14 +352,14 @@ check_parse_url{
 
 check_parse_url{
     url = "//host/path",
-    authority = "host", 
+    authority = "host",
     host = "host",
     path = "/path",
 }
 
 check_parse_url{
     url = "//host",
-    authority = "host", 
+    authority = "host",
     host = "host",
 }
 
@@ -364,7 +433,7 @@ check_parse_url{
 
 check_parse_url{
     url = "//userinfo@[::FFFF:129.144.52.38]:port/path;params?query#fragment",
-    authority = "userinfo@[::FFFF:129.144.52.38]:port", 
+    authority = "userinfo@[::FFFF:129.144.52.38]:port",
     host = "::FFFF:129.144.52.38",
     port = "port",
     userinfo = "userinfo",
@@ -378,7 +447,7 @@ check_parse_url{
 check_parse_url{
     url = "scheme://user:password@[::192.9.5.5]:port/path;params?query#fragment",
     scheme = "scheme",
-    authority = "user:password@[::192.9.5.5]:port", 
+    authority = "user:password@[::192.9.5.5]:port",
     host = "::192.9.5.5",
     port = "port",
     userinfo = "user:password",
@@ -393,7 +462,7 @@ check_parse_url{
 print("testing URL building")
 check_build_url {
     url = "scheme://user:password@host:port/path;params?query#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     port = "port",
     user = "user",
@@ -430,7 +499,7 @@ check_build_url{
 
 check_build_url {
     url = "scheme://user:password@host/path;params?query#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     user = "user",
     password = "password",
@@ -442,7 +511,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://user@host/path;params?query#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     user = "user",
     path = "/path",
@@ -453,7 +522,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://host/path;params?query#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     path = "/path",
     params = "params",
@@ -463,7 +532,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://host/path;params#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     path = "/path",
     params = "params",
@@ -472,7 +541,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://host/path#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     path = "/path",
     fragment = "fragment"
@@ -480,7 +549,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://host/path",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     path = "/path",
 }
@@ -498,7 +567,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://user:password@host:port/path;params?query#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     port = "port",
     user = "user",
@@ -512,7 +581,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://user:password@host:port/path;params?query#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     port = "port",
     user = "user",
@@ -527,7 +596,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://user:password@host:port/path;params?query#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     host = "host",
     port = "port",
     userinfo = "user:password",
@@ -540,7 +609,7 @@ check_build_url {
 
 check_build_url {
     url = "scheme://user:password@host:port/path;params?query#fragment",
-    scheme = "scheme", 
+    scheme = "scheme",
     authority = "user:password@host:port",
     path = "/path",
     params = "params",
@@ -558,25 +627,37 @@ check_absolute_url("http://a/b/c/d;p?q#f", "/g", "http://a/g")
 check_absolute_url("http://a/b/c/d;p?q#f", "//g", "http://g")
 check_absolute_url("http://a/b/c/d;p?q#f", "?y", "http://a/b/c/d;p?y")
 check_absolute_url("http://a/b/c/d;p?q#f", "g?y", "http://a/b/c/g?y")
-check_absolute_url("http://a/b/c/d;p?q#f", "g?y/./x", "http://a/b/c/g?y/./x")
+check_absolute_url("http://a/b/c/d;p?q#f", "g?y/./x", "http://a/b/c/g?y/x")
 check_absolute_url("http://a/b/c/d;p?q#f", "#s", "http://a/b/c/d;p?q#s")
 check_absolute_url("http://a/b/c/d;p?q#f", "g#s", "http://a/b/c/g#s")
-check_absolute_url("http://a/b/c/d;p?q#f", "g#s/./x", "http://a/b/c/g#s/./x")
+check_absolute_url("http://a/b/c/d;p?q#f", "g#s/./x", "http://a/b/c/g#s/x")
 check_absolute_url("http://a/b/c/d;p?q#f", "g?y#s", "http://a/b/c/g?y#s")
 check_absolute_url("http://a/b/c/d;p?q#f", ";x", "http://a/b/c/d;x")
 check_absolute_url("http://a/b/c/d;p?q#f", "g;x", "http://a/b/c/g;x")
 check_absolute_url("http://a/b/c/d;p?q#f", "g;x?y#s", "http://a/b/c/g;x?y#s")
 check_absolute_url("http://a/b/c/d;p?q#f", ".", "http://a/b/c/")
 check_absolute_url("http://a/b/c/d;p?q#f", "./", "http://a/b/c/")
+check_absolute_url("http://a/b/c/d;p?q#f", "./g", "http://a/b/c/g")
+check_absolute_url("http://a/b/c/d;p?q#f", "./g/", "http://a/b/c/g/")
+check_absolute_url("http://a/b/c/d;p?q#f", "././g", "http://a/b/c/g")
+check_absolute_url("http://a/b/c/d;p?q#f", "././g/", "http://a/b/c/g/")
+check_absolute_url("http://a/b/c/d;p?q#f", "g/.", "http://a/b/c/g/")
+check_absolute_url("http://a/b/c/d;p?q#f", "g/./", "http://a/b/c/g/")
+check_absolute_url("http://a/b/c/d;p?q#f", "g/./.", "http://a/b/c/g/")
+check_absolute_url("http://a/b/c/d;p?q#f", "g/././", "http://a/b/c/g/")
+check_absolute_url("http://a/b/c/d;p?q#f", "./.", "http://a/b/c/")
+check_absolute_url("http://a/b/c/d;p?q#f", "././.", "http://a/b/c/")
+check_absolute_url("http://a/b/c/d;p?q#f", "././g/./.", "http://a/b/c/g/")
 check_absolute_url("http://a/b/c/d;p?q#f", "..", "http://a/b/")
 check_absolute_url("http://a/b/c/d;p?q#f", "../", "http://a/b/")
 check_absolute_url("http://a/b/c/d;p?q#f", "../g", "http://a/b/g")
 check_absolute_url("http://a/b/c/d;p?q#f", "../..", "http://a/")
 check_absolute_url("http://a/b/c/d;p?q#f", "../../", "http://a/")
 check_absolute_url("http://a/b/c/d;p?q#f", "../../g", "http://a/g")
+check_absolute_url("http://a/b/c/d;p?q#f", "../../../g", "http://a/g")
 check_absolute_url("http://a/b/c/d;p?q#f", "", "http://a/b/c/d;p?q#f")
-check_absolute_url("http://a/b/c/d;p?q#f", "/./g", "http://a/./g")
-check_absolute_url("http://a/b/c/d;p?q#f", "/../g", "http://a/../g")
+check_absolute_url("http://a/b/c/d;p?q#f", "/./g", "http://a/g")
+check_absolute_url("http://a/b/c/d;p?q#f", "/../g", "http://a/g")
 check_absolute_url("http://a/b/c/d;p?q#f", "g.", "http://a/b/c/g.")
 check_absolute_url("http://a/b/c/d;p?q#f", ".g", "http://a/b/c/.g")
 check_absolute_url("http://a/b/c/d;p?q#f", "g..", "http://a/b/c/g..")
@@ -586,31 +667,53 @@ check_absolute_url("http://a/b/c/d;p?q#f", "./g/.", "http://a/b/c/g/")
 check_absolute_url("http://a/b/c/d;p?q#f", "g/./h", "http://a/b/c/g/h")
 check_absolute_url("http://a/b/c/d;p?q#f", "g/../h", "http://a/b/c/h")
 
+check_absolute_url("http://a/b/c/d:p?q#f/", "../g/", "http://a/b/g/")
+check_absolute_url("http://a/b/c/d:p?q#f/", "../g", "http://a/b/g")
+check_absolute_url("http://a/b/c/d:p?q#f/", "../.g/", "http://a/b/.g/")
+check_absolute_url("http://a/b/c/d:p?q#f/", "../.g", "http://a/b/.g")
+check_absolute_url("http://a/b/c/d:p?q#f/", "../.g.h/", "http://a/b/.g.h/")
+check_absolute_url("http://a/b/c/d:p?q#f/", "../.g.h", "http://a/b/.g.h")
+
+check_absolute_url("http://a/b/c/d:p?q#f/", "g.h/", "http://a/b/c/g.h/")
+check_absolute_url("http://a/b/c/d:p?q#f/", "../g.h/", "http://a/b/g.h/")
+check_absolute_url("http://a/", "../g.h/", "http://a/g.h/")
+
 -- extra tests
 check_absolute_url("//a/b/c/d;p?q#f", "d/e/f", "//a/b/c/d/e/f")
 check_absolute_url("/a/b/c/d;p?q#f", "d/e/f", "/a/b/c/d/e/f")
 check_absolute_url("a/b/c/d", "d/e/f", "a/b/c/d/e/f")
 check_absolute_url("a/b/c/d/../", "d/e/f", "a/b/c/d/e/f")
-check_absolute_url("http://velox.telemar.com.br", "/dashboard/index.html", 
+check_absolute_url("http://velox.telemar.com.br", "/dashboard/index.html",
    "http://velox.telemar.com.br/dashboard/index.html")
+check_absolute_url("http://example.com/", "../.badhost.com/", "http://example.com/.badhost.com/")
+check_absolute_url("http://example.com/", "...badhost.com/", "http://example.com/...badhost.com/")
+check_absolute_url("http://example.com/a/b/c/d/", "../q", "http://example.com/a/b/c/q")
+check_absolute_url("http://example.com/a/b/c/d/", "../../q", "http://example.com/a/b/q")
+check_absolute_url("http://example.com/a/b/c/d/", "../../../q", "http://example.com/a/q")
+check_absolute_url("http://example.com", ".badhost.com", "http://example.com/.badhost.com")
+check_absolute_url("http://example.com/a/b/c/d/", "..//../../../q", "http://example.com/a/q")
+check_absolute_url("http://example.com/a/b/c/d/", "..//a/../../../../q", "http://example.com/a/q")
+check_absolute_url("http://example.com/a/b/c/d/", "..//a/..//../../../q", "http://example.com/a/b/q")
+check_absolute_url("http://example.com/a/b/c/d/", "..//a/..///../../../../q", "http://example.com/a/b/q")
+check_absolute_url("http://example.com/a/b/c/d/", "../x/a/../y/z/../../../../q", "http://example.com/a/b/q")
 
 print("testing path parsing and composition")
 check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 })
 check_parse_path("/eu/", { "eu"; is_absolute = 1, is_directory = 1 })
-check_parse_path("eu/tu/ele/nos/vos/eles/", 
+check_parse_path("eu/tu/ele/nos/vos/eles/",
     { "eu", "tu", "ele", "nos", "vos", "eles"; is_directory = 1})
 check_parse_path("/", { is_absolute = 1, is_directory = 1})
 check_parse_path("", { })
-check_parse_path("eu%01/%02tu/e%03l%04e/nos/vos%05/e%12les/", 
+check_parse_path("eu%01/%02tu/e%03l%04e/nos/vos%05/e%12les/",
     { "eu\1", "\2tu", "e\3l\4e", "nos", "vos\5", "e\18les"; is_directory = 1})
 check_parse_path("eu/tu", { "eu", "tu" })
 
 print("testing path protection")
 check_protect({ "eu", "-_.!~*'():@&=+$,", "tu" }, "eu/-_.!~*'():@&=+$,/tu")
 check_protect({ "eu ", "~diego" }, "eu%20/~diego")
-check_protect({ "/eu>", "<diego?" }, "%2feu%3e/%3cdiego%3f")
-check_protect({ "\\eu]", "[diego`" }, "%5ceu%5d/%5bdiego%60")
-check_protect({ "{eu}", "|diego\127" }, "%7beu%7d/%7cdiego%7f")
+check_protect({ "/eu>", "<diego?" }, "%2Feu%3E/%3Cdiego%3F")
+check_protect({ "\\eu]", "[diego`" }, "%5Ceu%5D/%5Bdiego%60")
+check_protect({ "{eu}", "|diego\127" }, "%7Beu%7D/%7Cdiego%7F")
 check_protect({ "eu ", "~diego" }, "eu /~diego", 1)
 check_protect({ "/eu>", "<diego?" }, "/eu>/<diego?", 1)
 check_protect({ "\\eu]", "[diego`" }, "\\eu]/[diego`", 1)