schleuder 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80f579a3285abeaea12343a4d475e6b1de3c35308b923ee6c397e65c1b1be455
-  data.tar.gz: 6473080963a09323a4feb6364fab9290a2ff4f17588e29af4f4dbada0da867a2
+  metadata.gz: 9f8275838177195ab78283d9c737de9cbd2d39e816c9f41db2e31d785d787dd8
+  data.tar.gz: 464e220965c5d0ee43d300a1f988e7a27edd9344d751bae9e06a9a02fc5c2a43
 SHA512:
-  metadata.gz: d972b205bf9b3f9d4e3a1dbbb12ccab952d5ccfde2d71ceb4d0464faff6f8aeb8e0c0543fc0166fce72840af463fbc7217a1e9cdca509a764d47946ef1018a02
-  data.tar.gz: 06ea91d301606341692f92f8e9d0937e63f03071b7d32538d6de7de00163e4a6533c47725d3b8c51de5cf86e0f9530b9de969fe91fdc43f42fc4ccf952d93c28
+  metadata.gz: d6ba6aab5c19ae0f8f74a0fe44e84e5a10f4adf434f55454a1d7ca49943557fbad5db23ff06fee1a3e0efa5a248034f8a6a17dcbeb91864bf04ec68f8cd14d1f
+  data.tar.gz: bd361a32b63c6bcfa146e1369a45fa54e9c3c94d29baaefbbff01a1629b468c896a34c17cd6ff957357eaf67611a5b09b5c2b2d9a023130430a86f29892b19cb

data/README.md

@@ -16,21 +16,10 @@ Requirements
 * openssl
 * icu
 
-*If you use Debian buster or CentOS 7, please have a look at the [installation docs](https://schleuder.org/schleuder/docs/server-admins.html#installation). We do provide packages for those platforms, which simplify the installation a lot.*
-
-*🛈 A note regarding Ubuntu: All Ubuntu versions up to and including 17.10 don't meet the requirements with their packaged versions of gnupg! To run Schleuder on Ubuntu you currently have to install a more recent version of gnupg manually. Only Ubuntu 18.04 ("bionic") provides modern enough versions of Schleuder's requirements.*
-
-On systems that base on Debian 10 ("buster"), install the dependencies via
-
-    apt-get install ruby-dev gnupg2 libgpgme-dev libsqlite3-dev libssl-dev build-essential libicu-dev
-
+*If you use Debian buster, CentOS 7 or Archlinux, please have a look at the [installation docs](https://schleuder.org/schleuder/docs/server-admins.html#installation). We do provide packages for those platforms, which simplify the installation a lot.*
 
 We **recommend** to also run a random number generator like [haveged](http://www.issihosts.com/haveged/). This ensures Schleuder won't be blocked by lacking entropy, which otherwise might happen especially during key generation.
 
-On Debian based systems, install it via
-
-    apt-get install haveged
-
 
 Additionally these **rubygems** are required (will be installed automatically unless present):
 
@@ -47,15 +36,15 @@ Additionally these **rubygems** are required (will be installed automatically un
 Installing Schleuder
 ------------
 
-1. Download [the gem](https://schleuder.org/download/schleuder-4.0.1.gem) and [the OpenPGP-signature](https://schleuder.org/download/schleuder-4.0.1.gem.sig) and verify:
+1. Download [the gem](https://schleuder.org/download/schleuder-4.0.2.gem) and [the OpenPGP-signature](https://schleuder.org/download/schleuder-4.0.2.gem.sig) and verify:
    ```
    gpg --recv-key 0xB3D190D5235C74E1907EACFE898F2C91E2E6E1F3
-   gpg --verify schleuder-4.0.1.gem.sig
+   gpg --verify schleuder-4.0.2.gem.sig
    ```
 
 2. If all went well install the gem:
    ```
-   gem install schleuder-4.0.1.gem
+   gem install schleuder-4.0.2.gem
    ```
 
 3. Set up schleuder:
@@ -145,4 +134,4 @@ GNU GPL 3.0. Please see [LICENSE.txt](LICENSE.txt).
 Alternative Download
 --------------------
 
-Alternatively to the gem-files you can download the latest release as [a tarball](https://schleuder.org/download/schleuder-4.0.1.tar.gz) and [its OpenPGP-signature](https://schleuder.org/download/schleuder-4.0.1.tar.gz.sig).
+Alternatively to the gem-files you can download the latest release as [a tarball](https://schleuder.org/download/schleuder-4.0.2.tar.gz) and [its OpenPGP-signature](https://schleuder.org/download/schleuder-4.0.2.tar.gz.sig).

data/Rakefile

@@ -7,6 +7,9 @@ require_relative "lib/#{project}.rb"
 @filename_gem = "#{@tagname}.gem"
 @filename_tarball = "#{@tagname}.tar.gz"
 
+# Make ActiveRecord's tasks usable for us (without this, those tasks try to run
+# in the "default_env" environment, which is not configured).
+ENV['RACK_ENV'] ||= ENV['SCHLEUDER_ENV']
 load 'active_record/railties/databases.rake'
 
 # Configure ActiveRecord

data/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
@@ -15,13 +15,13 @@ ActiveRecord::Schema.define(version: 2020_01_18_170110) do
   create_table "lists", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string "email", limit: 255
-    t.string "fingerprint", limit: 255
-    t.string "log_level", limit: 255, default: "warn"
-    t.string "subject_prefix", limit: 255, default: ""
-    t.string "subject_prefix_in", limit: 255, default: ""
-    t.string "subject_prefix_out", limit: 255, default: ""
-    t.string "openpgp_header_preference", limit: 255, default: "signencrypt"
+    t.string "email"
+    t.string "fingerprint"
+    t.string "log_level", default: "warn"
+    t.string "subject_prefix", default: ""
+    t.string "subject_prefix_in", default: ""
+    t.string "subject_prefix_out", default: ""
+    t.string "openpgp_header_preference", default: "signencrypt"
     t.text "public_footer", default: ""
     t.text "headers_to_meta", default: "[\"from\", \"to\", \"cc\", \"date\", \"sig\", \"enc\"]"
     t.text "bounces_drop_on_headers", default: "{\"x-spam-flag\":\"yes\"}"
@@ -39,7 +39,7 @@ ActiveRecord::Schema.define(version: 2020_01_18_170110) do
     t.boolean "include_list_headers", default: true
     t.boolean "include_openpgp_header", default: true
     t.integer "max_message_size_kb", default: 10240
-    t.string "language", limit: 255, default: "en"
+    t.string "language", default: "en"
     t.boolean "forward_all_incoming_to_admins", default: false
     t.integer "logfiles_to_keep", default: 2
     t.text "internal_footer", default: ""
@@ -51,8 +51,8 @@ ActiveRecord::Schema.define(version: 2020_01_18_170110) do
 
   create_table "subscriptions", force: :cascade do |t|
     t.integer "list_id"
-    t.string "email", limit: 255
-    t.string "fingerprint", limit: 255
+    t.string "email"
+    t.string "fingerprint"
     t.boolean "admin", default: false
     t.boolean "delivery_enabled", default: true
     t.datetime "created_at"

data/lib/schleuder.rb

@@ -6,6 +6,7 @@
 Encoding.default_external = Encoding::UTF_8
 
 # Stdlib
+require 'etc'
 require 'fileutils'
 require 'singleton'
 require 'yaml'
@@ -13,6 +14,7 @@ require 'pathname'
 require 'syslog/logger'
 require 'logger'
 require 'open3'
+require 'socket'
 
 # Require mandatory libs. The database-layer-lib is required below.
 require 'mail-gpg'
@@ -32,7 +34,8 @@ $:.unshift libdir
 require 'schleuder/mail/parts_list.rb'
 require 'schleuder/mail/message.rb'
 require 'schleuder/mail/gpg.rb'
-require 'schleuder/mail/encrypted_part.rb'
+require 'schleuder/mail/gpg/encrypted_part.rb'
+require 'schleuder/mail/gpg/sign_part.rb'
 require 'schleuder/gpgme/import_status.rb'
 require 'schleuder/gpgme/key.rb'
 require 'schleuder/gpgme/sub_key.rb'

data/lib/schleuder/cli.rb

@@ -70,7 +70,6 @@ module Schleuder
 
     desc 'refresh_keys [list1@example.com]', 'Refresh all keys of all list from the keyservers sequentially (one by one or on the passed list). (This is supposed to be run from cron or systemd weekly.)'
     def refresh_keys(list=nil)
-      GPGME::Ctx.send_notice_if_gpg_does_not_know_import_filter
       work_on_lists(:refresh_keys, list)
       permission_notice
     end

data/lib/schleuder/gpgme/ctx.rb

@@ -134,7 +134,6 @@ module GPGME
       arguments, error = fetch_key_gpg_arguments_for(input)
       return error if error
 
-      self.class.send_notice_if_gpg_does_not_know_import_filter
       gpgerr, gpgout, exitcode = self.class.gpgcli("#{import_filter_arg} #{arguments}")
 
       # Unfortunately gpg doesn't exit with code > 0 if `--fetch-key` fails.
@@ -229,21 +228,6 @@ module GPGME
       raise 'Need gpg in $PATH or in $GPGBIN'
     end
 
-    def self.spawn_daemon(name, args)
-      delete_daemon_socket(name)
-      cmd = "#{name} #{args} --daemon > /dev/null 2>&1"
-      if ! system(cmd)
-        return [false, "#{name} exited with code #{$?}"]
-      end
-    end
-
-    def self.delete_daemon_socket(name)
-      path = File.join(ENV['GNUPGHOME'], "S.#{name}")
-      if File.exist?(path)
-        File.delete(path)
-      end
-    end
-
     def keyserver_arg
       if Conf.keyserver.present?
         "--keyserver #{Conf.keyserver}"
@@ -252,24 +236,8 @@ module GPGME
       end
     end
 
-    def self.gpg_knows_import_filter?
-      sufficient_gpg_version?('2.1.15')
-    end
-
     def import_filter_arg
-      if self.class.gpg_knows_import_filter?
-        %{ --import-filter drop-sig='sig_created_d > 0000-00-00'}
-      end
-    end
-
-    def self.send_notice_if_gpg_does_not_know_import_filter
-      if ! gpg_knows_import_filter?
-        Schleuder.logger.notify_superadmin(
-            subject: 'Schleuder installation problem',
-            message: "Your version of GnuPG is very old, please update!\n\nWith your version of GnuPG we can not protect your setup against signature flooding. Please update to at least version 2.1.15 to fix this problem. See <https://dkg.fifthhorseman.net/blog/openpgp-certificate-flooding.html> for details on the background."
-          )
-        ''
-      end
+      %{ --import-filter drop-sig='sig_created_d > 0000-00-00'}
     end
   end
 end

data/lib/schleuder/logger.rb

@@ -9,7 +9,7 @@ module Schleuder
     def initialize
       super('Schleuder', Syslog::LOG_MAIL)
       # We need some sender-address different from the superadmin-address.
-      @from = "#{`whoami`.chomp}@#{`hostname`.chomp}"
+      @from = "#{Etc.getlogin}@#{Socket.gethostname}"
       @adminaddresses = Conf.superadmin
       @level = ::Logger.const_get(Conf.log_level.upcase)
     end

data/lib/schleuder/mail/gpg/sign_part.rb

@@ -0,0 +1,33 @@
+module Mail
+  module Gpg
+    class SignPart < Mail::Part
+      # Copied verbatim from mail-gpg v.0.4.2. This code was changed in
+      # <https://github.com/jkraemer/mail-gpg/commit/5fded41ccee4a58f848a2f8e7bd53d11236f8984>,
+      # which breaks verifying some encapsulated (signed-then-encrypted)
+      # messages. See
+      # <https://github.com/jkraemer/mail-gpg/pull/40#issue-95776382> for
+      # details.
+      def self.verify_signature(plain_part, signature_part, options = {})
+        if !(signature_part.has_content_type? &&
+            ('application/pgp-signature' == signature_part.mime_type))
+          return false
+        end
+
+        # Work around the problem that plain_part.raw_source prefixes an
+        # erroneous CRLF, <https://github.com/mikel/mail/issues/702>.
+        if ! plain_part.raw_source.empty?
+          plaintext = [ plain_part.header.raw_source,
+                        "\r\n\r\n",
+                        plain_part.body.raw_source
+          ].join
+        else
+          plaintext = plain_part.encoded
+        end
+
+        signature = signature_part.body.encoded
+        GpgmeHelper.sign_verify(plaintext, signature, options)
+      end
+    end
+  end
+end
+

data/lib/schleuder/version.rb

@@ -1,3 +1,3 @@
 module Schleuder
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

metadata

@@ -1,119 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: schleuder
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - schleuder dev team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gpgme
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 6.1.3
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
-  name: mail-gpg
+  name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.7.6
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: gpgme
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.19
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mail-gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 10.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -143,19 +143,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -171,47 +171,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: charlock_holmes
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: hirb
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -227,31 +227,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: hirb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-console
+  name: irb
   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'
 - !ruby/object:Gem::Dependency
@@ -268,6 +268,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -283,19 +297,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 description: |-
   Schleuder is a group's email-gateway: subscribers can exchange encrypted emails among themselves, receive emails from non-subscribers and send emails to non-subscribers via the list.
 
@@ -404,8 +418,9 @@ files:
 - lib/schleuder/listlogger.rb
 - lib/schleuder/logger.rb
 - lib/schleuder/logger_notifications.rb
-- lib/schleuder/mail/encrypted_part.rb
 - lib/schleuder/mail/gpg.rb
+- lib/schleuder/mail/gpg/encrypted_part.rb
+- lib/schleuder/mail/gpg/sign_part.rb
 - lib/schleuder/mail/message.rb
 - lib/schleuder/mail/parts_list.rb
 - lib/schleuder/runner.rb
@@ -445,9 +460,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
 summary: Schleuder is an encrypting mailing list manager with remailing-capabilities.
 test_files: []