tuktuk 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b23aad601ecb20c8e9f2a61ca0c5d8740fe08fb
-  data.tar.gz: ccd26989dcc9cf8ea0cd124bc117cd8aa4ebe337
+SHA256:
+  metadata.gz: 299486ad4c10490a6e03a48a1a340d362e45e7c3d1475948dce7d9a1cc4d70b8
+  data.tar.gz: 1f3bebc2cbf9e4ca5cf643a9db817a2198e5c57fde596267f3adf9275f8ad39f
 SHA512:
-  metadata.gz: 573938ae9b56c2fea03e8cf19ae133b298e146232813b022ee2cc17e275e68cf98a353e4863eec720da3a898a7e78d3ba59926963db846bc02f215cb87eaf92f
-  data.tar.gz: 0fb02b910a04a3f0e2472e7e65264add4eed11cc12a46f68b3a1adf820f9ff615392d24a65831da98aafa95f0a909d828f68454192111706aad905ee5fc487a1
+  metadata.gz: 70b11e0699eee6765b72ed737422cf7e501b55ac4456504c9b7291d2d2c8b59092463a2e00f3cafbce7324af62aafa90a61ca736a6e278c74238412c350d51a1
+  data.tar.gz: 4e6cd4aa14dbd0b1de9da8b86db9ac40c6f22cd3ef91a1f3abc6c90a758df6743aca5a23169c4e4955be5ae0c837591548e049a03e94d5ceb41026d023a1dcf9

data/README.md

@@ -193,6 +193,49 @@ config.action_mailer.tuktuk_settings = {
 }
 ```
 
+# Example SPK/DKIM/DMARC settings
+
+If you're sending email from yoursite.com, the SPF record should be set for the APEX/root host, and look like this:
+
+    v=spf1 ip4:[ipv4_address] ip6:[ipv6_address] mx a include:[other_host] ~all 
+
+For example:
+
+    v=spf1 ip4:12.34.56.78 ip6:2600:3c05::f07c:92ff:fe48:b2fd mx a include:mailgun.org ~all 
+
+This tells the receiving server to accept email sent from a) the addresses explicitly mentioned (`ip4` and `ip6`), 
+b) from the hosts mentioned in the `include` statements, as well as c) the hosts listed as `MX` and `A` records for that domain.
+
+As for DKIM, you should add two TXT records. The first is a simple, short one that goes under the `_domainkey` host, 
+and should contain the following:
+
+    t=y;o=~;
+
+Then, a second DKIM record should be placed under `[selector]._domainkey` (e.g. `mailer._domainkey`), and should look like this:
+
+    k=rsa; p=MIIBIBANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA[...]DAQAB (public key)
+    
+And finally, your DMARC record goes under the `_dmarc` host, and goes like this:
+
+    v=DMARC1; p=none; rua=mailto:postmaster@yoursite.com; ruf=mailto:postmaster@yoursite.com
+
+So, in summary:
+
+    (SPF)   @.yoursite.com                     --> v=spf1 ip4:[ipv4_address] ip6:[ipv6_address] mx a include:[other_host] ~all 
+    (DKIM1) _domainkey.yoursite.com            --> t=y;o=~;
+    (DKIM2) [selector]._domainkey.yoursite.com --> k=rsa; p=MIIBIBANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA[...]DAQAB
+    (DMARC) _dmarc.yoursite.com                --> v=DMARC1; p=none; rua=mailto:postmaster@yoursite.com; ruf=mailto:postmaster@yoursite.com
+
+Now, to check wether your records are OK, you can use the `dig` command like follows:
+
+    dig yoursite.com TXT +short # should output the SPF record, under the root domain
+    dig mailer._domainkey.yoursite.com TXT +short # should output the DKIM record containing the key
+    dig _domainkey.yoursite.com TXT +short # should output the other (short) DKIM 
+    dig _dmarc.yoursite.com TXT +short # should output the DMARC record
+    
+Remember you can query your DNS server directly with the `dig` command by adding `@name.server.com` 
+after the `dig` command (e.g. `dig @ns1.linode.com yoursite.com TXT`).
+
 # Contributions
 
 You're more than welcome. Send a pull request, including tests, and make sure you don't break anything. That's it.

data/lib/tuktuk/tuktuk.rb

@@ -234,7 +234,7 @@ module Tuktuk
           begin
             resp = smtp.send_message(get_raw_mail(mail), get_from(mail), mail.to)
             smtp.send(:getok, 'RSET') if server['hotmail'] # fix for '503 Sender already specified'
-          rescue Net::SMTPFatalError => e # error code 5xx, except for 500, like: 550 Mailbox not found
+          rescue Net::SMTPFatalError, Net::SMTPServerBusy => e # error code 5xx, except for 500, like: 550 Mailbox not found
             resp = Bounce.type(e)
           end
           responses[mail] = resp
@@ -244,7 +244,7 @@ module Tuktuk
 
       responses
     rescue => e # SMTPServerBusy, SMTPSyntaxError, SMTPUnsupportedCommand, SMTPUnknownError (unexpected reply code)
-      logger.error "[SERVER ERROR: #{server}] #{e.message}"
+      logger.error "[SERVER ERROR: #{server}] #{e.class} -> #{e.message}"
       @last_error = e
       responses
     end

data/lib/tuktuk/version.rb

@@ -1,7 +1,7 @@
 module Tuktuk
   MAJOR = 0
   MINOR = 6
-  PATCH = 3
+  PATCH = 4
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tuktuk
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: tuktuk
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: SMTP client for Ruby with DKIM support.