[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: improve ECs
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] branch master updated: improve ECs |
|
Date: |
Sun, 21 Feb 2021 17:55:36 +0100 |
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 d4ae973 improve ECs
d4ae973 is described below
commit d4ae97366cd42ceea46132f24a382d249f12c359
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Feb 21 17:55:34 2021 +0100
improve ECs
---
contrib/gana | 2 +-
src/reducer/anastasis_api_backup_redux.c | 32 +++++++++++++++---------------
src/reducer/anastasis_api_recovery_redux.c | 31 +++++++++++++++--------------
src/reducer/anastasis_api_redux.c | 4 ++--
4 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/contrib/gana b/contrib/gana
index cf4c9cc..943729d 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit cf4c9cc53b19e2296481ae6c89aa6e5375a198e3
+Subproject commit 943729d4e2c2d97c3b5d737cf76b388086d94378
diff --git a/src/reducer/anastasis_api_backup_redux.c
b/src/reducer/anastasis_api_backup_redux.c
index 7bc138d..9669b0b 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -1432,14 +1432,14 @@ secret_share_result_cb (void *cls,
// FIXME-#6764: extract more failure data from sr to give back to
application
ANASTASIS_redux_fail_ (uc->cb,
uc->cb_cls,
- TALER_EC_INVALID,
+ TALER_EC_ANASTASIS_REDUCER_BACKUP_PROVIDER_FAILED,
"provider failure");
break;
default:
GNUNET_break (0);
ANASTASIS_redux_fail_ (uc->cb,
uc->cb_cls,
- TALER_EC_INVALID,
+ TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
"unexpected share result");
break;
}
@@ -1481,10 +1481,10 @@ share_secret (struct UploadContext *uc)
spec,
NULL, NULL))
{
- GNUNET_break (0);
- uc->cb (uc->cb_cls,
- TALER_EC_INVALID,
- NULL);
+ ANASTASIS_redux_fail_ (uc->cb,
+ uc->cb_cls,
+ TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
+ "State parsing failed when preparing to share
secret");
upload_cancel_cb (uc);
return;
}
@@ -1495,10 +1495,10 @@ share_secret (struct UploadContext *uc)
( (NULL != payments) &&
(! json_is_array (payments)) ) )
{
- GNUNET_break (0);
- uc->cb (uc->cb_cls,
- TALER_EC_INVALID,
- NULL);
+ ANASTASIS_redux_fail_ (uc->cb,
+ uc->cb_cls,
+ TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
+ "State parsing failed checks when preparing to
share secret");
GNUNET_JSON_parse_free (spec);
upload_cancel_cb (uc);
return;
@@ -1524,7 +1524,7 @@ share_secret (struct UploadContext *uc)
GNUNET_break (0);
ANASTASIS_redux_fail_ (uc->cb,
uc->cb_cls,
- TALER_EC_INVALID,
+ TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
"'methods' must be an array");
GNUNET_JSON_parse_free (spec);
upload_cancel_cb (uc);
@@ -1549,7 +1549,7 @@ share_secret (struct UploadContext *uc)
ANASTASIS_truth_free (truths[k]);
ANASTASIS_redux_fail_ (uc->cb,
uc->cb_cls,
- TALER_EC_INVALID,
+ TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
"'truth' failed to decode");
GNUNET_JSON_parse_free (spec);
upload_cancel_cb (uc);
@@ -1585,8 +1585,8 @@ share_secret (struct UploadContext *uc)
GNUNET_break (0);
ANASTASIS_redux_fail_ (uc->cb,
uc->cb_cls,
- TALER_EC_INVALID,
- NULL);
+ TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
+ "'payment_secret' malformed");
for (unsigned int i = 0; i<policies_len; i++)
ANASTASIS_policy_destroy (vpolicies[i]);
upload_cancel_cb (uc);
@@ -1615,8 +1615,8 @@ share_secret (struct UploadContext *uc)
GNUNET_break (0);
ANASTASIS_redux_fail_ (uc->cb,
uc->cb_cls,
- TALER_EC_INVALID,
- NULL);
+ TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+ "Failed to begin secret sharing");
upload_cancel_cb (uc);
return;
}
diff --git a/src/reducer/anastasis_api_recovery_redux.c
b/src/reducer/anastasis_api_recovery_redux.c
index 797d321..2ffed7a 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -266,7 +266,7 @@ answer_feedback_cb (
set_state (sctx->state,
ANASTASIS_GENERIC_STATE_ERROR);
sctx->cb (sctx->cb_cls,
- TALER_EC_INVALID, // FIXME: use better code!
+ TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
sctx->state);
sctx_free (sctx);
return;
@@ -414,7 +414,7 @@ answer_feedback_cb (
GNUNET_break (0);
ANASTASIS_redux_fail_ (sctx->cb,
sctx->cb_cls,
- TALER_EC_INVALID,
+ TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
NULL);
sctx_free (sctx);
}
@@ -449,8 +449,8 @@ run_challenge_cb (void *cls,
GNUNET_break (0);
ANASTASIS_redux_fail_ (sctx->cb,
sctx->cb_cls,
- TALER_EC_INVALID,
- NULL);
+ TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
+ "recovery information could not be deserialized");
sctx_free (sctx);
return;
}
@@ -566,8 +566,8 @@ run_challenge_cb (void *cls,
{
ANASTASIS_redux_fail_ (sctx->cb,
sctx->cb_cls,
- TALER_EC_INVALID,
- NULL);
+ TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+ "Failed to begin answering challenge");
sctx_free (sctx);
return;
}
@@ -769,9 +769,10 @@ ANASTASIS_recovery_action_ (json_t *state,
rs = ANASTASIS_recovery_state_from_string_ (s);
if (ANASTASIS_RECOVERY_STATE_ERROR == rs)
{
- cb (cb_cls,
- TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
- NULL);
+ ANASTASIS_redux_fail_ (cb,
+ cb_cls,
+ TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
+ "'recovery_state' field invalid");
return NULL;
}
for (unsigned int i = 0; NULL != dispatchers[i].fun; i++)
@@ -955,7 +956,7 @@ policy_lookup_cb (void *cls,
set_state (rss->state,
ANASTASIS_GENERIC_STATE_ERROR);
rss->cb (rss->cb_cls,
- TALER_EC_INVALID, // FIXME: use better code!
+ TALER_EC_ANASTASIS_REDUCER_POLICY_LOOKUP_FAILED,
rss->state);
free_rss (rss);
return;
@@ -1033,7 +1034,7 @@ policy_lookup_cb (void *cls,
set_state (rss->state,
ANASTASIS_GENERIC_STATE_ERROR);
rss->cb (rss->cb_cls,
- TALER_EC_INVALID, // FIXME: use better code!
+ TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
rss->state);
free_rss (rss);
return;
@@ -1123,8 +1124,8 @@ ANASTASIS_REDUX_recovery_challenge_begin_ (json_t *state,
GNUNET_break (0);
ANASTASIS_redux_fail_ (cb,
cb_cls,
- TALER_EC_INVALID,
- "could not begin parse provider configuration");
+ TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
+ "could not begin parse
'authentication_provider' data");
free_rss (rss);
return NULL;
}
@@ -1148,8 +1149,8 @@ ANASTASIS_REDUX_recovery_challenge_begin_ (json_t *state,
GNUNET_break (0);
ANASTASIS_redux_fail_ (cb,
cb_cls,
- TALER_EC_INVALID,
- "could not begin recovery operation");
+ TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+ "Failed to begin recovery operation");
free_rss (rss);
return NULL;
}
diff --git a/src/reducer/anastasis_api_redux.c
b/src/reducer/anastasis_api_redux.c
index f6468a3..a448104 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -559,12 +559,12 @@ config_cb (void *cls,
cr->tt = NULL;
cr->http_status = http_status;
if (MHD_HTTP_OK != http_status)
- cr->ec = TALER_EC_INVALID;
+ cr->ec = TALER_EC_ANASTASIS_REDUCER_PROVIDER_CONFIG_FAILED;
if ( (MHD_HTTP_OK == http_status) &&
(NULL == acfg) )
{
cr->http_status = MHD_HTTP_NOT_FOUND;
- cr->ec = TALER_EC_INVALID;
+ cr->ec = TALER_EC_ANASTASIS_REDUCER_PROVIDER_CONFIG_FAILED;
}
else if (NULL != acfg)
{
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: improve ECs,
gnunet <=