From 04288d0063db91a27a9dbc6812892f289088341a Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Thu, 19 Nov 2026 09:46:24 +0100 Subject: [PATCH] DMARC: add missing records, p=quarantine --- .../auth-dns/zones/eh22.easterhegg.eu.zone | 2 +- .../chaosknoten/auth-dns/zones/hamburg.ccc.de.zone | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone b/resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone index a34c183f..d7013bb0 100644 --- a/resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone +++ b/resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone @@ -19,7 +19,7 @@ $TTL 600 ;autoconfig IN CNAME cow.hamburg.ccc.de IN TXT "v=spf1 mx ip4:144.76.16.19/32 ip4:212.12.51.133/32 ip6:2a01:4f8:191:331::2/128 ip6:2a00:14b0:f000:23:51:133:0:1/128 ~all" -;_dmarc IN TXT **TODO** +_dmarc IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" dkim._domainkey IN TXT ( "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhk" "iG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoWo7mbis3REqBURP3ZQZwOY7RSsS7" diff --git a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone index 0a3aec47..e1b7cf09 100644 --- a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone +++ b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone @@ -34,7 +34,7 @@ dkim._domainkey IN TXT ("v=DKIM1;k=rsa;t=s;s=em "j3hCMHmyjE8mn8lYnS0QfSnV8NlqKwOhF+iwqfrhMI2bZFCQ+td03RtQjaXw5W+" "30NMcOv6Se4vPDl4nUIBJZ/wP3CBz1k66VShHB+un7SxoUQuW0+oDqN4QHH338b" "2dDOoBJndwIDAQAB") -_dmarc IN TXT "v=DMARC1;p=none;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" +_dmarc IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" localhost IN A 127.0.0.1 @@ -126,6 +126,7 @@ dkim._domainkey.lists IN TXT ("v=DKIM1; h=sha256; k=r "8KuSNAx9ycTO0urNkz4In1I2srmK8qPTfqfPU7y5kjHM1oC31+LwVNiyzeIQl" "cdW00DMTHfzkQAjtdDXgKG5db4Dqw+2wtZfLGvBFOSfV0RspZmSDSN6ON81dk" "lVABMMOA7Vd8wwIj0ms/gb/+AB0IQIDAQAB" ) +_dmarc.lists IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" ccchoir-intern IN A 172.31.17.156 cow IN A 212.12.51.133 @@ -145,6 +146,7 @@ dkim._domainkey.cowtest IN TXT ("v=DKIM1;k=rsa;t=s;s=em "jRLI8r48pASg6IoiByV8kR3r7OZw9dzmNgbTCOEyKaicB4KJDjgJvQut8af8g" "sYQYTCSPVqkwb5Y+yJNKhQmsYBwUX23x5Yng2gDBY/pjGeWl28SxdGhm8C23a" "0wVCz4kQGNvcULnrzifwIDAQAB") +_dmarc.cowtest IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" _autodiscover._tcp.cowtest IN SRV 0 1 443 cow _caldavs._tcp.cowtest IN SRV 0 1 443 cow _caldavs._tcp.cowtest IN TXT "path=/SOGo/dav/" @@ -191,6 +193,7 @@ dkim._domainkey.id IN TXT ("v=DKIM1;k=rsa;t=s;s=em "genmqXgBopvmnTeXa+kQnoVgrMyWE41zdWaXrDAtoYye3e31j0Nxhnfg+I7vO" "XPfmatTH7yieDaLG+3kHjbA3WFyAkb/ZAqZaFM8k6cQJEZb7jDzdKlm1fuPrk" "YUrfZ1V3pglzdm0QbM4wIDAQAB") +_dmarc.id IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" matrix-intern IN A 172.31.17.150 ; have this for compatibility (like references in CI) @@ -213,6 +216,7 @@ dkim._domainkey.design IN TXT ("v=DKIM1;k=rsa;t=s;s=em "TRTV4LM/n5Jm7Mm1F5DwJ+7Ie9s/WvTWKKKUExmoa5SNheGcfybC+sqnJu7L0" "F5dWFwk0zzQDcVSY2m9qFWPEuO2fZmiB4IoG4yXkooSY2sH9Z8eX2+6i3k/ub" "qx58Mav6VlkTxsOAdbbQIDAQAB") +_dmarc.design IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" regio-stage IN A 212.12.51.142 AAAA 2a00:14b0:f000:23:51:142:0:1 @@ -303,6 +307,7 @@ dkim._domainkey.git IN TXT ("v=DKIM1;k=rsa;t=s;s=e "qwD8/pYvMLOqvCStVHM5Zi+j1Jr0BC8mxU8pIY6rfOVt+h/V3wh0F6dL0z9nw" "ZhDE53K8frGp2CC5dW/A37FrfMJv+ODw2tX8EdyL2hDBshBQ4r8WiYJTtIMPL" "50A9UzZndyiLAHoeLrZQIDAQAB") +_dmarc.git IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" hackertours IN A 212.12.48.125 IN AAAA 2a00:14b0:4200:3000:125::1 MX 10 cow.hamburg.ccc.de. @@ -314,6 +319,7 @@ dkim._domainkey.hackertours IN TXT ("v=DKIM1;k=rsa;t=s;s=em "YmhHorgnxR3HbHeUmaxIe4WM2wWRYiD+9tpY1f0O/NEEoHxmFecRhU9SVmuhLgiOyF" "AWpPYBMOsKEHoKREENc+4VBj6H2GYTKIs+dYKDNEmVVdnRkgtAVO3FrjCkedBJ7RbR" "RNHIqdt9u8AF+Vrs1Oq72ZQrNVR0ezEyBScJaxy5JphvBWkMSYSoDpvXLwIDAQAB") +_dmarc.hackertours IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" staging.hackertours IN A 212.12.48.125 IN AAAA 2a00:14b0:4200:3000:125::1 grafana IN A 212.12.48.125 @@ -352,6 +358,7 @@ dkim._domainkey.cloud IN TXT ("v=DKIM1;k=rsa;t=s;s=em "7+HQs9BuDo4PKQs1/mE5BEWQ0ISEKZ4bk1p8U0ZsfcdQ8o9X53Tj+JxvJHgxi" "h7yHMr4y9hCOAkvZTFZ/Z/r3KU+N+t9NrVYm995KEernSxE3MXYIsdaFKBDvX" "Xq837yzJmv7D9S9We3YwIDAQAB") +_dmarc.cloud IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" ; Mail: hosts.hamburg.ccc.de hosts IN MX 10 cow IN TXT "v=spf1 mx -all" @@ -363,6 +370,7 @@ dkim._domainkey.hosts IN TXT ("v=DKIM1;k=rsa;t=s;s=em "RMs3ECvcCVgsyhRPJahs8tzbKjhnp956ru6Jda3Yo/ubhy4AztP/7ZQayCv/W" "06PfZNo/i2711F98L2ATQaDsOCKWhpskyrCRcR1nTWNSL7qYhOPD1hZonsd5I" "f5WwrR4meWD3wmXbX29wIDAQAB") +_dmarc.hosts IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" ; Mail: hosts-external.hamburg.ccc.de external-hosts IN MX 10 cow IN TXT "v=spf1 mx -all" @@ -374,6 +382,7 @@ dkim._domainkey.external-hosts IN TXT ("v=DKIM1;k=rsa;t=s;s=em "/dL73spDajlDx4VRMUpZQq/PAoPPwCFdw/HNnzxBYBIdVloeJx91qBRaNyUIb" "C/to8YSDVi2aMHiXhTBfoNd1VcxjlBYWqEZtdUhecUjwmbbAO4f0ECO4bs0Yz" "d/EgJB70ry1quA0MqgZQIDAQAB") +_dmarc.external-hosts IN TXT "v=DMARC1;p=quarantine;sp=none;pct=100;rua=mailto:dmarc-report@hamburg.ccc.de;ruf=mailto:dmarc-report@hamburg.ccc.de;ri=86400;aspf=r;adkim=r;fo=1" ; for thw: orga IN A 212.12.51.130