schleuder 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bfc0ef3b48d1b6b251a2e169a4edeb2efe5c5050f607e28c8115d518687cfd0
-  data.tar.gz: 5aee2a3e9a3c5e91a14f3c797052a732cb970efc85c28e84e9c0a66a239cc694
+  metadata.gz: 8e820f173303f3322674fe67b3bf7fc6468b376d15afa959feca090de32381f3
+  data.tar.gz: 5747036650daa9ad1a3d67fd8597d084fa6f78ddefd063293c7e61ce53431805
 SHA512:
-  metadata.gz: 51e3e13d15f94c216d63590d2e3083aca69fc49e69e8a1e5d0c27e9c24f2ba138126723be707799bbce681d2e3ae99d6d47a7f3a30d736dc23fdceadfa594ad2
-  data.tar.gz: 4467545c1bce338f68cb375d4f923f4a4d5f1128333c66328071a87afeb3b557c753dce6f237979a3016ddb0db98d60eb96cf524d4c0880879805100c3478504
+  metadata.gz: 206b404982bec910328d1fb9b90eaa1c3f6b088da5acdaf2f7825a45401bc334938a71b6afb639f0a75b2e8e1b18a7af675213d05b1d60ea539d904fe4da9987
+  data.tar.gz: 3f4224d41d1b1de88e3b2648c378b7c09b5762d15ee38f9f45331317d749f0266c1cc9a11ffdec65f2907b8da340d20f6e1c3442f2a8dc7ce625c2b732ff3a2f

data/README.md

@@ -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.5.1.gem) and [the OpenPGP-signature](https://schleuder.org/download/schleuder-3.5.1.gem.sig) and verify:
+1. Download [the gem](https://schleuder.org/download/schleuder-3.5.2.gem) and [the OpenPGP-signature](https://schleuder.org/download/schleuder-3.5.2.gem.sig) and verify:
    ```
    gpg --recv-key 0xB3D190D5235C74E1907EACFE898F2C91E2E6E1F3
-   gpg --verify schleuder-3.5.1.gem.sig
+   gpg --verify schleuder-3.5.2.gem.sig
    ```
 
 2. If all went well install the gem:
    ```
-   gem install schleuder-3.5.1.gem
+   gem install schleuder-3.5.2.gem
    ```
 
 3. Set up schleuder:
@@ -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.5.1.tar.gz) and [its OpenPGP-signature](https://schleuder.org/download/schleuder-3.5.1.tar.gz.sig).
+Alternatively to the gem-files you can download the latest release as [a tarball](https://schleuder.org/download/schleuder-3.5.2.tar.gz) and [its OpenPGP-signature](https://schleuder.org/download/schleuder-3.5.2.tar.gz.sig).

data/lib/schleuder.rb

@@ -1,4 +1,4 @@
-# default to ASCII-8BIT encoding as early as possible for external
+# default to UTF-8 encoding as early as possible for external
 # data.
 #
 # this should ensure we are able to parse most incoming

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-----\r?$/ =~ material
-      return false unless /^-----END PGP PUBLIC KEY BLOCK-----\r?$/ =~ material
-
-      lines = material.split(/\r?\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/version.rb

@@ -1,3 +1,3 @@
 module Schleuder
-  VERSION = '3.5.1'
+  VERSION = '3.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schleuder
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - schleuder dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpgme