vigilion-rails 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf77784d940566822b109c78453d6e5243ac2e56b494b4d312adf1111dc9849
-  data.tar.gz: 977d2425983190e51677445c79575ffa6b8f7617f6144f88664b2d769ace052a
+  metadata.gz: e1f3ee39ebf2b55e3545ba4a2ea9c656e9b48d297e50250342a5a981d4d4aed3
+  data.tar.gz: 171c41bb2480b4a084051822bc0116a3e20af7d275e7a4c89c46f6c3eccb0f41
 SHA512:
-  metadata.gz: 4e328f50bb9f3189817baa85a3b4613b5f14234c8549cdf74ceb9c2f8da2fec7693a902f52d941c15f448b1e9329921c31b74bd6cd152a16d66ba2c8f0791f78
-  data.tar.gz: 7c8ba6df3708e9f075da925ca93b33510d2cc3876f8948568cc0fcf1967a5694ef0b3ab4e55ce98c6b29dc524c9a7f160288324c642287c644bac4860309b0c0
+  metadata.gz: dc908eb63faff594fa229f73c54ae067591715f4a494f5836666a9fd956f1c328fc5c247fb5a394d20e17d51afc17e3c2ab056b2dc320a1a66bbc9bbb4b79e5e
+  data.tar.gz: b0bd0272236fd4fed6be07ab447a1cee92422d6aa17ec6a7988f0b8e32ebf65685428b071aef49e28cce132b5b61781d351af0e653b3f4546b75ab1f1d5b1ffb

data/app/jobs/vigilion_rails/application_job.rb

@@ -0,0 +1,9 @@
+module VigilionRails
+  class ApplicationJob < ActiveJob::Base
+    # Automatically retry jobs that encountered a deadlock
+    # retry_on ActiveRecord::Deadlocked
+
+    # Most jobs are safe to ignore if the underlying records are no longer available
+    # discard_on ActiveJob::DeserializationError
+  end
+end

data/app/jobs/vigilion_rails/vigilion_scan_job.rb

@@ -0,0 +1,10 @@
+module VigilionRails
+  class VigilionScanJob < ApplicationJob
+    queue_as :default
+
+    def perform(integration_class, class_name, id, key, column)
+      file = class_name.constantize.find(id)
+      integration_class.constantize.new.scan key, file, column.to_sym
+    end
+  end
+end

data/lib/vigilion-rails/configuration.rb

@@ -7,6 +7,7 @@ module VigilionRails
         config.integration = :url
         config.loopback = Rails.env.development? || Rails.env.test?
         config.loopback_response = 'clean'
+        config.active_job = false
       end
     end
   end

data/lib/vigilion-rails/version.rb

@@ -1,3 +1,3 @@
 module VigilionRails
-  VERSION = "2.0.0"
+  VERSION = "2.2.0"
 end

data/lib/vigilion-rails.rb

@@ -4,6 +4,7 @@ require "vigilion-rails/integrations/local_integration"
 require "vigilion-rails/configuration"
 
 module VigilionRails
+  PENDING_STATUS = 'pending'
 
   module ActiveRecord
     def scan_file column, options={}
@@ -20,7 +21,12 @@ module VigilionRails
 
             self.class.find(id).on_scan_#{column} status: Vigilion::Configuration.loopback_response
           else
-            #{integration_class}.new.scan key, self, :#{column}
+            if Vigilion::Configuration.active_job
+              ::VigilionRails::VigilionScanJob.set(wait: 60).perform_later(#{integration_class}.to_s, self.class.name, id, key, '#{column}')
+            else
+              #{integration_class}.new.scan key, self, :#{column}
+            end
+            self.class.find(id).send('on_scan_#{column}', status: PENDING_STATUS)
           end
           @#{column}_old_url = #{column}.url
           return true
@@ -32,7 +38,7 @@ module VigilionRails
         end
 
         after_initialize :remember_#{column}_url
-        after_commit :check_scan_#{column}
+        after_commit :check_scan_#{column}, on: [:create, :update]
 
         def remember_#{column}_url
           @#{column}_old_url = #{column}.try(:url) unless new_record?

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/config/application.rb

@@ -24,9 +24,5 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
-

data/spec/dummy/config/initializers/vigilion.rb

@@ -0,0 +1,4 @@
+Vigilion.configure do |config|
+  config.access_key_id = 'test'
+  config.secret_access_key = 'test'
+end

data/spec/jobs/vigilion_rails/vigilion_scan_job_spec.rb

@@ -0,0 +1,26 @@
+require "vigilion_rails_helper"
+
+RSpec.describe VigilionRails::VigilionScanJob do
+  disable_loopback
+  it "matches with performed job" do
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    document = CarrierwaveDocument.create
+    key = { model: document.class.name, column: 'attachment', id: document.id }
+
+    stub_request(:post, "https://api.vigilion.com/scans").
+    with(
+      body: "{\"scan\":{\"key\":{\"model\":\"CarrierwaveDocument\",\"column\":\"attachment\",\"id\":1},\"url\":null}}",
+      headers: {
+      'Accept'=>'*/*',
+      'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+      'Content-Type'=>'application/json',
+      'User-Agent'=>'Vigilion 1.0.4 (x86_64-darwin19, Ruby 2.7.1)',
+      'X-Api-Key'=>'test'
+      }).
+    to_return(status: 200, body: "", headers: {})
+
+    VigilionRails::VigilionScanJob.perform_later("VigilionRails::UrlIntegration", document.class.name, document.id, key, 'attachment')
+    expect(VigilionRails::VigilionScanJob).to have_been_performed
+  end
+end

data/spec/lib/integrations/local_integration_spec.rb

@@ -5,9 +5,9 @@ describe VigilionRails::LocalIntegration do
 
   describe "#scan" do
     it "calls vigilion scanner" do
-      document = CarrierwaveDocument.new
+      document = CarrierwaveDocument.create
       expect(Vigilion).to receive(:scan_path)
       document.scan_attachment!
     end
   end
-end
+end

data/spec/lib/vigilion_rails_spec.rb

@@ -1,6 +1,8 @@
 require "vigilion_rails_helper"
 
 describe VigilionRails do
+  include ActiveJob::TestHelper
+
   describe "#clean?" do
     context "without scan results" do
       it "is not clean" do
@@ -32,7 +34,7 @@ describe VigilionRails do
       disable_loopback
 
       it "calls vigilion scanner" do
-        document = AgnosticDocument.new
+        document = AgnosticDocument.create
         expect(Vigilion).to receive(:scan_url)
         document.scan_attachment!
       end
@@ -119,4 +121,36 @@ describe VigilionRails do
       end
     end
   end
+
+  describe "#active_job" do
+    before do
+      Vigilion::Configuration.loopback = false
+      Vigilion::Configuration.active_job = true
+      Vigilion::Configuration.integration = :url
+    end
+
+    it "enqueues a job" do
+      document = AgnosticDocument.create
+      expect {
+        document.scan_attachment!
+      }.to have_enqueued_job(::VigilionRails::VigilionScanJob)
+    end
+
+    it 'calls proper integration' do
+      document = AgnosticDocument.create
+      key = { model: document.class.name, column: 'attachment', id: document.id }.to_json
+      expect_any_instance_of(
+        ::VigilionRails::UrlIntegration
+      ).to receive(:scan).with(key, document, :attachment)
+      perform_enqueued_jobs do
+        document.scan_attachment!
+      end
+    end
+
+    it 'sets default status' do
+      document = AgnosticDocument.create
+      document.scan_attachment!
+      expect(document.reload.attachment_scan_results).to eq "pending"
+    end
+  end
 end

data/spec/vigilion_rails_helper.rb

@@ -4,8 +4,10 @@ require 'spec_helper'
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
 require 'helper_methods'
+require 'webmock/rspec'
 
 ActiveRecord::Migration.maintain_test_schema!
+ActiveJob::Base.queue_adapter = :test
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vigilion-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Bit Zesty Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 6.0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 6.0.3.7
 - !ruby/object:Gem::Dependency
   name: vigilion
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails engine for Vigilion Anti-Virus & Malware file scanning service.
 email:
 - help@vigilion.com
@@ -90,6 +104,8 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/controllers/vigilion/vigilion_controller.rb
+- app/jobs/vigilion_rails/application_job.rb
+- app/jobs/vigilion_rails/vigilion_scan_job.rb
 - config/routes.rb
 - lib/generators/vigilion/install_generator.rb
 - lib/generators/vigilion/scan/USAGE
@@ -104,6 +120,7 @@ files:
 - lib/vigilion-rails/version.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -133,6 +150,7 @@ files:
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/vigilion.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
@@ -147,6 +165,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/helper_methods.rb
+- spec/jobs/vigilion_rails/vigilion_scan_job_spec.rb
 - spec/lib/integrations/local_integration_spec.rb
 - spec/lib/vigilion_rails_spec.rb
 - spec/routing/vigilion_routing_spec.rb
@@ -171,59 +190,61 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Rails engine for Vigilion Anti-Virus & Malware file scanning service.
 test_files:
+- spec/routing/vigilion_routing_spec.rb
+- spec/helper_methods.rb
+- spec/lib/vigilion_rails_spec.rb
+- spec/lib/integrations/local_integration_spec.rb
 - spec/vigilion_rails_helper.rb
-- spec/spec_helper.rb
-- spec/dummy/app/uploaders/attachment_uploader.rb
-- spec/dummy/app/models/carrierwave_document.rb
-- spec/dummy/app/models/agnostic_document.rb
-- spec/dummy/app/models/paperclip_document.rb
-- spec/dummy/app/models/dragonfly_document.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/bin/rake
+- spec/dummy/Rakefile
+- spec/dummy/README.rdoc
 - spec/dummy/bin/setup
+- spec/dummy/bin/rake
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environment.rb
 - spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/initializers/vigilion.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/models/dragonfly_document.rb
+- spec/dummy/app/models/carrierwave_document.rb
+- spec/dummy/app/models/agnostic_document.rb
+- spec/dummy/app/models/paperclip_document.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/uploaders/attachment_uploader.rb
+- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/config.ru
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
 - spec/dummy/db/schema.rb
 - spec/dummy/db/migrate/20150616144235_create_dragonfly_documents.rb
-- spec/dummy/db/migrate/20150616144544_create_agnostic_documents.rb
 - spec/dummy/db/migrate/20150616144227_create_paperclip_documents.rb
+- spec/dummy/db/migrate/20150616144544_create_agnostic_documents.rb
 - spec/dummy/db/migrate/20150616144220_create_carrierwave_documents.rb
-- spec/dummy/README.rdoc
-- spec/helper_methods.rb
-- spec/lib/vigilion_rails_spec.rb
-- spec/lib/integrations/local_integration_spec.rb
-- spec/routing/vigilion_routing_spec.rb
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/spec_helper.rb
+- spec/jobs/vigilion_rails/vigilion_scan_job_spec.rb