diff options
author | Christian Blättler <blatc2@bfh.ch> | 2023-12-05 12:44:25 +0100 |
---|---|---|
committer | Christian Blättler <blatc2@bfh.ch> | 2023-12-05 12:44:25 +0100 |
commit | f99262923121d5c0e1b995e325d97830110f5ce5 (patch) | |
tree | 920eb143e689104eb9d4b9882910ae42296bcce1 /contrib | |
parent | 9b27ee9c8d7d2bda08c795d9ae60cd2523bd8ffe (diff) | |
parent | 4347393e44ca59e305514eeb0d11638c8c38f07d (diff) |
Merge branch 'master' into feature/tokens
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/Makefile.am.in | 5 | ||||
-rwxr-xr-x | contrib/ci/jobs/0-codespell/job.sh | 2 | ||||
-rw-r--r-- | contrib/gnunet.tag | 12 | ||||
-rw-r--r-- | contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po | 6 | ||||
-rwxr-xr-x | contrib/taler-exchange-dbconfig | 35 | ||||
-rwxr-xr-x | contrib/taler-nexus-prepare | 115 | ||||
m--------- | contrib/wallet-core | 0 |
7 files changed, 41 insertions, 134 deletions
diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in index 64a5a9f54..57853e99e 100644 --- a/contrib/Makefile.am.in +++ b/contrib/Makefile.am.in @@ -32,8 +32,8 @@ bin_SCRIPTS = \ taler-auditor-dbconfig \ taler-exchange-dbconfig \ taler-terms-generator \ - taler-bank-manage-testing \ - taler-nexus-prepare + taler-bank-manage-testing + edit_script = $(SED) -e 's,%termsdir%,$(termsdir),'g -e 's,%localedir%,$(localedir),'g $(NULL) taler-terms-generator: taler-terms-generator.in @@ -48,7 +48,6 @@ CLEANFILES = \ EXTRA_DIST = \ locale/de/LC_MESSAGES/exchange-tos-v0.po \ taler-bank-manage-testing \ - taler-nexus-prepare \ taler-terms-generator.in \ taler-auditor-dbconfig \ taler-exchange-dbconfig \ diff --git a/contrib/ci/jobs/0-codespell/job.sh b/contrib/ci/jobs/0-codespell/job.sh index 58bd07b5a..b9c5c9963 100755 --- a/contrib/ci/jobs/0-codespell/job.sh +++ b/contrib/ci/jobs/0-codespell/job.sh @@ -3,4 +3,4 @@ set -exuo pipefail job_dir=$(dirname "${BASH_SOURCE[0]}") -codespell -I "${job_dir}"/dictionary.txt -S "*.bib,*.bst,*.cls,*.json,*.png,*.svg,*.wav,*.gz,*/templating/test?/**,**/auditor/*.sql,**/templating/mustach**,*.fees,*key,*.tag,*.info,*.latexmkrc,*.ecc,*.jpg,*.zkey,*.sqlite,*/contrib/hellos/**,*/vpn/tests/**,*.priv,*.file,*.tgz,*.woff,*.gif,*.odt,*.fee,*.deflate,*.dat,*.jpeg,*.eps,*.odg,*/m4/ax_lib_postgresql.m4,*/m4/libgcrypt.m4,*.rpath,config.status,ABOUT-NLS,*/doc/texinfo.tex,*.PNG,*.??.json,*.docx,*.ods,*.doc,*.docx,*.xcf,*.xlsx,*.ecc,*.ttf,*.woff2,*.eot,*.ttf,*.eot,*.mp4,*.pptx,*.epgz,*.min.js,**/*.map,**/fonts/**,*.pack.js,*.po,*.bbl,*/afl-tests/*,*/.git/**,*.pdf,*.epub,**/signing-key.asc,**/pnpm-lock.yaml,**/*.svg,**/*.cls,**/rfc.bib,**/*.bst,*/cbdc-es.tex,*/cbdc-it.tex,**/ExchangeSelection/example.ts,*/testcurl/test_tricky.c,*/i18n/strings.ts,*/src/anastasis-data.ts,**/doc/flows/main.de.tex" +codespell -I "${job_dir}"/dictionary.txt -S "*.bib,*.bst,*.cls,*.json,*.png,*.svg,*.wav,*.gz,*/templating/test?/**,**/auditor/*.sql,**/templating/mustach**,*.fees,*key,*.tag,*.info,*.latexmkrc,*.ecc,*.jpg,*.zkey,*.sqlite,*/contrib/hellos/**,*/vpn/tests/**,**/valgrind.h,*.priv,*.file,*.tgz,*.woff,*.gif,*.odt,*.fee,*.deflate,*.dat,*.jpeg,*.eps,*.odg,*/m4/ax_lib_postgresql.m4,*/m4/libgcrypt.m4,*.rpath,config.status,ABOUT-NLS,*/doc/texinfo.tex,*.PNG,*.??.json,*.docx,*.ods,*.doc,*.docx,*.xcf,*.xlsx,*.ecc,*.ttf,*.woff2,*.eot,*.ttf,*.eot,*.mp4,*.pptx,*.epgz,*.min.js,**/*.map,**/fonts/**,*.pack.js,*.po,*.bbl,*/afl-tests/*,*/.git/**,*.pdf,*.epub,**/signing-key.asc,**/pnpm-lock.yaml,**/*.svg,**/*.cls,**/rfc.bib,**/*.bst,*/cbdc-es.tex,*/cbdc-it.tex,**/ExchangeSelection/example.ts,*/testcurl/test_tricky.c,*/i18n/strings.ts,*/src/anastasis-data.ts,**/doc/flows/main.de.tex" diff --git a/contrib/gnunet.tag b/contrib/gnunet.tag index bdc112a17..4cfdbff9c 100644 --- a/contrib/gnunet.tag +++ b/contrib/gnunet.tag @@ -18,6 +18,18 @@ </member> <member kind="define"> <type>#define</type> + <name>GNUNET_CRYPTO_BSA_RSA</name> + <anchorfile>gnunet_crypto_lib.h</anchorfile> + <arglist></arglist> + </member> + <member kind="define"> + <type>#define</type> + <name>GNUNET_CRYPTO_BSA_CS</name> + <anchorfile>gnunet_crypto_lib.h</anchorfile> + <arglist></arglist> + </member> + <member kind="define"> + <type>#define</type> <name>GNUNET_NO</name> <anchorfile>gnunet_util_lib.h</anchorfile> <arglist></arglist> diff --git a/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po b/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po index 69679e94f..6cd899442 100644 --- a/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po +++ b/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po @@ -17,10 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -msgid "Terms Of Service" -msgstr "Allgemeine Geschaeftsbedingungen" +msgid "Terms of Service" +msgstr "Allgemeine Geschäftsbedingungen" -msgid "Last Updated: 12.4.2019" +msgid "Last Updated: 27.11.2023" msgstr "" msgid "" diff --git a/contrib/taler-exchange-dbconfig b/contrib/taler-exchange-dbconfig index 8fb05d738..c4790f823 100755 --- a/contrib/taler-exchange-dbconfig +++ b/contrib/taler-exchange-dbconfig @@ -25,14 +25,22 @@ FORCE_PERMS=0 DBUSER="taler-exchange-httpd" DBGROUP="taler-exchange-db" DBNAME="exchange" -CFGFILE="/etc/taler/secrets/exchange-db.secret.conf" +CFGFILE="/etc/taler/taler.conf" +DBCFGFILE="/etc/taler/secrets/exchange-db.secret.conf" # Parse command-line options -while getopts ':g:hn:prsu:' OPTION; do +while getopts 'c:d:g:hn:prsu:' OPTION; do case "$OPTION" in + c) + CFGFILE="$OPTARG" + ;; + d) + DBCFGFILE="$OPTARG" + ;; h) echo 'Supported options:' echo " -c FILENAME -- write configuration to FILENAME (default: $CFGFILE)" + echo " -d FILENAME -- write database access configuration to FILENAME (default: $DBCFGFILE)" echo " -g GROUP -- taler-exchange to be run by GROUP (default: $DBGROUP)" echo " -h -- print this help text" echo " -n NAME -- user NAME for database name (default: $DBNAME)" @@ -58,7 +66,8 @@ while getopts ':g:hn:prsu:' OPTION; do DBUSER="$OPTARG" ;; ?) - exit_fail "Unrecognized command line option" + echo "Unrecognized command line option" 1>&2 + exit 1 ;; esac done @@ -80,7 +89,9 @@ then if ! taler-exchange-dbinit -v 2> /dev/null then echo "Required 'taler-exchange-dbinit' not found. Please fix your installation." + exit 1 fi + DBINIT=$(which taler-exchange-dbinit) fi if ! id "$DBUSER" > /dev/null @@ -117,24 +128,24 @@ then exit 1 fi -if [ -f "$CFGFILE" ] +if [ -f "$DBCFGFILE" ] then - echo "Adding database configuration to '$CFGFILE'." 1>&2 - echo -e "[exchangedb-postgres]\nCONFIG=postgres:///$DBNAME\n" >> "$CFGFILE" - chown root:"$DBGROUP" "$CFGFILE" + echo "Adding database configuration to '$DBCFGFILE'." 1>&2 + echo -e "[exchangedb-postgres]\nCONFIG=postgres:///$DBNAME\n" >> "$DBCFGFILE" + chown root:"$DBGROUP" "$DBCFGFILE" chmod 640 "$CFGFILE" else - echo "Configuration '$CFGFILE' does not yet exist, creating it." 1>&2 - mkdir -p "$(dirname "$CFGFILE")" + echo "Configuration '$DBCFGFILE' does not yet exist, creating it." 1>&2 + mkdir -p "$(dirname "$DBCFGFILE")" echo -e "[exchangedb-postgres]\nCONFIG=postgres:///$DBNAME\n" >> "$CFGFILE" - chown root:"$DBGROUP" "$CFGFILE" - chmod 640 "$CFGFILE" + chown root:"$DBGROUP" "$DBCFGFILE" + chmod 640 "$DBCFGFILE" fi if [ 0 = "$SKIP_DBINIT" ] then echo "Initializing database '$DBNAME'." 1>&2 - sudo -u "$DBUSER" taler-exchange-dbinit + sudo -u "$DBUSER" "$DBINIT" -c "$CFGFILE" fi if [ 0 = "$SKIP_DBINIT" ] || [ 1 = "$FORCE_PERMS" ] diff --git a/contrib/taler-nexus-prepare b/contrib/taler-nexus-prepare deleted file mode 100755 index d98e5eb43..000000000 --- a/contrib/taler-nexus-prepare +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -set -eu - -# EBICS details -EBICS_URL="http://localhost:5000/ebicsweb" -HOST_ID="HOST01" -PARTNER_ID="PARTNER1" -USER_ID="USER1" - -# This is used _both_ at Sandbox and at Nexus. -# Basically, Nexus imports the offered bank account -# using the same name used by the Sandbox. -BANK_ACCOUNT_LABEL="my-bank-account" -BANK_CONNECTION_LABEL="my-bank-connection" -FACADE_LABEL="my-facade" - -export LIBEUFIN_SANDBOX_USERNAME=exchange -export LIBEUFIN_SANDBOX_PASSWORD=x -export LIBEUFIN_SANDBOX_URL=http://localhost:5000/ -libeufin-cli sandbox demobank register --name "Exchange Company" - -export LIBEUFIN_SANDBOX_USERNAME=fortytwo -export LIBEUFIN_SANDBOX_PASSWORD=x -export LIBEUFIN_SANDBOX_URL=http://localhost:5000/ -libeufin-cli sandbox demobank register \ - --name User42 --iban FR7630006000011234567890189 - -export LIBEUFIN_SANDBOX_USERNAME=fortythree -export LIBEUFIN_SANDBOX_PASSWORD=x -export LIBEUFIN_SANDBOX_URL=http://localhost:5000/ -libeufin-cli sandbox demobank register \ - --name User43 --iban GB33BUKB20201555555555 - -export LIBEUFIN_SANDBOX_USERNAME=admin -export LIBEUFIN_SANDBOX_PASSWORD=secret -export LIBEUFIN_SANDBOX_URL=http://localhost:5000/ -echo -n "Create EBICS host at Sandbox..." -libeufin-cli sandbox \ - --sandbox-url "http://localhost:5000" \ - ebicshost create --host-id $HOST_ID -echo " OK" - -echo -n "Create exchange EBICS subscriber at Sandbox..." -libeufin-cli sandbox \ - demobank new-ebicssubscriber --host-id $HOST_ID \ - --user-id $USER_ID --partner-id $PARTNER_ID \ - --bank-account exchange # that's a username _and_ a bank account name -echo " OK" -unset LIBEUFIN_SANDBOX_USERNAME -unset LIBEUFIN_SANDBOX_PASSWORD -unset LIBEUFIN_SANDBOX_URL - -export LIBEUFIN_NEXUS_USERNAME=exchange -export LIBEUFIN_NEXUS_PASSWORD=x -export LIBEUFIN_NEXUS_URL=http://localhost:5001/ - -echo -n "Create the exchange (super)user at Nexus..." -libeufin-nexus superuser exchange --password x -echo " DONE" - -echo -n "Creating a EBICS connection at Nexus..." -libeufin-cli connections new-ebics-connection \ - --ebics-url $EBICS_URL \ - --host-id $HOST_ID \ - --partner-id $PARTNER_ID \ - --ebics-user-id $USER_ID \ - $BANK_CONNECTION_LABEL -echo " OK" - -echo -n "Setup EBICS keying..." -libeufin-cli connections connect $BANK_CONNECTION_LABEL > /dev/null -echo " OK" - -echo -n "Download bank account name from Sandbox..." -libeufin-cli connections download-bank-accounts $BANK_CONNECTION_LABEL -echo " OK" - -echo -n "Importing bank account info into Nexus..." -libeufin-cli connections import-bank-account \ - --offered-account-id exchange \ - --nexus-bank-account-id $BANK_ACCOUNT_LABEL \ - $BANK_CONNECTION_LABEL -echo " OK" - -echo -n "Create the Taler facade at Nexus..." -libeufin-cli facades \ - new-taler-wire-gateway-facade \ - --currency KUDOS --facade-name $FACADE_LABEL \ - $BANK_CONNECTION_LABEL $BANK_ACCOUNT_LABEL -echo " DONE" - -echo -n Setup payments submission task.. -# Tries every second. -libeufin-cli accounts task-schedule \ - --task-type submit \ - --task-name exchange-payments \ - --task-cronspec "* * *" \ - $BANK_ACCOUNT_LABEL -echo OK -# Tries every second. Ask C52 -echo -n Setup history fetch task.. -libeufin-cli accounts task-schedule \ - --task-type fetch \ - --task-name exchange-history \ - --task-cronspec "* * *" \ - --task-param-level report \ - --task-param-range-type latest \ - $BANK_ACCOUNT_LABEL -echo OK - -# unset, in case the script gets 'source'd. -unset LIBEUFIN_NEXUS_USERNAME -unset LIBEUFIN_NEXUS_PASSWORD -unset LIBEUFIN_NEXUS_URL diff --git a/contrib/wallet-core b/contrib/wallet-core -Subproject 6eca153b329953b703d0517dbd65001715431c6 +Subproject 53472cb936c69a6830c48d4c8d79d43cb19e37e |