clamby 1.6.8 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81853e9529f298f606bb599f22da044e9ada2f805d2d6f6635caac455450e93e
-  data.tar.gz: d122cf67adcfd0187c8fabd7153ca7fe20643b075f9bcfe77c8d482075462f74
+  metadata.gz: f3e1a92dd3ace58588a950da63a979a45dd4634006417a4bdfd8b37e5cda339a
+  data.tar.gz: 1988703846a4fe4b53049a897b036bf8e1a279faa0c6eb3f52d7b931417f213a
 SHA512:
-  metadata.gz: c56dc7d74dfa3e29eeeca5d44b0cee9fc55efbc55269bcee95cd5108cb8c09ac8faa5a353bd6932ae7602adf1686bec8df4671a5afd57997bb0bdf605d2c2bdc
-  data.tar.gz: 85b9072343ce8061cb67ab7607a52570f6d42459e9ad3467c3497c381a9df6cdea3832435dd276e306b1b5fdc1a8bb415940e0a90371027f65497952f215a89b
+  metadata.gz: 2b82f110ca83c57a33f9ba542d77623ab0eb66fa658f2df2f6346d72ed80d456352524b385b4ccabf2c51f5f7f8e2c4a66ddea213b8454148efc240274e375f7
+  data.tar.gz: c7288c6c4e8f32756a1334d2a94d7543c3172fe1f001715f88bba7fbc86b99e350b1290bbfbd7ea68ba464cb67e9e2ec25cc361c2c1e91a3450310000d73060b

data/.github/workflows/ruby-ci.yml

@@ -0,0 +1,41 @@
+name: Ruby CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6.10', '2.7.8']
+        # ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4', '3.2.2']
+        gemfile: ['Gemfile']
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: 2.4.17
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo groupadd clamav
+        sudo useradd -g clamav -s /bin/false -c "Clam Antivirus" clamav
+        sudo apt-get install -y clamav
+        sudo systemctl stop clamav-freshclam
+        sudo pkill freshclam || true
+        sudo freshclam
+
+    - name: Install Gems
+      run: |
+        gem install rake
+        gem install rspec
+        bundle install --jobs 4 --retry 3
+
+    - name: Run tests
+      run: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.6.10
+ - Moved from Travis CI to GitHub Actions
+
+# v1.6.9
+ - [AndreasRonnqvistCytiva](https://github.com/kobaltz/clamby/commits?author=AndreasRonnqvistCytiva)  - Allow reload option #44
+
 # v1.6.8
  - [codezomb](https://github.com/kobaltz/clamby/commits?author=codezomb)  - Allow paths to be escaped #37
 

data/README.md

@@ -1,7 +1,7 @@
 ![Clamby Logo](https://raw.github.com/kobaltz/clamby/master/clamby_logo.png)
 
 [![GemVersion](https://badge.fury.io/rb/clamby.png)](https://badge.fury.io/rb/clamby.png)
-[![Build Status](https://travis-ci.org/kobaltz/clamby.svg?branch=master)](https://travis-ci.org/kobaltz/clamby)
+[![Ruby CI](https://github.com/kobaltz/clamby/actions/workflows/ruby-ci.yml/badge.svg)](https://github.com/kobaltz/clamby/actions/workflows/ruby-ci.yml)
 
 This gem depends on the [clamscan](http://www.clamav.net/) and `freshclam` daemons to be installed already.
 
@@ -66,7 +66,7 @@ It's good to note that Clamby will not by default delete files which had a virus
 
 ## 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`. 
+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
@@ -99,6 +99,7 @@ Configuration is rather limited right now. You can exclude the check if `clamsca
       :error_file_virus => false,
       :fdpass => false,
       :stream => false,
+      :reload => false,
       :output_level => 'medium', # one of 'off', 'low', 'medium', 'high'
       :executable_path_clamscan => 'clamscan',
       :executable_path_clamdscan => 'clamdscan',
@@ -128,6 +129,12 @@ Setting the `stream` configuration option will stream the file to the daemon. Th
 
 `--stream : Forces file streaming to clamd. This is generally not needed as clamdscan detects automatically if streaming is required. This option only exists for debugging and testing purposes, in all other cases --fdpass is preferred.`
 
+#### Force streaming files to clamd
+
+Setting the `reload` configuration option to `true` will pass the `--reload` option  to the daemon. Only works when also specifying `daemonize`. From the clamdscan man page:
+
+`--reload : Request clamd to reload virus database.`
+
 #### Output levels
 
 - *off*: suppress all output

data/clamby.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["dave@k-innovations.net"]
   spec.summary       = "Scan file uploads with ClamAV"
   spec.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."
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/kobaltz/clamby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/clamby/command.rb

@@ -21,6 +21,7 @@ module Clamby
       if Clamby.config[:daemonize]
         args << '--fdpass' if Clamby.config[:fdpass]
         args << '--stream' if Clamby.config[:stream]
+        args << '--reload' if Clamby.config[:reload]
       end
 
       args << "-d #{Clamby.config[:datadir]}" if Clamby.config[:datadir]

data/lib/clamby/version.rb

@@ -1,3 +1,3 @@
 module Clamby
-  VERSION = "1.6.8"
+  VERSION = "1.6.10"
 end

data/lib/clamby.rb

@@ -14,6 +14,7 @@ module Clamby
     :error_file_virus => false,
     :fdpass => false,
     :stream => false,
+    :reload => false,
     :output_level => 'medium',
     :datadir => nil,
     :executable_path_clamscan => 'clamscan',

data/spec/clamby/command_spec.rb

@@ -84,6 +84,32 @@ describe Clamby::Command do
       end
     end
 
+    describe 'reloading virus database' do
+      it 'does not include reload in the command by default' do
+        Clamby.configure
+        expect(runner).to receive(:run).with('clamscan', good_path, '--no-summary')
+        allow(described_class).to receive(:new).and_return(runner)
+
+        described_class.scan(good_path)
+      end
+
+      it 'omits the reload option when invoking clamscan if it is set, but daemonize isn\'t' do
+        Clamby.configure(reload: true)
+        expect(runner).to receive(:run).with('clamscan', good_path, '--no-summary')
+        allow(described_class).to receive(:new).and_return(runner)
+
+        described_class.scan(good_path)
+      end
+
+      it 'passes the reload option when invoking clamscan if it is set with daemonize' do
+        Clamby.configure(reload: true, daemonize: true)
+        expect(runner).to receive(:run).with('clamdscan', good_path, '--no-summary', '--reload')
+        allow(described_class).to receive(:new).and_return(runner)
+
+        described_class.scan(good_path)
+      end
+    end
+
     describe 'specifying config-file' do
       it 'does not include the parameter in the clamscan command by default' do
         Clamby.configure

data/spec/clamby_spec.rb

@@ -66,6 +66,18 @@ describe Clamby do
     end
   end
 
+  # From the clamscan man page:
+  # Request clamd to reload virus database.
+  context 'reload option' do
+    it 'is false by default' do
+      expect(Clamby.config[:reload]).to eq false
+    end
+    it 'accepts an reload option in the config' do
+      Clamby.configure(reload: true)
+      expect(Clamby.config[:reload]).to eq true
+    end
+  end
+
   context 'error_clamscan_client_error option' do
     it 'is false by default' do
       expect(Clamby.config[:error_clamscan_client_error]).to eq false

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ RSpec.configure do |config|
   end
 
   def download(url)
-    file = open(url)
+    file = URI.open(url)
     file.is_a?(StringIO) ? to_tempfile(file) : file
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clamby
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.10
 platform: ruby
 authors:
 - kobaltz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,11 +61,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby-ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,7 +82,7 @@ files:
 - spec/fixtures/safe.txt
 - spec/spec_helper.rb
 - spec/support/shared_context.rb
-homepage: ''
+homepage: https://github.com/kobaltz/clamby
 licenses:
 - MIT
 metadata: {}
@@ -102,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Scan file uploads with ClamAV

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-before_install:
-  - gem install bundler -v '1.17.3'
-  - gem install rake
-  - gem install rspec
-rvm:
-  - 2.3.4
-  - 2.4.1
-  - 2.5.3
-  - 2.6.3
-  - 2.6.5
-  - 2.6.6
-  - 2.7.2
-install:
- - sudo apt-get install clamav
- - sudo freshclam
-
-gemfile:
-  - Gemfile

data/CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at dave@k-innovations.net. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/