Corrected cookie parameters properly in Python web analyzers

Signed-off-by: ksg97031 <ksg97031@gmail.com>

Author: ksg97031

spec/functional_test/fixtures/python_flask/app.py

@@ -11,7 +11,7 @@
 
 @app.teardown_appcontext
 def shutdown_session(exception=None):
-    db_session.remove()    
+    db_session.remove()
 
 @app.route('/sign', methods=['GET', 'POST'])
 def sign_sample():
@@ -28,6 +28,13 @@ def sign_sample():
 
     return render_template('sign.html')
 
+@app.route('/cookie', methods=['GET'])
+def cookie_test():
+    if request.cookies.get('test') == "y":
+        return "exist cookie"
+
+    return "no cookie"
+
 @app.route('/login', methods=['POST'])
 def login_sample():
     if request.method == 'POST':
@@ -40,7 +47,7 @@ def login_sample():
         else:
             return "Fail"
 
-    return render_template('login.html')    
+    return render_template('login.html')
 
 @app.route('/create_record', methods=['PUT'])
 def create_record():

spec/functional_test/testers/python_django_spec.cr

@@ -14,7 +14,7 @@ extected_endpoints = [
   Endpoint.new("/links.html", "GET"),
   Endpoint.new("/upload", "GET", [Param.new("sign", "", "query"), Param.new("sign", "", "query"), Param.new("X_FORWARDED_FOR", "", "header"), Param.new("X_REAL_IP", "", "header")]),
   Endpoint.new("/upload", "POST", [Param.new("sign", "", "query"), Param.new("X_FORWARDED_FOR", "", "header"), Param.new("X_REAL_IP", "", "header")]),
-  Endpoint.new("/not_found", "GET", [Param.new("Cookie['app_type']", "", "header")]),
+  Endpoint.new("/not_found", "GET", [Param.new("app_type", "", "cookie")]),
   Endpoint.new("/test", "GET", [Param.new("test_param", "", "form")]),
   Endpoint.new("/test", "POST", [Param.new("test_param", "", "form")]),
   Endpoint.new("/test", "PUT", [Param.new("test_param", "", "form")]),

spec/functional_test/testers/python_fastapi_spec.cr

@@ -4,7 +4,7 @@ extected_endpoints = [
   Endpoint.new("/query/param-required/int", "GET", [Param.new("query", "", "query")]),
   Endpoint.new("/items/{item_id}", "PUT", [Param.new("name", "", "form"), Param.new("size", "", "form")]),
   Endpoint.new("/hidden_header", "GET", [Param.new("hidden_header", "", "header")]),
-  Endpoint.new("/cookie_examples/", "GET", [Param.new("Cookie['data']", "", "header")]),
+  Endpoint.new("/cookie_examples/", "GET", [Param.new("data", "", "cookie")]),
   Endpoint.new("/dummypath", "POST", [Param.new("dummy", "", "json")]),
   Endpoint.new("/main", "GET"),
 ]

spec/functional_test/testers/python_flask_spec.cr

@@ -3,6 +3,7 @@ require "../func_spec.cr"
 extected_endpoints = [
   Endpoint.new("/sign", "GET"),
   Endpoint.new("/sign", "POST", [Param.new("username", "", "form"), Param.new("password", "", "form")]),
+  Endpoint.new("/cookie", "GET", [Param.new("test", "", "cookie")]),
   Endpoint.new("/login", "POST", [Param.new("username", "", "form"), Param.new("password", "", "form")]),
   Endpoint.new("/create_record", "PUT"),
   Endpoint.new("/delete_record", "DELETE", [Param.new("name", "", "json")]),
@@ -12,5 +13,5 @@ extected_endpoints = [
 
 FunctionalTester.new("fixtures/python_flask/", {
   :techs     => 1,
-  :endpoints => 7,
+  :endpoints => 8,
 }, extected_endpoints).test_all

src/analyzer/analyzers/analyzer_django.cr

@@ -10,7 +10,7 @@ class AnalyzerDjango < AnalyzerPython
   REQUEST_PARAM_FIELD_MAP = {
     "GET"     => {["GET"], "query"},
     "POST"    => {["POST"], "form"},
-    "COOKIES" => {nil, "header"},
+    "COOKIES" => {nil, "cookie"},
     "META"    => {nil, "header"},
     "data"    => {["POST", "PUT", "PATCH"], "form"},
   }
@@ -293,10 +293,6 @@ class AnalyzerDjango < AnalyzerPython
               if param_name.starts_with? "HTTP_"
                 param_name = param_name[5..]
               end
-            elsif noir_param_type == "header"
-              if field_name == "COOKIES"
-                param_name = "Cookie['#{param_name}']"
-              end
             end
 
             # If it receives a specific parameter, it is considered to allow the method.

src/analyzer/analyzers/analyzer_fastapi.cr

@@ -100,10 +100,6 @@ class AnalyzerFastAPI < AnalyzerPython
                         # Get param type by default value first
                         if param.default.size != 0
                           param_type = infer_parameter_type(param.default)
-                          if param_type == "cookie"
-                            param_type = "header"
-                            param.name = "Cookie['#{param.name}']"
-                          end
                         end
 
                         # Get param type by type if not found

src/analyzer/analyzers/analyzer_flask.cr

@@ -11,7 +11,7 @@ class AnalyzerFlask < AnalyzerPython
     "files"   => {["POST", "PUT", "PATCH", "DELETE"], "form"},
     "values"  => {["GET", "POST", "PUT", "PATCH", "DELETE"], "query"},
     "json"    => {["POST", "PUT", "PATCH", "DELETE"], "json"},
-    "cookie"  => {nil, "header"},
+    "cookie"  => {nil, "cookie"},
     "headers" => {nil, "header"},
   }
 
@@ -200,11 +200,6 @@ class AnalyzerFlask < AnalyzerPython
         matches.each do |parameter_match|
           next if parameter_match.size != 2
           param_name = parameter_match[1]
-          if noir_param_type == "header"
-            if field_name == "cookie"
-              param_name = "Cookie['#{param_name}']"
-            end
-          end
 
           suspicious_params << Param.new(param_name, "", noir_param_type)
         end