dkim 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b79c96d0478fbf8b0034adf4e151e57eb0a54713
+  data.tar.gz: 416192a1854051a5b7bb772746f6824e866daebc
+SHA512:
+  metadata.gz: 7420d356c4fbf3281d942a67647ad778d6ab84704a681b32d6b422aa57e01884dfd8b86cc0326a96972d2fe116825efa5fddde26d149f9c090c7cf03d7933d11
+  data.tar.gz: 2d9edfbe6f3028af2aa4edfd92cb87b74aa4ae7dead5ae2b102cc53eff987f1a68b7f6175d2157ebb2b0f59b18164e10012a89d67c1aec2db2f1bd7e3baeeb80

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+gemfiles/*.lock

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - jruby-18mode
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
+gemfile:
+  - gemfiles/mail_2.6.gemfile
+  - gemfiles/mail_2.7.gemfile

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'mail-2.6' do
+  gem 'mail', '2.6.6'
+end
+
+appraise 'mail-2.7' do
+  gem 'mail', '2.7.0'
+end

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # dkim Changelog
 
-## 1.0.0 (2012-01-15)
+## 1.0.0 (2013-01-15)
 * DKIM-Signature header is now prepended rather than appended
 * Headers are signed in the order they appear
 * Correct signing of repeated headers

data/Gemfile

@@ -1,14 +1,8 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in dkim.gemspec
 gemspec
 
-gem "rake"
-gem 'minitest'
-gem 'guard-minitest'
-gem 'mail'
-
 platforms :jruby do
   gem 'jruby-openssl'
 end
-

data/README.md

@@ -23,15 +23,19 @@ These can be specified globally
 
 Options can be overridden per message.
 
-    Dkim.sign(mail, :selector => 'mail2', :private_key => open('private2.pem').read)
+    Dkim.sign(mail, :selector => 'mail2', :private_key => OpenSSL::PKey::RSA.new(open('private2.pem').read))
 
 For more details see {Dkim::Options}
 
 Usage With Rails
 ================
 
-Dkim contains `Dkim::Interceptor` which can be used to sign all mail delivered by rails 3 or [mail](https://github.com/mikel/mail).
-For rails, create an initializer (for example `config/initializers/dkim.rb`) with the following template.
+Dkim contains `Dkim::Interceptor` which can be used to sign all mail delivered
+by [mail](https://github.com/mikel/mail), which is used by actionmailer in
+rails >= 3.
+
+For rails, create an initializer (for example `config/initializers/dkim.rb`)
+with the following template.
 
     # Configure dkim globally (see above)
     Dkim::domain      = 'example.com'

data/Rakefile

@@ -12,3 +12,15 @@ end
 
 Bundler::GemHelper.install_tasks
 
+desc 'Open an pry (or irb) session preloaded with Dkim'
+task :console do
+  begin
+    require 'pry'
+    sh 'pry -I lib -r dkim.rb'
+  rescue LoadError => _
+    sh 'irb -rubygems -I lib -r dkim.rb'
+  end
+
+end
+
+task c: :console

data/dkim.gemspec

@@ -18,4 +18,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- test/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest', '~> 5.0'
+  s.add_development_dependency 'mail'
+  s.add_development_dependency 'appraisal'
 end

data/gemfiles/mail_2.6.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mail", "2.6.6"
+
+platforms :jruby do
+  gem "jruby-openssl"
+end
+
+gemspec path: "../"

data/gemfiles/mail_2.7.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mail", "2.7.0"
+
+platforms :jruby do
+  gem "jruby-openssl"
+end
+
+gemspec path: "../"

data/lib/dkim.rb

@@ -25,6 +25,7 @@ end
 
 Dkim::signable_headers        = Dkim::DefaultHeaders.dup
 Dkim::domain                  = nil
+Dkim::identity                = nil
 Dkim::selector                = nil
 Dkim::signing_algorithm       = 'rsa-sha256'
 Dkim::private_key             = nil

data/lib/dkim/options.rb

@@ -39,6 +39,12 @@ module Dkim
     # @return [String] domain
     define_option_method :domain
 
+    # @attribute [rw]
+    # The identity used for signing.
+    # This corresponds to the i= tag in the dkim header.
+    # @return [String] identity
+    define_option_method :identity
+
     # @attribute [rw]
     # Selector used for signing.
     # This corresponds to the s= tag in the dkim header.

data/lib/dkim/signed_mail.rb

@@ -59,6 +59,7 @@ module Dkim
       dkim_header['a'] = signing_algorithm
       dkim_header['c'] = "#{header_canonicalization}/#{body_canonicalization}"
       dkim_header['d'] = domain
+      dkim_header['i'] = identity if identity
       dkim_header['q'] = 'dns/txt'
       dkim_header['s'] = selector
       dkim_header['t'] = (time || Time.now).to_i

data/lib/dkim/version.rb

@@ -1,3 +1,3 @@
 module Dkim
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/mail/dkim_field.rb

@@ -9,7 +9,8 @@ module Mail
 
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      value = strip_field(FIELD_NAME, value) if respond_to?(:strip_field)
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
 
@@ -22,4 +23,3 @@ module Mail
     end
   end
 end
-

data/test/dkim/canonicalization_test.rb

@@ -2,7 +2,7 @@
 require 'test_helper'
 
 module Dkim
-  class CanonicalizationTest < MiniTest::Unit::TestCase
+  class CanonicalizationTest < Minitest::Test
     # from section 3.4.6 of RFC 6376
     def setup
       @input = <<-eos.rfc_format

data/test/dkim/canonicalized_headers_test.rb

@@ -2,7 +2,7 @@
 require 'test_helper'
 
 module Dkim
-  class CanonicalizedHeadersTest < MiniTest::Unit::TestCase
+  class CanonicalizedHeadersTest < Minitest::Test
     def test_maintains_order
       headers = "ABCD".chars.map {|c| Header.new(c, c) }
       header_keys = headers.map &:relaxed_key

data/test/dkim/dkim_header_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 require 'base64'
 
 module Dkim
-  class DkimHeaderTest < MiniTest::Unit::TestCase
+  class DkimHeaderTest < Minitest::Test
     def setup
       @header = DkimHeader.new
 

data/test/dkim/encodings_test.rb

@@ -1,5 +1,5 @@
 module Dkim
-  class EncodingsTest < MiniTest::Unit::TestCase
+  class EncodingsTest < Minitest::Test
     def test_plain_text
       @encoder = Encodings::PlainText.new
       assert_equal 'testing123', @encoder.encode('testing123')

data/test/dkim/interceptor_test.rb

@@ -36,7 +36,7 @@ We lost the game. Are you hungry yet?
 Joe.
   eos
 
-  class InterceptorTest < MiniTest::Unit::TestCase
+  class InterceptorTest < Minitest::Test
     def setup
       @original_options = Dkim.options.dup
 
@@ -56,6 +56,7 @@ Joe.
       Dkim.header_canonicalization = 'relaxed'
       Dkim.body_canonicalization = 'relaxed'
       Dkim.signing_algorithm = 'rsa-sha256'
+      Dkim.identity = '@example.com'
       Interceptor.delivering_email(@mail)
       dkim_header = @mail['DKIM-Signature']
 
@@ -63,6 +64,7 @@ Joe.
       assert_includes dkim_header.to_s, 'rsa-sha256'
       assert_includes dkim_header.to_s, 's=brisbane'
       assert_includes dkim_header.to_s, 'd=example.com'
+      assert_includes dkim_header.to_s, 'i=@example.com'
       assert_includes dkim_header.to_s, 'c=relaxed/relaxed'
       assert_includes dkim_header.to_s, 'q=dns/txt'
       assert_includes dkim_header.to_s, 'bh=2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8='
@@ -74,12 +76,14 @@ Joe.
       Dkim.header_canonicalization = 'simple'
       Dkim.body_canonicalization = 'simple'
       Dkim.signing_algorithm = 'rsa-sha256'
+      Dkim.identity = '@example.com'
       Interceptor.delivering_email(@mail)
       dkim_header = @mail['DKIM-Signature']
       assert dkim_header
       assert_includes dkim_header.to_s, 'rsa-sha256'
       assert_includes dkim_header.to_s, 's=brisbane'
       assert_includes dkim_header.to_s, 'd=example.com'
+      assert_includes dkim_header.to_s, 'i=@example.com'
       assert_includes dkim_header.to_s, 'c=simple/simple'
       assert_includes dkim_header.to_s, 'q=dns/txt'
       assert_includes dkim_header.to_s, 'bh=2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8='

data/test/dkim/options_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Dkim
-  class OptionsTest < MiniTest::Unit::TestCase
+  class OptionsTest < Minitest::Test
     def setup
       klass = Class.new
       klass.send :include, Options
@@ -19,6 +19,7 @@ module Dkim
         :signing_algorithm => 'abc123',
         :signable_headers => [],
         :domain => 'example.net',
+        :identity => '@example.net',
         :selector => 'selector',
         :time => 'time',
         :header_canonicalization => 'simple',

data/test/dkim/signed_mail_test.rb

@@ -2,7 +2,7 @@
 require 'test_helper'
 
 module Dkim
-  class SignedMailTest < MiniTest::Unit::TestCase
+  class SignedMailTest < Minitest::Test
     def setup
       @mail = EXAMPLEEMAIL.dup
     end
@@ -46,6 +46,21 @@ module Dkim
       assert_equal 't+dk4yxTI2ByZxxRzkwhZhM4WzTZjGWHiWnS2t4pg7oT7fAIlMrfihJ/CIvGmYqYv4lbq4LStHqHx9TmEgxrkjLevHtuqhxkN55xJ2vA2QzTzFi2fMDZ4fFqWy4QtvlLjBAhevG+LXpmjPYec1cyeMlHlPAthq5+RNi6NHErJiM=', dkim_header['b']
     end
 
+    def test_identity
+      options = {
+        :domain => 'example.org',
+        :selector => 'sidney',
+        :identity => '@example.org',
+        :time => Time.at(1234567890)
+      }
+      signed_mail = SignedMail.new(@mail, options)
+      dkim_header = signed_mail.dkim_header.list
+
+      assert_equal '@example.org',                                  dkim_header['i']
+      assert_equal '2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8=',  dkim_header['bh']
+      assert_equal 'dCiulbJTD+GCCItMij1IU/RO0+q73afdjmrCWV5Qu7BIT5Kbp5Oi3jqCzj/v8Juks2/L6GBSXZia3aZprNVZX0szt8RnwC9NJx9WhcjN2RPz4Zf5F1jJivCN+PtaIWA3i3Ki/DR1q+RuNPgs7T1KKMo3Ih5uHubZIsMwRzbQBc0=', dkim_header['b']
+    end
+
     def test_empty_body_hashes
       @mail = @mail.split("\n\n").first + "\n\n"
 

data/test/dkim/tag_value_list_test.rb

@@ -2,7 +2,7 @@
 require 'test_helper'
 
 module Dkim
-  class TagValueListTest < MiniTest::Unit::TestCase
+  class TagValueListTest < Minitest::Test
     def test_replacement
       @list = TagValueList.new
 

metadata

@@ -1,16 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: dkim
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
-dependencies: []
+date: 2017-11-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  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
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: mail
+  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
+  name: appraisal
+  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'
 description: gem for adding DKIM signatures to email messages
 email:
 - john.hawthorn@gmail.com
@@ -19,15 +74,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
-- Guardfile
 - README.md
 - Rakefile
 - bin/dkimsign.rb
 - dkim.gemspec
+- gemfiles/mail_2.6.gemfile
+- gemfiles/mail_2.7.gemfile
 - lib/dkim.rb
 - lib/dkim/body.rb
 - lib/dkim/canonicalizable.rb
@@ -55,27 +112,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/jhawthorn/dkim
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dkim
-rubygems_version: 1.8.24
+rubygems_version: 2.6.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DKIM library in ruby
 test_files:
 - test/dkim/canonicalization_test.rb

data/Guardfile

@@ -1,5 +0,0 @@
-
-guard 'minitest' do
-  watch(%r|^test/(.*)\.rb|) { "test" }
-  watch(%r|^lib/(.*)\.rb|) { "test" }
-end