diff options
Diffstat (limited to 'packages/taler-wallet-core/src/operations')
7 files changed, 61 insertions, 78 deletions
diff --git a/packages/taler-wallet-core/src/operations/deposits.ts b/packages/taler-wallet-core/src/operations/deposits.ts index e45da7b4c..a5d6c93cf 100644 --- a/packages/taler-wallet-core/src/operations/deposits.ts +++ b/packages/taler-wallet-core/src/operations/deposits.ts @@ -20,6 +20,7 @@ import { buildCodecForObject, canonicalJson, Codec, + codecForDepositSuccess, codecForString, codecForTimestamp, codecOptional, @@ -32,6 +33,7 @@ import { GetFeeForDepositRequest, getRandomBytes, getTimestampNow, + hashWire, Logger, NotificationType, parsePaytoUri, @@ -57,7 +59,6 @@ import { generateDepositPermissions, getCandidatePayCoins, getTotalPaymentCost, - hashWire, } from "./pay.js"; import { getTotalRefreshCost } from "./refresh.js"; @@ -66,43 +67,6 @@ import { getTotalRefreshCost } from "./refresh.js"; */ const logger = new Logger("deposits.ts"); -interface DepositSuccess { - // Optional base URL of the exchange for looking up wire transfers - // associated with this transaction. If not given, - // the base URL is the same as the one used for this request. - // Can be used if the base URL for /transactions/ differs from that - // for /coins/, i.e. for load balancing. Clients SHOULD - // respect the transaction_base_url if provided. Any HTTP server - // belonging to an exchange MUST generate a 307 or 308 redirection - // to the correct base URL should a client uses the wrong base - // URL, or if the base URL has changed since the deposit. - transaction_base_url?: string; - - // timestamp when the deposit was received by the exchange. - exchange_timestamp: Timestamp; - - // the EdDSA signature of TALER_DepositConfirmationPS using a current - // signing key of the exchange affirming the successful - // deposit and that the exchange will transfer the funds after the refund - // deadline, or as soon as possible if the refund deadline is zero. - exchange_sig: string; - - // public EdDSA key of the exchange that was used to - // generate the signature. - // Should match one of the exchange's signing keys from /keys. It is given - // explicitly as the client might otherwise be confused by clock skew as to - // which signing key was used. - exchange_pub: string; -} - -const codecForDepositSuccess = (): Codec<DepositSuccess> => - buildCodecForObject<DepositSuccess>() - .property("exchange_pub", codecForString()) - .property("exchange_sig", codecForString()) - .property("exchange_timestamp", codecForTimestamp) - .property("transaction_base_url", codecOptional(codecForString())) - .build("DepositSuccess"); - async function resetDepositGroupRetry( ws: InternalWalletState, depositGroupId: string, @@ -202,7 +166,6 @@ async function processDepositGroupImpl( } const perm = depositPermissions[i]; let requestBody: any; - logger.info("creating v10 deposit request"); requestBody = { contribution: Amounts.stringify(perm.contribution), merchant_payto_uri: depositGroup.wire.payto_uri, diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts index 9d4a56fff..2006b792f 100644 --- a/packages/taler-wallet-core/src/operations/exchanges.ts +++ b/packages/taler-wallet-core/src/operations/exchanges.ts @@ -43,6 +43,7 @@ import { codecForAny, DenominationPubKey, DenomKeyType, + ExchangeKeysJson, } from "@gnu-taler/taler-util"; import { decodeCrock, encodeCrock, hash } from "@gnu-taler/taler-util"; import { CryptoApi } from "../crypto/workers/cryptoApi.js"; @@ -292,12 +293,37 @@ async function validateWireInfo( }; } +export interface ExchangeInfo { + wire: ExchangeWireJson; + keys: ExchangeKeysDownloadResult; +} + +export async function downloadExchangeInfo( + exchangeBaseUrl: string, + http: HttpRequestLibrary, +): Promise<ExchangeInfo> { + const wireInfo = await downloadExchangeWireInfo( + exchangeBaseUrl, + http, + Duration.getForever(), + ); + const keysInfo = await downloadExchangeKeysInfo( + exchangeBaseUrl, + http, + Duration.getForever(), + ); + return { + keys: keysInfo, + wire: wireInfo, + }; +} + /** * Fetch wire information for an exchange. * * @param exchangeBaseUrl Exchange base URL, assumed to be already normalized. */ -async function downloadExchangeWithWireInfo( +async function downloadExchangeWireInfo( exchangeBaseUrl: string, http: HttpRequestLibrary, timeout: Duration, @@ -374,7 +400,7 @@ interface ExchangeKeysDownloadResult { /** * Download and validate an exchange's /keys data. */ -async function downloadKeysInfo( +async function downloadExchangeKeysInfo( baseUrl: string, http: HttpRequestLibrary, timeout: Duration, @@ -526,10 +552,10 @@ async function updateExchangeFromUrlImpl( const timeout = getExchangeRequestTimeout(); - const keysInfo = await downloadKeysInfo(baseUrl, ws.http, timeout); + const keysInfo = await downloadExchangeKeysInfo(baseUrl, ws.http, timeout); logger.info("updating exchange /wire info"); - const wireInfoDownload = await downloadExchangeWithWireInfo( + const wireInfoDownload = await downloadExchangeWireInfo( baseUrl, ws.http, timeout, diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts index 6001cac4f..9844dc52e 100644 --- a/packages/taler-wallet-core/src/operations/pay.ts +++ b/packages/taler-wallet-core/src/operations/pay.ts @@ -113,19 +113,6 @@ import { createRefreshGroup, getTotalRefreshCost } from "./refresh.js"; const logger = new Logger("pay.ts"); /** - * FIXME: Move this to crypto worker or at least talerCrypto.ts - */ -export function hashWire(paytoUri: string, salt: string): string { - const r = kdf( - 64, - stringToBytes(paytoUri + "\0"), - decodeCrock(salt), - stringToBytes("merchant-wire-signature"), - ); - return encodeCrock(r); -} - -/** * Compute the total cost of a payment to the customer. * * This includes the amount taken by the merchant, fees (wire/deposit) contributed diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/operations/refresh.ts index 550119de1..cc2a1c566 100644 --- a/packages/taler-wallet-core/src/operations/refresh.ts +++ b/packages/taler-wallet-core/src/operations/refresh.ts @@ -17,6 +17,7 @@ import { DenomKeyType, encodeCrock, + ExchangeMeltRequest, ExchangeProtocolVersion, ExchangeRefreshRevealRequest, getRandomBytes, @@ -394,17 +395,14 @@ async function refreshMelt( `coins/${oldCoin.coinPub}/melt`, oldCoin.exchangeBaseUrl, ); - let meltReqBody: any; - if (oldDenom.denomPub.cipher === DenomKeyType.Rsa) { - meltReqBody = { - coin_pub: oldCoin.coinPub, - confirm_sig: derived.confirmSig, - denom_pub_hash: oldCoin.denomPubHash, - denom_sig: oldCoin.denomSig, - rc: derived.hash, - value_with_fee: Amounts.stringify(derived.meltValueWithFee), - }; - } + const meltReqBody: ExchangeMeltRequest = { + coin_pub: oldCoin.coinPub, + confirm_sig: derived.confirmSig, + denom_pub_hash: oldCoin.denomPubHash, + denom_sig: oldCoin.denomSig, + rc: derived.hash, + value_with_fee: Amounts.stringify(derived.meltValueWithFee), + }; const resp = await ws.runSequentialized([EXCHANGE_COINS_LOCK], async () => { return await ws.http.postJson(reqUrl.href, meltReqBody, { diff --git a/packages/taler-wallet-core/src/operations/reserves.ts b/packages/taler-wallet-core/src/operations/reserves.ts index a16d3ec31..d91ce89f1 100644 --- a/packages/taler-wallet-core/src/operations/reserves.ts +++ b/packages/taler-wallet-core/src/operations/reserves.ts @@ -780,7 +780,7 @@ export async function createTalerWithdrawReserve( selectedExchange: string, ): Promise<AcceptWithdrawalResponse> { await updateExchangeFromUrl(ws, selectedExchange); - const withdrawInfo = await getBankWithdrawalInfo(ws, talerWithdrawUri); + const withdrawInfo = await getBankWithdrawalInfo(ws.http, talerWithdrawUri); const exchangePaytoUri = await getExchangePaytoUri( ws, selectedExchange, diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts index d6f0626dd..93f48fb83 100644 --- a/packages/taler-wallet-core/src/operations/testing.ts +++ b/packages/taler-wallet-core/src/operations/testing.ts @@ -74,7 +74,7 @@ function makeId(length: number): string { /** * Helper function to generate the "Authorization" HTTP header. */ -function makeAuth(username: string, password: string): string { +function makeBasicAuthHeader(username: string, password: string): string { const auth = `${username}:${password}`; const authEncoded: string = Buffer.from(auth).toString("base64"); return `Basic ${authEncoded}`; @@ -89,7 +89,7 @@ export async function withdrawTestBalance( const bankUser = await registerRandomBankUser(ws.http, bankBaseUrl); logger.trace(`Registered bank user ${JSON.stringify(bankUser)}`); - const wresp = await createBankWithdrawalUri( + const wresp = await createDemoBankWithdrawalUri( ws.http, bankBaseUrl, bankUser, @@ -119,7 +119,11 @@ function getMerchantAuthHeader(m: MerchantBackendInfo): Record<string, string> { return {}; } -async function createBankWithdrawalUri( +/** + * Use the testing API of a demobank to create a taler://withdraw URI + * that the wallet can then use to make a withdrawal. + */ +export async function createDemoBankWithdrawalUri( http: HttpRequestLibrary, bankBaseUrl: string, bankUser: BankUser, @@ -136,7 +140,7 @@ async function createBankWithdrawalUri( }, { headers: { - Authorization: makeAuth(bankUser.username, bankUser.password), + Authorization: makeBasicAuthHeader(bankUser.username, bankUser.password), }, }, ); @@ -159,7 +163,7 @@ async function confirmBankWithdrawalUri( {}, { headers: { - Authorization: makeAuth(bankUser.username, bankUser.password), + Authorization: makeBasicAuthHeader(bankUser.username, bankUser.password), }, }, ); diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts index ae3763a02..392cecf0b 100644 --- a/packages/taler-wallet-core/src/operations/withdraw.ts +++ b/packages/taler-wallet-core/src/operations/withdraw.ts @@ -59,7 +59,10 @@ import { WithdrawalGroupRecord, } from "../db.js"; import { walletCoreDebugFlags } from "../util/debugFlags.js"; -import { readSuccessResponseJsonOrThrow } from "../util/http.js"; +import { + HttpRequestLibrary, + readSuccessResponseJsonOrThrow, +} from "../util/http.js"; import { initRetryInfo, updateRetryInfoTimeout } from "../util/retries.js"; import { guardOperationException, @@ -271,9 +274,11 @@ export function selectWithdrawalDenominations( /** * Get information about a withdrawal from * a taler://withdraw URI by asking the bank. + * + * FIXME: Move into bank client. */ export async function getBankWithdrawalInfo( - ws: InternalWalletState, + http: HttpRequestLibrary, talerWithdrawUri: string, ): Promise<BankWithdrawDetails> { const uriResult = parseWithdrawUri(talerWithdrawUri); @@ -283,7 +288,7 @@ export async function getBankWithdrawalInfo( const configReqUrl = new URL("config", uriResult.bankIntegrationApiBaseUrl); - const configResp = await ws.http.get(configReqUrl.href); + const configResp = await http.get(configReqUrl.href); const config = await readSuccessResponseJsonOrThrow( configResp, codecForTalerConfigResponse(), @@ -309,7 +314,7 @@ export async function getBankWithdrawalInfo( `withdrawal-operation/${uriResult.withdrawalOperationId}`, uriResult.bankIntegrationApiBaseUrl, ); - const resp = await ws.http.get(reqUrl.href); + const resp = await http.get(reqUrl.href); const status = await readSuccessResponseJsonOrThrow( resp, codecForWithdrawOperationStatusResponse(), @@ -1076,7 +1081,7 @@ export async function getWithdrawalDetailsForUri( talerWithdrawUri: string, ): Promise<WithdrawUriInfoResponse> { logger.trace(`getting withdrawal details for URI ${talerWithdrawUri}`); - const info = await getBankWithdrawalInfo(ws, talerWithdrawUri); + const info = await getBankWithdrawalInfo(ws.http, talerWithdrawUri); logger.trace(`got bank info`); if (info.suggestedExchange) { // FIXME: right now the exchange gets permanently added, |