ddr-antivirus 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3ef82b06ad7b12f5c73b2bf8d223baf3b2e3b3d
-  data.tar.gz: c764fe1c7b36acf7cb592da9105b0f32b923fa2d
+  metadata.gz: b58d6f83c9173427169af66c7d2ccb1a483a81a9
+  data.tar.gz: bf079fc09190effa086373ffb297666bab0aaf27
 SHA512:
-  metadata.gz: 77b13b6df4c1f71d28817fbd1a851a3387bd5083b5ba811745aabf9ba67c8f0437bfa6ba34b3b6fcafad44cdb2fcb7e958f34c8d34a71dfeca43c6736e6044b6
-  data.tar.gz: 6610ac368e938e6b968bd95aa9bc93b2b6eb9dec5c2fb04b2fc0b01ea278638b7b599275211728849632cdfdaf086691eefed7c88ab90a2c443db8b4eb21078c
+  metadata.gz: 7b90cccfce3fc9c011637c97388541b807f45f6db96f791af66b23aeecdac0acf2fd1f301e34ca7945d494fce2100e3c6de1b71eb56eeebfa280d65be2bb1acb
+  data.tar.gz: 7e170161b67ecb23e110b1917b3f818e42935c13d345949da0e479e2fb7fbf36fa8de32ad437fab8086e9ef0167e98f8f0ee99794289c21955e3ca7558ec279d

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

@@ -1,3 +1,4 @@
+require "fileutils"
 require_relative "scanner_adapter"
 require_relative "scan_result"
 
@@ -15,6 +16,16 @@ module Ddr
         end
 
         def clamdscan(path)
+          original_mode = File.stat(path).mode
+          FileUtils.chmod("a+r", path) unless File.world_readable?(path)
+          result = command(path)
+          FileUtils.chmod(original_mode, path) if File.stat(path).mode != original_mode
+          result
+        end
+
+        private
+
+        def command(path)
           `clamdscan --no-summary #{path}`.strip
         end
 
@@ -24,7 +35,7 @@ module Ddr
       # Result of a scan with the ClamdScannerAdapter
       #
       class ClamdScanResult < ScanResult
-        
+
         def virus_found
           if m = /: ([^\s]+) FOUND$/.match(raw)
             m[1]

data/lib/ddr/antivirus/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Antivirus
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/spec/unit/clamd_scanner_adapter_spec.rb

@@ -7,10 +7,38 @@ module Ddr
       RSpec.describe ClamdScannerAdapter do
 
         let(:path) { File.expand_path(File.join("..", "..", "fixtures", "blue-devil.png"), __FILE__) }
+        let(:adapter) { described_class.new }
+
+        describe "permissions" do
+          before do
+            @file = Tempfile.new("test")
+            @file.write("Scan me!")
+            @file.close
+            allow(adapter).to receive(:command).with(@file.path) { "#{@file.path}: OK" }
+          end
+          after { @file.unlink }
+          describe "when the file is not world readable" do
+            it "should temporarily change the permissions" do
+              original_mode = File.stat(@file.path).mode
+              expect(FileUtils).to receive(:chmod).with("a+r", @file.path)
+              adapter.scan(@file.path)
+              expect(File.stat(@file.path).mode).to eq(original_mode)
+            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)
+              adapter.scan(@file.path)
+              expect(File.stat(@file.path).mode).to eq(original_mode)
+            end
+          end
+        end
 
         describe "result" do
           subject { adapter.scan(path) }
-          let(:adapter) { described_class.new }
+
           it "should be a scan result" do
             expect(subject).to be_a(ClamdScanResult)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddr-antivirus
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport