Fixed custom domain DKIM signing

app/Mail/ForwardEmail.php

@@ -116,6 +116,12 @@ class ForwardEmail extends Mailable implements ShouldQueue, ShouldBeEncrypted
                     $this->dkimSigner = new Swift_Signers_DKIMSigner(config('anonaddy.dkim_signing_key'), $this->alias->domain, config('anonaddy.dkim_selector'));
                     $this->dkimSigner->ignoreHeader('List-Unsubscribe');
                     $this->dkimSigner->ignoreHeader('Return-Path');
+                    $this->dkimSigner->ignoreHeader('Feedback-ID');
+                    $this->dkimSigner->ignoreHeader('Content-Type');
+                    $this->dkimSigner->ignoreHeader('Content-Description');
+                    $this->dkimSigner->ignoreHeader('Content-Disposition');
+                    $this->dkimSigner->ignoreHeader('Content-Transfer-Encoding');
+                    $this->dkimSigner->ignoreHeader('MIME-Version');
                 }
             } else {
                 if (! isset($replyToEmail)) {

composer.lock

@@ -399,16 +399,16 @@
         },
         {
             "name": "composer/package-versions-deprecated",
-            "version": "1.11.99.3",
+            "version": "1.11.99.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/package-versions-deprecated.git",
-                "reference": "fff576ac850c045158a250e7e27666e146e78d18"
+                "reference": "b174585d1fe49ceed21928a945138948cb394600"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/fff576ac850c045158a250e7e27666e146e78d18",
-                "reference": "fff576ac850c045158a250e7e27666e146e78d18",
+                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600",
+                "reference": "b174585d1fe49ceed21928a945138948cb394600",
                 "shasum": ""
             },
             "require": {
@@ -452,7 +452,7 @@
             "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
             "support": {
                 "issues": "https://github.com/composer/package-versions-deprecated/issues",
-                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.3"
+                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4"
             },
             "funding": [
                 {
@@ -468,7 +468,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-17T13:49:14+00:00"
+            "time": "2021-09-13T08:41:34+00:00"
         },
         {
             "name": "dasprid/enum",
@@ -9681,16 +9681,16 @@
         },
         {
             "name": "facade/flare-client-php",
-            "version": "1.8.1",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/flare-client-php.git",
-                "reference": "47b639dc02bcfdfc4ebb83de703856fa01e35f5f"
+                "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/47b639dc02bcfdfc4ebb83de703856fa01e35f5f",
-                "reference": "47b639dc02bcfdfc4ebb83de703856fa01e35f5f",
+                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/b2adf1512755637d0cef4f7d1b54301325ac78ed",
+                "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed",
                 "shasum": ""
             },
             "require": {
@@ -9734,7 +9734,7 @@
             ],
             "support": {
                 "issues": "https://github.com/facade/flare-client-php/issues",
-                "source": "https://github.com/facade/flare-client-php/tree/1.8.1"
+                "source": "https://github.com/facade/flare-client-php/tree/1.9.1"
             },
             "funding": [
                 {
@@ -9742,26 +9742,26 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-05-31T19:23:29+00:00"
+            "time": "2021-09-13T12:16:46+00:00"
         },
         {
             "name": "facade/ignition",
-            "version": "2.12.1",
+            "version": "2.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/ignition.git",
-                "reference": "567b0a4ab04367603e61729b0ca133fb7b4819db"
+                "reference": "e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition/zipball/567b0a4ab04367603e61729b0ca133fb7b4819db",
-                "reference": "567b0a4ab04367603e61729b0ca133fb7b4819db",
+                "url": "https://api.github.com/repos/facade/ignition/zipball/e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78",
+                "reference": "e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "facade/flare-client-php": "^1.6",
+                "facade/flare-client-php": "^1.9.1",
                 "facade/ignition-contracts": "^1.0.2",
                 "illuminate/support": "^7.0|^8.0",
                 "monolog/monolog": "^2.0",
@@ -9818,7 +9818,7 @@
                 "issues": "https://github.com/facade/ignition/issues",
                 "source": "https://github.com/facade/ignition"
             },
-            "time": "2021-09-10T07:19:07+00:00"
+            "time": "2021-09-13T13:01:30+00:00"
         },
         {
             "name": "facade/ignition-contracts",
@@ -10151,16 +10151,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.4.3",
+            "version": "1.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea"
+                "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/d1339f64479af1bee0e82a0413813fe5345a54ea",
-                "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
+                "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
                 "shasum": ""
             },
             "require": {
@@ -10217,9 +10217,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mockery/mockery/issues",
-                "source": "https://github.com/mockery/mockery/tree/1.4.3"
+                "source": "https://github.com/mockery/mockery/tree/1.4.4"
             },
-            "time": "2021-02-24T09:51:49+00:00"
+            "time": "2021-09-13T15:28:59+00:00"
         },
         {
             "name": "myclabs/deep-copy",

config/version.yml

@@ -5,9 +5,9 @@ current:
   major: 0
   minor: 8
   patch: 3
-  prerelease: ''
+  prerelease: 1-ge34db89
   buildmetadata: ''
-  commit: c755a3
+  commit: e34db8
   timestamp:
     year: 2020
     month: 10

package-lock.json

@@ -1623,9 +1623,9 @@
             }
         },
         "node_modules/@trysound/sax": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
-            "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==",
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
             "engines": {
                 "node": ">=10.13.0"
             }
@@ -3902,9 +3902,9 @@
             "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.3.836",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz",
-            "integrity": "sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg=="
+            "version": "1.3.838",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.838.tgz",
+            "integrity": "sha512-65O6UJiyohFAdX/nc6KJ0xG/4zOn7XCO03kQNNbCeMRGxlWTLzc6Uyi0tFNQuuGWqySZJi8CD2KXPXySVYmzMA=="
         },
         "node_modules/elliptic": {
             "version": "6.5.4",
@@ -5414,9 +5414,9 @@
             }
         },
         "node_modules/jest-worker": {
-            "version": "27.1.1",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz",
-            "integrity": "sha512-XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA==",
+            "version": "27.2.0",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.0.tgz",
+            "integrity": "sha512-laB0ZVIBz+voh/QQy9dmUuuDsadixeerrKqyVpgPz+CCWiOYjOBabUXHIXZhsdvkWbLqSHbgkAHWl5cg24Q6RA==",
             "dependencies": {
                 "@types/node": "*",
                 "merge-stream": "^2.0.0",
@@ -5629,13 +5629,13 @@
             }
         },
         "node_modules/listr2": {
-            "version": "3.12.0",
-            "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.12.0.tgz",
-            "integrity": "sha512-DLaOIhIBXxSDGfAuGyQPsQs6XPIJrUE1MaNYBq8aUS3bulSAEl9RMNNuRbfdxonTizL5ztAYvCZKKnP3gFSvYg==",
+            "version": "3.12.1",
+            "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.12.1.tgz",
+            "integrity": "sha512-oB1DlXlCzGPbvWhqYBZUQEPJKqsmebQWofXG6Mpbe3uIvoNl8mctBEojyF13ZyqwQ91clCWXpwsWp+t98K4FOQ==",
             "dev": true,
             "dependencies": {
                 "cli-truncate": "^2.1.0",
-                "colorette": "^1.2.2",
+                "colorette": "^1.4.0",
                 "log-update": "^4.0.0",
                 "p-map": "^4.0.0",
                 "rxjs": "^6.6.7",
@@ -8403,11 +8403,11 @@
             }
         },
         "node_modules/svgo": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.5.0.tgz",
-            "integrity": "sha512-FSdBOOo271VyF/qZnOn1PgwCdt1v4Dx0Sey+U1jgqm1vqRYjPGdip0RGrFW6ItwtkBB8rHgHk26dlVr0uCs82Q==",
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.6.0.tgz",
+            "integrity": "sha512-ATpRmynNSjP/5hSM4Ij4Pg3L+BCN6IBES7wRLh1ZtVxJB7Xn8omiGttLW6v6ZbqrV5pCVB3XfdbUoY8IpgIwvw==",
             "dependencies": {
-                "@trysound/sax": "0.1.1",
+                "@trysound/sax": "0.2.0",
                 "colorette": "^1.3.0",
                 "commander": "^7.2.0",
                 "css-select": "^4.1.3",
@@ -8484,21 +8484,21 @@
             }
         },
         "node_modules/tapable": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-            "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
             "engines": {
                 "node": ">=6"
             }
         },
         "node_modules/terser": {
-            "version": "5.7.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz",
-            "integrity": "sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw==",
+            "version": "5.8.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.8.0.tgz",
+            "integrity": "sha512-f0JH+6yMpneYcRJN314lZrSwu9eKkUFEHLN/kNy8ceh8gaRiLgFPJqrB9HsXjhEGdv4e/ekjTOFxIlL6xlma8A==",
             "dependencies": {
                 "commander": "^2.20.0",
                 "source-map": "~0.7.2",
-                "source-map-support": "~0.5.19"
+                "source-map-support": "~0.5.20"
             },
             "bin": {
                 "terser": "bin/terser"
@@ -9245,9 +9245,9 @@
             }
         },
         "node_modules/webpack/node_modules/webpack-sources": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz",
-            "integrity": "sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==",
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz",
+            "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==",
             "engines": {
                 "node": ">=10.13.0"
             }
@@ -10508,9 +10508,9 @@
             "integrity": "sha512-HnUhk1Sy9IuKrxEMdIRCxpIqPw6BFsbYSEUO9p/hNw5sMld/+3OLMWQP80F8/db9qsv3qUjs7ZR5bS/R+iinXw=="
         },
         "@trysound/sax": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
-            "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow=="
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
         },
         "@types/babel__core": {
             "version": "7.1.16",
@@ -12336,9 +12336,9 @@
             "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "electron-to-chromium": {
-            "version": "1.3.836",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz",
-            "integrity": "sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg=="
+            "version": "1.3.838",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.838.tgz",
+            "integrity": "sha512-65O6UJiyohFAdX/nc6KJ0xG/4zOn7XCO03kQNNbCeMRGxlWTLzc6Uyi0tFNQuuGWqySZJi8CD2KXPXySVYmzMA=="
         },
         "elliptic": {
             "version": "6.5.4",
@@ -13437,9 +13437,9 @@
             "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "jest-worker": {
-            "version": "27.1.1",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz",
-            "integrity": "sha512-XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA==",
+            "version": "27.2.0",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.0.tgz",
+            "integrity": "sha512-laB0ZVIBz+voh/QQy9dmUuuDsadixeerrKqyVpgPz+CCWiOYjOBabUXHIXZhsdvkWbLqSHbgkAHWl5cg24Q6RA==",
             "requires": {
                 "@types/node": "*",
                 "merge-stream": "^2.0.0",
@@ -13603,13 +13603,13 @@
             }
         },
         "listr2": {
-            "version": "3.12.0",
-            "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.12.0.tgz",
-            "integrity": "sha512-DLaOIhIBXxSDGfAuGyQPsQs6XPIJrUE1MaNYBq8aUS3bulSAEl9RMNNuRbfdxonTizL5ztAYvCZKKnP3gFSvYg==",
+            "version": "3.12.1",
+            "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.12.1.tgz",
+            "integrity": "sha512-oB1DlXlCzGPbvWhqYBZUQEPJKqsmebQWofXG6Mpbe3uIvoNl8mctBEojyF13ZyqwQ91clCWXpwsWp+t98K4FOQ==",
             "dev": true,
             "requires": {
                 "cli-truncate": "^2.1.0",
-                "colorette": "^1.2.2",
+                "colorette": "^1.4.0",
                 "log-update": "^4.0.0",
                 "p-map": "^4.0.0",
                 "rxjs": "^6.6.7",
@@ -15633,11 +15633,11 @@
             }
         },
         "svgo": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.5.0.tgz",
-            "integrity": "sha512-FSdBOOo271VyF/qZnOn1PgwCdt1v4Dx0Sey+U1jgqm1vqRYjPGdip0RGrFW6ItwtkBB8rHgHk26dlVr0uCs82Q==",
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.6.0.tgz",
+            "integrity": "sha512-ATpRmynNSjP/5hSM4Ij4Pg3L+BCN6IBES7wRLh1ZtVxJB7Xn8omiGttLW6v6ZbqrV5pCVB3XfdbUoY8IpgIwvw==",
             "requires": {
-                "@trysound/sax": "0.1.1",
+                "@trysound/sax": "0.2.0",
                 "colorette": "^1.3.0",
                 "commander": "^7.2.0",
                 "css-select": "^4.1.3",
@@ -15696,18 +15696,18 @@
             }
         },
         "tapable": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-            "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw=="
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
         },
         "terser": {
-            "version": "5.7.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz",
-            "integrity": "sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw==",
+            "version": "5.8.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.8.0.tgz",
+            "integrity": "sha512-f0JH+6yMpneYcRJN314lZrSwu9eKkUFEHLN/kNy8ceh8gaRiLgFPJqrB9HsXjhEGdv4e/ekjTOFxIlL6xlma8A==",
             "requires": {
                 "commander": "^2.20.0",
                 "source-map": "~0.7.2",
-                "source-map-support": "~0.5.19"
+                "source-map-support": "~0.5.20"
             },
             "dependencies": {
                 "commander": {
@@ -16140,9 +16140,9 @@
                     "requires": {}
                 },
                 "webpack-sources": {
-                    "version": "3.2.0",
-                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz",
-                    "integrity": "sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw=="
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz",
+                    "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA=="
                 }
             }
         },