commit cd8e9198fdce81f8e45996806cebcd1ce5e54fab parent 9d29b0bbc333f71b8b74613e1a84af8d2b0853eb Author: Christian Grothoff <christian@grothoff.org> Date: Sun, 23 Feb 2025 09:54:41 +0100 -misc. fixes Diffstat:
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/playbooks/test-public.yml b/playbooks/test-public.yml @@ -49,7 +49,7 @@ 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_REGEX: "\\+41[0-9]+" +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 diff --git a/roles/challenger/templates/etc/challenger/challenger-email.conf.j2 b/roles/challenger/templates/etc/challenger/challenger-email.conf.j2 @@ -12,7 +12,7 @@ UNIXPATH_MODE = 666 # Which external command should be used to transmit challenges? # Example commands are challenger-send-{sms,email,post}.sh -AUTH_COMMAND = challenger-send-email.sh +AUTH_COMMAND = /usr/bin/challenger-send-email.sh # What address type are we validating? (phone, email, address, etc.) # A template of the form 'enter-$ADDRESS_TYPE-form' must @@ -22,7 +22,7 @@ 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-.]+$"} +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 diff --git a/roles/challenger/templates/etc/challenger/challenger-postal.conf.j2 b/roles/challenger/templates/etc/challenger/challenger-postal.conf.j2 @@ -12,7 +12,7 @@ UNIXPATH_MODE = 666 # Which external command should be used to transmit challenges? # Example commands are challenger-send-{sms,email,post}.sh -AUTH_COMMAND = challenger-send-post.sh +AUTH_COMMAND = /usr/bin/challenger-send-post.sh # What address type are we validating? (phone, email, address, etc.) # A template of the form 'enter-$ADDRESS_TYPE-form' must diff --git a/roles/challenger/templates/etc/challenger/challenger-sms.conf.j2 b/roles/challenger/templates/etc/challenger/challenger-sms.conf.j2 @@ -12,7 +12,7 @@ UNIXPATH_MODE = 666 # Which external command should be used to transmit challenges? # Example commands are challenger-send-{sms,email,post}.sh -AUTH_COMMAND = challenger-send-sms.sh +AUTH_COMMAND = /usr/bin/challenger-send-sms.sh # What address type are we validating? (phone, email, address, etc.) # A template of the form 'enter-$ADDRESS_TYPE-form' must diff --git a/roles/exchange/files/etc/taler-exchange/conf.d/kyc-rules.conf b/roles/exchange/files/etc/taler-exchange/conf.d/kyc-rules.conf @@ -41,7 +41,7 @@ TIMEFRAME = "1 days" # Note: For *testing* KYC processes. [kyc-rule-balance-testing-limit] OPERATION_TYPE = BALANCE -NEXT_MEASURES = sms-registration +NEXT_MEASURES = form-902.11 EXPOSED = YES ENABLED = YES THRESHOLD = CHF:1 @@ -153,8 +153,7 @@ CONTEXT = {} [kyc-measure-form-902.11] CHECK_NAME = form-vqf-902.11 -# FIXME: address validation via PIN instead! -PROGRAM = preserve-investigate +PROGRAM = tops-check-controlling-entity VOLUNTARY = NO CONTEXT = {} @@ -282,7 +281,7 @@ FORM_NAME = vqf-902-11 DESCRIPTION = "Ask user to supply VQF form 902.11" DESCRIPTION_I18N = {"de":"Formular VQF 902.11 hochladen"} # FIXME: list correct outputs for each form here (and update GANA) -OUTPUTS = LEGAL_ENTITY_TYPE +OUTPUTS = CONTROLLING_ENTITY_THIRD_PERSON FALLBACK = preserve-investigate [kyc-check-form-vqf-902.12] @@ -315,6 +314,11 @@ DESCRIPTION_I18N = {"de":"Formular VQF 902.15 hochladen"} OUTPUTS = LEGAL_ENTITY_TYPE FALLBACK = preserve-investigate +[kyc-measure-tops-check-controlling-entity] +TYPE = SKIP +CONTEXT = {} +PROGRAM = tops-check-controlling-entity + [kyc-measure-preserve-investigate] TYPE = SKIP CONTEXT = {} @@ -390,6 +394,12 @@ COMMAND = taler-exchange-helper-measure-tops-kyx-check ENABLED = YES FALLBACK = freeze-investigate +[aml-program-tops-kyx-check] +DESCRIPTION = "Program that checks if the 'Controlling entity 3rd persion' checkbox was set, and if so triggers the optional form VQF 902.9. Then in either case ensures we run the address validation logic. Always concludes by passing all results to an AML officer. Rules are preserved." +COMMAND = taler-exchange-helper-measure-tops-3rdparty-check +ENABLED = YES +FALLBACK = freeze-investigate + ########### # GLS Forms