diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b0c06473..8760c8d4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -103,7 +103,7 @@ This version is marked by a major version bump because of the significant upgrad ### Add -- Add [SEP-1](https://stellar.org/protocol/sep-1) fields to `StellarTomlResolver` for type checks ([#794](https://github.com/stellar/js-stellar-sdk/pull/794)). +- Add [SEP-1](https://stellar.org/protocol/sep-1) fields to `TomlResolver` for type checks ([#794](https://github.com/stellar/js-stellar-sdk/pull/794)). - Add support for passing `X-Auth-Token` as a custom header ([#795](https://github.com/stellar/js-stellar-sdk/pull/795)). ### Update @@ -1142,7 +1142,7 @@ Many thanks to @Ffloriel and @Akuukis for their help with this release! ## 0.8.2 -- Added `timeout` option to `StellarTomlResolver` and `FederationServer` calls +- Added `timeout` option to `TomlResolver` and `FederationServer` calls (https://github.com/stellar/js-stellar-sdk/issues/158). - Fixed adding random value to URLs multiple times (https://github.com/stellar/js-stellar-sdk/issues/169). @@ -1210,7 +1210,7 @@ Many thanks to @Ffloriel and @Akuukis for their help with this release! - **Breaking change** Upgraded `stellar-base` to `0.6.0`. `ed25519` package is now an optional dependency. Check `StellarSdk.FastSigning` variable to check if `ed25519` package is available. More in README file. -- New `StellarTomlResolver` class that allows getting `stellar.toml` file for a +- New `TomlResolver` class that allows getting `stellar.toml` file for a domain. - New `Config` class to set global config values. diff --git a/src/federation/federation_server.ts b/src/federation/federation_server.ts index b30c8cb19..975ba00df 100644 --- a/src/federation/federation_server.ts +++ b/src/federation/federation_server.ts @@ -4,7 +4,7 @@ import URI from "urijs"; import { Config } from "../config"; import { BadResponseError } from "../errors"; -import { StellarTomlResolver } from "./stellar_toml_resolver"; +import { TomlResolver } from "./stellar_toml_resolver"; // FEDERATION_RESPONSE_MAX_SIZE is the maximum size of response from a federation server export const FEDERATION_RESPONSE_MAX_SIZE = 100 * 1024; @@ -129,7 +129,7 @@ export class FederationServer { domain: string, opts: FederationServer.Options = {}, ): Promise { - const tomlObject = await StellarTomlResolver.resolve(domain, opts); + const tomlObject = await TomlResolver.resolve(domain, opts); if (!tomlObject.FEDERATION_SERVER) { return Promise.reject( new Error("stellar.toml does not contain FEDERATION_SERVER field"), diff --git a/src/federation/index.ts b/src/federation/index.ts index 18d238594..6aed6a090 100644 --- a/src/federation/index.ts +++ b/src/federation/index.ts @@ -4,6 +4,6 @@ export { } from './federation_server'; export { - StellarTomlResolver, + TomlResolver, STELLAR_TOML_MAX_SIZE } from './stellar_toml_resolver'; diff --git a/src/federation/stellar_toml_resolver.ts b/src/federation/stellar_toml_resolver.ts index 5e16944d9..36d742332 100644 --- a/src/federation/stellar_toml_resolver.ts +++ b/src/federation/stellar_toml_resolver.ts @@ -4,21 +4,19 @@ import { Networks } from "stellar-base"; import { Config } from "../config"; -// STELLAR_TOML_MAX_SIZE is the maximum size of stellar.toml file +/** the maximum size of stellar.toml file */ export const STELLAR_TOML_MAX_SIZE = 100 * 1024; // axios timeout doesn't catch missing urls, e.g. those with no response // so we use the axios cancel token to ensure the timeout const CancelToken = axios.CancelToken; -/** - * StellarTomlResolver allows resolving `stellar.toml` files. - */ -export class StellarTomlResolver { +/** TomlResolver allows resolving `stellar.toml` files. */ +export class TomlResolver { /** * Returns a parsed `stellar.toml` file for a given domain. * ```js - * StellarSdk.StellarTomlResolver.resolve('acme.com') + * StellarSdk.TomlResolver.resolve('acme.com') * .then(stellarToml => { * // stellarToml in an object representing domain stellar.toml file. * }) @@ -35,8 +33,8 @@ export class StellarTomlResolver { */ public static async resolve( domain: string, - opts: StellarTomlResolver.StellarTomlResolveOptions = {}, - ): Promise { + opts: TomlResolver.StellarTomlResolveOptions = {}, + ): Promise { const allowHttp = typeof opts.allowHttp === "undefined" ? Config.isAllowHttp() @@ -85,7 +83,7 @@ export class StellarTomlResolver { } /* tslint:disable-next-line: no-namespace */ -export namespace StellarTomlResolver { +export namespace TomlResolver { export interface StellarTomlResolveOptions { allowHttp?: boolean; timeout?: number; diff --git a/src/index.ts b/src/index.ts index 0b02bcd83..301e95d63 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,7 +4,7 @@ // Expose all types export * from './errors'; export { Config } from './config'; -export { Sep10, Utils } from './utils'; +export { Utils } from './utils'; // TOML and federation resolvers to expose export * as Federation from './federation'; @@ -14,6 +14,10 @@ export * as Horizon from './horizon'; // Soroban RPC-related classes to expose export * as SorobanRpc from './soroban'; +export { ContractSpec } from './soroban'; // not RPC related, so at top-level + +// SEP-10 related helpers to expose +export * as Sep10 from './sep10'; // expose classes and functions from stellar-base export * from 'stellar-base'; diff --git a/src/sep10/index.ts b/src/sep10/index.ts new file mode 100644 index 000000000..f437067f1 --- /dev/null +++ b/src/sep10/index.ts @@ -0,0 +1,709 @@ +import randomBytes from "randombytes"; +import { + Account, + BASE_FEE, + FeeBumpTransaction, + Keypair, + Memo, + MemoID, + MemoNone, + Operation, + TimeoutInfinite, + Transaction, + TransactionBuilder, +} from "stellar-base"; + +import { Utils } from "../utils"; +import { InvalidSep10ChallengeError } from "../errors"; +import { ServerApi } from "../horizon/server_api"; + +/** + * Returns a valid [SEP0010](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md) + * challenge transaction which you can use for Stellar Web Authentication. + * + * @see [SEP0010: Stellar Web Authentication](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md). + * @function + * @memberof Utils + * @param {Keypair} serverKeypair Keypair for server's signing account. + * @param {string} clientAccountID The stellar account (G...) or muxed account (M...) that the wallet wishes to authenticate with the server. + * @param {string} homeDomain The fully qualified domain name of the service requiring authentication + * @param {number} [timeout=300] Challenge duration (default to 5 minutes). + * @param {string} networkPassphrase The network passphrase. If you pass this argument then timeout is required. + * @param {string} webAuthDomain The fully qualified domain name of the service issuing the challenge. + * @param {string} [memo] The memo to attach to the challenge transaction. The memo must be of type `id`. If the `clientaccountID` is a muxed account, memos cannot be used. + * @param {string} [clientDomain] The fully qualified domain of the client requesting the challenge. Only necessary when the the 'client_domain' parameter is passed. + * @param {string} [clientSigningKey] The public key assigned to the SIGNING_KEY attribute specified on the stellar.toml hosted on the client domain. Only necessary when the 'client_domain' parameter is passed. + * @example + * import { Utils, Keypair, Networks } from 'stellar-sdk' + * + * let serverKeyPair = Keypair.fromSecret("server-secret") + * let challenge = Sep10.buildChallengeTx(serverKeyPair, "client-stellar-account-id", "stellar.org", 300, Networks.TESTNET) + * @returns {string} A base64 encoded string of the raw TransactionEnvelope xdr struct for the transaction. + */ +export function buildChallengeTx( + serverKeypair: Keypair, + clientAccountID: string, + homeDomain: string, + timeout: number = 300, + networkPassphrase: string, + webAuthDomain: string, + memo: string | null = null, + clientDomain: string | null = null, + clientSigningKey: string | null = null, +): string { + if (clientAccountID.startsWith("M") && memo) { + throw Error("memo cannot be used if clientAccountID is a muxed account"); + } + + const account = new Account(serverKeypair.publicKey(), "-1"); + const now = Math.floor(Date.now() / 1000); + + // A Base64 digit represents 6 bits, to generate a random 64 bytes + // base64 string, we need 48 random bytes = (64 * 6)/8 + // + // Each Base64 digit is in ASCII and each ASCII characters when + // turned into binary represents 8 bits = 1 bytes. + const value = randomBytes(48).toString("base64"); + + const builder = new TransactionBuilder(account, { + fee: BASE_FEE, + networkPassphrase, + timebounds: { + minTime: now, + maxTime: now + timeout, + }, + }) + .addOperation( + Operation.manageData({ + name: `${homeDomain} auth`, + value, + source: clientAccountID, + }), + ) + .addOperation( + Operation.manageData({ + name: "web_auth_domain", + value: webAuthDomain, + source: account.accountId(), + }), + ); + + if (clientDomain) { + if (!clientSigningKey) { + throw Error("clientSigningKey is required if clientDomain is provided"); + } + builder.addOperation( + Operation.manageData({ + name: `client_domain`, + value: clientDomain, + source: clientSigningKey, + }), + ); + } + + if (memo) { + builder.addMemo(Memo.id(memo)); + } + + const transaction = builder.build(); + transaction.sign(serverKeypair); + + return transaction + .toEnvelope() + .toXDR("base64") + .toString(); +} + +/** + * readChallengeTx reads a SEP 10 challenge transaction and returns the decoded + * transaction and client account ID contained within. + * + * It also verifies that the transaction has been signed by the server. + * + * It does not verify that the transaction has been signed by the client or + * that any signatures other than the server's on the transaction are valid. Use + * one of the following functions to completely verify the transaction: + * - verifyChallengeTxThreshold + * - verifyChallengeTxSigners + * + * @see [SEP0010: Stellar Web Authentication](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md). + * @function + * @memberof Utils + * @param {string} challengeTx SEP0010 challenge transaction in base64. + * @param {string} serverAccountID The server's stellar account (public key). + * @param {string} networkPassphrase The network passphrase, e.g.: 'Test SDF Network ; September 2015'. + * @param {string|string[]} [homeDomains] The home domain that is expected to be included in the first Manage Data operation's string key. If an array is provided, one of the domain names in the array must match. + * @param {string} webAuthDomain The home domain that is expected to be included as the value of the Manage Data operation with the 'web_auth_domain' key. If no such operation is included, this parameter is not used. + * @returns {Transaction|string|string|string} The actual transaction and the stellar public key (master key) used to sign the Manage Data operation, the matched home domain, and the memo attached to the transaction, which will be null if not present. + */ +export function readChallengeTx( + challengeTx: string, + serverAccountID: string, + networkPassphrase: string, + homeDomains: string | string[], + webAuthDomain: string, +): { + tx: Transaction; + clientAccountID: string; + matchedHomeDomain: string; + memo: string | null; +} { + if (serverAccountID.startsWith("M")) { + throw Error( + "Invalid serverAccountID: multiplexed accounts are not supported.", + ); + } + + let transaction; + try { + transaction = new Transaction(challengeTx, networkPassphrase); + } catch { + try { + transaction = new FeeBumpTransaction(challengeTx, networkPassphrase); + } catch { + throw new InvalidSep10ChallengeError( + "Invalid challenge: unable to deserialize challengeTx transaction string", + ); + } + throw new InvalidSep10ChallengeError( + "Invalid challenge: expected a Transaction but received a FeeBumpTransaction", + ); + } + + // verify sequence number + const sequence = Number.parseInt(transaction.sequence, 10); + + if (sequence !== 0) { + throw new InvalidSep10ChallengeError( + "The transaction sequence number should be zero", + ); + } + + // verify transaction source + if (transaction.source !== serverAccountID) { + throw new InvalidSep10ChallengeError( + "The transaction source account is not equal to the server's account", + ); + } + + // verify operation + if (transaction.operations.length < 1) { + throw new InvalidSep10ChallengeError( + "The transaction should contain at least one operation", + ); + } + + const [operation, ...subsequentOperations] = transaction.operations; + + if (!operation.source) { + throw new InvalidSep10ChallengeError( + "The transaction's operation should contain a source account", + ); + } + const clientAccountID: string = operation.source!; + + let memo: string | null = null; + if (transaction.memo.type !== MemoNone) { + if (clientAccountID.startsWith("M")) { + throw new InvalidSep10ChallengeError( + "The transaction has a memo but the client account ID is a muxed account", + ); + } + if (transaction.memo.type !== MemoID) { + throw new InvalidSep10ChallengeError( + "The transaction's memo must be of type `id`", + ); + } + memo = transaction.memo.value as string; + } + + if (operation.type !== "manageData") { + throw new InvalidSep10ChallengeError( + "The transaction's operation type should be 'manageData'", + ); + } + + // verify timebounds + if ( + transaction.timeBounds && + Number.parseInt(transaction.timeBounds?.maxTime, 10) === TimeoutInfinite + ) { + throw new InvalidSep10ChallengeError( + "The transaction requires non-infinite timebounds", + ); + } + + // give a small grace period for the transaction time to account for clock drift + if (!Utils.validateTimebounds(transaction, 60 * 5)) { + throw new InvalidSep10ChallengeError("The transaction has expired"); + } + + if (operation.value === undefined) { + throw new InvalidSep10ChallengeError( + "The transaction's operation values should not be null", + ); + } + + // verify base64 + if (!operation.value) { + throw new InvalidSep10ChallengeError( + "The transaction's operation value should not be null", + ); + } + + if (Buffer.from(operation.value.toString(), "base64").length !== 48) { + throw new InvalidSep10ChallengeError( + "The transaction's operation value should be a 64 bytes base64 random string", + ); + } + + // verify homeDomains + if (!homeDomains) { + throw new InvalidSep10ChallengeError( + "Invalid homeDomains: a home domain must be provided for verification", + ); + } + + let matchedHomeDomain; + + if (typeof homeDomains === "string") { + if (`${homeDomains} auth` === operation.name) { + matchedHomeDomain = homeDomains; + } + } else if (Array.isArray(homeDomains)) { + matchedHomeDomain = homeDomains.find( + (domain) => `${domain} auth` === operation.name, + ); + } else { + throw new InvalidSep10ChallengeError( + `Invalid homeDomains: homeDomains type is ${typeof homeDomains} but should be a string or an array`, + ); + } + + if (!matchedHomeDomain) { + throw new InvalidSep10ChallengeError( + "Invalid homeDomains: the transaction's operation key name does not match the expected home domain", + ); + } + + // verify any subsequent operations are manage data ops and source account is the server + for (const op of subsequentOperations) { + if (op.type !== "manageData") { + throw new InvalidSep10ChallengeError( + "The transaction has operations that are not of type 'manageData'", + ); + } + if (op.source !== serverAccountID && op.name !== "client_domain") { + throw new InvalidSep10ChallengeError( + "The transaction has operations that are unrecognized", + ); + } + if (op.name === "web_auth_domain") { + if (op.value === undefined) { + throw new InvalidSep10ChallengeError( + "'web_auth_domain' operation value should not be null", + ); + } + if (op.value.compare(Buffer.from(webAuthDomain))) { + throw new InvalidSep10ChallengeError( + `'web_auth_domain' operation value does not match ${webAuthDomain}`, + ); + } + } + } + + if (!verifyTxSignedBy(transaction, serverAccountID)) { + throw new InvalidSep10ChallengeError( + `Transaction not signed by server: '${serverAccountID}'`, + ); + } + + return { tx: transaction, clientAccountID, matchedHomeDomain, memo }; +} + +/** + * verifyChallengeTxThreshold verifies that for a SEP 10 challenge transaction + * all signatures on the transaction are accounted for and that the signatures + * meet a threshold on an account. A transaction is verified if it is signed by + * the server account, and all other signatures match a signer that has been + * provided as an argument, and those signatures meet a threshold on the + * account. + * + * Signers that are not prefixed as an address/account ID strkey (G...) will be + * ignored. + * + * Errors will be raised if: + * - The transaction is invalid according to ReadChallengeTx. + * - No client signatures are found on the transaction. + * - One or more signatures in the transaction are not identifiable as the + * server account or one of the signers provided in the arguments. + * - The signatures are all valid but do not meet the threshold. + * + * @see [SEP0010: Stellar Web Authentication](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md). + * @function + * @memberof Utils + * @param {string} challengeTx SEP0010 challenge transaction in base64. + * @param {string} serverAccountID The server's stellar account (public key). + * @param {string} networkPassphrase The network passphrase, e.g.: 'Test SDF Network ; September 2015'. + * @param {number} threshold The required signatures threshold for verifying this transaction. + * @param {ServerApi.AccountRecordSigners[]} signerSummary a map of all authorized signers to their weights. It's used to validate if the transaction signatures have met the given threshold. + * @param {string|string[]} [homeDomains] The home domain(s) that should be included in the first Manage Data operation's string key. Required in verifyChallengeTxSigners() => readChallengeTx(). + * @param {string} webAuthDomain The home domain that is expected to be included as the value of the Manage Data operation with the 'web_auth_domain' key, if present. Used in verifyChallengeTxSigners() => readChallengeTx(). + * @returns {string[]} The list of signers public keys that have signed the transaction, excluding the server account ID, given that the threshold was met. + * @example + * + * import { Networks, TransactionBuilder, Utils } from 'stellar-sdk'; + * + * const serverKP = Keypair.random(); + * const clientKP1 = Keypair.random(); + * const clientKP2 = Keypair.random(); + * + * // Challenge, possibly built in the server side + * const challenge = Sep10.buildChallengeTx( + * serverKP, + * clientKP1.publicKey(), + * "SDF", + * 300, + * Networks.TESTNET + * ); + * + * // clock.tick(200); // Simulates a 200 ms delay when communicating from server to client + * + * // Transaction gathered from a challenge, possibly from the client side + * const transaction = TransactionBuilder.fromXDR(challenge, Networks.TESTNET); + * transaction.sign(clientKP1, clientKP2); + * const signedChallenge = transaction + * .toEnvelope() + * .toXDR("base64") + * .toString(); + * + * // Defining the threshold and signerSummary + * const threshold = 3; + * const signerSummary = [ + * { + * key: this.clientKP1.publicKey(), + * weight: 1, + * }, + * { + * key: this.clientKP2.publicKey(), + * weight: 2, + * }, + * ]; + * + * // The result below should be equal to [clientKP1.publicKey(), clientKP2.publicKey()] + * Sep10.verifyChallengeTxThreshold(signedChallenge, serverKP.publicKey(), Networks.TESTNET, threshold, signerSummary); + */ +export function verifyChallengeTxThreshold( + challengeTx: string, + serverAccountID: string, + networkPassphrase: string, + threshold: number, + signerSummary: ServerApi.AccountRecordSigners[], + homeDomains: string | string[], + webAuthDomain: string, +): string[] { + const signers = signerSummary.map((signer) => signer.key); + + const signersFound = verifyChallengeTxSigners( + challengeTx, + serverAccountID, + networkPassphrase, + signers, + homeDomains, + webAuthDomain, + ); + + let weight = 0; + for (const signer of signersFound) { + const sigWeight = + signerSummary.find((s) => s.key === signer)?.weight || 0; + weight += sigWeight; + } + + if (weight < threshold) { + throw new InvalidSep10ChallengeError( + `signers with weight ${weight} do not meet threshold ${threshold}"`, + ); + } + + return signersFound; +} + +/** + * verifyChallengeTxSigners verifies that for a SEP 10 challenge transaction all + * signatures on the transaction are accounted for. A transaction is verified + * if it is signed by the server account, and all other signatures match a signer + * that has been provided as an argument (as the accountIDs list). Additional signers + * can be provided that do not have a signature, but all signatures must be matched + * to a signer (accountIDs) for verification to succeed. If verification succeeds, + * a list of signers that were found is returned, not including the server account ID. + * + * Signers that are not prefixed as an address/account ID strkey (G...) will be ignored. + * + * Errors will be raised if: + * - The transaction is invalid according to ReadChallengeTx. + * - No client signatures are found on the transaction. + * - One or more signatures in the transaction are not identifiable as the + * server account or one of the signers provided in the arguments. + * + * @see [SEP0010: Stellar Web Authentication](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md). + * @function + * @memberof Utils + * @param {string} challengeTx SEP0010 challenge transaction in base64. + * @param {string} serverAccountID The server's stellar account (public key). + * @param {string} networkPassphrase The network passphrase, e.g.: 'Test SDF Network ; September 2015'. + * @param {string[]} signers The signers public keys. This list should contain the public keys for all signers that have signed the transaction. + * @param {string|string[]} [homeDomains] The home domain(s) that should be included in the first Manage Data operation's string key. Required in readChallengeTx(). + * @param {string} webAuthDomain The home domain that is expected to be included as the value of the Manage Data operation with the 'web_auth_domain' key, if present. Used in readChallengeTx(). + * @returns {string[]} The list of signers public keys that have signed the transaction, excluding the server account ID. + * @example + * + * import { Networks, TransactionBuilder, Utils } from 'stellar-sdk'; + * + * const serverKP = Keypair.random(); + * const clientKP1 = Keypair.random(); + * const clientKP2 = Keypair.random(); + * + * // Challenge, possibly built in the server side + * const challenge = Sep10.buildChallengeTx( + * serverKP, + * clientKP1.publicKey(), + * "SDF", + * 300, + * Networks.TESTNET + * ); + * + * // clock.tick(200); // Simulates a 200 ms delay when communicating from server to client + * + * // Transaction gathered from a challenge, possibly from the client side + * const transaction = TransactionBuilder.fromXDR(challenge, Networks.TESTNET); + * transaction.sign(clientKP1, clientKP2); + * const signedChallenge = transaction + * .toEnvelope() + * .toXDR("base64") + * .toString(); + * + * // The result below should be equal to [clientKP1.publicKey(), clientKP2.publicKey()] + * Sep10.verifyChallengeTxSigners(signedChallenge, serverKP.publicKey(), Networks.TESTNET, threshold, [clientKP1.publicKey(), clientKP2.publicKey()]); + */ +export function verifyChallengeTxSigners( + challengeTx: string, + serverAccountID: string, + networkPassphrase: string, + signers: string[], + homeDomains: string | string[], + webAuthDomain: string, +): string[] { + // Read the transaction which validates its structure. + const { tx } = readChallengeTx( + challengeTx, + serverAccountID, + networkPassphrase, + homeDomains, + webAuthDomain, + ); + + // Ensure the server account ID is an address and not a seed. + let serverKP: Keypair; + try { + serverKP = Keypair.fromPublicKey(serverAccountID); // can throw 'Invalid Stellar public key' + } catch (err: any) { + throw new Error( + "Couldn't infer keypair from the provided 'serverAccountID': " + + err.message, + ); + } + + // Deduplicate the client signers and ensure the server is not included + // anywhere we check or output the list of signers. + const clientSigners = new Set(); + for (const signer of signers) { + // Ignore the server signer if it is in the signers list. It's + // important when verifying signers of a challenge transaction that we + // only verify and return client signers. If an account has the server + // as a signer the server should not play a part in the authentication + // of the client. + if (signer === serverKP.publicKey()) { + continue; + } + + // Ignore non-G... account/address signers. + if (signer.charAt(0) !== "G") { + continue; + } + + clientSigners.add(signer); + } + + // Don't continue if none of the signers provided are in the final list. + if (clientSigners.size === 0) { + throw new InvalidSep10ChallengeError( + "No verifiable client signers provided, at least one G... address must be provided", + ); + } + + let clientSigningKey; + for (const op of tx.operations) { + if (op.type === "manageData" && op.name === "client_domain") { + if (clientSigningKey) { + throw new InvalidSep10ChallengeError( + "Found more than one client_domain operation", + ); + } + clientSigningKey = op.source; + } + } + + // Verify all the transaction's signers (server and client) in one + // hit. We do this in one hit here even though the server signature was + // checked in the ReadChallengeTx to ensure that every signature and signer + // are consumed only once on the transaction. + const allSigners: string[] = [ + serverKP.publicKey(), + ...Array.from(clientSigners), + ]; + if (clientSigningKey) { + allSigners.push(clientSigningKey); + } + + const signersFound: string[] = gatherTxSigners(tx, allSigners); + + let serverSignatureFound = false; + let clientSigningKeySignatureFound = false; + for (const signer of signersFound) { + if (signer === serverKP.publicKey()) { + serverSignatureFound = true; + } + if (signer === clientSigningKey) { + clientSigningKeySignatureFound = true; + } + } + + // Confirm we matched a signature to the server signer. + if (!serverSignatureFound) { + throw new InvalidSep10ChallengeError( + "Transaction not signed by server: '" + serverKP.publicKey() + "'", + ); + } + + // Confirm we matched a signature to the client domain's signer + if (clientSigningKey && !clientSigningKeySignatureFound) { + throw new InvalidSep10ChallengeError( + "Transaction not signed by the source account of the 'client_domain' " + + "ManageData operation", + ); + } + + // Confirm we matched at least one given signer with the transaction signatures + if (signersFound.length === 1) { + throw new InvalidSep10ChallengeError( + "None of the given signers match the transaction signatures", + ); + } + + // Confirm all signatures, including the server signature, were consumed by a signer: + if (signersFound.length !== tx.signatures.length) { + throw new InvalidSep10ChallengeError( + "Transaction has unrecognized signatures", + ); + } + + // Remove the server public key before returning + signersFound.splice(signersFound.indexOf(serverKP.publicKey()), 1); + if (clientSigningKey) { + // Remove the client domain public key public key before returning + signersFound.splice(signersFound.indexOf(clientSigningKey), 1); + } + + return signersFound; +} + +/** + * Verifies if a transaction was signed by the given account id. + * + * @function + * @memberof Sep10 + * @param {Transaction} transaction + * @param {string} accountID + * @example + * let keypair = Keypair.random(); + * const account = new StellarSdk.Account(keypair.publicKey(), "-1"); + * + * const transaction = new TransactionBuilder(account, { fee: 100 }) + * .setTimeout(30) + * .build(); + * + * transaction.sign(keypair) + * Sep10.verifyTxSignedBy(transaction, keypair.publicKey()) + * @returns {boolean}. + */ +export function verifyTxSignedBy( + transaction: FeeBumpTransaction | Transaction, + accountID: string, +): boolean { + return gatherTxSigners(transaction, [accountID]).length !== 0; +} + +/** + * + * gatherTxSigners checks if a transaction has been signed by one or more of + * the given signers, returning a list of non-repeated signers that were found to have + * signed the given transaction. + * + * @function + * @memberof Sep10 + * @param {Transaction} transaction the signed transaction. + * @param {string[]} signers The signers public keys. + * @example + * let keypair1 = Keypair.random(); + * let keypair2 = Keypair.random(); + * const account = new StellarSdk.Account(keypair1.publicKey(), "-1"); + * + * const transaction = new TransactionBuilder(account, { fee: 100 }) + * .setTimeout(30) + * .build(); + * + * transaction.sign(keypair1, keypair2) + * Sep10.gatherTxSigners(transaction, [keypair1.publicKey(), keypair2.publicKey()]) + * @returns {string[]} a list of signers that were found to have signed the transaction. + */ +export function gatherTxSigners( + transaction: FeeBumpTransaction | Transaction, + signers: string[], +): string[] { + const hashedSignatureBase = transaction.hash(); + + const txSignatures = [...transaction.signatures]; // shallow copy for safe splicing + const signersFound = new Set(); + + for (const signer of signers) { + if (txSignatures.length === 0) { + break; + } + + let keypair: Keypair; + try { + keypair = Keypair.fromPublicKey(signer); // This can throw a few different errors + } catch (err: any) { + throw new InvalidSep10ChallengeError( + "Signer is not a valid address: " + err.message, + ); + } + + for (let i = 0; i < txSignatures.length; i++) { + const decSig = txSignatures[i]; + + if (!decSig.hint().equals(keypair.signatureHint())) { + continue; + } + + if (keypair.verify(hashedSignatureBase, decSig.signature())) { + signersFound.add(signer); + txSignatures.splice(i, 1); + break; + } + } + } + + return Array.from(signersFound); +} \ No newline at end of file diff --git a/src/soroban/contract_spec.ts b/src/soroban/contract_spec.ts index 1f0cd1ae8..eb48559b8 100644 --- a/src/soroban/contract_spec.ts +++ b/src/soroban/contract_spec.ts @@ -1,8 +1,11 @@ -import { ScIntType, XdrLargeInt, xdr } from 'stellar-base'; - -import { Address } from 'stellar-base'; -import { Contract } from 'stellar-base'; -import { scValToBigInt } from 'stellar-base'; +import { + Address, + Contract, + ScIntType, + XdrLargeInt, + scValToBigInt, + xdr +} from 'stellar-base'; export interface Union { tag: string; diff --git a/src/utils.ts b/src/utils.ts index 052969b80..88edd34e7 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,21 +1,4 @@ -import randomBytes from "randombytes"; -import { - Account, - BASE_FEE, - FeeBumpTransaction, - Keypair, - Memo, - MemoID, - MemoNone, - Operation, - TimeoutInfinite, - Transaction, - TransactionBuilder, -} from "stellar-base"; - -import { InvalidSep10ChallengeError } from "./errors"; -import { ServerApi } from "./horizon/server_api"; - +import { Transaction } from "stellar-base"; export class Utils { /** @@ -43,697 +26,3 @@ export class Utils { ); } } - -/** @namespace Sep10 */ -export namespace Sep10 { - /** - * Returns a valid [SEP0010](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md) - * challenge transaction which you can use for Stellar Web Authentication. - * - * @see [SEP0010: Stellar Web Authentication](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md). - * @function - * @memberof Utils - * @param {Keypair} serverKeypair Keypair for server's signing account. - * @param {string} clientAccountID The stellar account (G...) or muxed account (M...) that the wallet wishes to authenticate with the server. - * @param {string} homeDomain The fully qualified domain name of the service requiring authentication - * @param {number} [timeout=300] Challenge duration (default to 5 minutes). - * @param {string} networkPassphrase The network passphrase. If you pass this argument then timeout is required. - * @param {string} webAuthDomain The fully qualified domain name of the service issuing the challenge. - * @param {string} [memo] The memo to attach to the challenge transaction. The memo must be of type `id`. If the `clientaccountID` is a muxed account, memos cannot be used. - * @param {string} [clientDomain] The fully qualified domain of the client requesting the challenge. Only necessary when the the 'client_domain' parameter is passed. - * @param {string} [clientSigningKey] The public key assigned to the SIGNING_KEY attribute specified on the stellar.toml hosted on the client domain. Only necessary when the 'client_domain' parameter is passed. - * @example - * import { Utils, Keypair, Networks } from 'stellar-sdk' - * - * let serverKeyPair = Keypair.fromSecret("server-secret") - * let challenge = Sep10.buildChallengeTx(serverKeyPair, "client-stellar-account-id", "stellar.org", 300, Networks.TESTNET) - * @returns {string} A base64 encoded string of the raw TransactionEnvelope xdr struct for the transaction. - */ - export function buildChallengeTx( - serverKeypair: Keypair, - clientAccountID: string, - homeDomain: string, - timeout: number = 300, - networkPassphrase: string, - webAuthDomain: string, - memo: string | null = null, - clientDomain: string | null = null, - clientSigningKey: string | null = null, - ): string { - if (clientAccountID.startsWith("M") && memo) { - throw Error("memo cannot be used if clientAccountID is a muxed account"); - } - - const account = new Account(serverKeypair.publicKey(), "-1"); - const now = Math.floor(Date.now() / 1000); - - // A Base64 digit represents 6 bits, to generate a random 64 bytes - // base64 string, we need 48 random bytes = (64 * 6)/8 - // - // Each Base64 digit is in ASCII and each ASCII characters when - // turned into binary represents 8 bits = 1 bytes. - const value = randomBytes(48).toString("base64"); - - const builder = new TransactionBuilder(account, { - fee: BASE_FEE, - networkPassphrase, - timebounds: { - minTime: now, - maxTime: now + timeout, - }, - }) - .addOperation( - Operation.manageData({ - name: `${homeDomain} auth`, - value, - source: clientAccountID, - }), - ) - .addOperation( - Operation.manageData({ - name: "web_auth_domain", - value: webAuthDomain, - source: account.accountId(), - }), - ); - - if (clientDomain) { - if (!clientSigningKey) { - throw Error("clientSigningKey is required if clientDomain is provided"); - } - builder.addOperation( - Operation.manageData({ - name: `client_domain`, - value: clientDomain, - source: clientSigningKey, - }), - ); - } - - if (memo) { - builder.addMemo(Memo.id(memo)); - } - - const transaction = builder.build(); - transaction.sign(serverKeypair); - - return transaction - .toEnvelope() - .toXDR("base64") - .toString(); - } - - /** - * readChallengeTx reads a SEP 10 challenge transaction and returns the decoded - * transaction and client account ID contained within. - * - * It also verifies that the transaction has been signed by the server. - * - * It does not verify that the transaction has been signed by the client or - * that any signatures other than the server's on the transaction are valid. Use - * one of the following functions to completely verify the transaction: - * - verifyChallengeTxThreshold - * - verifyChallengeTxSigners - * - * @see [SEP0010: Stellar Web Authentication](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md). - * @function - * @memberof Utils - * @param {string} challengeTx SEP0010 challenge transaction in base64. - * @param {string} serverAccountID The server's stellar account (public key). - * @param {string} networkPassphrase The network passphrase, e.g.: 'Test SDF Network ; September 2015'. - * @param {string|string[]} [homeDomains] The home domain that is expected to be included in the first Manage Data operation's string key. If an array is provided, one of the domain names in the array must match. - * @param {string} webAuthDomain The home domain that is expected to be included as the value of the Manage Data operation with the 'web_auth_domain' key. If no such operation is included, this parameter is not used. - * @returns {Transaction|string|string|string} The actual transaction and the stellar public key (master key) used to sign the Manage Data operation, the matched home domain, and the memo attached to the transaction, which will be null if not present. - */ - export function readChallengeTx( - challengeTx: string, - serverAccountID: string, - networkPassphrase: string, - homeDomains: string | string[], - webAuthDomain: string, - ): { - tx: Transaction; - clientAccountID: string; - matchedHomeDomain: string; - memo: string | null; - } { - if (serverAccountID.startsWith("M")) { - throw Error( - "Invalid serverAccountID: multiplexed accounts are not supported.", - ); - } - - let transaction; - try { - transaction = new Transaction(challengeTx, networkPassphrase); - } catch { - try { - transaction = new FeeBumpTransaction(challengeTx, networkPassphrase); - } catch { - throw new InvalidSep10ChallengeError( - "Invalid challenge: unable to deserialize challengeTx transaction string", - ); - } - throw new InvalidSep10ChallengeError( - "Invalid challenge: expected a Transaction but received a FeeBumpTransaction", - ); - } - - // verify sequence number - const sequence = Number.parseInt(transaction.sequence, 10); - - if (sequence !== 0) { - throw new InvalidSep10ChallengeError( - "The transaction sequence number should be zero", - ); - } - - // verify transaction source - if (transaction.source !== serverAccountID) { - throw new InvalidSep10ChallengeError( - "The transaction source account is not equal to the server's account", - ); - } - - // verify operation - if (transaction.operations.length < 1) { - throw new InvalidSep10ChallengeError( - "The transaction should contain at least one operation", - ); - } - - const [operation, ...subsequentOperations] = transaction.operations; - - if (!operation.source) { - throw new InvalidSep10ChallengeError( - "The transaction's operation should contain a source account", - ); - } - const clientAccountID: string = operation.source!; - - let memo: string | null = null; - if (transaction.memo.type !== MemoNone) { - if (clientAccountID.startsWith("M")) { - throw new InvalidSep10ChallengeError( - "The transaction has a memo but the client account ID is a muxed account", - ); - } - if (transaction.memo.type !== MemoID) { - throw new InvalidSep10ChallengeError( - "The transaction's memo must be of type `id`", - ); - } - memo = transaction.memo.value as string; - } - - if (operation.type !== "manageData") { - throw new InvalidSep10ChallengeError( - "The transaction's operation type should be 'manageData'", - ); - } - - // verify timebounds - if ( - transaction.timeBounds && - Number.parseInt(transaction.timeBounds?.maxTime, 10) === TimeoutInfinite - ) { - throw new InvalidSep10ChallengeError( - "The transaction requires non-infinite timebounds", - ); - } - - // give a small grace period for the transaction time to account for clock drift - if (!Utils.validateTimebounds(transaction, 60 * 5)) { - throw new InvalidSep10ChallengeError("The transaction has expired"); - } - - if (operation.value === undefined) { - throw new InvalidSep10ChallengeError( - "The transaction's operation values should not be null", - ); - } - - // verify base64 - if (!operation.value) { - throw new InvalidSep10ChallengeError( - "The transaction's operation value should not be null", - ); - } - - if (Buffer.from(operation.value.toString(), "base64").length !== 48) { - throw new InvalidSep10ChallengeError( - "The transaction's operation value should be a 64 bytes base64 random string", - ); - } - - // verify homeDomains - if (!homeDomains) { - throw new InvalidSep10ChallengeError( - "Invalid homeDomains: a home domain must be provided for verification", - ); - } - - let matchedHomeDomain; - - if (typeof homeDomains === "string") { - if (`${homeDomains} auth` === operation.name) { - matchedHomeDomain = homeDomains; - } - } else if (Array.isArray(homeDomains)) { - matchedHomeDomain = homeDomains.find( - (domain) => `${domain} auth` === operation.name, - ); - } else { - throw new InvalidSep10ChallengeError( - `Invalid homeDomains: homeDomains type is ${typeof homeDomains} but should be a string or an array`, - ); - } - - if (!matchedHomeDomain) { - throw new InvalidSep10ChallengeError( - "Invalid homeDomains: the transaction's operation key name does not match the expected home domain", - ); - } - - // verify any subsequent operations are manage data ops and source account is the server - for (const op of subsequentOperations) { - if (op.type !== "manageData") { - throw new InvalidSep10ChallengeError( - "The transaction has operations that are not of type 'manageData'", - ); - } - if (op.source !== serverAccountID && op.name !== "client_domain") { - throw new InvalidSep10ChallengeError( - "The transaction has operations that are unrecognized", - ); - } - if (op.name === "web_auth_domain") { - if (op.value === undefined) { - throw new InvalidSep10ChallengeError( - "'web_auth_domain' operation value should not be null", - ); - } - if (op.value.compare(Buffer.from(webAuthDomain))) { - throw new InvalidSep10ChallengeError( - `'web_auth_domain' operation value does not match ${webAuthDomain}`, - ); - } - } - } - - if (!verifyTxSignedBy(transaction, serverAccountID)) { - throw new InvalidSep10ChallengeError( - `Transaction not signed by server: '${serverAccountID}'`, - ); - } - - return { tx: transaction, clientAccountID, matchedHomeDomain, memo }; - } - - /** - * verifyChallengeTxThreshold verifies that for a SEP 10 challenge transaction - * all signatures on the transaction are accounted for and that the signatures - * meet a threshold on an account. A transaction is verified if it is signed by - * the server account, and all other signatures match a signer that has been - * provided as an argument, and those signatures meet a threshold on the - * account. - * - * Signers that are not prefixed as an address/account ID strkey (G...) will be - * ignored. - * - * Errors will be raised if: - * - The transaction is invalid according to ReadChallengeTx. - * - No client signatures are found on the transaction. - * - One or more signatures in the transaction are not identifiable as the - * server account or one of the signers provided in the arguments. - * - The signatures are all valid but do not meet the threshold. - * - * @see [SEP0010: Stellar Web Authentication](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md). - * @function - * @memberof Utils - * @param {string} challengeTx SEP0010 challenge transaction in base64. - * @param {string} serverAccountID The server's stellar account (public key). - * @param {string} networkPassphrase The network passphrase, e.g.: 'Test SDF Network ; September 2015'. - * @param {number} threshold The required signatures threshold for verifying this transaction. - * @param {ServerApi.AccountRecordSigners[]} signerSummary a map of all authorized signers to their weights. It's used to validate if the transaction signatures have met the given threshold. - * @param {string|string[]} [homeDomains] The home domain(s) that should be included in the first Manage Data operation's string key. Required in verifyChallengeTxSigners() => readChallengeTx(). - * @param {string} webAuthDomain The home domain that is expected to be included as the value of the Manage Data operation with the 'web_auth_domain' key, if present. Used in verifyChallengeTxSigners() => readChallengeTx(). - * @returns {string[]} The list of signers public keys that have signed the transaction, excluding the server account ID, given that the threshold was met. - * @example - * - * import { Networks, TransactionBuilder, Utils } from 'stellar-sdk'; - * - * const serverKP = Keypair.random(); - * const clientKP1 = Keypair.random(); - * const clientKP2 = Keypair.random(); - * - * // Challenge, possibly built in the server side - * const challenge = Sep10.buildChallengeTx( - * serverKP, - * clientKP1.publicKey(), - * "SDF", - * 300, - * Networks.TESTNET - * ); - * - * // clock.tick(200); // Simulates a 200 ms delay when communicating from server to client - * - * // Transaction gathered from a challenge, possibly from the client side - * const transaction = TransactionBuilder.fromXDR(challenge, Networks.TESTNET); - * transaction.sign(clientKP1, clientKP2); - * const signedChallenge = transaction - * .toEnvelope() - * .toXDR("base64") - * .toString(); - * - * // Defining the threshold and signerSummary - * const threshold = 3; - * const signerSummary = [ - * { - * key: this.clientKP1.publicKey(), - * weight: 1, - * }, - * { - * key: this.clientKP2.publicKey(), - * weight: 2, - * }, - * ]; - * - * // The result below should be equal to [clientKP1.publicKey(), clientKP2.publicKey()] - * Sep10.verifyChallengeTxThreshold(signedChallenge, serverKP.publicKey(), Networks.TESTNET, threshold, signerSummary); - */ - export function verifyChallengeTxThreshold( - challengeTx: string, - serverAccountID: string, - networkPassphrase: string, - threshold: number, - signerSummary: ServerApi.AccountRecordSigners[], - homeDomains: string | string[], - webAuthDomain: string, - ): string[] { - const signers = signerSummary.map((signer) => signer.key); - - const signersFound = verifyChallengeTxSigners( - challengeTx, - serverAccountID, - networkPassphrase, - signers, - homeDomains, - webAuthDomain, - ); - - let weight = 0; - for (const signer of signersFound) { - const sigWeight = - signerSummary.find((s) => s.key === signer)?.weight || 0; - weight += sigWeight; - } - - if (weight < threshold) { - throw new InvalidSep10ChallengeError( - `signers with weight ${weight} do not meet threshold ${threshold}"`, - ); - } - - return signersFound; - } - - /** - * verifyChallengeTxSigners verifies that for a SEP 10 challenge transaction all - * signatures on the transaction are accounted for. A transaction is verified - * if it is signed by the server account, and all other signatures match a signer - * that has been provided as an argument (as the accountIDs list). Additional signers - * can be provided that do not have a signature, but all signatures must be matched - * to a signer (accountIDs) for verification to succeed. If verification succeeds, - * a list of signers that were found is returned, not including the server account ID. - * - * Signers that are not prefixed as an address/account ID strkey (G...) will be ignored. - * - * Errors will be raised if: - * - The transaction is invalid according to ReadChallengeTx. - * - No client signatures are found on the transaction. - * - One or more signatures in the transaction are not identifiable as the - * server account or one of the signers provided in the arguments. - * - * @see [SEP0010: Stellar Web Authentication](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0010.md). - * @function - * @memberof Utils - * @param {string} challengeTx SEP0010 challenge transaction in base64. - * @param {string} serverAccountID The server's stellar account (public key). - * @param {string} networkPassphrase The network passphrase, e.g.: 'Test SDF Network ; September 2015'. - * @param {string[]} signers The signers public keys. This list should contain the public keys for all signers that have signed the transaction. - * @param {string|string[]} [homeDomains] The home domain(s) that should be included in the first Manage Data operation's string key. Required in readChallengeTx(). - * @param {string} webAuthDomain The home domain that is expected to be included as the value of the Manage Data operation with the 'web_auth_domain' key, if present. Used in readChallengeTx(). - * @returns {string[]} The list of signers public keys that have signed the transaction, excluding the server account ID. - * @example - * - * import { Networks, TransactionBuilder, Utils } from 'stellar-sdk'; - * - * const serverKP = Keypair.random(); - * const clientKP1 = Keypair.random(); - * const clientKP2 = Keypair.random(); - * - * // Challenge, possibly built in the server side - * const challenge = Sep10.buildChallengeTx( - * serverKP, - * clientKP1.publicKey(), - * "SDF", - * 300, - * Networks.TESTNET - * ); - * - * // clock.tick(200); // Simulates a 200 ms delay when communicating from server to client - * - * // Transaction gathered from a challenge, possibly from the client side - * const transaction = TransactionBuilder.fromXDR(challenge, Networks.TESTNET); - * transaction.sign(clientKP1, clientKP2); - * const signedChallenge = transaction - * .toEnvelope() - * .toXDR("base64") - * .toString(); - * - * // The result below should be equal to [clientKP1.publicKey(), clientKP2.publicKey()] - * Sep10.verifyChallengeTxSigners(signedChallenge, serverKP.publicKey(), Networks.TESTNET, threshold, [clientKP1.publicKey(), clientKP2.publicKey()]); - */ - export function verifyChallengeTxSigners( - challengeTx: string, - serverAccountID: string, - networkPassphrase: string, - signers: string[], - homeDomains: string | string[], - webAuthDomain: string, - ): string[] { - // Read the transaction which validates its structure. - const { tx } = readChallengeTx( - challengeTx, - serverAccountID, - networkPassphrase, - homeDomains, - webAuthDomain, - ); - - // Ensure the server account ID is an address and not a seed. - let serverKP: Keypair; - try { - serverKP = Keypair.fromPublicKey(serverAccountID); // can throw 'Invalid Stellar public key' - } catch (err: any) { - throw new Error( - "Couldn't infer keypair from the provided 'serverAccountID': " + - err.message, - ); - } - - // Deduplicate the client signers and ensure the server is not included - // anywhere we check or output the list of signers. - const clientSigners = new Set(); - for (const signer of signers) { - // Ignore the server signer if it is in the signers list. It's - // important when verifying signers of a challenge transaction that we - // only verify and return client signers. If an account has the server - // as a signer the server should not play a part in the authentication - // of the client. - if (signer === serverKP.publicKey()) { - continue; - } - - // Ignore non-G... account/address signers. - if (signer.charAt(0) !== "G") { - continue; - } - - clientSigners.add(signer); - } - - // Don't continue if none of the signers provided are in the final list. - if (clientSigners.size === 0) { - throw new InvalidSep10ChallengeError( - "No verifiable client signers provided, at least one G... address must be provided", - ); - } - - let clientSigningKey; - for (const op of tx.operations) { - if (op.type === "manageData" && op.name === "client_domain") { - if (clientSigningKey) { - throw new InvalidSep10ChallengeError( - "Found more than one client_domain operation", - ); - } - clientSigningKey = op.source; - } - } - - // Verify all the transaction's signers (server and client) in one - // hit. We do this in one hit here even though the server signature was - // checked in the ReadChallengeTx to ensure that every signature and signer - // are consumed only once on the transaction. - const allSigners: string[] = [ - serverKP.publicKey(), - ...Array.from(clientSigners), - ]; - if (clientSigningKey) { - allSigners.push(clientSigningKey); - } - - const signersFound: string[] = gatherTxSigners(tx, allSigners); - - let serverSignatureFound = false; - let clientSigningKeySignatureFound = false; - for (const signer of signersFound) { - if (signer === serverKP.publicKey()) { - serverSignatureFound = true; - } - if (signer === clientSigningKey) { - clientSigningKeySignatureFound = true; - } - } - - // Confirm we matched a signature to the server signer. - if (!serverSignatureFound) { - throw new InvalidSep10ChallengeError( - "Transaction not signed by server: '" + serverKP.publicKey() + "'", - ); - } - - // Confirm we matched a signature to the client domain's signer - if (clientSigningKey && !clientSigningKeySignatureFound) { - throw new InvalidSep10ChallengeError( - "Transaction not signed by the source account of the 'client_domain' " + - "ManageData operation", - ); - } - - // Confirm we matched at least one given signer with the transaction signatures - if (signersFound.length === 1) { - throw new InvalidSep10ChallengeError( - "None of the given signers match the transaction signatures", - ); - } - - // Confirm all signatures, including the server signature, were consumed by a signer: - if (signersFound.length !== tx.signatures.length) { - throw new InvalidSep10ChallengeError( - "Transaction has unrecognized signatures", - ); - } - - // Remove the server public key before returning - signersFound.splice(signersFound.indexOf(serverKP.publicKey()), 1); - if (clientSigningKey) { - // Remove the client domain public key public key before returning - signersFound.splice(signersFound.indexOf(clientSigningKey), 1); - } - - return signersFound; - } - - /** - * Verifies if a transaction was signed by the given account id. - * - * @function - * @memberof Sep10 - * @param {Transaction} transaction - * @param {string} accountID - * @example - * let keypair = Keypair.random(); - * const account = new StellarSdk.Account(keypair.publicKey(), "-1"); - * - * const transaction = new TransactionBuilder(account, { fee: 100 }) - * .setTimeout(30) - * .build(); - * - * transaction.sign(keypair) - * Sep10.verifyTxSignedBy(transaction, keypair.publicKey()) - * @returns {boolean}. - */ - export function verifyTxSignedBy( - transaction: FeeBumpTransaction | Transaction, - accountID: string, - ): boolean { - return gatherTxSigners(transaction, [accountID]).length !== 0; - } - - /** - * - * gatherTxSigners checks if a transaction has been signed by one or more of - * the given signers, returning a list of non-repeated signers that were found to have - * signed the given transaction. - * - * @function - * @memberof Sep10 - * @param {Transaction} transaction the signed transaction. - * @param {string[]} signers The signers public keys. - * @example - * let keypair1 = Keypair.random(); - * let keypair2 = Keypair.random(); - * const account = new StellarSdk.Account(keypair1.publicKey(), "-1"); - * - * const transaction = new TransactionBuilder(account, { fee: 100 }) - * .setTimeout(30) - * .build(); - * - * transaction.sign(keypair1, keypair2) - * Sep10.gatherTxSigners(transaction, [keypair1.publicKey(), keypair2.publicKey()]) - * @returns {string[]} a list of signers that were found to have signed the transaction. - */ - export function gatherTxSigners( - transaction: FeeBumpTransaction | Transaction, - signers: string[], - ): string[] { - const hashedSignatureBase = transaction.hash(); - - const txSignatures = [...transaction.signatures]; // shallow copy for safe splicing - const signersFound = new Set(); - - for (const signer of signers) { - if (txSignatures.length === 0) { - break; - } - - let keypair: Keypair; - try { - keypair = Keypair.fromPublicKey(signer); // This can throw a few different errors - } catch (err: any) { - throw new InvalidSep10ChallengeError( - "Signer is not a valid address: " + err.message, - ); - } - - for (let i = 0; i < txSignatures.length; i++) { - const decSig = txSignatures[i]; - - if (!decSig.hint().equals(keypair.signatureHint())) { - continue; - } - - if (keypair.verify(hashedSignatureBase, decSig.signature())) { - signersFound.add(signer); - txSignatures.splice(i, 1); - break; - } - } - } - - return Array.from(signersFound); - } -} diff --git a/test/unit/contract_spec.js b/test/unit/contract_spec.js index d8d88f654..b73e03b38 100644 --- a/test/unit/contract_spec.js +++ b/test/unit/contract_spec.js @@ -1,5 +1,4 @@ -import { xdr, Address } from "../../lib"; -import { ContractSpec } from "../../lib/soroban"; +import { xdr, Address, ContractSpec } from "../../lib"; //@ts-ignore import spec from "../spec.json"; import { expect } from "chai"; diff --git a/test/unit/contract_spec.ts b/test/unit/contract_spec.ts index c87c0ac8e..b9481d2a1 100644 --- a/test/unit/contract_spec.ts +++ b/test/unit/contract_spec.ts @@ -1,5 +1,4 @@ -import { xdr, Address } from "../../lib"; -import { ContractSpec } from "../../lib/soroban"; +import { xdr, Address, ContractSpec } from "../../lib"; //@ts-ignore import spec from "../spec.json"; diff --git a/test/unit/stellar_toml_resolver_test.js b/test/unit/stellar_toml_resolver_test.js index 81d2a728c..f63056dae 100644 --- a/test/unit/stellar_toml_resolver_test.js +++ b/test/unit/stellar_toml_resolver_test.js @@ -1,6 +1,6 @@ const http = require("http"); -const { StellarTomlResolver, STELLAR_TOML_MAX_SIZE } = StellarSdk.Federation; +const { TomlResolver, STELLAR_TOML_MAX_SIZE } = StellarSdk.Federation; describe("stellar_toml_resolver.js tests", function () { beforeEach(function () { @@ -13,7 +13,7 @@ describe("stellar_toml_resolver.js tests", function () { this.axiosMock.restore(); }); - describe("StellarTomlResolver.resolve", function () { + describe("TomlResolver.resolve", function () { afterEach(function () { StellarSdk.Config.setDefault(); }); @@ -32,7 +32,7 @@ FEDERATION_SERVER="https://api.stellar.org/federation" }), ); - StellarTomlResolver.resolve("acme.com").then((stellarToml) => { + TomlResolver.resolve("acme.com").then((stellarToml) => { expect(stellarToml.FEDERATION_SERVER).equals( "https://api.stellar.org/federation", ); @@ -54,7 +54,7 @@ FEDERATION_SERVER="http://api.stellar.org/federation" }), ); - StellarTomlResolver.resolve("acme.com", { + TomlResolver.resolve("acme.com", { allowHttp: true, }).then((stellarToml) => { expect(stellarToml.FEDERATION_SERVER).equals( @@ -80,7 +80,7 @@ FEDERATION_SERVER="http://api.stellar.org/federation" }), ); - StellarTomlResolver.resolve("acme.com").then((stellarToml) => { + TomlResolver.resolve("acme.com").then((stellarToml) => { expect(stellarToml.FEDERATION_SERVER).equals( "http://api.stellar.org/federation", ); @@ -102,7 +102,7 @@ FEDERATION_SERVER="https://api.stellar.org/federation" }), ); - StellarTomlResolver.resolve("acme.com") + TomlResolver.resolve("acme.com") .should.be.rejectedWith(/Parsing error on line/) .and.notify(done); }); @@ -113,7 +113,7 @@ FEDERATION_SERVER="https://api.stellar.org/federation" .withArgs(sinon.match("https://acme.com/.well-known/stellar.toml")) .returns(Promise.reject()); - StellarTomlResolver.resolve("acme.com").should.be.rejected.and.notify( + TomlResolver.resolve("acme.com").should.be.rejected.and.notify( done, ); }); @@ -130,7 +130,7 @@ FEDERATION_SERVER="https://api.stellar.org/federation" res.end(response); }) .listen(4444, () => { - StellarTomlResolver.resolve("localhost:4444", { + TomlResolver.resolve("localhost:4444", { allowHttp: true, }) .should.be.rejectedWith( @@ -154,7 +154,7 @@ FEDERATION_SERVER="https://api.stellar.org/federation" setTimeout(() => {}, 10000); }) .listen(4444, () => { - StellarTomlResolver.resolve("localhost:4444", { + TomlResolver.resolve("localhost:4444", { allowHttp: true, }) .should.be.rejectedWith(/timeout of 1000ms exceeded/) @@ -166,7 +166,7 @@ FEDERATION_SERVER="https://api.stellar.org/federation" }); }); - it("rejects after given timeout when timeout specified in StellarTomlResolver opts param", function (done) { + it("rejects after given timeout when timeout specified in TomlResolver opts param", function (done) { // Unable to create temp server in a browser if (typeof window != "undefined") { return done(); @@ -177,7 +177,7 @@ FEDERATION_SERVER="https://api.stellar.org/federation" setTimeout(() => {}, 10000); }) .listen(4444, () => { - StellarTomlResolver.resolve("localhost:4444", { + TomlResolver.resolve("localhost:4444", { allowHttp: true, timeout: 1000, })