From 8010595dd25aa95df3d52fa047176353885170d5 Mon Sep 17 00:00:00 2001 From: bladeswords Date: Mon, 9 Mar 2020 23:22:13 +1100 Subject: [PATCH 1/3] Remove SPF type SPF record #1394 As mentioned in #1394 - In accordance with RFC 7208, offer only TXT RRs for SPF. Agree with @Nebukadneza - but not sure how to go about telling people to remove the old record... --- core/admin/mailu/ui/templates/domain/details.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/admin/mailu/ui/templates/domain/details.html b/core/admin/mailu/ui/templates/domain/details.html index adb2ad34..65c6ec1a 100644 --- a/core/admin/mailu/ui/templates/domain/details.html +++ b/core/admin/mailu/ui/templates/domain/details.html @@ -34,8 +34,7 @@ {% trans %}DNS SPF entries{% endtrans %} 
-{{ domain.name }}. 600 IN TXT "v=spf1 mx a:{{ hostname }} -all"
-{{ domain.name }}. 600 IN SPF "v=spf1 mx a:{{ hostname }} -all"
+{{ domain.name }}. 600 IN TXT "v=spf1 mx a:{{ hostname }} -all" {% if domain.dkim_publickey %} From d5d097eebc43d2e5347488f64f32b37914baa71f Mon Sep 17 00:00:00 2001 From: ofthesun9 Date: Sat, 21 Mar 2020 13:19:56 +0000 Subject: [PATCH 2/3] docker-compose exec needs a -T flag it no TTY is allocated This flag is missing in 00_create_users.sh and is failing the tests on travis arm architecture --- tests/compose/core/00_create_users.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/compose/core/00_create_users.sh b/tests/compose/core/00_create_users.sh index d2ee5c20..49d0511b 100755 --- a/tests/compose/core/00_create_users.sh +++ b/tests/compose/core/00_create_users.sh @@ -1,11 +1,11 @@ echo "Users tests ..." # Should fail, admin is already auto-created -docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu admin admin mailu.io 'FooBar' && exit 1 +docker-compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu admin admin mailu.io 'FooBar' && exit 1 echo "The above error was intended!" # Should not fail, but does nothing; ifmissing mode -docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu admin admin mailu.io 'FooBar' --mode=ifmissing || exit 1 +docker-compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu admin admin mailu.io 'FooBar' --mode=ifmissing || exit 1 # Should not fail and update the password; update mode -docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu admin admin mailu.io 'password' --mode=update || exit 1 -docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu user user mailu.io 'password' 'SHA512-CRYPT' || exit 1 -docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu user 'user/with/slash' mailu.io 'password' 'SHA512-CRYPT' || exit 1 +docker-compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu admin admin mailu.io 'password' --mode=update || exit 1 +docker-compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu user user mailu.io 'password' 'SHA512-CRYPT' || exit 1 +docker-compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu user 'user/with/slash' mailu.io 'password' 'SHA512-CRYPT' || exit 1 echo "User testing succesfull!" From df4f6f895d2d94635033578a8486152f91b4c8cf Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 18 Mar 2020 11:33:40 +0100 Subject: [PATCH 3/3] Add newfragment file for SPF vs. TXT records closes #1394 --- towncrier/newsfragments/1394.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 towncrier/newsfragments/1394.bugfix diff --git a/towncrier/newsfragments/1394.bugfix b/towncrier/newsfragments/1394.bugfix new file mode 100644 index 00000000..6f17afbb --- /dev/null +++ b/towncrier/newsfragments/1394.bugfix @@ -0,0 +1 @@ +Show SPF records in accordance with RFC 7208: Previously we instructed admins to create SPF and TXT records, where only TXT records are correct now. !! Attention !! You need to manually remove the SPF-typed records and keep only TXT in your DNS.