Skip to content

Commit

Permalink
Fixed typo in param type (body->form)
Browse files Browse the repository at this point in the history
  • Loading branch information
hahwul committed Aug 30, 2023
1 parent 5cb8863 commit e7a91c3
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ noir -b . -u https://testapp.internal.domains -f json
"value": ""
},
{
"name": "body",
"name": "title",
"param_type": "json",
"value": ""
},
Expand Down
2 changes: 1 addition & 1 deletion spec/functional_test/testers/crystal_kemal_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require "../func_spec.cr"
extected_endpoints = [
Endpoint.new("/", "GET"),
Endpoint.new("/socket", "GET"),
Endpoint.new("/query", "POST", [Param.new("query", "", "body")]),
Endpoint.new("/query", "POST", [Param.new("query", "", "form")]),
]

FunctionalTester.new("fixtures/kemal/", {
Expand Down
2 changes: 1 addition & 1 deletion spec/functional_test/testers/go_echo_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extected_endpoints = [
Param.new("name", "", "json"),
]),
Endpoint.new("/pet_form", "POST", [
Param.new("name", "", "body"),
Param.new("name", "", "form"),
]),
Endpoint.new("/public/secret.html", "GET"),
]
Expand Down
11 changes: 7 additions & 4 deletions spec/functional_test/testers/php_pure_spec.cr
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
require "../func_spec.cr"

extected_endpoints = [
Endpoint.new("/get.php", "GET"),
Endpoint.new("/header.php", "GET", [Param.new("X-API-KEY", "", "header")]),
Endpoint.new("/get.php", "GET", [Param.new("param1", "", "query")]),
Endpoint.new("/header.php", "GET", [
Param.new("X-API-KEY", "", "header"),
Param.new("param1", "", "query"),
]),
Endpoint.new("/post.php", "GET"),
Endpoint.new("/post.php", "POST", [Param.new("param1", "", "body")]),
Endpoint.new("/post.php", "POST", [Param.new("param1", "", "form")]),
Endpoint.new("/request.php", "GET", [Param.new("param1", "", "query")]),
Endpoint.new("/request.php", "POST", [Param.new("param1", "", "body")]),
Endpoint.new("/request.php", "POST", [Param.new("param1", "", "form")]),
]

FunctionalTester.new("fixtures/php_pure/", {
Expand Down
2 changes: 1 addition & 1 deletion spec/functional_test/testers/ruby_sinatra_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require "../func_spec.cr"
extected_endpoints = [
Endpoint.new("/", "GET", [Param.new("query", "", "query")]),
Endpoint.new("/update", "POST"),
Endpoint.new("/query", "POST", [Param.new("query", "", "body")]),
Endpoint.new("/query", "POST", [Param.new("query", "", "form")]),
]

FunctionalTester.new("fixtures/sinatra/", {
Expand Down
2 changes: 1 addition & 1 deletion src/analyzer/analyzers/analyzer_go_echo.cr
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class AnalyzerGoEcho < Analyzer
param_type = "query"
end
if line.includes?("FormValue")
param_type = "body"
param_type = "form"
end

first = line.strip.split("(")
Expand Down
2 changes: 1 addition & 1 deletion src/analyzer/analyzers/analyzer_kemal.cr
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class AnalyzerKemal < Analyzer

if content.includes? "env.params.body["
param = content.split("env.params.body[")[1].split("]")[0].gsub("\"", "").gsub("'", "")
return Param.new(param, "", "body")
return Param.new(param, "", "form")
end

if content.includes? "env.response.headers["
Expand Down
4 changes: 2 additions & 2 deletions src/analyzer/analyzers/analyzer_oas2.cr
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class AnalyzerOAS2 < Analyzer
if param_obj["in"] == "query"
param = Param.new(param_name, "", "query")
params << param
elsif param_obj["in"] == "body"
elsif param_obj["in"] == "form"
param = Param.new(param_name, "", "json")
params << param
elsif param_obj["in"] == "formData"
Expand Down Expand Up @@ -62,7 +62,7 @@ class AnalyzerOAS2 < Analyzer
if param_obj["in"] == "query"
param = Param.new(param_name, "", "query")
params << param
elsif param_obj["in"] == "body"
elsif param_obj["in"] == "form"
param = Param.new(param_name, "", "json")
params << param
elsif param_obj["in"] == "formData"
Expand Down
6 changes: 2 additions & 4 deletions src/analyzer/analyzers/analyzer_php_pure.cr
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,14 @@ class AnalyzerPhpPure < Analyzer
method = match[1]
param_name = match[2]


if method == "GET"
params_query << Param.new(param_name, "", "query")
elsif method == "POST"
params_body << Param.new(param_name, "", "body")
params_body << Param.new(param_name, "", "form")
methods << "POST"
elsif method == "REQUEST"
params_query << Param.new(param_name, "", "query")
params_body << Param.new(param_name, "", "body")
params_body << Param.new(param_name, "", "form")
methods << "POST"
elsif method == "SERVER"
if param_name.includes? "HTTP_"
Expand Down Expand Up @@ -64,7 +63,6 @@ class AnalyzerPhpPure < Analyzer
end
end


def analyzer_php_pure(options : Hash(Symbol, String))
instance = AnalyzerPhpPure.new(options)
instance.analyze
Expand Down
2 changes: 1 addition & 1 deletion src/models/noir.cr
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class NoirRunner
end
end

if param.param_type == "body"
if param.param_type == "form"
if first_form
final_body += "#{param.name}=#{param.value}"
first_form
Expand Down

0 comments on commit e7a91c3

Please sign in to comment.