From a3ac19fe89b89d532f80558245f9c75b369779cd Mon Sep 17 00:00:00 2001
From: Eugene Paniot <e.paniot@gmail.com>
Date: Mon, 7 Nov 2022 13:14:26 +0000
Subject: [PATCH] bug: do not treat ./ as invalid uri

Co-authored-by: Pavel Balaev <balaev@tarantool.org>

Closes #171
---
 CHANGELOG.md                                   | 4 ++++
 http/server.lua                                | 9 ++++++++-
 test/integration/http_server_requests_test.lua | 9 +++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c7ae42..07137fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Add versioning support.
 
+### Fixed
+
+- Allow dot in path segment.
+
 ## [1.4.0] - 2022-12-30
 
 ### Added
diff --git a/http/server.lua b/http/server.lua
index 79ecc75..2e67a45 100644
--- a/http/server.lua
+++ b/http/server.lua
@@ -746,10 +746,17 @@ local function parse_request(req)
     end
     p.path_raw = p.path
     p.path = uri_unescape(p.path)
-    if p.path:sub(1, 1) ~= "/" or p.path:find("./", nil, true) ~= nil then
+    if p.path:sub(1, 1) ~= "/" then
         p.error = "invalid uri"
         return p
     end
+    for _, path_segment in ipairs(p.path:split('/')) do
+        if path_segment == "." or path_segment == ".." then
+            p.error = "invalid uri"
+            return p
+        end
+    end
+
     return p
 end
 
diff --git a/test/integration/http_server_requests_test.lua b/test/integration/http_server_requests_test.lua
index 753b092..fce82ce 100644
--- a/test/integration/http_server_requests_test.lua
+++ b/test/integration/http_server_requests_test.lua
@@ -417,3 +417,12 @@ g.test_content_type_header_without_render = function()
     t.assert_equals(r.status, 200)
     t.assert_equals(r.headers['content-type'], 'text/plain; charset=utf-8', 'content-type header')
 end
+
+g.test_get_dot_slash = function()
+    local httpd = g.httpd
+    httpd:route({
+        path = '/*dot_slash'
+    }, function() end)
+    local r = http_client.get(helpers.base_uri .. '/dot_slash.')
+    t.assert_equals(r.status, 200)
+end