commit 9d29b0bbc333f71b8b74613e1a84af8d2b0853eb parent 52b40c950d1c30790ba50d07c6d85cd452f7e088 Author: Christian Grothoff <christian@grothoff.org> Date: Mon, 17 Feb 2025 19:58:23 +0100 escape required Diffstat:
5 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/playbooks/test-public.yml b/playbooks/test-public.yml @@ -48,12 +48,14 @@ KYCAID_TEMPLATE_INDIVIDUAL: tmpl_xxx # Template to use for identification of businesses with KYCAID KYCAID_TEMPLATE_BUSINESS: tmpl_xxx # Regex specifying allowed phone numbers for the SMS check -EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX: \+41[0-9]+ +EXCHANGE_AML_PROGRAM_TOPS_SMS_HINT: "Swiss number required" +EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX: "\\+41[0-9]+" # Limit to lift for withdraw upon SMS registration EXCHANGE_AML_PROGRAM_TOPS_SMS_WITHDRAW_THRESHOLD: CHF:200 # Limit to lift for merge upon SMS registration EXCHANGE_AML_PROGRAM_TOPS_SMS_MERGE_THRESHOLD: CHF:0 # 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_COUNTRY_REGEX: "CH|Ch|ch" # Tool to use for sanction list checking EXCHANGE_SANCTION_HELPER: taler-exchange-helper-sanctions-dummy diff --git a/playbooks/tops-public.yml b/playbooks/tops-public.yml @@ -52,12 +52,14 @@ KYCAID_TEMPLATE_INDIVIDUAL: tmpl_xxx # Template to use for identification of businesses with KYCAID KYCAID_TEMPLATE_BUSINESS: tmpl_xxx # Regex specifying allowed phone numbers for the SMS check -EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX: \+41[0-9]+ +EXCHANGE_AML_PROGRAM_TOPS_SMS_HINT: "Swiss number required" +EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX: "\\+41[0-9]+" # Limit to lift for withdraw upon SMS registration EXCHANGE_AML_PROGRAM_TOPS_SMS_WITHDRAW_THRESHOLD: CHF:200 # Limit to lift for merge upon SMS registration EXCHANGE_AML_PROGRAM_TOPS_SMS_MERGE_THRESHOLD: CHF:0 # 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_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 @@ -21,6 +21,9 @@ AUTH_COMMAND = challenger-send-email.sh # ADDRESS_TYPE = email +# What addresses are allowed. +ADDRESS_RESTRICTIONS = {"email":{"hint":"valid e-mail address required","regex":"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+$"} + [challengerdb-postgres] #The connection string the plugin has to use for connecting to the database CONFIG = postgres:///challenger-email diff --git a/roles/challenger/templates/etc/challenger/challenger-postal.conf.j2 b/roles/challenger/templates/etc/challenger/challenger-postal.conf.j2 @@ -21,6 +21,9 @@ AUTH_COMMAND = challenger-send-post.sh # ADDRESS_TYPE = address +# What addresses are allowed. +ADDRESS_RESTRICTIONS = {"zip":{"hint":"numeric zip code required","regex":"^[0-9]+$"}, "country":{"hint":"{{ EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_HINT }}","regex":"^{{ EXCHANGE_AML_PROGRAM_TOPS_POSTAL_COUNTRY_REGEX }}$"}} + [challengerdb-postgres] #The connection string the plugin has to use for connecting to the database CONFIG = postgres:///challenger-postal diff --git a/roles/challenger/templates/etc/challenger/challenger-sms.conf.j2 b/roles/challenger/templates/etc/challenger/challenger-sms.conf.j2 @@ -21,6 +21,10 @@ AUTH_COMMAND = challenger-send-sms.sh # ADDRESS_TYPE = phone +# Limit acceptable phone numbers. +ADDRESS_RESTRICTIONS = {"phone":{"hint":"{{ EXCHANGE_AML_PROGRAM_TOPS_SMS_HINT }}","regex":"{{ EXCHANGE_AML_PROGRAM_TOPS_SMS_REGEX }}"}} + + [challengerdb-postgres] #The connection string the plugin has to use for connecting to the database CONFIG = postgres:///challenger-sms