From c8f857dff35a07eacfc3f4d924d2bc056ca31aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Serdar=20Dogruyol=20-=20Sedo=20=E3=82=BB=E3=83=89?=
 <990485+sdogruyol@users.noreply.github.com>
Date: Thu, 15 Sep 2022 11:52:28 +0300
Subject: [PATCH] Omitting filters fix for lowercase methods requests (#647)

---
 spec/filters_spec.cr        | 37 +++++++++++++++++++++++++++++++++++++
 spec/spec_helper.cr         |  1 +
 src/kemal/filter_handler.cr |  1 +
 src/kemal/handler.cr        | 12 +++++-------
 src/kemal/route_handler.cr  |  2 +-
 5 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 spec/filters_spec.cr

diff --git a/spec/filters_spec.cr b/spec/filters_spec.cr
new file mode 100644
index 0000000..e74878b
--- /dev/null
+++ b/spec/filters_spec.cr
@@ -0,0 +1,37 @@
+require "./spec_helper"
+
+describe "Kemal::FilterHandler" do
+  it "handles with upcased 'POST'" do
+    filter_handler = Kemal::FilterHandler.new
+    filter_handler._add_route_filter("POST", "*", :before) do |env|
+      env.set "sensitive", "1"
+    end
+    Kemal.config.add_filter_handler(filter_handler)
+
+    post "/sensitive_post" do |env|
+      env.get "sensitive"
+    end
+
+    request = HTTP::Request.new("POST", "/sensitive_post")
+    client_response = call_request_on_app(request)
+    client_response.status_code.should eq(200)
+    client_response.body.should eq("1")
+  end
+
+  it "handles with downcased 'post'" do
+    filter_handler = Kemal::FilterHandler.new
+    filter_handler._add_route_filter("POST", "*", :before) do |env|
+      env.set "sensitive", "1"
+    end
+    Kemal.config.add_filter_handler(filter_handler)
+
+    post "/sensitive_post" do
+      "sensitive"
+    end
+
+    request = HTTP::Request.new("post", "/sensitive_post")
+    client_response = call_request_on_app(request)
+    client_response.status_code.should eq(200)
+    client_response.body.should eq("")
+  end
+end
diff --git a/spec/spec_helper.cr b/spec/spec_helper.cr
index 0065848..6509e1e 100644
--- a/spec/spec_helper.cr
+++ b/spec/spec_helper.cr
@@ -85,6 +85,7 @@ end
 
 Spec.after_each do
   Kemal.config.clear
+  Kemal::FilterHandler::INSTANCE.tree = Radix::Tree(Array(Kemal::FilterHandler::FilterBlock)).new
   Kemal::RouteHandler::INSTANCE.routes = Radix::Tree(Route).new
   Kemal::RouteHandler::INSTANCE.cached_routes = Hash(String, Radix::Result(Route)).new
   Kemal::WebSocketHandler::INSTANCE.routes = Radix::Tree(WebSocket).new
diff --git a/src/kemal/filter_handler.cr b/src/kemal/filter_handler.cr
index 298ce26..5bf9fd6 100644
--- a/src/kemal/filter_handler.cr
+++ b/src/kemal/filter_handler.cr
@@ -3,6 +3,7 @@ module Kemal
   class FilterHandler
     include HTTP::Handler
     INSTANCE = new
+    property tree
 
     # This middleware is lazily instantiated and added to the handlers as soon as a call to `after_X` or `before_X` is made.
     def initialize
diff --git a/src/kemal/handler.cr b/src/kemal/handler.cr
index 6016ba7..f87e60a 100644
--- a/src/kemal/handler.cr
+++ b/src/kemal/handler.cr
@@ -11,19 +11,17 @@ module Kemal
 
     macro only(paths, method = "GET")
       class_name = {{@type.name}}
-      method_downcase = {{method.downcase}}
-      class_name_method = "#{class_name}/#{method_downcase}"
+      class_name_method = "#{class_name}/#{{{method}}}"
       ({{paths}}).each do |path|
-        @@only_routes_tree.add class_name_method + path, '/' + method_downcase + path
+        @@only_routes_tree.add class_name_method + path, '/' + {{method}} + path
       end
     end
 
     macro exclude(paths, method = "GET")
       class_name = {{@type.name}}
-      method_downcase = {{method.downcase}}
-      class_name_method = "#{class_name}/#{method_downcase}"
+      class_name_method = "#{class_name}/#{{{method}}}"
       ({{paths}}).each do |path|
-        @@exclude_routes_tree.add class_name_method + path, '/' + method_downcase + path
+        @@exclude_routes_tree.add class_name_method + path, '/' + {{method}} + path
       end
     end
 
@@ -74,7 +72,7 @@ module Kemal
     end
 
     private def radix_path(method : String, path : String)
-      "#{self.class}/#{method.downcase}#{path}"
+      "#{self.class}/#{method}#{path}"
     end
   end
 end
diff --git a/src/kemal/route_handler.cr b/src/kemal/route_handler.cr
index 216616a..698c6fd 100644
--- a/src/kemal/route_handler.cr
+++ b/src/kemal/route_handler.cr
@@ -57,7 +57,7 @@ module Kemal
     end
 
     private def radix_path(method, path)
-      '/' + method.downcase + path
+      '/' + method + path
     end
 
     private def add_to_radix_tree(method, path, route)