Merge pull request #306 from ninoseki/fix-api-issues

Fix api issues
ninoseki · Aug 15, 2021 · 672e771 · 672e771
2 parents 35c6424 + 63f6cad
commit 672e771
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/lib/mihari/models/alert.rb b/lib/mihari/models/alert.rb
@@ -18,8 +18,8 @@ class << self
       # @param [String, nil] source
       # @param [String, nil] tag_name
       # @param [String, nil] title
-      # @param [String, nil] from_at
-      # @param [String, nil] to_at
+      # @param [DateTime, nil] from_at
+      # @param [DateTime, nil] to_at
       # @param [Integer, nil] limit
       # @param [Integer, nil] page
       #
@@ -62,8 +62,8 @@ def search(artifact_data: nil, description: nil, source: nil, tag_name: nil, tit
       # @param [String, nil] source
       # @param [String, nil] tag_name
       # @param [String, nil] title
-      # @param [String, nil] from_at
-      # @param [String, nil] to_at
+      # @param [DateTime, nil] from_at
+      # @param [DateTime, nil] to_at
       #
       # @return [Integer]
       #

diff --git a/lib/mihari/web/controllers/alerts_controller.rb b/lib/mihari/web/controllers/alerts_controller.rb
@@ -26,9 +26,7 @@ class AlertsController < BaseController
         title = params["title"]
 
         from_at = params["from_at"] || params["fromAt"]
-        from_at = DateTime.parse(from_at) if from_at
         to_at = params["to_at"] || params["toAt"]
-        to_at = DateTime.parse(to_at) if to_at
 
         alerts = Mihari::Alert.search(
           artifact_data: artifact_data,
@@ -55,8 +53,9 @@ class AlertsController < BaseController
       end
 
       delete "/api/alerts/:id" do
-        id = params["id"]
-        id = id.to_i
+        param :id, Integer, required: true
+
+        id = params["id"].to_i
 
         begin
           alert = Mihari::Alert.find(id)

diff --git a/lib/mihari/web/controllers/artifacts_controller.rb b/lib/mihari/web/controllers/artifacts_controller.rb
@@ -4,8 +4,9 @@ module Mihari
   module Controllers
     class ArtifactsController < BaseController
       get "/api/artifacts/:id" do
-        id = params["id"]
-        id = id.to_s
+        param :id, Integer, required: true
+
+        id = params["id"].to_i
 
         begin
           artifact = Mihari::Artifact.find(id)
@@ -27,8 +28,9 @@ class ArtifactsController < BaseController
       end
 
       delete "/api/artifacts/:id" do
-        id = params["id"]
-        id = id.to_i
+        param :id, Integer, required: true
+
+        id = params["id"].to_i
 
         begin
           alert = Mihari::Artifact.find(id)

diff --git a/lib/mihari/web/controllers/ip_address_controller.rb b/lib/mihari/web/controllers/ip_address_controller.rb
@@ -18,8 +18,9 @@ def query(ip)
       end
 
       get "/api/ip_addresses/:ip" do
-        ip = params["ip"]
-        ip = ip.to_s
+        param :ip, String, required: true
+
+        ip = params["ip"].to_s
 
         begin
           data = query(ip)

diff --git a/lib/mihari/web/controllers/tags_controller.rb b/lib/mihari/web/controllers/tags_controller.rb
@@ -9,7 +9,9 @@ class TagsController < BaseController
       end
 
       delete "/api/tags/:name" do
-        name = params["name"]
+        param :name, String, required: true
+
+        name = params["name"].to_s
 
         begin
           Mihari::Tag.where(name: name).destroy_all