[taler-anastasis] branch master updated: fix pay-URI calculation

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new f6b7dac  fix pay-URI calculation
f6b7dac is described below

commit f6b7dac52c934f384d33acc21a391b745c2387cf
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Feb 13 20:41:09 2021 +0100

    fix pay-URI calculation
---
 src/backend/anastasis-httpd_truth.c          | 31 +++++++++++++++++++++++++---
 src/backend/anastasis-httpd_truth_upload.c   |  4 ++--
 src/restclient/anastasis_api_policy_lookup.c |  3 ++-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/backend/anastasis-httpd_truth.c 
b/src/backend/anastasis-httpd_truth.c
index 75becfe..dc78900 100644
--- a/src/backend/anastasis-httpd_truth.c
+++ b/src/backend/anastasis-httpd_truth.c
@@ -225,18 +225,43 @@ make_payment_request (struct GetContext *gc)
   {
     char *hdr;
     char *order_id;
+    const char *pfx;
+    const char *hn;
+
+    if (0 == strncasecmp ("https://";,
+                          AH_backend_url,
+                          strlen ("https://";)))
+    {
+      pfx = "taler://";
+      hn = &AH_backend_url[strlen ("https://";)];
+    }
+    else if (0 == strncasecmp ("http://";,
+                               AH_backend_url,
+                               strlen ("http://";)))
+    {
+      pfx = "taler+http://";;
+      hn = &AH_backend_url[strlen ("http://";)];
+    }
+    else
+    {
+      /* This invariant holds as per check in anastasis-httpd.c */
+      GNUNET_assert (0);
+    }
+    /* This invariant holds as per check in anastasis-httpd.c */
+    GNUNET_assert (0 != strlen (hn));
 
     order_id = GNUNET_STRINGS_data_to_string_alloc (
       &gc->payment_identifier,
       sizeof (gc->payment_identifier));
     GNUNET_asprintf (&hdr,
-                     "taler://pay/%s/%s",
-                     AH_backend_url,
+                     "%spay/%s/%s",
+                     pfx,
+                     hn,
                      order_id);
     GNUNET_free (order_id);
     GNUNET_break (MHD_YES ==
                   MHD_add_response_header (resp,
-                                           "Taler",
+                                           ANASTASIS_HTTP_HEADER_TALER,
                                            hdr));
     GNUNET_free (hdr);
   }
diff --git a/src/backend/anastasis-httpd_truth_upload.c 
b/src/backend/anastasis-httpd_truth_upload.c
index f3f43a7..371c922 100644
--- a/src/backend/anastasis-httpd_truth_upload.c
+++ b/src/backend/anastasis-httpd_truth_upload.c
@@ -151,8 +151,8 @@ make_payment_request (struct TruthUploadContext *tuc)
   TALER_MHD_add_global_headers (resp);
   {
     char *hdr;
-    char *pfx;
-    char *hn;
+    const char *pfx;
+    const char *hn;
 
     if (0 == strncasecmp ("https://";,
                           AH_backend_url,
diff --git a/src/restclient/anastasis_api_policy_lookup.c 
b/src/restclient/anastasis_api_policy_lookup.c
index e40700d..5d9db6b 100644
--- a/src/restclient/anastasis_api_policy_lookup.c
+++ b/src/restclient/anastasis_api_policy_lookup.c
@@ -70,7 +70,8 @@ struct ANASTASIS_PolicyLookupOperation
   struct ANASTASIS_CRYPTO_AccountPublicKeyP account_pub;
 
   /**
-   * Signature returned in the "Sync-Signature"
+   * Signature returned in the #ANASTASIS_HTTP_HEADER_POLICY_SIGNATURE
+
    * header, or all zeros for none.
    */
   struct ANASTASIS_AccountSignatureP account_sig;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.