summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/anastasis-config.12
-rw-r--r--doc/anastasis-helper-authorization-iban.12
-rw-r--r--doc/anastasis-httpd.12
-rw-r--r--doc/anastasis-reducer.12
-rw-r--r--doc/anastasis.conf.514
-rw-r--r--doc/sphinx/manpages/anastasis.conf.5.rst11
-rwxr-xr-xsrc/cli/test_iban.sh25
7 files changed, 45 insertions, 13 deletions
diff --git a/doc/anastasis-config.1 b/doc/anastasis-config.1
index b15bbf4..925fc9d 100644
--- a/doc/anastasis-config.1
+++ b/doc/anastasis-config.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "ANASTASIS-CONFIG" "1" "Aug 20, 2021" "0.0" "Anastasis"
+.TH "ANASTASIS-CONFIG" "1" "Aug 24, 2021" "0.0" "Anastasis"
.SH NAME
anastasis-config \- anastasis configuration file manipulation
.
diff --git a/doc/anastasis-helper-authorization-iban.1 b/doc/anastasis-helper-authorization-iban.1
index 3f65af2..7d89b76 100644
--- a/doc/anastasis-helper-authorization-iban.1
+++ b/doc/anastasis-helper-authorization-iban.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "ANASTASIS-HELPER-AUTHORIZATION-IBAN" "1" "Aug 20, 2021" "0.0" "Anastasis"
+.TH "ANASTASIS-HELPER-AUTHORIZATION-IBAN" "1" "Aug 24, 2021" "0.0" "Anastasis"
.SH NAME
anastasis-helper-authorization-iban \- anastasis IBAN authorization helper
.
diff --git a/doc/anastasis-httpd.1 b/doc/anastasis-httpd.1
index 27b61c6..c3233a5 100644
--- a/doc/anastasis-httpd.1
+++ b/doc/anastasis-httpd.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "ANASTASIS-HTTPD" "1" "Aug 20, 2021" "0.0" "Anastasis"
+.TH "ANASTASIS-HTTPD" "1" "Aug 24, 2021" "0.0" "Anastasis"
.SH NAME
anastasis-httpd \- anastasis HTTP backend
.
diff --git a/doc/anastasis-reducer.1 b/doc/anastasis-reducer.1
index c7c4246..ca8890a 100644
--- a/doc/anastasis-reducer.1
+++ b/doc/anastasis-reducer.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "ANASTASIS-REDUCER" "1" "Aug 20, 2021" "0.0" "Anastasis"
+.TH "ANASTASIS-REDUCER" "1" "Aug 24, 2021" "0.0" "Anastasis"
.SH NAME
anastasis-reducer \- anastasis CLI frontend
.
diff --git a/doc/anastasis.conf.5 b/doc/anastasis.conf.5
index e23f7b8..4b32457 100644
--- a/doc/anastasis.conf.5
+++ b/doc/anastasis.conf.5
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "ANASTASIS.CONF" "5" "Aug 20, 2021" "0.0" "Anastasis"
+.TH "ANASTASIS.CONF" "5" "Aug 24, 2021" "0.0" "Anastasis"
.SH NAME
anastasis.conf \- anastasis configuration file
.
@@ -159,6 +159,18 @@ wire the money to for authentication.
.TP
.B BUSINESS_NAME
Name of the account holder.
+.TP
+.B WIRE_GATEWAY_URL
+Base URL of the LibEuFin wire gateway (Anastasis facade).
+.TP
+.B WIRE_GATEWAY_AUTH_METHOD
+Authentication method used to talk to the LibEuFin wire gateway, i.e. \(aqbasic\(aq for HTTP basic authentication.
+.TP
+.B USERNAME
+Username to use when using HTTP basic authentication.
+.TP
+.B PASSWORD
+Password to use when using HTTP basic authentication.
.UNINDENT
.SS Postgres database configuration
.sp
diff --git a/doc/sphinx/manpages/anastasis.conf.5.rst b/doc/sphinx/manpages/anastasis.conf.5.rst
index f0e683c..1f6b49e 100644
--- a/doc/sphinx/manpages/anastasis.conf.5.rst
+++ b/doc/sphinx/manpages/anastasis.conf.5.rst
@@ -149,7 +149,16 @@ BUSINESS_NAME
Name of the account holder.
WIRE_GATEWAY_URL
- Base URL of the LibEuFin wire gateway.
+ Base URL of the LibEuFin wire gateway (Anastasis facade).
+
+WIRE_GATEWAY_AUTH_METHOD
+ Authentication method used to talk to the LibEuFin wire gateway, i.e. 'basic' for HTTP basic authentication.
+
+USERNAME
+ Username to use when using HTTP basic authentication.
+
+PASSWORD
+ Password to use when using HTTP basic authentication.
Postgres database configuration
diff --git a/src/cli/test_iban.sh b/src/cli/test_iban.sh
index 9cdb475..8d090e1 100755
--- a/src/cli/test_iban.sh
+++ b/src/cli/test_iban.sh
@@ -298,15 +298,23 @@ echo -n "Configuring Anastasis IBAN account ..."
anastasis-config -c $CONF \
-s authorization-iban \
-o CREDIT_IBAN \
- -V ${IBAN_CREDIT}
+ -V "${IBAN_CREDIT}"
anastasis-config -c $CONF \
-s authorization-iban \
-o WIRE_GATEWAY_URL \
- -V ${FACADE_URL}
+ -V "${FACADE_URL}"
anastasis-config -c $CONF \
-s authorization-iban \
-o WIRE_GATEWAY_AUTH_METHOD \
- -V "external"
+ -V "basic"
+anastasis-config -c $CONF \
+ -s authorization-iban \
+ -o USERNAME \
+ -V "${LIBEUFIN_NEXUS_USERNAME}"
+anastasis-config -c $CONF \
+ -s authorization-iban \
+ -o WIRE_GATEWAY_AUTH_METHOD \
+ -V "${LIBEUFIN_NEXUS_PASSWORD}"
echo " OK"
echo -n "Launching Anastasis service ..."
@@ -419,7 +427,7 @@ then
fi
echo " OK"
-echo -n "Running challenge logic ..."
+echo -n "Running challenge selection logic ..."
NAME_UUID=`jq -r -e .recovery_information.challenges[0].uuid < $R2FILE`
anastasis-reducer -a \
@@ -431,6 +439,8 @@ anastasis-reducer -a \
)" \
select_challenge < $R2FILE > $R1FILE 2>> test_reducer.err
+echo "OK"
+
METHOD=`jq -r -e .challenge_feedback.\"$NAME_UUID\".method < $R1FILE`
if test "$METHOD" != "iban"
then
@@ -446,17 +456,18 @@ fi
AMOUNT=`jq -r -e .challenge_feedback.\"$NAME_UUID\".details.challenge_amount < $R1FILE`
SUBJECT=`jq -r -e .challenge_feedback.\"$NAME_UUID\".details.wire_transfer_subject < $R1FILE`
-echo -e "Performing authorization wire transfer ..."
+echo -n "Performing authorization wire transfer ..."
wire_transfer_to_anastasis "${AMOUNT}" "${SUBJECT}"
echo " OK"
-echo -e "Triggering inbound check ..."
+bash
+echo -n "Triggering inbound check ..."
anastasis-helper-authorization-iban -c $CONF -t
echo " OK"
# Now we should get the secret...
-echo -e "Polling for recovery ..."
+echo -n "Polling for recovery ..."
anastasis-reducer poll < $R1FILE > $R2FILE
echo " OK"