schleuder 3.3.0 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 637d9f0b81f2cb7aaee30a9761eeb0f09f49d95649a00d735ce13ecd008abdad
-  data.tar.gz: ca41b305951ef8ac0fb7edfb42e87521cf1d2ce5e51be6ceaa3c57c933846067
+  metadata.gz: 8aff8f8ecff4958e630158f6fc5811db96d26699ab0946d16b4fc430e2897387
+  data.tar.gz: daa4d6fbe4941a311dcfc54d5544b1771d809ca2f570f6060473b0f94f4bc577
 SHA512:
-  metadata.gz: 3b7f8cd46761314484df53f64ba3d929c75eccdfd4c7a2c7ce87d76720b6fa1025d59f370126b107b08a19b9916fe7e160563739a1058dc88a537acd744af212
-  data.tar.gz: 149620dc7fc6549391af197396b68c8cf42b990e037d2224e337db57af00f90edb293e23120a8f2f8156e40cbfadcd35bca1009d066ba2126f98c4b7c90ae29a
+  metadata.gz: b125a6734601100a1a768b9295848c4d3c1de0fb8336e7a6cf070972c78913f71c2ff52418a8a16cff705a546ca27de29155cae0c1f30736f4f8127bffe5b823
+  data.tar.gz: 55bd88009950e4dbc52a3f17f3566ee8f4bd7d43751237f19da514d00e8e3d2dc92817c15660b0d826bb8072cb537f3652cf5e93ebeca43fcc424faf33964978

data/README.md

@@ -16,11 +16,11 @@ Requirements
 * sqlite3
 * openssl
 
-*If you use Debian stretch or CentOS 7, please have a look at the [installation docs](https://schleuder.org/docs/#installation). We do provide packages for those platforms, which simplify the installation a lot.*
+*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 9 ("stretch"), install the dependencies via
+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
 
@@ -47,15 +47,15 @@ Additionally these **rubygems** are required (will be installed automatically un
 Installing Schleuder
 ------------
 
-1. Download [the gem](https://schleuder.org/download/schleuder-3.3.0.gem) and [the OpenPGP-signature](https://schleuder.org/download/schleuder-3.3.0.gem.sig) and verify:
+1. Download [the gem](https://schleuder.org/download/schleuder-3.5.3.gem) and [the OpenPGP-signature](https://schleuder.org/download/schleuder-3.5.3.gem.sig) and verify:
    ```
    gpg --recv-key 0xB3D190D5235C74E1907EACFE898F2C91E2E6E1F3
-   gpg --verify schleuder-3.3.0.gem.sig
+   gpg --verify schleuder-3.5.3.gem.sig
    ```
 
 2. If all went well install the gem:
    ```
-   gem install schleuder-3.3.0.gem
+   gem install schleuder-3.5.3.gem
    ```
 
 3. Set up schleuder:
@@ -65,7 +65,7 @@ Installing Schleuder
   This creates necessary directories, copies example configs, etc. If you see errors about missing write permissions please follow the advice given.
 
 
-For further information on setup and configuration please read <https://schleuder.org/docs/#setup>.
+For further information on setup and configuration please read <https://schleuder.org/schleuder/docs/server-admins.html>.
 
 
 Command line usage
@@ -112,7 +112,7 @@ To execute the test suite run:
 
     bundle exec rspec
 
-Please note: Some of the specs use 'pgrep'. On systems that base on Debian 9 ("stretch") install it via 
+Please note: Some of the specs use 'pgrep'. On systems that base on Debian 10 ("buster") install it via 
 
     apt-get install procps
 
@@ -145,4 +145,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-3.3.0.tar.gz) and [its OpenPGP-signature](https://schleuder.org/download/schleuder-3.3.0.tar.gz.sig).
+Alternatively to the gem-files you can download the latest release as [a tarball](https://schleuder.org/download/schleuder-3.5.3.tar.gz) and [its OpenPGP-signature](https://schleuder.org/download/schleuder-3.5.3.tar.gz.sig).

data/Rakefile

@@ -3,7 +3,7 @@ require_relative "lib/#{project}.rb"
 
 @version = Schleuder::VERSION
 @tagname = "#{project}-#{@version}"
-@gpguid = 'team@schleuder.org'
+@gpguid = 'B3D190D5235C74E1907EACFE898F2C91E2E6E1F3'
 @filename_gem = "#{@tagname}.gem"
 @filename_tarball = "#{@tagname}.tar.gz"
 
@@ -110,7 +110,7 @@ end
 desc 'Publish gem-file to rubygems.org'
 task :publish_gem do
   puts "Really push #{@filename_gem} to rubygems.org? [yN]"
-  if gets.match(/^y/i)
+  if $stdin.gets.match(/^y/i)
     puts "Pushing..."
     `gem push #{@filename_gem}`
   else
@@ -132,7 +132,7 @@ desc 'Check if version-tag already exists'
 task :check_version do
   # Check if Schleuder::VERSION has been updated since last release
   if `git tag`.match?(/^#{@tagname}$/)
-    $stderr.puts "Warning: Tag '#{@tagname}' already exists. Did you forget to update #{project}/version.rb?"
+    $stderr.puts "Warning: Tag '#{@tagname}' already exists. Did you forget to update lib/#{project}/version.rb?"
     $stderr.print "Delete tag to continue? [yN] "
     if $stdin.gets.match(/^y/i)
       `git tag -d #{@tagname}`

data/db/migrate/20180723173900_add_deliver_selfsent_to_list.rb

@@ -0,0 +1,11 @@
+class AddDeliverSelfsentToList < ActiveRecord::Migration
+  def up
+    if ! column_exists?(:lists, :deliver_selfsent)
+      add_column :lists, :deliver_selfsent, :boolean, default: true
+    end
+  end
+
+  def down
+    remove_column(:lists, :deliver_selfsent)
+  end
+end

data/db/migrate/20190906194820_add_autocrypt_header_to_list.rb

@@ -0,0 +1,11 @@
+class AddAutocryptHeaderToList < ActiveRecord::Migration
+  def up
+    if ! column_exists?(:lists, :include_autocrypt_header)
+      add_column :lists, :include_autocrypt_header, :boolean, default: true
+    end
+  end
+
+  def down
+    remove_column(:lists, :include_autocrypt_header)
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180110203100) do
+ActiveRecord::Schema.define(version: 20190906194820) do
 
   create_table "lists", force: :cascade do |t|
     t.datetime "created_at"
@@ -37,6 +37,7 @@ ActiveRecord::Schema.define(version: 20180110203100) do
     t.boolean  "keep_msgid",                                              default: true
     t.boolean  "bounces_drop_all",                                        default: false
     t.boolean  "bounces_notify_admins",                                   default: true
+    t.boolean  "deliver_selfsent",                                        default: true
     t.boolean  "include_list_headers",                                    default: true
     t.boolean  "include_openpgp_header",                                  default: true
     t.integer  "max_message_size_kb",                                     default: 10240
@@ -44,6 +45,7 @@ ActiveRecord::Schema.define(version: 20180110203100) do
     t.boolean  "forward_all_incoming_to_admins",                          default: false
     t.integer  "logfiles_to_keep",                                        default: 2
     t.text     "internal_footer",                                         default: ""
+    t.boolean  "include_autocrypt_header",                                default: true
   end
 
   create_table "subscriptions", force: :cascade do |t|

data/etc/list-defaults.yml

@@ -6,7 +6,7 @@
 #
 # Options are listed with the behaviour encoded in the database schema.
 
-# Only send out enrypted emails to subscriptions?
+# Only send out encrypted emails to subscriptions?
 # (This setting does not affect resend-messages.)
 send_encrypted_only: true
 
@@ -93,6 +93,9 @@ bounces_drop_on_headers:
 # Send a notice to the list-admins whenever an email is bounced or dropped?
 bounces_notify_admins: true
 
+# Include Autocrypt header into emails?
+include_autocrypt_header: true
+
 # Include RFC-compliant List-* Headers into emails?
 include_list_headers: true
 
@@ -123,3 +126,8 @@ language: en
 # Forward a raw copy of all incoming emails to the list-admins?
 # Mainly useful for debugging.
 forward_all_incoming_to_admins: false
+
+# Should e-mails be delivered to the original subscribed sender?
+# Disabling this only works for signed e-mails; any e-mail that is unsigned
+# sent to the list is treated as coming from an unknown source
+deliver_selfsent: true

data/lib/schleuder.rb

@@ -1,3 +1,10 @@
+# default to UTF-8 encoding as early as possible for external
+# data.
+#
+# this should ensure we are able to parse most incoming
+# plain text mails in different charsets.
+Encoding.default_external = Encoding::UTF_8
+
 # Stdlib
 require 'fileutils'
 require 'singleton'
@@ -61,6 +68,9 @@ ENV["SCHLEUDER_CONFIG"] ||= '/etc/schleuder/schleuder.yml'
 ENV["SCHLEUDER_LIST_DEFAULTS"] ||= '/etc/schleuder/list-defaults.yml'
 ENV["SCHLEUDER_ENV"] ||= 'production'
 ENV["SCHLEUDER_ROOT"] = rootdir.to_s
+# Ensure that gnupg never-ever tries to ask for a passphrase.
+ENV["GPG_TTY"] = "/nonexistant-#{rand}"
+ENV["DISPLAY"] = nil
 
 GPGME::Ctx.set_gpg_path_from_env
 GPGME::Ctx.check_gpg_version

data/lib/schleuder/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'yaml'
 require 'gpgme'
+require 'charlock_holmes'
 
 require_relative '../schleuder'
 require 'schleuder/cli/subcommand_fix'
@@ -67,6 +68,7 @@ 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 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
@@ -319,11 +321,15 @@ Please notify the users and admins of this list of these changes.
     private
 
     def work_on_lists(subj, list=nil)
-      selected_lists = if list.nil?
-        List.all
+      if list.nil?
+        selected_lists = List.all
       else
-        List.where(email: list)
+        selected_lists = List.where(email: list)
+        if selected_lists.blank?
+          error("No list with this address exists: #{list.inspect}")
+        end
       end
+
       selected_lists.each do |list|
         I18n.locale = list.language
         output = list.send(subj)

data/lib/schleuder/filters/post_decryption/90_strip_html_from_alternative_if_keywords_present.rb

@@ -0,0 +1,21 @@
+module Schleuder
+  module Filters
+    def self.strip_html_from_alternative_if_keywords_present(list, mail)
+      if mail[:content_type].blank? ||
+          mail[:content_type].content_type != 'multipart/alternative' ||
+          mail.keywords.blank?
+        return false
+      end
+
+      Schleuder.logger.debug 'Stripping html-part from multipart/alternative-message because it contains keywords'
+      mail.parts.delete_if do |part|
+        part[:content_type].content_type == 'text/html'
+      end
+      mail.content_type = 'multipart/mixed'
+      mail.add_pseudoheader(:note, I18n.t('pseudoheaders.stripped_html_from_multialt_with_keywords'))
+    end
+  end
+end
+
+
+

data/lib/schleuder/gpgme/ctx.rb

@@ -103,7 +103,7 @@ module GPGME
     end
 
     def refresh_key(fingerprint)
-      args = "#{keyserver_arg} --refresh-keys #{fingerprint}"
+      args = "#{keyserver_arg} #{import_filter_arg} --refresh-keys #{fingerprint}"
       gpgerr, gpgout, exitcode = self.class.gpgcli(args)
 
       if exitcode > 0
@@ -136,7 +136,8 @@ module GPGME
       arguments, error = fetch_key_gpg_arguments_for(input)
       return error if error
 
-      gpgerr, gpgout, exitcode = self.class.gpgcli(arguments)
+      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.
       if exitcode > 0 || gpgerr.grep(/ unable to fetch /).presence
@@ -270,5 +271,25 @@ 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
+    end
   end
 end

data/lib/schleuder/gpgme/key.rb

@@ -57,6 +57,10 @@ module GPGME
       "#{self.to_s}\n\n#{export(armor: true).read}"
     end
 
+    def minimal
+      export(minimal: true).to_s
+    end
+
     # Force encoding, some databases save "ASCII-8BIT" as binary data.
     alias_method :orig_fingerprint, :fingerprint
     def fingerprint

data/lib/schleuder/list.rb

@@ -19,6 +19,7 @@ module Schleuder
         :receive_admin_only,
         :keep_msgid,
         :bounces_drop_all,
+        :deliver_selfsent,
         :bounces_notify_admins,
         :include_list_headers,
         :include_openpgp_header,
@@ -146,6 +147,16 @@ module Schleuder
       key.armored
     end
 
+    def key_minimal_base64_encoded(fingerprint=self.fingerprint)
+      key = keys(fingerprint).first
+      
+      if key.blank?
+        return false
+      end
+      
+      Base64.strict_encode64(key.minimal)
+    end
+
     def check_keys
       now = Time.now
       checkdate = now + (60 * 60 * 24 * 14) # two weeks
@@ -340,16 +351,24 @@ module Schleuder
       true
     end
 
-    def send_to_subscriptions(mail)
+    def send_to_subscriptions(mail, incoming_mail=nil)
       logger.debug "Sending to subscriptions."
       mail.add_internal_footer!
       self.subscriptions.each do |subscription|
         begin
-          if subscription.delivery_enabled
-            subscription.send_mail(mail)
-          else
+          
+          if ! subscription.delivery_enabled
             logger.info "Not sending to #{subscription.email}: delivery is disabled."
+            next
+          end
+          
+          if ! self.deliver_selfsent && incoming_mail.was_validly_signed? && ( subscription == incoming_mail.signer )
+            logger.info "Not sending to #{subscription.email}: delivery of self sent is disabled."
+            next
           end
+          
+          subscription.send_mail(mail)
+          
         rescue => exc
           msg = I18n.t('errors.delivery_error',
                        { email: subscription.email, error: exc.to_s })

data/lib/schleuder/logger_notifications.rb

@@ -18,9 +18,14 @@ module Schleuder
       notify_admin(string, original_message)
     end
 
-    def notify_admin(thing, original_message=nil, subject='Error')
+    def notify_superadmin(message:, original_message: nil, subject: 'Error')
+      notify_admin(message, original_message, subject, superadmin)
+    end
+
+    def notify_admin(thing, original_message=nil, subject='Error', recipients=nil)
       # Minimize using other classes here, we don't know what caused the error.
       msg_parts = convert_to_msg_parts(thing, original_message)
+      recipients ||= adminaddresses
       Array(adminaddresses).each do |address, key|
         mail = Mail.new
         mail.from = @from
@@ -37,6 +42,8 @@ module Schleuder
             gpg_opts.merge!(encrypt: true, keys: { address => key.fingerprint })
           end
           mail.gpg gpg_opts
+
+          mail.header['List-Id'] = "<#{@list.email.gsub('@', '.')}>"
         end
         mail.deliver
       end

data/lib/schleuder/mail/message.rb

@@ -17,6 +17,7 @@ module Mail
     attr_accessor :original_message
     attr_accessor :list
     attr_accessor :protected_headers_subject
+    attr_writer :dynamic_pseudoheaders
 
     # TODO: This should be in initialize(), but I couldn't understand the
     # strange errors about wrong number of arguments when overriding
@@ -44,22 +45,19 @@ module Mail
       # might be gone (e.g. request-keywords that delete subscriptions or
       # keys).
       new.signer
-      self.dynamic_pseudoheaders.each do |str|
-        new.add_pseudoheader(str)
-      end
+      new.dynamic_pseudoheaders = self.dynamic_pseudoheaders.dup
 
       # Store previously protected subject for later access.
       # mail-gpg pulls headers from the decrypted mime parts "up" into the main
       # headers, which reveals protected subjects.
       if self.subject != new.subject
         new.protected_headers_subject = self.subject.dup
-
-        # Delete the protected headers which might leak information.
-        if new.parts.first.content_type == "text/rfc822-headers; protected-headers=v1"
-          new.parts.shift
-        end
       end
 
+      # Delete the protected headers which might leak information.
+      if new.parts.first && new.parts.first.content_type == "text/rfc822-headers; protected-headers=v1"
+        new.parts.shift
+      end
 
       new
     end
@@ -207,11 +205,15 @@ module Mail
       @recipient.match(/-bounce@/).present? ||
           # Empty Return-Path
           self.return_path.to_s == '<>' ||
-          # Auto-Submitted exists and does not equal 'no' and no cron header
-          # present, as cron emails have the auto-submitted header.
+          # Auto-Submitted exists and does not equal 'no' and:
+          #  - no cron header is present
+          #  - no Jenkins job notification header is present
+          # as these emails have the auto-submitted header.
           ( self['Auto-Submitted'].present? && \
             self['Auto-Submitted'].to_s.downcase != 'no' && \
-            !self['X-Cron-Env'].present?)
+            !self['X-Cron-Env'].present? && \
+            !self['X-Jenkins-Job'].present? && \
+            self.subject.to_s !~ /\A\*\*\* SECURITY information.*\*\*\*\Z/)
     end
 
     def keywords
@@ -245,11 +247,11 @@ module Mail
       # decide itself how to encode, it works. If we don't, some
       # character-sequences are not properly re-encoded.
       part.content_transfer_encoding = nil
-      # Make the converted strings (now UTF-8) match what mime-part's headers say,
-      # fall back to US-ASCII if none is set.
-      # https://tools.ietf.org/html/rfc2046#section-4.1.2
-      # -> Default charset is US-ASCII
-      part.body = lines.compact.join.encode(part.charset||'US-ASCII')
+
+      # Set the right charset on the now parsed body
+      new_body = lines.compact.join
+      part.charset = new_body.encoding.to_s
+      part.body = new_body
 
       @keywords
     end
@@ -267,20 +269,17 @@ module Mail
     end
 
     def add_pseudoheader(string_or_key, value=nil)
-      @dynamic_pseudoheaders ||= []
-      if value.present?
-        @dynamic_pseudoheaders << make_pseudoheader(string_or_key, value)
-      else
-        @dynamic_pseudoheaders << string_or_key.to_s
-      end
+      dynamic_pseudoheaders << make_pseudoheader(string_or_key, value)
     end
 
     def make_pseudoheader(key, value)
-      "#{key.to_s.camelize}: #{value.to_s}"
+      output = "#{key.to_s.camelize}: #{value.to_s}"
+      # wrap lines after 76 with 2 indents
+      output.gsub(/(.{1,76})( +|$)\n?/, "  \\1\n").chomp.lstrip
     end
 
     def dynamic_pseudoheaders
-      @dynamic_pseudoheaders || []
+      @dynamic_pseudoheaders ||= []
     end
 
     def signature_state
@@ -331,7 +330,8 @@ module Mail
     end
 
     def pseudoheaders(list)
-      (standard_pseudoheaders(list) + dynamic_pseudoheaders).flatten.join("\n") + "\n"
+      separator = '------------------------------------------------------------------------------'
+      (standard_pseudoheaders(list) + dynamic_pseudoheaders).flatten.join("\n") + "\n" + separator + "\n"
     end
 
     def add_msgids(list, orig)
@@ -346,6 +346,14 @@ module Mail
     end
 
     def add_list_headers(list)
+      if list.include_autocrypt_header
+        # Inject whitespaces, to let Mail break the string at these points
+        # leading to correct wrapping.
+        keydata = list.key_minimal_base64_encoded.gsub(/(.{78})/, '\1 ')
+        
+        self['Autocrypt'] = "addr=#{list.email}; prefer-encrypt=mutual; keydata=#{keydata}"
+      end
+
       if list.include_list_headers
         self['List-Id'] = "<#{list.email.gsub('@', '.')}>"
         self['List-Owner'] = "<mailto:#{list.owner_address}> (Use list's public key)"

data/lib/schleuder/plugins/attach_listkey.rb

@@ -1,16 +1,12 @@
 module Schleuder
   module ListPlugins
     def self.attach_listkey(arguments, list, mail)
-      filename = "#{list.fingerprint}.pgpkey"
-      # "Mail" only really converts to multipart if the content-type is blank.
-      mail.content_type = nil
-      mail.add_file({
-        filename: filename,
-        content: list.export_key
-      })
-      mail.attachments[filename].content_type = 'application/pgp-keys'
-      mail.attachments[filename].content_description = "OpenPGP public key of #{list.email}"
-      mail.attachments[filename].content_disposition = "attachment; filename=#{filename}"
+      new_part = Mail::Part.new
+      new_part.body = list.export_key
+      new_part.content_type = 'application/pgp-keys'
+      new_part.content_description = "OpenPGP public key of #{list.email}"
+      new_part.content_disposition = "attachment; filename=#{list.fingerprint}.pgpkey"
+      mail.add_part new_part
       nil
     end
   end

data/lib/schleuder/plugins/key_management.rb

@@ -104,35 +104,18 @@ module Schleuder
     # helper methods
     private
 
-    def self.is_armored_key?(material)
-      return false unless /^-----BEGIN PGP PUBLIC KEY BLOCK-----$/ =~ material
-      return false unless /^-----END PGP PUBLIC KEY BLOCK-----$/ =~ material
-
-      lines = material.split("\n").reject(&:empty?)
-      # remove header
-      lines.shift
-      # remove tail
-      lines.pop
-      # verify the rest
-      # TODO: verify length except for lasts lines?
-      # headers according to https://tools.ietf.org/html/rfc4880#section-6.2
-      lines.map do |line|
-        /\A((comment|version|messageid|hash|charset):.*|[0-9a-z\/=+]+)\Z/i =~ line
-      end.all?
-    end
-
     def self.import_keys_from_attachments(list, mail)
       mail.attachments.map do |attachment|
         material = attachment.body.to_s
 
-        list.import_key(material) if self.is_armored_key?(material)
+        list.import_key(material)
       end
     end
 
     def self.import_key_from_body(list, mail)
       key_material = mail.first_plaintext_part.body.to_s
 
-      list.import_key(key_material) if self.is_armored_key?(key_material)
+      list.import_key(key_material)
     end
   end
 end

data/lib/schleuder/plugins/resend.rb

@@ -56,6 +56,9 @@ module Schleuder
 
       # Only continue if all recipients are still here.
       if recip_map.size < arguments.size
+        recip_map.keys.each do |aborted_sender|
+          mail.add_pseudoheader(:error, I18n.t("plugins.resend.aborted", email: aborted_sender))
+        end
         return
       end
 
@@ -117,22 +120,22 @@ module Schleuder
       Array(recipients).inject({}) do |hash, email|
         keys = mail.list.keys(email)
         # Exclude unusable keys.
-        keys.select! { |key| key.usable_for?(:encrypt) }
-        case keys.size
+        usable_keys = keys.select { |key| key.usable_for?(:encrypt) }
+        case usable_keys.size
         when 1
-          hash[email] = keys.first
+          hash[email] = usable_keys.first
         when 0
           if encrypted_only
             # Don't add the email to the result to exclude it from the
             # recipients.
-            add_keys_error(mail, email, keys.size)
+            add_resend_msg(mail, email, :error, 'not_resent_no_keys', usable_keys.size, keys.size)
           else
             hash[email] = ''
           end
         else
           # Always report this situation, regardless of sending or not. It's
           # bad and should be fixed.
-          add_keys_error(mail, email, keys.size)
+          add_resend_msg(mail, email, :notice, 'not_resent_encrypted_no_keys', usable_keys.size, keys.size)
           if ! encrypted_only
             hash[email] = ''
           end
@@ -152,8 +155,8 @@ module Schleuder
       gpg_opts
     end
 
-    def self.add_keys_error(mail, email, keys_size)
-      mail.add_pseudoheader(:error, I18n.t("plugins.resend.not_resent_no_keys", email: email, num_keys: keys_size))
+    def self.add_resend_msg(mail, email, severity, msg, usable_keys_size, all_keys_size)
+      mail.add_pseudoheader(severity, I18n.t("plugins.resend.#{msg}", email: email, usable_keys: usable_keys_size, all_keys: all_keys_size))
     end
 
     def self.add_error_header(mail, recipients_map)
@@ -163,15 +166,15 @@ module Schleuder
     def self.add_resent_headers(mail, recipients_map, to_or_cc, sent_encrypted)
       if sent_encrypted
         prefix = I18n.t('plugins.resend.encrypted_to')
-        str = recipients_map.map do |email, key|
+        str = "\n" + recipients_map.map do |email, key|
           "#{email} (#{key.fingerprint})"
-        end.join(', ')
+        end.join(",\n")
       else
         prefix = I18n.t('plugins.resend.unencrypted_to')
-        str = recipients_map.keys.join(', ')
+        str = ' ' + recipients_map.keys.join(", ")
       end
       headername = resent_header_name(to_or_cc)
-      mail.add_pseudoheader(headername, "#{prefix} #{str}")
+      mail.add_pseudoheader(headername, "#{prefix}#{str}")
     end
 
     def self.resent_header_name(to_or_cc)

data/lib/schleuder/runner.rb

@@ -5,15 +5,43 @@ module Schleuder
       return error if error
 
       logger.info "Parsing incoming email."
+
+      # is it valid utf-8?
+      msg_scrubbed = false
+      unless msg.valid_encoding?
+        logger.warn "Converting message due to invalid characters"
+        detection = CharlockHolmes::EncodingDetector.detect(msg)
+        begin
+          msg = CharlockHolmes::Converter.convert(msg, detection[:encoding], 'UTF-8')
+        rescue ArgumentError
+          # it looks like even icu wasn't able to convert
+          # so we scrub the invalid characters to be able to
+          # at least parse the message somehow. Though this might
+          # result in data loss.
+          logger.warn "Scrubbing message due to invalid characters"
+          msg = msg.scrub
+          msg_scrubbed = true
+        end
+      end
+
       @mail = Mail.create_message_to_list(msg, recipient, list)
 
+      if msg_scrubbed
+        @mail.add_pseudoheader(:note, I18n.t("pseudoheaders.scrubbed_message"))
+      end
+
       error = run_filters('pre')
       return error if error
 
       begin
         # This decrypts, verifies, etc.
         @mail = @mail.setup
-      rescue GPGME::Error::DecryptFailed
+
+      rescue GPGME::Error::BadPassphrase,
+             GPGME::Error::DecryptFailed,
+             GPGME::Error::NoData,
+             GPGME::Error::NoSecretKey
+
         logger.warn "Decryption of incoming message failed."
         return Errors::DecryptionFailed.new(list)
       end
@@ -46,7 +74,7 @@ module Schleuder
       # Subscriptions
       logger.debug "Creating clean copy of message"
       copy = @mail.clean_copy(list.headers_to_meta.any?)
-      list.send_to_subscriptions(copy)
+      list.send_to_subscriptions(copy, @mail)
       nil
     end
 

data/lib/schleuder/version.rb

@@ -1,3 +1,3 @@
 module Schleuder
-  VERSION = '3.3.0'
+  VERSION = '3.5.3'
 end

data/locales/de.yml

@@ -121,7 +121,9 @@ de:
         Oder, um einen Schlüssel per HTTP von einem Server zu laden:
         X-FETCH-KEY: https://example.org/keys/mykey.asc
     resend:
-      not_resent_no_keys: Resending an <%{email}> fehlgeschlagen (%{num_keys} Schlüssel gefunden und unverschlüsseltes Senden verboten).
+      not_resent_no_keys: Resending an <%{email}> fehlgeschlagen (%{all_keys} Schlüssel gefunden, davon %{usable_keys} nutzbar. Unverschlüsseltes Senden verboten).
+      not_resent_encrypted_no_keys: Verschlüsseltes Resending an <%{email}> fehlgeschlagen (%{all_keys} Schlüssel gefunden, davon %{usable_keys} nutzbar).
+      aborted: Resending an <%{email}> abgebrochen aufgrund anderer Probleme.
       encrypted_to: Verschlüsselt an
       unencrypted_to: Unverschlüsselt an
       invalid_recipient: "Ungültige Emailadresse für resend: %{address}"
@@ -250,7 +252,9 @@ de:
   fetch_key:
     invalid_input: "Ungültige Angabe. Gültig sind: URLs, OpenPGP-Fingerabdrücke, oder Emailadressen."
   pseudoheaders:
+    scrubbed_message: Diese Email enthielt ungültige Zeichen, die aus Verarbeitungsgründen möglicherweise entfernt wurden.
     stripped_html_from_multialt: Diese Email enthielt einen alternativen HTML-Teil, der PGP-Daten beinhaltete. Der HTML-Teil wurde entfernt, um die Email sauberer analysieren zu können.
+    stripped_html_from_multialt_with_keywords: Diese Email enthielt Schlüsselwörter und einen alternativen HTML-Teil. Der HTML-Teil wurde entfernt, um zu verhindern dass diese Schlüsselwörter Aussenstehenden bekannt werden.
   signature_states:
     unknown: "Unbekannte Signatur von unbekanntem Schlüssel 0x%{fingerprint}"
     unsigned: "Unsigniert"

data/locales/en.yml

@@ -125,7 +125,9 @@ en:
         Or, to fetch a key keys by URL:
         X-FETCH-KEY: https://example.org/keys/mykey.asc
     resend:
-      not_resent_no_keys: Resending to <%{email}> failed (%{num_keys} keys found and unencrypted sending disallowed).
+      not_resent_no_keys: Resending to <%{email}> failed (%{all_keys} keys found, of which %{usable_keys} can be used. Unencrypted sending not allowed).
+      not_resent_encrypted_no_keys: Resending as encrypted email to <%{email}> failed (%{all_keys} keys found, of which %{usable_keys} can be used).
+      aborted: Resending to <%{email}> aborted due to other errors.
       encrypted_to: Encrypted to
       unencrypted_to: Unencrypted to
       invalid_recipient: "Invalid email-address for resending: %{address}"
@@ -254,7 +256,9 @@ en:
   fetch_key:
     invalid_input: "Invalid input. Allowed are: URLs, OpenPGP-fingerprints, or email-addresses."
   pseudoheaders:
+    scrubbed_message: This message included invalid characters, which might have been removed to be able to process the message properly.
     stripped_html_from_multialt: This message included an alternating HTML-part that contained PGP-data. The HTML-part was removed to enable parsing the message more properly.
+    stripped_html_from_multialt_with_keywords: This message included keywords and an alternating HTML-part. The HTML-part was removed to prevent the disclosure of these keywords to third parties.
   signature_states:
     unknown: "Unknown signature by unknown key 0x%{fingerprint}"
     unsigned: "Unsigned"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schleuder
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.3
 platform: ruby
 authors:
 - schleuder dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpgme
@@ -19,7 +19,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.19
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: mail-gpg
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,9 +61,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +176,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +263,7 @@ dependencies:
 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.
 
-  (Please note: For some platforms there's a better way of installing Schleuder than `gem install`. See <https://schleuder.org/docs/#installation> for details.)
+  (Please note: For some platforms there's a better way of installing Schleuder than `gem install`. See <https://schleuder.org/schleuder/docs/server-admins.html#installation> for details.)
 email: team@schleuder.org
 executables:
 - schleuder
@@ -275,6 +289,8 @@ files:
 - db/migrate/20160501172700_fix_headers_to_meta_defaults.rb
 - db/migrate/20170713215059_add_internal_footer_to_list.rb
 - db/migrate/20180110203100_add_sig_enc_to_headers_to_meta_defaults.rb
+- db/migrate/20180723173900_add_deliver_selfsent_to_list.rb
+- db/migrate/20190906194820_add_autocrypt_header_to_list.rb
 - db/schema.rb
 - etc/init.d/schleuder-api-daemon
 - etc/list-defaults.yml
@@ -323,6 +339,7 @@ files:
 - lib/schleuder/filters/post_decryption/60_receive_signed_only.rb
 - lib/schleuder/filters/post_decryption/70_receive_encrypted_only.rb
 - lib/schleuder/filters/post_decryption/80_receive_from_subscribed_emailaddresses_only.rb
+- lib/schleuder/filters/post_decryption/90_strip_html_from_alternative_if_keywords_present.rb
 - lib/schleuder/filters/pre_decryption/10_forward_bounce_to_admins.rb
 - lib/schleuder/filters/pre_decryption/20_forward_all_incoming_to_admins.rb
 - lib/schleuder/filters/pre_decryption/30_send_key.rb
@@ -390,8 +407,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.7.7
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Schleuder is a gpg-enabled mailing list manager with remailing-capabilities.