dkim 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b79c96d0478fbf8b0034adf4e151e57eb0a54713
-  data.tar.gz: 416192a1854051a5b7bb772746f6824e866daebc
+SHA256:
+  metadata.gz: f9ac50ad199771571d27da93d35d17d404e6cf24b18642856b8d8e3574ecb7f9
+  data.tar.gz: 7d1248e2086cea45176e60867ac15c4de7eb39f8cd5767c04e682f406e7901eb
 SHA512:
-  metadata.gz: 7420d356c4fbf3281d942a67647ad778d6ab84704a681b32d6b422aa57e01884dfd8b86cc0326a96972d2fe116825efa5fddde26d149f9c090c7cf03d7933d11
-  data.tar.gz: 2d9edfbe6f3028af2aa4edfd92cb87b74aa4ae7dead5ae2b102cc53eff987f1a68b7f6175d2157ebb2b0f59b18164e10012a89d67c1aec2db2f1bd7e3baeeb80
+  metadata.gz: 0161d656b0d464c2dced244ce241077181700c42451178bb7e6ccc5af5d63790b993e15f0d7f4cec579830b9e52bbde1aafa80d7ee908ea3310fdaba821884e8
+  data.tar.gz: 9d6d1b6218d2fdf7e1a7935c72de032fe7db7f2178f257f3bfa9ebc2ae810dde46988416e6a40b711616b328b30f2762412b796b403459738f2aa534fdc811f8

data/.github/workflows/test.yml

@@ -0,0 +1,20 @@
+name: Test
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # dkim Changelog
 
+## Unreleased
+
+## 1.1.0 (2021-12-05)
+* Add support for DKIM expiration tag
+
+## 1.0.1 (2013-01-15)
+* Fix Minitest
+* Add support for identity, the "i=" tag
+* Fix problem with `strip_field` in mail gem 2.7.0
+
 ## 1.0.0 (2013-01-15)
 * DKIM-Signature header is now prepended rather than appended
 * Headers are signed in the order they appear

data/README.md

@@ -2,8 +2,6 @@ dkim
 ====
 A DKIM signing library in ruby.
 
-[![Build Status](https://secure.travis-ci.org/jhawthorn/dkim.png?branch=master)](http://travis-ci.org/jhawthorn/dkim)
-
 [Documentation](http://rubydoc.info/github/jhawthorn/dkim)
 
 Installation
@@ -96,7 +94,6 @@ Limitations
 * No support for the older Yahoo! DomainKeys standard ([RFC 4870](http://tools.ietf.org/html/rfc4870)) *(none planned)*
 * No support for specifying DKIM identity `i=` *(planned)*
 * No support for body length `l=` *(planned)*
-* No support for signature expiration `x=` *(planned)*
 * No support for copied header fields `z=` *(not immediately planned)*
 
 Resources

data/lib/dkim/options.rb

@@ -21,6 +21,12 @@ module Dkim
     # @return [Time,#to_i] A Time object or seconds since the epoch
     define_option_method :time
 
+    # @attribute [rw]
+    # Signature expiration.
+    # This corresponds to the x= tag in the dkim header.
+    # @return [Time,#to_i] A Time object or seconds since the epoch
+    define_option_method :expire
+
     # @attribute [rw]
     # The signing algorithm for dkim. Valid values are 'rsa-sha1' and 'rsa-sha256' (default).
     # This corresponds to the a= tag in the dkim header.

data/lib/dkim/signed_mail.rb

@@ -63,6 +63,7 @@ module Dkim
       dkim_header['q'] = 'dns/txt'
       dkim_header['s'] = selector
       dkim_header['t'] = (time || Time.now).to_i
+      dkim_header['x'] = expire.to_i if expire
 
       # Add body hash and blank signature
       dkim_header['bh']= digest_alg.digest(canonical_body)

data/lib/dkim/version.rb

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

data/test/dkim/signed_mail_test.rb

@@ -46,6 +46,19 @@ module Dkim
       assert_equal 't+dk4yxTI2ByZxxRzkwhZhM4WzTZjGWHiWnS2t4pg7oT7fAIlMrfihJ/CIvGmYqYv4lbq4LStHqHx9TmEgxrkjLevHtuqhxkN55xJ2vA2QzTzFi2fMDZ4fFqWy4QtvlLjBAhevG+LXpmjPYec1cyeMlHlPAthq5+RNi6NHErJiM=', dkim_header['b']
     end
 
+    def test_expire
+      options = {
+        :time => Time.at(1234567890),
+        :expire => Time.at(1234567990)
+      }
+      signed_mail = SignedMail.new(@mail, options)
+      dkim_header = signed_mail.dkim_header.list
+
+      assert_equal 1234567990,                                      dkim_header['x']
+      assert_equal '2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8=',  dkim_header['bh']
+      assert_equal 'dn2Y5rSXQNRBy904vwpvri6xcmlrwKDmDX4XtBgyABQw9jLTulgD/G61TeyqinwgaHiatQaYt4pnpzYQGMaCCg7MepkkpZAR4IggAnHo/qB4JRx5OYBslKCCwpeb70YOPdukVopEnaCoUfkCGJ5vvu3xXG1N+ajKWqYiZ0n4z+o=', dkim_header['b']
+    end
+
     def test_identity
       options = {
         :domain => 'example.org',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dkim
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - John Hawthorn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,8 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -113,7 +113,7 @@ files:
 homepage: https://github.com/jhawthorn/dkim
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,9 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: dkim
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: DKIM library in ruby
 test_files:

data/.travis.yml

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