mihari 5.4.3 → 5.4.4

data/lib/mihari/web/endpoints/rules.rb

@@ -61,15 +61,23 @@ module Mihari
           requires :id, type: String
         end
         get "/:id" do
+          extend Dry::Monads[:result, :try]
+
           id = params["id"].to_s
 
-          begin
-            rule = Mihari::Rule.find(id)
-          rescue ActiveRecord::RecordNotFound
+          result = Try do
+            Mihari::Rule.find(id)
+          end.to_result
+
+          return present(result.value!, with: Entities::Rule) if result.success?
+
+          failure = result.failure
+          case failure
+          when ActiveRecord::RecordNotFound
             error!({ message: "ID:#{id} is not found" }, 404)
+          else
+            raise failure
           end
-
-          present rule, with: Entities::Rule
         end
 
         desc "Run a rule", {
@@ -80,19 +88,27 @@ module Mihari
           requires :id, type: String
         end
         get "/:id/run" do
+          extend Dry::Monads[:result, :try]
+
           id = params["id"].to_s
 
-          begin
-            rule = Mihari::Services::RuleProxy.from_model(Mihari::Rule.find(id))
-          rescue ActiveRecord::RecordNotFound
-            error!({ message: "ID:#{id} is not found" }, 404)
-          end
+          result = Try do
+            Mihari::Services::RuleProxy.from_model(Mihari::Rule.find(id))
+          end.to_result
 
-          analyzer = rule.analyzer
-          analyzer.run
+          if result.success?
+            result.value!.analyzer.run
+            status 201
+            return present({ message: "ID:#{id} is ran successfully" }, with: Entities::Message)
+          end
 
-          status 201
-          present({ message: "ID:#{id} is ran successfully" }, with: Entities::Message)
+          failure = result.failure
+          case failure
+          when ActiveRecord::RecordNotFound
+            error!({ message: "ID:#{id} is not found" }, 404)
+          else
+            raise failure
+          end
         end
 
         desc "Create a rule", {
@@ -103,39 +119,38 @@ module Mihari
           requires :yaml, type: String, documentation: { param_type: "body" }
         end
         post "/" do
-          yaml = params[:yaml]
+          extend Dry::Monads[:result, :try]
 
-          begin
-            rule = Services::RuleProxy.from_yaml(yaml)
-          rescue YAMLSyntaxError => e
-            error!({ message: e.message }, 400)
+          yaml = params[:yaml]
+          result = Try do
+            Services::RuleProxy.from_yaml(yaml)
+          end.to_result.bind do |rule|
+            Try do
+              found = Mihari::Rule.find_by_id(rule.id)
+              error!({ message: "ID:#{rule.id} is already registered" }, 400) unless found.nil?
+              rule
+            end.to_result
+          end.bind do |rule|
+            Try do
+              rule.model.save
+              rule
+            end.to_result
           end
 
-          # check ID duplication
-          begin
-            Mihari::Rule.find(rule.id)
-            error!({ message: "ID:#{rule.id} is already registered" }, 400)
-          rescue ActiveRecord::RecordNotFound
-            # do nothing
+          if result.success?
+            status 201
+            return present(result.value!.model, with: Entities::Rule)
           end
 
-          begin
-            rule.validate!
-          rescue RuleValidationError
-            error!({ message: "Data format is invalid", details: rule.errors.to_h }, 400) if rule.errors?
-
-            # when NoMethodError occurs
-            error!({ message: "Data format is invalid" }, 400)
+          failure = result.failure
+          case failure
+          when Psych::SyntaxError
+            error!({ message: failure.message }, 400)
+          when ValidationError
+            error!({ message: "Data format is invalid", details: failure.errors.to_h }, 400)
+          else
+            raise failure
           end
-
-          begin
-            rule.model.save
-          rescue ActiveRecord::RecordNotUnique
-            error!({ message: "ID:#{rule.id} is already registered" }, 400)
-          end
-
-          status 201
-          present rule.model, with: Entities::Rule
         end
 
         desc "Update a rule", {
@@ -147,38 +162,40 @@ module Mihari
           requires :yaml, type: String, documentation: { param_type: "body" }
         end
         put "/" do
+          extend Dry::Monads[:result, :try]
+
           id = params[:id]
           yaml = params[:yaml]
 
-          begin
+          result = Try do
             Mihari::Rule.find(id)
-          rescue ActiveRecord::RecordNotFound
-            error!({ message: "ID:#{id} is not found" }, 404)
+          end.to_result.bind do |_|
+            Try do
+              Services::RuleProxy.from_yaml(yaml)
+            end.to_result
+          end.bind do |rule|
+            Try do
+              rule.model.save
+              rule
+            end.to_result
           end
 
-          begin
-            rule = Services::RuleProxy.from_yaml(yaml)
-          rescue YAMLSyntaxError => e
-            error!({ message: e.message }, 400)
+          if result.success?
+            status 201
+            return present(result.value!.model, with: Entities::Rule)
           end
 
-          begin
-            rule.validate!
-          rescue RuleValidationError
-            error!({ message: "Data format is invalid", details: rule.errors.to_h }, 400) if rule.errors?
-
-            # when NoMethodError occurs
-            error!({ message: "Data format is invalid" }, 400)
-          end
-
-          begin
-            rule.model.save
-          rescue ActiveRecord::RecordNotUnique
-            error!({ message: "ID:#{id} is already registered" }, 400)
+          failure = result.failure
+          case failure
+          when ActiveRecord::RecordNotFound
+            error!({ message: "ID:#{id} is not found" }, 404)
+          when Psych::SyntaxError
+            error!({ message: failure.message }, 400)
+          when ValidationError
+            error!({ message: "Data format is invalid", details: failure.errors.to_h }, 400)
+          else
+            raise failure
           end
-
-          status 201
-          present rule.model, with: Entities::Rule
         end
 
         desc "Delete a rule", {
@@ -190,18 +207,27 @@ module Mihari
           requires :id, type: String
         end
         delete "/:id" do
+          extend Dry::Monads[:result, :try]
+
           id = params["id"].to_s
 
-          begin
+          result = Try do
             rule = Mihari::Rule.find(id)
-          rescue ActiveRecord::RecordNotFound
-            error!({ message: "ID:#{id} is not found" }, 404)
-          end
+            rule.destroy
+          end.to_result
 
-          rule.destroy
+          if result.success?
+            status 204
+            return present({ message: "ID:#{id} is deleted" }, with: Entities::Message)
+          end
 
-          status 204
-          present({ message: "ID:#{id} is deleted" }, with: Entities::Message)
+          failure = result.failure
+          case failure
+          when ActiveRecord::RecordNotFound
+            error!({ message: "ID:#{id} is not found" }, 404)
+          else
+            raise failure
+          end
         end
       end
     end

data/lib/mihari/web/endpoints/tags.rb

@@ -23,16 +23,26 @@ module Mihari
           requires :name, type: String
         end
         delete "/:name" do
+          extend Dry::Monads[:result, :try]
+
           name = params[:name].to_s
 
-          begin
+          result = Try do
             Mihari::Tag.where(name: name).destroy_all
-          rescue ActiveRecord::RecordNotFound
-            error!({ message: "Name:#{name} is not found" }, 404)
+          end.to_result
+
+          if result.success?
+            status 204
+            return present({ message: "" }, with: Entities::Message)
           end
 
-          status 204
-          present({ message: "" }, with: Entities::Message)
+          failure = result.failure
+          case failure
+          when ActiveRecord::RecordNotFound
+            error!({ message: "Name:#{name} is not found" }, 404)
+          else
+            raise failure
+          end
         end
       end
     end