enmail 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '038acec812557605c0617e55c00be79bc33ce16a54c6fcf29fb46746ef99ff6c'
-  data.tar.gz: cb6ae7bdfa66d55caa7c528ce7edf24466a8cff2a1dd14f27296bf705226050e
+  metadata.gz: 65e9a85a2a79570246e2312e8352f1747c4195d61f3ed2867cce79fa54e1fba4
+  data.tar.gz: f44e9728a978d4dfa0daaa9cd877799ddd7e30be43495e9f6ff1cfb559d5768d
 SHA512:
-  metadata.gz: dd2a871a71076c5f7fcffdfea2b56b8f619948fd587b7ef62c0e938d6362ce3614a58c8b17bd9e26467c491fb1eebf43348033f5b3d475cc00b5361a10be73f5
-  data.tar.gz: 1546d852a5faf9e5d6e1834784fab1532f8091a271f9c0d285cb2413727f94fe5d7d1c63df86ed64ea7f5d0d87677067f4b972ec11774597dc447986eab4147f
+  metadata.gz: 6829ea3e29957d2c19c585daec9546fca11df13e529fa3b97dac09beb0a65a5efd72dff9763165851c180e57a2514b080c0ef10fc09e8d3e54f50016dc6a6dff
+  data.tar.gz: d205faff2f0d37f72aace686e658e4cdb559a715cc243e245675816df836dabc8dfb4c071492f1e98043043ac900f8b47ea824552b0f5b0e213f5cfb6b51c870

data/.gitattributes

@@ -0,0 +1 @@
+.gitignore	-text

data/.gitignore

@@ -1,65 +1,115 @@
-/Gemfile.lock
-/.ruby-gemset
-/.ruby-version
 /.rspec_status
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
 
-# Used by dotenv library to load environment variables.
-# .env
 
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
+# Created by https://www.toptal.com/developers/gitignore/api/vim,ruby,linux,emacs,macos,rails,jekyll,textmate,sublimetext,visualstudiocode,windows,webstorm+all
+# Edit at https://www.toptal.com/developers/gitignore?templates=vim,ruby,linux,emacs,macos,rails,jekyll,textmate,sublimetext,visualstudiocode,windows,webstorm+all
 
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
+### Emacs ###
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
 
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
+# Org-mode
+.org-id-locations
+*_archive
 
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
+# flymake-mode
+*_flymake.*
 
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+# eshell files
+/eshell/history
+/eshell/lastdir
 
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el
+
+# network security
+/network-security.data
+
+
+### Jekyll ###
+_site/
+.sass-cache/
+.jekyll-cache/
+.jekyll-metadata
+
+### Linux ###
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
 
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Rails ###
 *.rbc
 capybara-*.html
 .rspec
-/log
-/tmp
 /db/*.sqlite3
 /db/*.sqlite3-journal
+/db/*.sqlite3-[0-9]*
 /public/system
 /coverage/
 /spec/tmp
@@ -67,22 +117,32 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
 # TODO Comment out this rule if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
+config/master.key
 
 # Only include if you have production secrets in this file, which is no longer a Rails default
 # config/secrets.yml
 
-# dotenv
-# TODO Comment out this rule if environment variables can be committed
+# dotenv, dotenv-rails
+# TODO Comment out these rules if environment variables can be committed
 .env
+.env.*
 
 ## Environment normalization:
 /.bundle
 /vendor/bundle
 
 # these should all be checked in to normalize the environment:
-# Gemfile.lock, .ruby-version, .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
@@ -98,73 +158,265 @@ bower.json
 # Ignore Byebug command history file.
 .byebug_history
 
+# Ignore node_modules
+node_modules/
 
-# Created by https://www.gitignore.io/api/vim
-
-### Vim ###
-# swap
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-v][a-z]
-[._]sw[a-p]
-# session
-Session.vim
-# temporary
-.netrwhist
-*~
-# auto-generated tag files
-tags
-
-# End of https://www.gitignore.io/api/vim
+# Ignore precompiled javascript packs
+/public/packs
+/public/packs-test
+/public/assets
 
+# Ignore yarn files
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
 
-# Created by https://www.gitignore.io/api/emacs
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
+/public/uploads
 
-### Emacs ###
-# -*- mode: gitignore; -*-
-*~
-\#*\#
-/.emacs.desktop
-/.emacs.desktop.lock
-*.elc
-auto-save-list
-tramp
-.\#*
+### Ruby ###
+*.gem
+/.config
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
 
-# Org-mode
-.org-id-locations
-*_archive
+# Used by dotenv library to load environment variables.
+# .env
 
-# flymake-mode
-*_flymake.*
+# Ignore Byebug command history file.
 
-# eshell files
-/eshell/history
-/eshell/lastdir
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
 
-# elpa packages
-/elpa/
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# vendor/Pods/
 
-# reftex files
-*.rel
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
 
-# AUCTeX auto folder
-/auto/
+/.bundle/
+/lib/bundler/man/
 
-# cask packages
-.cask/
-dist/
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
 
-# Flycheck
-flycheck_*.el
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 
-# server auth directory
-/server/
+# Used by RuboCop. Remote config files pulled in from inherit_from directive.
+.rubocop-https?--*
+
+### SublimeText ###
+# Cache files for Sublime Text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# Workspace files are user-specific
+*.sublime-workspace
+
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
+# *.sublime-project
+
+# SFTP configuration file
+sftp-config.json
+sftp-config-alt*.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings
+
+### TextMate ###
+*.tmproj
+*.tmproject
+tmtags
 
-# projectiles files
-.projectile
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+!*.svg  # comment out if you don't need vector files
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
 
-# directory configuration
-.dir-locals.el
+# Session
+Session.vim
+Sessionx.vim
 
-# End of https://www.gitignore.io/api/emacs
+# Temporary
+.netrwhist
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+### WebStorm+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### WebStorm+all Patch ###
+# Ignores the whole .idea folder and all .iml files
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
+
+.idea/
+
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/vim,ruby,linux,emacs,macos,rails,jekyll,textmate,sublimetext,visualstudiocode,windows,webstorm+all

data/.rubocop.yml

@@ -9,7 +9,7 @@ inherit_from:
 AllCops:
   DisplayCopNames: false
   StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.7
 
 Rails:
   Enabled: false

data/.travis.yml

@@ -83,6 +83,12 @@ matrix:
   include:
     - env: TEST_WITHOUT_RNP="1"
     - env: TEST_WITHOUT_GPGME="1"
+    # Test against older GPG versions
+    - env: GPG_VERSION="2.1" EXPECT_GPG_VERSION="2.1"
+    - gemfile: "ci/Mail-2.6.4.gemfile"
+    - gemfile: "ci/Mail-2.6.gemfile"
+    - gemfile: "ci/Mail-head.gemfile"
 
   allow_failures:
     - rvm: ruby-head
+    - gemfile: "ci/Mail-head.gemfile"

data/Gemfile

@@ -11,3 +11,9 @@ gem "simplecov", require: false, group: :test
 
 gem "gpgme", install_if: -> { !ENV["TEST_WITHOUT_GPGME"] }
 gem "rnp", install_if: -> { !ENV["TEST_WITHOUT_RNP"] }
+
+group :development do
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+end

data/README.adoc

@@ -4,7 +4,7 @@ ifdef::env-github[]
 image:https://img.shields.io/gem/v/enmail.svg[
 	Gem Version, link="https://rubygems.org/gems/enmail"]
 image:https://img.shields.io/travis/riboseinc/enmail/master.svg[
-	Build Status, link="https://travis-ci.org/riboseinc/enmail/branches"]
+	Build Status, link="https://travis-ci.com/riboseinc/enmail/branches"]
 image:https://img.shields.io/codecov/c/github/riboseinc/enmail.svg[
 	Test Coverage, link="https://codecov.io/gh/riboseinc/enmail"]
 image:https://img.shields.io/codeclimate/maintainability/riboseinc/enmail.svg[

data/Rakefile

@@ -60,11 +60,17 @@ namespace :pgp_keys do
 
   desc "Generates keys in tmp/pgp_home"
   task :generate => :prepare do
+    # NOTE:
+    # - "cert" flag is implicit in "Key-Usage".  It is harmless to specify
+    #   it in GnuPG 2.2, but it is not recognized in 2.1.
+    # - For keys which are not password-protected, "%no-protection" is required
+    #   in GnuPG 2.2, whereas it is ignored (with a warning) in 2.1.
+
     # Key pairs without password
     generate_pgp_keys(<<~KEY_PARAMS)
       %no-protection
       Key-Type: RSA
-      Key-Usage: sign, cert
+      Key-Usage: sign
       Key-Length: 2048
       Subkey-Type: RSA
       Subkey-Length: 2048
@@ -78,7 +84,7 @@ namespace :pgp_keys do
     generate_pgp_keys(<<~KEY_PARAMS)
       %no-protection
       Key-Type: RSA
-      Key-Usage: sign, cert
+      Key-Usage: sign
       Key-Length: 2048
       Subkey-Type: RSA
       Subkey-Length: 2048
@@ -92,7 +98,7 @@ namespace :pgp_keys do
     generate_pgp_keys(<<~KEY_PARAMS)
       %no-protection
       Key-Type: RSA
-      Key-Usage: sign, cert
+      Key-Usage: sign
       Key-Length: 2048
       Subkey-Type: RSA
       Subkey-Length: 2048
@@ -106,7 +112,7 @@ namespace :pgp_keys do
     # Password-protected key pairs
     generate_pgp_keys(<<~KEY_PARAMS)
       Key-Type: RSA
-      Key-Usage: sign, cert
+      Key-Usage: sign
       Key-Length: 2048
       Subkey-Type: RSA
       Subkey-Length: 2048

data/ci/Mail-2.6.4.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile "../Gemfile"
+
+gem "mail", "= 2.6.4"

data/ci/Mail-2.6.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile "../Gemfile"
+
+gem "mail", "~> 2.6.0"

data/ci/Mail-head.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile "../Gemfile"
+
+gem "mail", github: "mikel/mail"

data/docs/GPGMEAdapter.adoc

@@ -7,7 +7,7 @@ https://gnupg.org/software/gpgme/index.html[GnuPG Made Easy] library.
 
 This adapter requries two additional pieces of software to be installed:
 
-1. GnuPG, version 2.2
+1. GnuPG, version 2.1 or newer
 2. `https://rubygems.org/gems/gpgme[gpgme]` gem
 
 == Options

data/enmail.gemspec

@@ -32,7 +32,11 @@ Gem::Specification.new do |spec|
   # Mail 2.6.4 has been released on March 23, 2016, hence should be considered
   # old enough.  Nevertheless, pull requests which extend compatibility will be
   # accepted.
-  spec.add_dependency "mail", "~> 2.6.4"
+  #
+  # Version 2.7.0 has been blacklisted due to some bug (not sure which one
+  # exactly) in that version, which is fatal for EnMail.  That bug has been
+  # fixed in 2.7.1.
+  spec.add_dependency "mail", "~> 2.6", ">= 2.6.4", "!= 2.7.0"
 
   spec.add_development_dependency "bundler", ">= 1.14", "< 3.0"
   spec.add_development_dependency "gpgme", *EnMail::DependencyConstraints::GPGME

data/lib/enmail/adapters/gpgme.rb

@@ -35,10 +35,10 @@ module EnMail
             ctx.sign(plain, output, mode)
             hash_algorithm_num = ctx.sign_result.signatures[0].hash_algo
             hash_algorithm = ::GPGME.hash_algo_name(hash_algorithm_num)
-          rescue ::GPGME::Error::UnusableSecretKey => exc
+          rescue ::GPGME::Error::UnusableSecretKey => e
             # TODO Copy-pasted from GPGME gem.  Needs any test coverage.
-            exc.keys = ctx.sign_result.invalid_signers
-            raise exc
+            e.keys = ctx.sign_result.invalid_signers
+            raise e
           end
         end
 

data/lib/enmail/helpers/message_manipulation.rb

@@ -25,13 +25,23 @@ module EnMail
         part = ::Mail::Part.new
         part.content_type = message.content_type
         if message.multipart?
-          message.body.parts.each { |p| part.add_part p.dup }
+          message.body.parts.each { |p| part.add_part duplicate_part(p) }
         else
           part.body = message.body.decoded
         end
         part
       end
 
+      # Duplicates a message part, preserving its Content-ID if present.
+      #
+      # @param [Mail::Part] part message part
+      # @return [Mail::Part] duplicate of +part+
+      def duplicate_part(part)
+        duplicate = part.dup
+        duplicate.add_content_id(part.content_id) unless part.content_id.nil?
+        duplicate
+      end
+
       # Detects a list of e-mails which should be used to define a list of
       # recipients of encrypted message.  All is simply taken from the message
       # +To:+ field.

data/lib/enmail/helpers/rfc1847.rb

@@ -85,7 +85,7 @@ module EnMail
         part
       end
 
-      def multipart_signed_content_type(protocol: sign_protocol, micalg:)
+      def multipart_signed_content_type(micalg:, protocol: sign_protocol)
         %[multipart/signed; protocol="#{protocol}"; micalg="#{micalg}"]
       end
 

data/lib/enmail/version.rb

@@ -2,5 +2,5 @@
 #
 
 module EnMail
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

metadata

@@ -1,29 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: enmail
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.4
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.4
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +166,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".gitattributes"
 - ".gitignore"
 - ".gitmodules"
 - ".hound.yml"
@@ -169,6 +182,9 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
+- ci/Mail-2.6.4.gemfile
+- ci/Mail-2.6.gemfile
+- ci/Mail-head.gemfile
 - ci/install_botan.sh
 - ci/install_json_c.sh
 - ci/install_rnp.sh
@@ -191,7 +207,7 @@ homepage: https://github.com/riboseinc/enmail
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Encrypted Email in Ruby
 test_files: []