clamby 1.6.2 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386be08fb41c318b1c32997c00f9df9ed3ee78796ceaded3927cb4672d45b370
-  data.tar.gz: b1ed8cbc7842eb3ee4699cb4759c7ccb707bde51d82efc5ce5ff467f1dd9730b
+  metadata.gz: ea8e0af4d5353040a1d77f2d083e9273116d176b35466a252469c6229fcdd615
+  data.tar.gz: 7e16db099c92c3d0f5936b18656b648ed79379d84eddca7ab7b1ebff029e0f9a
 SHA512:
-  metadata.gz: 5f0e78c730b651e66bce6710df83f13a5e250540dcfb7ba840584561e509666950513bd07221a46b6833ffab9356ade9e0cc1fe2250de622bb4a0f5a2378502f
-  data.tar.gz: 17069ecf45fd0d5b48cfef58ba45ef489c7468dd2a5a0bcf4388058ef2fa651e8c6bb0cf802ca2f382a0c6fc4fc1215ffdd046e677667d06d6e960311b134042
+  metadata.gz: 4b0cbbfb2ac384a60e7f22805a4b3d519dad097a6a4d5420f5bf5204f5b6f086ab6aae4844deb9ea8fa09f4846370b8be5fa65ce66f7884c6f4d198dadf1780e
+  data.tar.gz: 583abcfd57e5e73ee0875a57af769c1c6acf86c81c2f4de736e7158d71652431c24aaf12eb8b92fecefb589d3a70e34decb0ce0f39a7fdae2748c3979b536d54

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .DS_Store/
+.byebug_history

data/.travis.yml

@@ -4,11 +4,11 @@ before_install:
   - gem install rake
   - gem install rspec
 rvm:
-  - 2.0.0
-  - 2.1.1
   - 2.3.4
   - 2.4.1
   - 2.5.3
+  - 2.6.3
+  - 2.6.5
 install: 
  - sudo apt-get install clamav
  - sudo freshclam

data/README.md

@@ -17,14 +17,14 @@ Just add `gem 'clamby'` to your `Gemfile` and run `bundle install`.
 
 You can use two methods to scan a file for a virus:
 
-If you use `safe?` to scan a file, it will return true if no viruses were found, false if a virus was found, and nil if there was a problem finding the file or if there was a problem using `clamscan`
+If you use `safe?` to scan a file, it will return `true` if no viruses were found, `false` if a virus was found, and `nil` if there was a problem finding the file or if there was a problem using `clamscan`
 
-`safe?(path_to_file)`
+`Clamby.safe?(path_to_file)`
 
-If you use `virus?` to scan a file, it will return true if a virus was found, false if no virus was found, and nil if there was a problem finding the file or if there was a problem using `clamscan`
+If you use `virus?` to scan a file, it will return `true` if a virus was found, `false` if no virus was found, and `nil` if there was a problem finding the file or if there was a problem using `clamscan`
 
 
-`virus?(path_to_file)`
+`Clamby.virus?(path_to_file)`
 
 In your model with the uploader, you can add the scanner to a before method to scan the file. When a file is scanned, a successful scan will return `true`. An unsuccessful scan will return `false`. A scan may be unsuccessful for a number of reasons; `clamscan` could not be found, `clamscan` returned a virus, or the file which you were trying to scan could not be found.
 
@@ -64,6 +64,25 @@ It's good to note that Clamby will not by default delete files which had a virus
   end
 ```
 
+## with ActiveStorage
+
+With ActiveStorage, you don't have access to the file through normal methods, so you'll have to access the file through the `attachment_changes`. 
+
+```ruby
+class User < ApplicationRecord
+  has_one_attached :avatar
+  before_save :scan_for_viruses
+
+  private
+
+  def scan_for_viruses
+    return unless self.attachment_changes['avatar']
+
+    path = self.attachment_changes['avatar'].attachable.tempfile.path
+    Clamby.safe?(path)
+  end
+end
+```
 
 # Configuration
 
@@ -161,6 +180,11 @@ This opens the root crontab file in a text editor. Add the following line
 
 `57 08 * * * sudo freshclam`
 
+# Contributors
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
 # LICENSE
 
 Copyright (c) 2016 kobaltz

data/clamby.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "byebug"
 end

data/lib/clamby.rb

@@ -15,6 +15,7 @@ module Clamby
     :fdpass => false,
     :stream => false,
     :output_level => 'medium',
+    :datadir => nil,
     :executable_path_clamscan => 'clamscan',
     :executable_path_clamdscan => 'clamdscan',
     :executable_path_freshclam => 'freshclam',

data/lib/clamby/command.rb

@@ -23,6 +23,10 @@ module Clamby
         args << '--stream' if Clamby.config[:stream]
       end
 
+      puts "use db : #{Clamby.config[:datadir]}"
+      args << "-d #{Clamby.config[:datadir]}" if Clamby.config[:datadir]
+      puts args.join(' ')
+
       new.run scan_executable, *args
 
       # $CHILD_STATUS maybe nil if the execution itself (not the client process)
@@ -35,7 +39,7 @@ module Clamby
         if Clamby.config[:error_clamscan_client_error] && Clamby.config[:daemonize]
           raise Clamby::ClamscanClientError.new("Clamscan client error")
         end
-
+ 
         # returns true to maintain legacy behavior
         return true
       else
@@ -47,7 +51,9 @@ module Clamby
 
     # Update the virus definitions.
     def self.freshclam
-      new.run 'freshclam'
+      args = []
+      args << "--datadir=#{Clamby.config[:datadir]}" if Clamby.config[:datadir]
+      new.run 'freshclam', *args
     end
 
     # Show the ClamAV version. Also acts as a quick check if ClamAV functions.
@@ -68,7 +74,7 @@ module Clamby
       self.command = args | default_args
       self.command = command.sort.unshift(executable_full)
 
-      system(*self.command, system_options)
+      system(self.command.join(' '), system_options)
     end
 
     private

data/lib/clamby/version.rb

@@ -1,3 +1,3 @@
 module Clamby
-  VERSION = "1.6.2"
+  VERSION = "1.6.5"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: clamby
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.5
 platform: ruby
 authors:
 - kobaltz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: Clamby allows users to scan files uploaded with Paperclip or Carrierwave.
   If a file has a virus, then you can delete this file and discard it without causing
   harm to other users.
@@ -101,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Scan file uploads with ClamAV