diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2022-07-21 09:06:15 +0200 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2022-07-21 09:06:15 +0200 |
| commit | 6ea6a9ae8ed3535bddb8c11b15dc9ebc6f68aec1 (patch) | |
| tree | ad13b84a9d9a686bffb26797453f5f15f1fb9f35 | |
| parent | 2b04785c589a5e0255cae208bb167ae398efa559 (diff) | |
| download | merchant-6ea6a9ae8ed3535bddb8c11b15dc9ebc6f68aec1.tar.gz merchant-6ea6a9ae8ed3535bddb8c11b15dc9ebc6f68aec1.tar.bz2 merchant-6ea6a9ae8ed3535bddb8c11b15dc9ebc6f68aec1.zip | |
allow credentials override also for /instances/default paths
| m--------- | contrib/merchant-backoffice | 0 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 6 |
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice -Subproject 1d7ee55ea115b91687c203a8f084ea852867b1f +Subproject 182cdfffa1d4b6f2bb3543d30cfa7509e73bda0 diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index d4d8bc11..94213556 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -1424,7 +1424,11 @@ url_handler (void *cls, &hc->instance->auth.auth_salt, &hc->instance->auth.auth_hash)); else /* Are the credentials provided OK for CLI override? */ - auth_ok |= ( (use_default) && + auth_ok |= ( (use_default || + /* also allow default credentials if + accessed via /instances/default/ */ + (0 == strcmp ("default", + hc->instance->settings.id))) && (NULL != TMH_default_auth) && (NULL != auth) && (! auth_malformed) && |