diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| -rw-r--r-- | doc/taler-config-generate.1 | 60 | ||||
| -rw-r--r-- | src/exchange-tools/taler-exchange-wire.c | 11 | ||||
| -rwxr-xr-x | src/exchange/taler-config-generate | 255 |
5 files changed, 329 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f14372f52..4bbc20821 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include SUBDIRS = src doc ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = AUTHORS +EXTRA_DIST = \ + AUTHORS \ + contrib/coverage.sh app: mkdir -p $(PACKAGE)-$(VERSION)-app diff --git a/doc/Makefile.am b/doc/Makefile.am index 0ccd84746..a857db572 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,6 +4,7 @@ SUBDIRS = . doxygen man_MANS = \ taler-auditor-sign.1 \ + taler-config-generate.1 \ taler-exchange-aggregator.1 \ taler-exchange-dbinit.1 \ taler-exchange-httpd.1 \ diff --git a/doc/taler-config-generate.1 b/doc/taler-config-generate.1 new file mode 100644 index 000000000..7f69e5556 --- /dev/null +++ b/doc/taler-config-generate.1 @@ -0,0 +1,60 @@ +.TH TALER\-CONFIG\-GENERATE 1 "May 5, 2016" "GNU Taler" + +.SH NAME +taler\-config\-generate \- tool to simplfy Taler configuration generation + +.SH SYNOPSIS +.B taler\-config\-generate +.RI [ options ] +.br + +.SH DESCRIPTION +\fBtaler\-config\-generate\fP can be used to generate configuration files for the Taler exchange or Taler merchants + +.SH OPTIONS +.B +.IP "\-c FILENAME, \-\-config=FILENAME" +Location where to write the generated configuration. Existing file will be updated, not overwritten. +.B +.IP "\-C CURRENCY, \-\-currency=CURRENCY" +Which currency should we use in the configuration. +.B +.IP "\-e, \-\-exchange" +Generate configuration for a Taler exchange. +.B +.IP "\-m, \-\-merchant" +Generate configuration for a Taler merchant. +.B +.IP "\-t, \-\-trusted" +Setup current exchange as trusted with current merchant. Generally only useful when configuring for testcases. +.B +.IP "\-w WIREFORMAT, \-\-wire WIREFORMAT" +Specifies which wire format to use (i.e. "test" or "sepa") +.B +.IP "\-j JSON, \-\-wire-json-merchant=JSON" +Wire configuration to use for the merchant. +.B +.IP "\-J JSON, \-\-wire-json-exchange=JSON" +Wire configuration to use for the exchange. +.B +.IP "\-\-bank-uri" +Alternative to specify wire configuration to use for the exchange and merchant for the "test" wire method. Only useful if WIREFORMAT was set to "test". Specifies the URI of the bank. +.B +.IP "\-\-exchange-bank-account" +Alternative to specify wire configuration to use for the exchange for the "test" wire method. Only useful if WIREFORMAT was set to "test". Specifies the bank account number of the exchange. +.B +.IP "\-\-merchant-bank-account" +Alternative to specify wire configuration to use for the merchant for the "test" wire method. Only useful if WIREFORMAT was set to "test". Specifies the bank account number of the merchant. +.B +.IP "\-h, \-\-help" +Shows this man page. +.B +.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL" +Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. +.B +.IP "\-v, \-\-version" +Print GNUnet version number. + + +.SH BUGS +Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org> diff --git a/src/exchange-tools/taler-exchange-wire.c b/src/exchange-tools/taler-exchange-wire.c index 81f292a1d..c84c0b693 100644 --- a/src/exchange-tools/taler-exchange-wire.c +++ b/src/exchange-tools/taler-exchange-wire.c @@ -177,9 +177,18 @@ run (void *cls, if (NULL != output_filename) { - fclose (stdout); + if (NULL != stdout) + fclose (stdout); stdout = fopen (output_filename, "w+"); + if (NULL == stdout) + { + fprintf (stderr, + "Failed to open `%s': %s\n", + output_filename, + STRERROR (errno)); + return; + } } fprintf (stdout, "%s", diff --git a/src/exchange/taler-config-generate b/src/exchange/taler-config-generate new file mode 100755 index 000000000..5693f920c --- /dev/null +++ b/src/exchange/taler-config-generate @@ -0,0 +1,255 @@ +# This file is in the public domain. +#!/bin/bash +# + +# Options are: +# -c FILENAME, --config=FILENAME (where to write config, defaults to ~/.config/taler.conf) +# -C CURRENCY, --currency=CURRENCY (name of the currency) +# -e, --exchange (generate configuration for the exchange) +# -j WIREJSON, --wire-json-merchant=WIREJSON (wire plugin details in JSON) +# -J WIREJSON, --wire-json-exchange=WIREJSON (wire plugin details in JSON) +# -m, --merchant (generate configuration for the merchant) +# -t, --trusted (generate configuration for exchange and merchant, with exchange set as trusted with merchant) +# -w WIREFORMAT, --wire=WIREFORMAT (which wire plugin should we use) +# --bank-uri=URI (only for WIREFORMAT='test') +# --exchange-bank-account=NUMBER (only for WIREFORMAT='test') +# --merchant-bank-account=NUMBER (only for WIREFORMAT='test') + +########################################## +# set an initial value for the flags +ARG_CONFIG=~/.config/taler.conf +ARG_CURRENCY= +ARG_E=0 +ARG_H=0 +ARG_JE= +ARG_JM= +ARG_M=0 +ARG_T=0 +ARG_W=test +ARG_BANK_URI= +ARG_EXCHANGE_BANK_ACCOUNT= +ARG_MERCHANT_BANK_ACCOUNT= + +################################## +# read the options +TEMP=`getopt -o c:C:ehj:J:mtw: --long config:,currency:,exchange,help,wire-json-exchange:,wire-json-merchant:,merchant,trusted,wire:,bank-uri:,exchange-bank-account:,merchant-bank-account: -n 'taler-config-generate' -- "$@"` +eval set -- "$TEMP" + +#################################################### +# extract options and their arguments into variables. +while true ; do + case "$1" in + -c|--config) + ARG_CONFIG="$2" + shift 2 ;; + -C|--currency) + ARG_CURRENCY="$2" + shift 2 ;; + -e|--exchange) + ARG_E=1 + shift ;; + -h|--help) + ARG_H=1 + shift ;; + -j|--wire-json-merchant) + ARG_JM="$2" + shift 2 ;; + -J|--wire-json-exchange) + ARG_JE="$2" + shift 2 ;; + -m|--merchant) + ARG_M=1 + shift ;; + -t|--trusted) + ARG_T=1 + shift ;; + -w|--wire) + ARG_W="$2" + shift 2 ;; + --bank-uri) + ARG_BANK_URI="$2" + shift 2 ;; + --exchange-bank-account) + ARG_EXCHANGE_BANK_ACCOUNT="$2" + shift 2 ;; + --merchant-bank-account) + ARG_MERCHANT_BANK_ACCOUNT="$2" + shift 2 ;; + --) shift ; break ;; + *) echo "Internal error!" ; exit 1 ;; + esac +done + +########################################## +# Handle -h +if (test 1 == "$ARG_H") +then + exec man taler-config-generate + exit 1 +fi + +######################################### +# General preparations +CS="taler-config -c $ARG_CONFIG" +touch "$ARG_CONFIG" + + +######################################### +# Configure currency in main configuration +if (test ! -z "$ARG_CURRENCY") +then + $CS -s taler -o CURRENCY -V "$ARG_CURRENCY" || exit 1 +else + ARG_CURRENCY=`$CS -s taler -o CURRENCY` +fi + +########################################## +# Assemble JSON description of wireformat for "test" if we can +if (test "test" = "$ARG_W") +then + if (test ! -z "$ARG_BANK_URI" -a ! -z "$ARG_MERCHANT_BANK_ACCOUNT") + then + ARG_JM="{\"type\":\"test\",\"bank_uri\":\"$ARG_BANK_URI\",\"account_number\":$ARG_MERCHANT_BANK_ACCOUNT}" +# echo "Account detail: $ARG_JM" + else + echo "Bank URI or account not given, skipping JSON generation for merchant" + fi + if (test ! -z "$ARG_BANK_URI" -a ! -z "$ARG_EXCHANGE_BANK_ACCOUNT") + then + ARG_JE="{\"type\":\"test\",\"bank_uri\":\"$ARG_BANK_URI\",\"account_number\":$ARG_EXCHANGE_BANK_ACCOUNT}" +# echo "Account detail: $ARG_JE" + else + echo "Bank URI or account not given, skipping JSON generation for exchange" + fi +else + echo "Wire format is not 'test', not auto-generating JSON" +fi + +########################################### +# Generate merchant-specific configuration +if (test 1 = "$ARG_M") +then + $CS -s merchant -o WIREFORMAT -V "$ARG_W" || exit 1 + + if (test ! -z "$ARG_JM") + then + JSONF=`$CS -s merchant-wireformat -o ${ARG_W}_RESPONSE_FILE -f` + mkdir -p `dirname "$JSONF"` + echo "$ARG_J" > "$JSONF" || exit 1 + else + echo "Skipped generating wire details for merchant" + fi +else + echo "Skipped merchant setup" +fi + + +############################################ +# Generate exchange-specific configuration + +if (test 1 = "$ARG_E") +then + + MASTER_KEY=`$CS -f -s exchange -o MASTER_PRIV_FILE` + +# Generate master key (if missing) + if (test ! -e "$MASTER_KEY") + then + mkdir -p `dirname "$MASTER_KEY"` + gnunet-ecc -g 1 "$MASTER_KEY" || exit 1 + fi + +# Obtain public master key of exchange + MASTER_PUB=`gnunet-ecc -p "$MASTER_KEY"` + +# Setup wire format + $CS -s exchange -o WIREFORMAT -V "$ARG_W" || exit 1 +# Setup master public key + $CS -s exchange -o MASTER_PUBLIC_KEY -V "$MASTER_PUB" || exit 1 +# If possible, initialize outgoing wire account details ('test' method only) + if (test "test" = "$ARG_W" -a ! -z "$ARG_BANK_URI") + then + $CS -s exchange-wire-outgoing-test -o BANK_URI -V "$ARG_BANK_URI" || exit 1 + else + echo "Skipped generating outgoing wire account details for exchange" + fi + if (test "test" = "$ARG_W" -a ! -z "$ARG_EXCHANGE_BANK_ACCOUNT") + then + $CS -s exchange-wire-outgoing-test -o BANK_ACCOUNT_NUMBER -V "$ARG_EXCHANGE_BANK_ACCOUNT" || exit 1 + else + echo "Skipped generating outgoing wire account details for exchange" + fi +# If possible, initialize /wire response from JSON (with signature) + if (test ! -z $ARG_JE) + then + JSONF=`$CS -s exchange-wire-incoming-${ARG_W} -o ${ARG_W}_RESPONSE_FILE -f` +# echo "Generating /wire response at $JSONF" + mkdir -p `dirname $JSONF` + taler-exchange-wire -c "$ARG_CONFIG" -t "$ARG_W" -j "$ARG_JE" -m "$MASTER_KEY" -o "$JSONF" || exit 1 + else + echo "Skipped generating /wire response for exchange" + fi +else + echo "Skipped exchange setup" +fi + +######################################## +# setup trust in exchange with merchant +if (test 1 = "$ARG_T") +then + if (test 1 = "$ARG_E") + then + EPORT=`$CS -s exchange -o PORT` + $CS -s merchant-exchange-test -o URI -V "http://localhost:$EPORT/" || exit + $CS -s merchant-exchange-test -o MASTER_KEY -V "$MASTER_KEY" + else + echo "Need to be configuring exchange as well for -t to be useful." + fi +fi + + +################################################### +# Generate coin configuration +for FRACTION in 1 2 4 8 16 32 64 +do + SECTION="coin_${ARG_CURRENCY}_ct_${FRACTION}" + $CS -s $SECTION -o value -V ${ARG_CURRENCY}:0.${FRACTION} || exit 1 + $CS -s $SECTION -o duration_overlap -V "1 day" || exit 1 + $CS -s $SECTION -o duration_withdraw -V "7 days" || exit 1 + $CS -s $SECTION -o duration_spend -V "2 years" || exit 1 + $CS -s $SECTION -o duration_legal -V "3 tears" || exit 1 + $CS -s $SECTION -o fee_withdraw -V "${ARG_CURRENCY}:0.01" || exit 1 + $CS -s $SECTION -o fee_deposit -V "${ARG_CURRENCY}:0.01" || exit 1 + $CS -s $SECTION -o fee_refresh -V "${ARG_CURRENCY}:0.01" || exit 1 + $CS -s $SECTION -o fee_refund -V "${ARG_CURRENCY}:0.01" || exit 1 + $CS -s $SECTION -o rsa_keysize -V 1024 || exit 1 +done + +for VALUE in 1 2 4 8 16 32 64 +do + SECTION="coin_${ARG_CURRENCY}_${VALUE}" + $CS -s $SECTION -o value -V ${ARG_CURRENCY}:${VALUE} || exit 1 + $CS -s $SECTION -o duration_overlap -V "1 day" || exit 1 + $CS -s $SECTION -o duration_withdraw -V "7 days" || exit 1 + $CS -s $SECTION -o duration_spend -V "2 years" || exit 1 + $CS -s $SECTION -o duration_legal -V "3 tears" || exit 1 + $CS -s $SECTION -o fee_withdraw -V "${ARG_CURRENCY}:0.01" || exit 1 + $CS -s $SECTION -o fee_deposit -V "${ARG_CURRENCY}:0.01" || exit 1 + $CS -s $SECTION -o fee_refresh -V "${ARG_CURRENCY}:0.01" || exit 1 + $CS -s $SECTION -o fee_refund -V "${ARG_CURRENCY}:0.01" || exit 1 + $CS -s $SECTION -o rsa_keysize -V 1024 || exit 1 +done + +####################################################### +# Clean up configuration: only keep differences to defaults +$CS -w || exit + + +####################################################### +# Let user know what is next... + +echo "All done." +if (test "$ARG_E" = 1) +then + echo "You probably want to run 'taler-exchange-keyup' next." +fi |