implement import of auth_token into merchant DB when configuring instances (#6731)

1 files changed, 27 insertions, 0 deletions

diff --git a/src/backend/taler-merchant-httpd_private-post-instances.c b/src/backend/taler-merchant-httpd_private-post-instances.c
index 1cd1a0bb..79c78f38 100644
--- a/src/backend/taler-merchant-httpd_private-post-instances.c
+++ b/src/backend/taler-merchant-httpd_private-post-instances.c
@@ -142,9 +142,13 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh,
 {
   struct TALER_MERCHANTDB_InstanceSettings is;
   json_t *payto_uris;
+  const char *auth_token = NULL;
   struct TMH_WireMethod *wm_head = NULL;
   struct TMH_WireMethod *wm_tail = NULL;
   struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_string ("auth_token",
+                               &auth_token)),
     GNUNET_JSON_spec_json ("payto_uris",
                            &payto_uris),
     GNUNET_JSON_spec_string ("id",
@@ -205,6 +209,14 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh,
                          is.id)) &&
            (0 == strcmp (mi->settings.name,
                          is.name)) &&
+           ( ( (NULL != auth_token) &&
+               (GNUNET_OK ==
+                TMH_check_auth (auth_token,
+                                &mi->settings.auth_salt,
+                                &mi->settings.auth_hash)) ) ||
+             ( (NULL == auth_token) &&
+               (GNUNET_YES ==
+                GNUNET_is_zero (&mi->settings.auth_hash))) ) &&
            (1 == json_equal (mi->settings.address,
                              is.address)) &&
            (1 == json_equal (mi->settings.jurisdiction,
@@ -343,6 +355,21 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh,
     }
   }
 
+  if (NULL == auth_token)
+  {
+    memset (&is.auth_salt,
+            0,
+            sizeof (is.auth_salt));
+    memset (&is.auth_hash,
+            0,
+            sizeof (is.auth_hash));
+  }
+  else
+  {
+    TMH_compute_auth (auth_token,
+                      &is.auth_salt,
+                      &is.auth_hash);
+  }
   {
     struct TMH_MerchantInstance *mi;
     enum GNUNET_DB_QueryStatus qs;