merchant

commit c5b1ec7288179b8651303aca1c7aab690e14fbb9
parent fe526b04be90d67d0623dcf9e05b0705cc236b44
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 21 Dec 2025 20:25:15 +0100

fix #10765: do not require MFA if the admin is patching an instance

Diffstat:
M
src/backend/taler-merchant-httpd_private-patch-instances-ID.c
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
@@ -54,12 +54,14 @@ free_wm (struct TMH_WireMethod *wm)
  * PATCH configuration of an existing instance, given its configuration.
  *
  * @param mi instance to patch
+ * @param mfa_check true if a MFA check is required
  * @param connection the MHD connection to handle
  * @param[in,out] hc context with further information about the request
  * @return MHD result code
  */
 static MHD_RESULT
 patch_instances_ID (struct TMH_MerchantInstance *mi,
+                    bool mfa_check,
                     struct MHD_Connection *connection,
                     struct TMH_HandlerContext *hc)
 {
@@ -205,6 +207,7 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
        0 == strcmp (mi->settings.email,
                     is.email) )
     is.email_validated = mi->settings.email_validated;
+  if (mfa_check)
   {
     enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
     enum TEH_TanChannelSet mtc = TEH_mandatory_tan_channels;
@@ -310,7 +313,6 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
         ? MHD_YES
         : MHD_NO;
     }
-
   }
 
   for (unsigned int retry = 0; retry<MAX_RETRIES; retry++)
@@ -429,6 +431,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh,
   struct TMH_MerchantInstance *mi = hc->instance;
 
   return patch_instances_ID (mi,
+                             true,
                              connection,
                              hc);
 }
@@ -457,6 +460,7 @@ TMH_private_patch_instances_default_ID (const struct TMH_RequestHandler *rh,
                                        hc->infix);
   }
   return patch_instances_ID (mi,
+                             false,
                              connection,
                              hc);
 }