ddr-antivirus 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b9df155d09e46c53818f01062bb81c7edc064ce
-  data.tar.gz: f01c25fe5043058b97fbf6d058e75f36e6d0c0af
+  metadata.gz: 1e2dc2816bc43d784563002fecfa27809184e0e7
+  data.tar.gz: f662098335165f8b839dde9af1540901fbcb412e
 SHA512:
-  metadata.gz: b9881f3a0b1e46b82a3e179a361277ae9fc15032e97923daa94d02713fcbf32dc0522aed47f71f6af34eca8b68390adf43d2f46fb83bc085c290abca9090fa41
-  data.tar.gz: 00ca141a41c649d4b004d354014fb390c004dbaf7c99f3090dcf325ae41357e1af4687ba65f15dcbd03a21e01519c6ef7073c36d8ad8f214044b7593d3a7d78f
+  metadata.gz: 296903f26f411e4638f61a27782b5a6f2fd5c4d654d0c5edec1bfab8de6846c8fdd0156efdd5d302bd85135d31c7f097fd9c679bcc706e394ee740460f3812cd
+  data.tar.gz: d88a0465de7c6d7de55827de7b8264ba808ca3e1d1ec9ad5f28e5b728de9a2771d19b706ce5945d0084f0a989f3c84893d27786c35e422b3996cdefc51815eb2

data/.travis.yml

@@ -1,8 +1,12 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
+  - 2.1.5
 cache: 
   - bundler
-
+  - apt
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y clamav-daemon
+before_script:
+  - sudo freshclam -v
+  - sudo /etc/init.d/clamav-daemon start

data/lib/ddr/antivirus/adapters/clamd_scanner_adapter.rb

@@ -1,4 +1,3 @@
-require "open3"
 require "fileutils"
 require "shellwords"
 
@@ -9,11 +8,14 @@ module Ddr::Antivirus
   class ClamdScannerAdapter < ScannerAdapter
 
     SCANNER = "clamdscan".freeze
+    CONFIG = "clamconf".freeze
+
+    MAX_FILE_SIZE_RE = Regexp.new('^MaxFileSize = "(\d+)"')
 
     def scan(path)
-      output, status = clamdscan(path)
+      output, exitcode = clamdscan(path)
       result = ScanResult.new(path, output, version: version, scanned_at: Time.now.utc)
-      case status.exitstatus
+      case exitcode
       when 0
         result
       when 1
@@ -24,21 +26,31 @@ module Ddr::Antivirus
     end
 
     def clamdscan(path)
-      make_readable(path) do
-        command(path)
+      output = make_readable(path) do
+        command "--fdpass", safe_path(path)
       end
+      [ output, $?.exitstatus ]
     end
 
     def version
-      out, err, status = Open3.capture3(SCANNER, "-V")
-      out.strip
+      @version ||= command("-V").strip
+    end
+
+    def config
+      @config ||= `#{CONFIG}`
+    end
+
+    def max_file_size
+      if m = MAX_FILE_SIZE_RE.match(config)
+        m[1]
+      end
     end
 
     private
 
-    def command(path)
-      safe_path = Shellwords.shellescape(path)
-      Open3.capture2e(SCANNER, safe_path)
+    def command(*args)
+      cmd = args.dup.unshift(SCANNER).join(" ")
+      `#{cmd}`
     end
 
     def make_readable(path)
@@ -46,38 +58,18 @@ module Ddr::Antivirus
       original = File.stat(path).mode # raises Errno::ENOENT
       if !File.world_readable?(path)
         changed = FileUtils.chmod("a+r", path)
-        logger.info "File #{path} made world-readable for virus scanning."
+        logger.debug "#{self.class} - File \"#{path}\" made world-readable."
       end
       result = yield
       if changed
         FileUtils.chmod(original, path)
-        logger.info "Mode reset to original #{original} on file #{path}."
+        logger.debug "#{self.class} - Mode on file \"#{path}\" reset to original: #{original}."
       end
       result
     end
 
-  end
-
-  # Result of a scan with the ClamdScannerAdapter
-  # @api private
-  class ClamdScanResult < ScanResult
-
-    def virus_found
-      if m = /: ([^\s]+) FOUND$/.match(output)
-        m[1]
-      end
-    end
-
-    def ok?
-      status.exitstatus == 0
-    end
-
-    def has_virus?
-      status.exitstatus == 1
-    end
-
-    def error?
-      status.exitstatus == 2
+    def safe_path(path)
+      Shellwords.shellescape(path)
     end
 
   end

data/lib/ddr/antivirus/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Antivirus
-    VERSION = "2.0.0"
+    VERSION = "2.1.1"
   end
 end

data/spec/fixtures/clean.txt

@@ -0,0 +1 @@
+I'm clean!

data/spec/integration/clamd_spec.rb

@@ -0,0 +1,20 @@
+RSpec.describe "ClamAV support using clamd" do
+
+  let(:clean_file) { File.expand_path(File.join("..", "..", "fixtures", "clean.txt"), __FILE__) }
+
+  before do
+    @adapter = Ddr::Antivirus.scanner_adapter
+    Ddr::Antivirus.scanner_adapter = :clamd
+  end
+
+  after do
+    Ddr::Antivirus.scanner_adapter = @adapter
+  end
+
+  describe "on the clean file" do
+    it "doesn't raise an error" do
+      expect { Ddr::Antivirus.scan(clean_file) }.not_to raise_error
+    end
+  end
+
+end

data/spec/unit/clamd_scanner_adapter_spec.rb

@@ -1,11 +1,10 @@
 require "tempfile"
+require "fileutils"
 require "ddr/antivirus/adapters/clamd_scanner_adapter"
 
 module Ddr::Antivirus
   RSpec.describe ClamdScannerAdapter do
 
-    let(:path) { File.expand_path(File.join("..", "..", "fixtures", "blue-devil.png"), __FILE__) }
-
     before do
       allow(subject).to receive(:version) { "version" }
     end
@@ -15,57 +14,48 @@ module Ddr::Antivirus
         @file = Tempfile.new("test")
         @file.write("Scan me!")
         @file.close
-        allow(subject).to receive(:command).with(@file.path) { ["#{@file.path}: OK", double(exitstatus: 0)] }
+        FileUtils.chmod(0000, @file.path)
       end
       after { @file.unlink }
-      describe "when the file is not world readable" do
-        it "should temporarily change the permissions" do
-          FileUtils.chmod("a-r", @file.path)
-          original_mode = File.stat(@file.path).mode
-          expect(FileUtils).to receive(:chmod).with("a+r", @file.path)
-          subject.scan(@file.path)
-          expect(File.stat(@file.path).mode).to eq(original_mode)
+      describe "when the file is not readable" do
+        it "scans the file" do
+          expect { subject.scan(@file.path) }.not_to raise_error
         end
-      end
-      describe "when the file is world readable" do
-        before { FileUtils.chmod("a+r", @file.path) }
-        it "should not change the permissions" do
-          original_mode = File.stat(@file.path).mode
-          expect(FileUtils).not_to receive(:chmod)
-          subject.scan(@file.path)
-          expect(File.stat(@file.path).mode).to eq(original_mode)
+        it "resets the original permissions" do
+          expect { subject.scan(@file.path) }.not_to change { File.stat(@file.path).mode }
         end
       end
     end
 
     describe "result" do
+      let(:path) { File.expand_path(File.join("..", "..", "fixtures", "blue-devil.png"), __FILE__) }
       before do
-        allow(subject).to receive(:command).with(path) { ["output", status] }
+        allow(subject).to receive(:clamdscan).with(path) { ["output", exitcode] }
       end
       describe "when a virus is found" do
-        let(:status) { double(exitstatus: 1) }
+        let(:exitcode) { 1 }
         it "should raise a VirusFoundError" do
           expect { subject.scan(path) }.to raise_error(VirusFoundError)
         end
       end
       describe "when there is an error" do
-        let(:status) { double(exitstatus: 2) }
-        it "should raise a ScannerError" do
+        let(:exitcode) { 2 }
+        it "raises a ScannerError" do
           expect { subject.scan(path) }.to raise_error(ScannerError)
         end
       end
       describe "success" do
-        let(:status) { double(exitstatus: 0) }
-        it "should have output" do
+        let(:exitcode) { 0 }
+        it "has output" do
           expect(subject.scan(path).output).to eq("output")
         end
-        it "should have a scanned_at time" do
+        it "has a scanned_at time" do
           expect(subject.scan(path).scanned_at).to be_a(Time)
         end
-        it "should have a version" do
+        it "has a version" do
           expect(subject.scan(path).version).to eq("version")
         end
-        it "should have the file_path" do
+        it "has the file_path" do
           expect(subject.scan(path).file_path).to eq(path)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddr-antivirus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,8 @@ files:
 - lib/ddr/antivirus/scanner_adapter.rb
 - lib/ddr/antivirus/version.rb
 - spec/fixtures/blue-devil.png
+- spec/fixtures/clean.txt
+- spec/integration/clamd_spec.rb
 - spec/spec_helper.rb
 - spec/unit/clamd_scanner_adapter_spec.rb
 homepage: https://github.com/duke-libraries/ddr-antivirus
@@ -104,5 +106,7 @@ specification_version: 4
 summary: Pluggable antivirus scanning service.
 test_files:
 - spec/fixtures/blue-devil.png
+- spec/fixtures/clean.txt
+- spec/integration/clamd_spec.rb
 - spec/spec_helper.rb
 - spec/unit/clamd_scanner_adapter_spec.rb