From fb9077e7b39fef52372b2f413d7a94c6951dd911 Mon Sep 17 00:00:00 2001
From: IKEDA Soji <mail@ikedas.net>
Date: Tue, 19 Sep 2023 17:34:47 +0900
Subject: [PATCH] DKIM: i= tag may not match in some auto-generated messages
 (#1716)

---
 src/lib/Sympa/Tools/DKIM.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/lib/Sympa/Tools/DKIM.pm b/src/lib/Sympa/Tools/DKIM.pm
index 7a75d03c3..6433997f8 100644
--- a/src/lib/Sympa/Tools/DKIM.pm
+++ b/src/lib/Sympa/Tools/DKIM.pm
@@ -7,7 +7,7 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2018, 2020, 2021, 2022 The Sympa Community. See the
+# Copyright 2018, 2020, 2021, 2022, 2023 The Sympa Community. See the
 # AUTHORS.md # file at the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
@@ -59,11 +59,10 @@ sub get_dkim_parameters {
                     || $list->{'admin'}{'arc_parameters'}{'signer_domain'}
                     || $list->{'domain'}
             ),
-            # "i=" tag is -request address by default.
-            # See RFC 4871 (page 21).
+            # "i=" tag is "@domain" by default. See RFC 6376, pp.22f.
             i => (
                 $list->{'admin'}{'dkim_parameters'}{'signer_identity'}
-                    || Sympa::get_address($list, 'owner')
+                    || sprintf('@%s', $list->{'domain'})
             ),
             s => (
                        $list->{'admin'}{'dkim_parameters'}{'selector'}
@@ -84,7 +83,10 @@ sub get_dkim_parameters {
                     || $robot_id
             ),
             # This is NOT derived by list config
-            i => Conf::get_robot_conf($robot_id, 'dkim_signer_identity'),
+            i => (
+                Conf::get_robot_conf($robot_id, 'dkim_signer_identity')
+                    || sprintf('@%s', $robot_id)
+            ),
             s => (
                 Conf::get_robot_conf($robot_id, 'dkim_parameters.selector')
                     || Conf::get_robot_conf(