exchange

commit d5448ba7dbe480c5b382e433615f50faefc45dcc
parent 265f4ef8f2e8edbce980ba4b17d5c2108687b0d2
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 29 Apr 2025 10:28:48 +0200

fix TOPS SMS helper, fix assertion violation on malformed AML program output

Diffstat:
M
src/exchangedb/exchangedb_aml.c
 | 
12
+++++++++++-
M
src/kyclogic/taler-exchange-helper-measure-tops-sms-check
 | 
3
+--

2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/exchangedb/exchangedb_aml.c b/src/exchangedb/exchangedb_aml.c
@@ -47,7 +47,17 @@ TALER_EXCHANGEDB_persist_aml_program_result (
        (NULL != apr->details.success.new_measures) )
   {
     lrs = TALER_KYCLOGIC_rules_parse (apr->details.success.new_rules);
-    GNUNET_assert (NULL != lrs);
+    if (NULL == lrs)
+    {
+      qs = plugin->insert_aml_program_failure (
+        plugin->cls,
+        process_row,
+        account_id,
+        "Failed to parse AML program output",
+        TALER_EC_EXCHANGE_KYC_AML_PROGRAM_MALFORMED_RESULT);
+      GNUNET_break (qs > 0);
+      return qs;
+    }
     jmeasures = TALER_KYCLOGIC_get_jmeasures (
       lrs,
       apr->details.success.new_measures);
diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-sms-check b/src/kyclogic/taler-exchange-helper-measure-tops-sms-check
@@ -134,8 +134,7 @@ exec jq -n \
     --argjson et "$EXPIRATION_TIME" \
     --argjson sm "$SUCCESSOR_MEASURE" \
     --argjson cm "$CUSTOM_MEASURES" \
-    --argjson nm '"custom-address-investigation"' \
     --argjson cmp "$CUSTOM_PMEASURES" \
     --argjson nr "$NEW_RULES" \
     --argjson inv "$TO_INVESTIGATE" \
-    '{"new_measures":$nm,"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm+$cmp)}),"to_investigate":$inv}|del(..|nulls)'
+    '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm+$cmp)}),"to_investigate":$inv}|del(..|nulls)'