commit 6cb70bbc0f52cfa2337526e19a7b840f4a0426e4 parent 55100f9410eb11774c0c9700daebc5687cb996e1 Author: Christian Grothoff <christian@grothoff.org> Date: Fri, 4 Jul 2025 16:07:53 +0200 add ADDRESS_HINT option (#9996) Diffstat:
7 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/inventories/host_vars/fdold-acai-tops/test-public.yml b/inventories/host_vars/fdold-acai-tops/test-public.yml @@ -61,9 +61,11 @@ KYCAID_TEMPLATE_INDIVIDUAL: tmpl_xxx KYCAID_TEMPLATE_BUSINESS: tmpl_xxx # Regex specifying allowed phone numbers for the SMS check EXCHANGE_AML_PROGRAM_TOPS_SMS_HINT: "Swiss number required" +EXCHANGE_AML_PROGRAM_TOPS_SMS_EXAMPLE: "+41948224521" EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX: "\\\\+41[0-9]+" # Regex specifying allowed country names for the postal address check EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_HINT: "Swiss address required" +EXCHANGE_AML_PROGRAM_TOPS_POSTAL_EXAMPLE: "Max Mustermann\nBahnhofsplatz 1\n4201 Biel/Bienne" EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_REGEX: "CH|Ch|ch" # Tool to use for sanction list checking EXCHANGE_SANCTION_HELPER: taler-exchange-helper-sanctions-dummy diff --git a/inventories/host_vars/podman-localhost/test-public.yml b/inventories/host_vars/podman-localhost/test-public.yml @@ -49,9 +49,11 @@ KYCAID_TEMPLATE_INDIVIDUAL: tmpl_xxx KYCAID_TEMPLATE_BUSINESS: tmpl_xxx # Regex specifying allowed phone numbers for the SMS check EXCHANGE_AML_PROGRAM_TOPS_SMS_HINT: "Swiss number required" +EXCHANGE_AML_PROGRAM_TOPS_SMS_EXAMPLE: "+41948224521" EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX: "\\\\+41[0-9]+" # Regex specifying allowed country names for the postal address check EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_HINT: "Swiss address required" +EXCHANGE_AML_PROGRAM_TOPS_POSTAL_EXAMPLE: "Max Mustermann\nBahnhofsplatz 1\n4201 Biel/Bienne" EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_REGEX: "CH|Ch|ch" # Tool to use for sanction list checking EXCHANGE_SANCTION_HELPER: taler-exchange-helper-sanctions-dummy diff --git a/inventories/host_vars/rusty/test-public.yml b/inventories/host_vars/rusty/test-public.yml @@ -63,9 +63,11 @@ KYCAID_TEMPLATE_INDIVIDUAL: tmpl_xxx KYCAID_TEMPLATE_BUSINESS: tmpl_xxx # Regex specifying allowed phone numbers for the SMS check EXCHANGE_AML_PROGRAM_TOPS_SMS_HINT: "Swiss number required" +EXCHANGE_AML_PROGRAM_TOPS_SMS_EXAMPLE: "+41948224521" EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX: "\\\\+41[0-9]+" # Regex specifying allowed country names for the postal address check EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_HINT: "Swiss address required" +EXCHANGE_AML_PROGRAM_TOPS_POSTAL_EXAMPLE: "Max Mustermann\nBahnhofsplatz 1\n4201 Biel/Bienne" EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_REGEX: "CH|Ch|ch" # Tool to use for sanction list checking EXCHANGE_SANCTION_HELPER: taler-exchange-helper-sanctions-dummy diff --git a/inventories/host_vars/spec/tops-public.yml b/inventories/host_vars/spec/tops-public.yml @@ -67,9 +67,11 @@ KYCAID_TEMPLATE_INDIVIDUAL: tmpl_xxx KYCAID_TEMPLATE_BUSINESS: tmpl_xxx # Regex specifying allowed phone numbers for the SMS check EXCHANGE_AML_PROGRAM_TOPS_SMS_HINT: "Swiss number required" +EXCHANGE_AML_PROGRAM_TOPS_SMS_EXAMPLE: "+41948224521" EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX: "\\\\+41[0-9]+" # Regex specifying allowed country names for the postal address check EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_HINT: "Swiss address required" +EXCHANGE_AML_PROGRAM_TOPS_POSTAL_EXAMPLE: "Max Mustermann\nBahnhofsplatz 1\n4201 Biel/Bienne" EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_REGEX: "CH|Ch|ch" # Tool to use for sanction list checking EXCHANGE_SANCTION_HELPER: taler-exchange-helper-sanctions-dummy diff --git a/roles/challenger/templates/etc/challenger/challenger-email.conf.j2 b/roles/challenger/templates/etc/challenger/challenger-email.conf.j2 @@ -34,6 +34,9 @@ BASE_URL = https://email.challenger.{{ domain_name }}/ # ADDRESS_TYPE = email +# Hint to show on the address format. +ADDRESS_HINT = "user@example.com" + # What addresses are allowed. ADDRESS_RESTRICTIONS = {"CONTACT_EMAIL":{"hint":"valid e-mail address required","regex":"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+$"}} diff --git a/roles/challenger/templates/etc/challenger/challenger-postal.conf.j2 b/roles/challenger/templates/etc/challenger/challenger-postal.conf.j2 @@ -34,6 +34,9 @@ MESSAGE_TEMPLATE_FILE = /etc/challenger/postal-message-template.txt # ADDRESS_TYPE = postal-ch +# Hint to show on the address format. +ADDRESS_HINT = {{ EXCHANGE_AML_PROGRAM_TOPS_POSTAL_EXAMPLE }} + # What addresses are allowed. ADDRESS_RESTRICTIONS = {"COUNTRY_CODE":{"hint":"{{ EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_HINT }}","regex":"^{{ EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_REGEX }}$"}} diff --git a/roles/challenger/templates/etc/challenger/challenger-sms.conf.j2 b/roles/challenger/templates/etc/challenger/challenger-sms.conf.j2 @@ -25,9 +25,11 @@ BASE_URL = https://sms.challenger.{{ domain_name }}/ # A template of the form 'enter-$ADDRESS_TYPE-form' must # exist and the field names must be supported by the # AUTH_COMMAND. -# ADDRESS_TYPE = phone +# Hint to show on the address format. +ADDRESS_HINT = {{ EXCHANGE_AML_PROGRAM_TOPS_SMS_EXAMPLE }} + # Limit acceptable phone numbers. ADDRESS_RESTRICTIONS = {"CONTACT_PHONE":{"hint":"{{ EXCHANGE_AML_PROGRAM_TOPS_SMS_HINT }}","regex":"{{ EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX }}"}}