Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ca5b42eaae |
@@ -239,12 +239,8 @@ provide:
|
|||||||
`make check` stays non-mutating. Linting runs only in the container, because
|
`make check` stays non-mutating. Linting runs only in the container, because
|
||||||
an ESLint result that depends on whichever ESLint the host happens to have is
|
an ESLint result that depends on whichever ESLint the host happens to have is
|
||||||
not a result, so docker is required to lint.
|
not a result, so docker is required to lint.
|
||||||
- `script/fmt` — format all files (writes), on the host, with the `prettier`
|
- `script/fmt` — format all files (writes), on the host
|
||||||
that `script/bootstrap` installs in `node_modules/`; when that one is missing
|
- `script/fmt-check` — check formatting (read-only), on the host
|
||||||
it fails and says to run `script/bootstrap`, instead of using a `prettier`
|
|
||||||
from the `PATH`
|
|
||||||
- `script/fmt-check` — check formatting (read-only), on the host, with the same
|
|
||||||
`prettier` and the same refusal
|
|
||||||
- `script/check` — run `script/test`, `script/lint` and `script/fmt-check`
|
- `script/check` — run `script/test`, `script/lint` and `script/fmt-check`
|
||||||
- `script/check-censored` — assert the competitor name RULES.md bars appears
|
- `script/check-censored` — assert the competitor name RULES.md bars appears
|
||||||
nowhere in the working tree or under `dist/` outside its documented
|
nowhere in the working tree or under `dist/` outside its documented
|
||||||
@@ -426,12 +422,11 @@ captured at `eth_sendRawTransaction` rather than against anything the extension
|
|||||||
reported, rejecting each prompt is required to return a rejection to the page
|
reported, rejecting each prompt is required to return a rejection to the page
|
||||||
rather than hang or resolve, a network switch request is required to leave the
|
rather than hang or resolve, a network switch request is required to leave the
|
||||||
stored network unchanged and send no `chainChanged` until it is approved, a
|
stored network unchanged and send no `chainChanged` until it is approved, a
|
||||||
network switch in Settings is required to send the page `chainChanged` with the
|
prompt raised while another approval window has focus is required to open a
|
||||||
new chain id, a prompt raised while another approval window has focus is
|
window of its own, and the password is required to be absent from every message
|
||||||
required to open a window of its own, and the password is required to be absent
|
the approval window sends to the background — with the message that would carry
|
||||||
from every message the approval window sends to the background — with the
|
it required to be present, so that check cannot pass by observing nothing. That
|
||||||
message that would carry it required to be present, so that check cannot pass by
|
last one is the standing floor under
|
||||||
observing nothing. That last one is the standing floor under
|
|
||||||
[#157](https://git.eeqj.de/sneak/AutistMask/issues/157).
|
[#157](https://git.eeqj.de/sneak/AutistMask/issues/157).
|
||||||
|
|
||||||
The limits of that coverage and of the rest of the Chrome suite, none of them
|
The limits of that coverage and of the rest of the Chrome suite, none of them
|
||||||
@@ -464,9 +459,6 @@ papered over:
|
|||||||
forced by clicking Reveal and the settings gear in one page task, which a
|
forced by clicking Reveal and the settings gear in one page task, which a
|
||||||
person cannot do; the case a person can hit, the first decrypt after the popup
|
person cannot do; the case a person can hit, the first decrypt after the popup
|
||||||
opens while libsodium is still loading, is not driven.
|
opens while libsodium is still loading, is not driven.
|
||||||
- Approval windows open at 1280x720 whatever size the extension asks for, so
|
|
||||||
whether an approval screen fits its window is checked in the Firefox suite
|
|
||||||
only.
|
|
||||||
|
|
||||||
Any test that drives a failure path on purpose declares the `console.error` it
|
Any test that drives a failure path on purpose declares the `console.error` it
|
||||||
is about to provoke, via `errors.expect()`. That is not a mute: the declaration
|
is about to provoke, via `errors.expect()`. That is not a mute: the declaration
|
||||||
@@ -539,8 +531,7 @@ suite), wallet creation through the UI, the Add Token screen, and the dApp round
|
|||||||
trips — `eth_requestAccounts`, `personal_sign`, `wallet_switchEthereumChain`
|
trips — `eth_requestAccounts`, `personal_sign`, `wallet_switchEthereumChain`
|
||||||
rejected and then approved, `eth_sendTransaction`, and a closed approval window
|
rejected and then approved, `eth_sendTransaction`, and a closed approval window
|
||||||
rejecting with EIP-1193 4001 — driven through the real content script,
|
rejecting with EIP-1193 4001 — driven through the real content script,
|
||||||
background page and approval windows. The `personal_sign` prompt is also
|
background page and approval windows.
|
||||||
required to fit its window without scrolling sideways.
|
|
||||||
|
|
||||||
The suite lives in `tests/e2e/firefox/`. Its WebDriver client (`driver.js`) has
|
The suite lives in `tests/e2e/firefox/`. Its WebDriver client (`driver.js`) has
|
||||||
**no npm dependencies at all**: it is built on global `fetch` and
|
**no npm dependencies at all**: it is built on global `fetch` and
|
||||||
@@ -897,11 +888,8 @@ discoverable.
|
|||||||
enough that vanilla JS with simple view switching is sufficient. A framework
|
enough that vanilla JS with simple view switching is sufficient. A framework
|
||||||
would add bundle size, build complexity, and attack surface for no benefit at
|
would add bundle size, build complexity, and attack surface for no benefit at
|
||||||
this scale.
|
this scale.
|
||||||
- **396x600 popup**: The page is 396 pixels wide (`body` in
|
- **360x600 popup**: Standard browser extension popup dimensions. The UI is
|
||||||
`src/popup/styles/main.css`), and 600 pixels is as tall as the browser lets
|
designed for this fixed viewport.
|
||||||
the toolbar popup grow. The UI is designed for this fixed viewport. The window
|
|
||||||
an approval opens in is given the same size; the browser counts the window's
|
|
||||||
frame in its width, so the page widens the window by whatever the frame takes.
|
|
||||||
|
|
||||||
#### No Layout Shift
|
#### No Layout Shift
|
||||||
|
|
||||||
@@ -1797,12 +1785,10 @@ view would leave a wallet one click from deletion.
|
|||||||
plus a "+ Add token" button
|
plus a "+ Add token" button
|
||||||
- Display: "Show tracked tokens with zero balance" checkbox, "UTC
|
- Display: "Show tracked tokens with zero balance" checkbox, "UTC
|
||||||
Timestamps" checkbox, and a Theme selector (System / Light / Dark)
|
Timestamps" checkbox, and a Theme selector (System / Light / Dark)
|
||||||
- Network: network selector (Ethereum Mainnet / Sepolia Testnet). The
|
- Network: network selector (Ethereum Mainnet / Sepolia Testnet); switching
|
||||||
|
resets the RPC and Blockscout endpoints to that network's defaults. The
|
||||||
network changes only here, or when the user approves a site's request on
|
network changes only here, or when the user approves a site's request on
|
||||||
**NetworkApproval**; either way, switching restores the RPC and Blockscout
|
**NetworkApproval**
|
||||||
endpoints last used on that network, or that network's defaults if it has
|
|
||||||
none, and sends `chainChanged` with the new chain id to every open tab.
|
|
||||||
Choosing the network already active changes nothing and sends nothing
|
|
||||||
- Ethereum RPC: endpoint URL input + "Save" button (validated against
|
- Ethereum RPC: endpoint URL input + "Save" button (validated against
|
||||||
`eth_chainId` before being saved)
|
`eth_chainId` before being saved)
|
||||||
- Blockscout API: endpoint URL input + "Save" button (validated against
|
- Blockscout API: endpoint URL input + "Save" button (validated against
|
||||||
@@ -2082,9 +2068,7 @@ view would leave a wallet one click from deletion.
|
|||||||
artifact can be compared with it field for field. A nonce the site supplies is
|
artifact can be compared with it field for field. A nonce the site supplies is
|
||||||
ignored: the nonce is always the account's next nonce from the node, so a site
|
ignored: the nonce is always the account's next nonce from the node, so a site
|
||||||
cannot replace one of the user's pending transactions or leave this one stuck
|
cannot replace one of the user's pending transactions or leave this one stuck
|
||||||
behind a gap. A gas limit the site supplies, as `gas` or `gasLimit`, is used
|
behind a gap. A request that cannot be populated — unreachable node, reverting
|
||||||
in place of the node's estimate; a request giving both with different values
|
|
||||||
is refused. A request that cannot be populated — unreachable node, reverting
|
|
||||||
gas estimate — opens no window and is failed back to the site. Only one
|
gas estimate — opens no window and is failed back to the site. Only one
|
||||||
transaction approval exists at a time: populating fixes the nonce, so a second
|
transaction approval exists at a time: populating fixes the nonce, so a second
|
||||||
`eth_sendTransaction` arriving while one is unanswered is refused with
|
`eth_sendTransaction` arriving while one is unanswered is refused with
|
||||||
@@ -2173,13 +2157,6 @@ view would leave a wallet one click from deletion.
|
|||||||
- Typed data that states no primary type, or one other than the type it
|
- Typed data that states no primary type, or one other than the type it
|
||||||
would be signed as, or that cannot be read → shown with the error line
|
would be signed as, or that cannot be read → shown with the error line
|
||||||
saying so and "Sign" disabled; only "Reject" remains
|
saying so and "Sign" disabled; only "Reject" remains
|
||||||
- Typed data whose domain `chainId` names a chain other than the active
|
|
||||||
network's → shown with the error line naming both chain ids and "Sign"
|
|
||||||
disabled; only "Reject" remains. EIP-712 asks for this, because the
|
|
||||||
signature is valid on the chain the domain names. Typed data with no
|
|
||||||
`chainId` is not refused. The background refuses such a signature too,
|
|
||||||
against the network active when the signature reaches it, and answers the
|
|
||||||
site with the same sentence
|
|
||||||
- A `personal_sign` or `eth_sign` message that is not hex (`0x` or `0X` and
|
- A `personal_sign` or `eth_sign` message that is not hex (`0x` or `0X` and
|
||||||
an even number of hex digits, the form ethers' `getBytes` reads when
|
an even number of hex digits, the form ethers' `getBytes` reads when
|
||||||
signing) → shown as plain text, with the error line "This message is plain
|
signing) → shown as plain text, with the error line "This message is plain
|
||||||
@@ -2220,9 +2197,8 @@ view would leave a wallet one click from deletion.
|
|||||||
- "Switch" / "Reject" buttons
|
- "Switch" / "Reject" buttons
|
||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- "Switch" → closes popup; the background switches the network as
|
- "Switch" → closes popup; the background switches the network as
|
||||||
**Settings** does, restoring the RPC and Blockscout endpoints last used on
|
**Settings** does, sends `chainChanged` to every open tab, and answers the
|
||||||
that network (or that network's defaults if it has none), sends
|
site with success
|
||||||
`chainChanged` to every open tab, and answers the site with success
|
|
||||||
- "Reject" → closes popup; the site is answered with EIP-1193 code 4001 and
|
- "Reject" → closes popup; the site is answered with EIP-1193 code 4001 and
|
||||||
nothing changes
|
nothing changes
|
||||||
- Popup window closed without answering → the same as "Reject"
|
- Popup window closed without answering → the same as "Reject"
|
||||||
@@ -2672,8 +2648,7 @@ plaintext list of anyone's domain names.
|
|||||||
When a dApp on a blocklisted domain requests a wallet connection, transaction
|
When a dApp on a blocklisted domain requests a wallet connection, transaction
|
||||||
approval, or signature, the approval popup displays a prominent red warning
|
approval, or signature, the approval popup displays a prominent red warning
|
||||||
banner alerting the user. The domain checker matches exact hostnames and all
|
banner alerting the user. The domain checker matches exact hostnames and all
|
||||||
parent domains (subdomain matching), and checks a hostname written with a
|
parent domains (subdomain matching).
|
||||||
trailing dot (`name.`) as `name`.
|
|
||||||
|
|
||||||
#### Transaction Decoding
|
#### Transaction Decoding
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
- `git pull` `next` and cut a branch from it — one branch per issue, named
|
- `git pull` `next` and cut a branch from it — one branch per issue, named
|
||||||
`issue-<N>-<slug>`. Never branch from `main`.
|
`issue-<N>-<slug>`. Never branch from `main`.
|
||||||
- Do the work as one commit whose title ends with ` (closes #N)`.
|
- Do the work as one commit whose title ends with ` (closes #N)`, with the
|
||||||
- Add no entry to Completed Steps. What landed is recorded on the tracker and in
|
`TODO.md` update in that same commit.
|
||||||
`git log`, where each commit title names the issue it closes.
|
- Move Next Step to the top of Completed Steps; move the top item of Future
|
||||||
|
Steps into Next Step.
|
||||||
- Run `make fmt`, then `make check`. A feature branch may be red; `next` and
|
- Run `make fmt`, then `make check`. A feature branch may be red; `next` and
|
||||||
`main` may not.
|
`main` may not.
|
||||||
- Rebase onto current `next` immediately before pushing — other branches land on
|
- Rebase onto current `next` immediately before pushing — other branches land on
|
||||||
@@ -43,25 +44,6 @@ then continue tagging as milestones land.
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
- 2026-10-08: The browser suites no longer read a screen before the page has
|
|
||||||
shown it ([#502](https://git.eeqj.de/sneak/AutistMask/issues/502)). Their wait
|
|
||||||
for a screen used to pass as soon as the element laid out, which every view
|
|
||||||
does until the page's stylesheet has applied, so an approval test could read
|
|
||||||
the prompt's fields before the page's script had filled them. `visible()` in
|
|
||||||
`tests/e2e/harness.js` and `waitVisible()` in `tests/e2e/firefox/driver.js`
|
|
||||||
now also wait for the page to finish loading and for neither the element nor
|
|
||||||
anything around it to carry the `hidden` class that `showView()` puts on every
|
|
||||||
view but the current one. No caller changed.
|
|
||||||
|
|
||||||
- 2026-10-08: Switching the network in Settings now tells open pages
|
|
||||||
([#500](https://git.eeqj.de/sneak/AutistMask/issues/500)). Once the switch is
|
|
||||||
saved, Settings asks the background to send `chainChanged` with the new chain
|
|
||||||
id to every open tab, through the same function an approved site request uses.
|
|
||||||
Choosing the network already active changes nothing and sends nothing. Only
|
|
||||||
the extension's own pages can ask for this. `tests/chainSwitchGate.test.js`
|
|
||||||
drives the real Settings view against the background, and the Chrome suite
|
|
||||||
checks that the test page hears both switches.
|
|
||||||
|
|
||||||
- 2026-10-07: A site can no longer switch the wallet's network by itself
|
- 2026-10-07: A site can no longer switch the wallet's network by itself
|
||||||
([#408](https://git.eeqj.de/sneak/AutistMask/issues/408)). A connected site's
|
([#408](https://git.eeqj.de/sneak/AutistMask/issues/408)). A connected site's
|
||||||
`wallet_switchEthereumChain` request for the other supported network opens a
|
`wallet_switchEthereumChain` request for the other supported network opens a
|
||||||
|
|||||||
@@ -25,13 +25,6 @@ run_yarn() {
|
|||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
# Without the repo's own prettier, yarn runs whatever prettier is on
|
|
||||||
# the PATH, which may be a version that formats files differently.
|
|
||||||
if [ ! -x node_modules/.bin/prettier ]; then
|
|
||||||
echo "fmt: this repo's prettier is not installed in node_modules/," \
|
|
||||||
"so run script/bootstrap first." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "Formatting..."
|
echo "Formatting..."
|
||||||
run_yarn run fmt
|
run_yarn run fmt
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,13 +26,6 @@ run_yarn() {
|
|||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
# Without the repo's own prettier, yarn runs whatever prettier is on
|
|
||||||
# the PATH, which may be a version that formats files differently.
|
|
||||||
if [ ! -x node_modules/.bin/prettier ]; then
|
|
||||||
echo "fmt-check: this repo's prettier is not installed in" \
|
|
||||||
"node_modules/, so run script/bootstrap first." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "Checking formatting..."
|
echo "Checking formatting..."
|
||||||
run_yarn run fmt-check
|
run_yarn run fmt-check
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-36
@@ -22,7 +22,6 @@ const { debugFetch, log } = require("../shared/log");
|
|||||||
const {
|
const {
|
||||||
verifySignedTx,
|
verifySignedTx,
|
||||||
verifySignature,
|
verifySignature,
|
||||||
typedDataChainRefusal,
|
|
||||||
failureIsRetryable,
|
failureIsRetryable,
|
||||||
describeTxFailure,
|
describeTxFailure,
|
||||||
sameAddress,
|
sameAddress,
|
||||||
@@ -423,10 +422,7 @@ function releaseApproval(approval) {
|
|||||||
// the result on the floor, so a rejection here would be unhandled.
|
// the result on the floor, so a rejection here would be unhandled.
|
||||||
async function openApprovalWindow(id) {
|
async function openApprovalWindow(id) {
|
||||||
const popupUrl = runtime.getURL("src/popup/index.html?approval=" + id);
|
const popupUrl = runtime.getURL("src/popup/index.html?approval=" + id);
|
||||||
// As wide as the page: body in src/popup/styles/main.css. The browser
|
const popupWidth = 360;
|
||||||
// counts the window's frame in this width; the page itself adds back
|
|
||||||
// whatever the frame takes (src/popup/index.js).
|
|
||||||
const popupWidth = 396;
|
|
||||||
const popupHeight = 600;
|
const popupHeight = 600;
|
||||||
|
|
||||||
let currentWin = null;
|
let currentWin = null;
|
||||||
@@ -446,7 +442,7 @@ async function openApprovalWindow(id) {
|
|||||||
// Centred on a browser window only. The last focused window can be
|
// Centred on a browser window only. The last focused window can be
|
||||||
// another approval window still open, and centring on one can give a
|
// another approval window still open, and centring on one can give a
|
||||||
// position the browser refuses ("Bounds must be at least 50% within
|
// position the browser refuses ("Bounds must be at least 50% within
|
||||||
// visible screen space"): headless Chrome reports this 396x600 popup as
|
// visible screen space"): headless Chrome reports this 360x600 popup as
|
||||||
// 1280x720. The request then failed with no window at all. Over a popup,
|
// 1280x720. The request then failed with no window at all. Over a popup,
|
||||||
// the browser picks the position.
|
// the browser picks the position.
|
||||||
if (currentWin && currentWin.type === "normal") {
|
if (currentWin && currentWin.type === "normal") {
|
||||||
@@ -636,9 +632,8 @@ function isExtensionSender(sender) {
|
|||||||
// had refused.
|
// had refused.
|
||||||
//
|
//
|
||||||
// TX and sign approvals do not decide here. They stay pending across a
|
// TX and sign approvals do not decide here. They stay pending across a
|
||||||
// disconnect. When their window closes, the windows.onRemoved listener below
|
// disconnect — the user can reopen the toolbar popup — and are rejected by the
|
||||||
// rejects them, unless an approved attempt is still running, in which case
|
// windows.onRemoved listener below.
|
||||||
// that attempt answers the page.
|
|
||||||
runtime.onConnect.addListener((port) => {
|
runtime.onConnect.addListener((port) => {
|
||||||
if (port.name.startsWith("approval:")) {
|
if (port.name.startsWith("approval:")) {
|
||||||
const id = port.name.split(":")[1];
|
const id = port.name.split(":")[1];
|
||||||
@@ -666,9 +661,7 @@ runtime.onConnect.addListener((port) => {
|
|||||||
const approval = pendingApprovals[id];
|
const approval = pendingApprovals[id];
|
||||||
if (approval) {
|
if (approval) {
|
||||||
if (approval.type === "tx" || approval.type === "sign") {
|
if (approval.type === "tx" || approval.type === "sign") {
|
||||||
// When its window closes, windows.onRemoved rejects it,
|
// Keep pending — user can reopen the toolbar popup
|
||||||
// unless an approved attempt is still running, in which
|
|
||||||
// case that attempt answers the page.
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
settleApproval(id, { approved: false, remember: false });
|
settleApproval(id, { approved: false, remember: false });
|
||||||
@@ -1478,7 +1471,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
|||||||
"AUTISTMASK_ADDRESSES_REMOVED",
|
"AUTISTMASK_ADDRESSES_REMOVED",
|
||||||
"AUTISTMASK_GET_CONNECTED_SITES",
|
"AUTISTMASK_GET_CONNECTED_SITES",
|
||||||
"AUTISTMASK_REMOVE_SITE",
|
"AUTISTMASK_REMOVE_SITE",
|
||||||
"AUTISTMASK_NETWORK_CHANGED",
|
|
||||||
];
|
];
|
||||||
if (POPUP_ONLY_TYPES.includes(msg.type) && !isExtensionSender(sender)) {
|
if (POPUP_ONLY_TYPES.includes(msg.type) && !isExtensionSender(sender)) {
|
||||||
sendResponse({ error: "Unauthorized sender" });
|
sendResponse({ error: "Unauthorized sender" });
|
||||||
@@ -1771,8 +1763,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
|||||||
|
|
||||||
(async () => {
|
(async () => {
|
||||||
try {
|
try {
|
||||||
const s = await getState();
|
const activeAddress = await getActiveAddress();
|
||||||
const activeAddress = activeAddressOf(s);
|
|
||||||
// Same as the transaction path: the address the approval named
|
// Same as the transaction path: the address the approval named
|
||||||
// is the one that must have signed, and a switch since then is
|
// is the one that must have signed, and a switch since then is
|
||||||
// a refusal rather than a signature from another account.
|
// a refusal rather than a signature from another account.
|
||||||
@@ -1791,20 +1782,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
|||||||
signature,
|
signature,
|
||||||
approval.approvedFrom,
|
approval.approvedFrom,
|
||||||
);
|
);
|
||||||
// The sign screen refuses typed data whose domain names
|
|
||||||
// another chain. A signature for it that arrives anyway is
|
|
||||||
// refused here, against the network active now.
|
|
||||||
const sp = approval.signParams;
|
|
||||||
if (
|
|
||||||
sp.method === "eth_signTypedData_v4" ||
|
|
||||||
sp.method === "eth_signTypedData"
|
|
||||||
) {
|
|
||||||
const refusal = typedDataChainRefusal(
|
|
||||||
JSON.parse(sp.typedData).domain,
|
|
||||||
networkById(s.networkId),
|
|
||||||
);
|
|
||||||
if (refusal) throw new ApprovalMismatchError(refusal);
|
|
||||||
}
|
|
||||||
settleApproval(msg.id, { signature }, { holdsClaim: true });
|
settleApproval(msg.id, { signature }, { holdsClaim: true });
|
||||||
sendResponse({ signature });
|
sendResponse({ signature });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -1877,13 +1854,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
|||||||
broadcastSiteRemoved(msg.origin);
|
broadcastSiteRemoved(msg.origin);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Settings switched the network and has saved it. Open tabs are told the
|
|
||||||
// new chain id the same way as after a site's approved switch request.
|
|
||||||
if (msg.type === "AUTISTMASK_NETWORK_CHANGED") {
|
|
||||||
broadcastChainChanged(msg.chainId);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
module.exports = { PROXY_METHODS };
|
module.exports = { PROXY_METHODS };
|
||||||
|
|||||||
+8
-12
@@ -7,10 +7,9 @@
|
|||||||
<link rel="stylesheet" href="styles.css" />
|
<link rel="stylesheet" href="styles.css" />
|
||||||
</head>
|
</head>
|
||||||
<!-- Chrome gives extension pages a stylesheet of its own that sets the
|
<!-- Chrome gives extension pages a stylesheet of its own that sets the
|
||||||
font and its size on body, and a Tailwind class beats it only when
|
font on body, and a Tailwind class beats it only when marked
|
||||||
marked important: hence font-mono! and text-sm! rather than
|
important: hence font-mono! rather than font-mono. -->
|
||||||
font-mono and text-sm. -->
|
<body class="bg-bg text-fg font-mono! text-sm">
|
||||||
<body class="bg-bg text-fg font-mono! text-sm!">
|
|
||||||
<div id="app" class="p-2 pr-5 overflow-x-hidden">
|
<div id="app" class="p-2 pr-5 overflow-x-hidden">
|
||||||
<!-- ============ GLOBAL TITLE BAR ============ -->
|
<!-- ============ GLOBAL TITLE BAR ============ -->
|
||||||
<div
|
<div
|
||||||
@@ -88,14 +87,11 @@
|
|||||||
|
|
||||||
<!-- Mnemonic form section -->
|
<!-- Mnemonic form section -->
|
||||||
<div id="add-wallet-section-mnemonic">
|
<div id="add-wallet-section-mnemonic">
|
||||||
<!-- The die button shares the instruction's row: on a row
|
<p class="mb-2">
|
||||||
of its own it pushes Import below the fold at
|
Enter your 12 or 24 word recovery phrase below, or click
|
||||||
360x600. -->
|
the button to roll the die for a new one.
|
||||||
<div class="mb-2 flex justify-between items-start gap-2">
|
</p>
|
||||||
<p>
|
<div class="mb-1 flex justify-end">
|
||||||
Enter your 12 or 24 word recovery phrase below, or
|
|
||||||
click the button to roll the die for a new one.
|
|
||||||
</p>
|
|
||||||
<button
|
<button
|
||||||
id="btn-generate-phrase"
|
id="btn-generate-phrase"
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
|
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ const {
|
|||||||
goBack,
|
goBack,
|
||||||
} = require("./views/helpers");
|
} = require("./views/helpers");
|
||||||
const { applyTheme } = require("./theme");
|
const { applyTheme } = require("./theme");
|
||||||
const { windowsGetCurrent, windowsUpdate } = require("../shared/browserApi");
|
|
||||||
// Renders a view the popup lands on without having navigated to it forward:
|
// Renders a view the popup lands on without having navigated to it forward:
|
||||||
// on restore here, and on Back. Only the views that can be fully re-rendered
|
// on restore here, and on Back. Only the views that can be fully re-rendered
|
||||||
// from persisted state (RESTORABLE_VIEWS, src/shared/restorableViews.js) go
|
// from persisted state (RESTORABLE_VIEWS, src/shared/restorableViews.js) go
|
||||||
@@ -234,22 +233,6 @@ async function init() {
|
|||||||
const params = new URLSearchParams(window.location.search);
|
const params = new URLSearchParams(window.location.search);
|
||||||
const approvalId = params.get("approval");
|
const approvalId = params.get("approval");
|
||||||
if (approvalId) {
|
if (approvalId) {
|
||||||
// The background opens this window as wide as the page, but the
|
|
||||||
// browser counts the window's frame in that width, and how wide the
|
|
||||||
// frame is depends on the browser and the system. The window is
|
|
||||||
// widened by however far the page would scroll sideways. The
|
|
||||||
// connection prompt can also show in the toolbar popup, whose window
|
|
||||||
// is the user's browser window; that one is left alone.
|
|
||||||
const sideways =
|
|
||||||
document.documentElement.scrollWidth -
|
|
||||||
document.documentElement.clientWidth;
|
|
||||||
if (sideways > 0) {
|
|
||||||
windowsGetCurrent().then((win) => {
|
|
||||||
if (win.type === "popup") {
|
|
||||||
windowsUpdate(win.id, { width: win.width + sideways });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// Deliberately not awaited, and deliberately not .catch()ed. show()
|
// Deliberately not awaited, and deliberately not .catch()ed. show()
|
||||||
// is async, so a throw past its first await surfaces as an unhandled
|
// is async, so a throw past its first await surfaces as an unhandled
|
||||||
// rejection rather than an uncaught error — measured as still failing
|
// rejection rather than an uncaught error — measured as still failing
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ const {
|
|||||||
formatFee,
|
formatFee,
|
||||||
tokenLabel,
|
tokenLabel,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const {
|
const {
|
||||||
networkById,
|
networkById,
|
||||||
networkByChainId,
|
networkByChainId,
|
||||||
@@ -46,10 +46,7 @@ const {
|
|||||||
const { decryptWithPassword } = require("../../shared/vault");
|
const { decryptWithPassword } = require("../../shared/vault");
|
||||||
const { getSignerForAddress } = require("../../shared/wallet");
|
const { getSignerForAddress } = require("../../shared/wallet");
|
||||||
const { walletDefect } = require("../../shared/walletDefects");
|
const { walletDefect } = require("../../shared/walletDefects");
|
||||||
const {
|
const { describeSigningFailure } = require("../../shared/approvalVerify");
|
||||||
describeSigningFailure,
|
|
||||||
typedDataChainRefusal,
|
|
||||||
} = require("../../shared/approvalVerify");
|
|
||||||
const txStatus = require("./txStatus");
|
const txStatus = require("./txStatus");
|
||||||
const uniswap = require("../../shared/uniswap");
|
const uniswap = require("../../shared/uniswap");
|
||||||
const { notify, runtimeApi, sendMessage } = require("../../shared/browserApi");
|
const { notify, runtimeApi, sendMessage } = require("../../shared/browserApi");
|
||||||
@@ -446,8 +443,7 @@ function signedPrimaryType(types) {
|
|||||||
// Why a signature request cannot be signed, as a sentence for the error line,
|
// Why a signature request cannot be signed, as a sentence for the error line,
|
||||||
// or null when it can. Only typed data is refused: the `primaryType` the page
|
// or null when it can. Only typed data is refused: the `primaryType` the page
|
||||||
// states has to be the type ethers will sign, or this screen would name one
|
// states has to be the type ethers will sign, or this screen would name one
|
||||||
// message while another is signed. Its domain may name no chain but the active
|
// message while another is signed.
|
||||||
// network's.
|
|
||||||
function typedDataRefusal(sp) {
|
function typedDataRefusal(sp) {
|
||||||
if (sp.method === "personal_sign" || sp.method === "eth_sign") return null;
|
if (sp.method === "personal_sign" || sp.method === "eth_sign") return null;
|
||||||
let data;
|
let data;
|
||||||
@@ -470,7 +466,7 @@ function typedDataRefusal(sp) {
|
|||||||
", so it cannot be signed."
|
", so it cannot be signed."
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return typedDataChainRefusal(data.domain, currentNetwork());
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The largest amount a Permit2 allowance can hold, a uint160. Permit2 treats
|
// The largest amount a Permit2 allowance can hold, a uint160. Permit2 treats
|
||||||
|
|||||||
@@ -316,11 +316,7 @@ function init(ctx) {
|
|||||||
const networkSelect = $("settings-network");
|
const networkSelect = $("settings-network");
|
||||||
networkSelect.addEventListener("change", async () => {
|
networkSelect.addEventListener("change", async () => {
|
||||||
const newId = networkSelect.value;
|
const newId = networkSelect.value;
|
||||||
if (newId === state.networkId) return;
|
|
||||||
const net = await onChainSwitch(newId);
|
const net = await onChainSwitch(newId);
|
||||||
// Open pages are told by the background, as after a site's approved
|
|
||||||
// switch request.
|
|
||||||
notify({ type: "AUTISTMASK_NETWORK_CHANGED", chainId: net.chainId });
|
|
||||||
$("settings-rpc").value = state.rpcUrl;
|
$("settings-rpc").value = state.rpcUrl;
|
||||||
$("settings-blockscout").value = state.blockscoutUrl;
|
$("settings-blockscout").value = state.blockscoutUrl;
|
||||||
showFlash("Switched to " + net.name + ".");
|
showFlash("Switched to " + net.name + ".");
|
||||||
|
|||||||
+12
-39
@@ -1,14 +1,13 @@
|
|||||||
// Preparation of the transaction an approval screen displays.
|
// Preparation of the transaction an approval screen displays.
|
||||||
//
|
//
|
||||||
// A dApp's eth_sendTransaction normally fixes `to`, `value` and `data`, and
|
// A dApp's eth_sendTransaction normally fixes only `to`, `value` and `data`.
|
||||||
// sometimes the gas limit. The nonce, the fees, and the gas limit when the
|
// The nonce, the gas limit and the fees have to be filled in from the network
|
||||||
// site gives none have to be filled in from the network before anything can
|
// before anything can be signed, and whoever fills them in decides what the
|
||||||
// be signed, and whoever fills them in decides what the user is shown. That
|
// user is shown. That work used to happen in the popup, after the user had
|
||||||
// work used to happen in the popup, after the user had already approved: the
|
// already approved: the numbers on the approval screen came from the popup and
|
||||||
// numbers on the approval screen came from the popup and were compared against
|
// were compared against nothing, so a compromised popup could display one fee
|
||||||
// nothing, so a compromised popup could display one fee and sign another, and
|
// and sign another, and the ceilings in approvalVerify.js were all that stood
|
||||||
// the ceilings in approvalVerify.js were all that stood between the user and a
|
// between the user and a fee that hands the validator the balance.
|
||||||
// fee that hands the validator the balance.
|
|
||||||
//
|
//
|
||||||
// So it happens here instead, in the background, before the approval window is
|
// So it happens here instead, in the background, before the approval window is
|
||||||
// opened. The background populates the transaction, shows that object, and
|
// opened. The background populates the transaction, shows that object, and
|
||||||
@@ -32,7 +31,6 @@ const {
|
|||||||
VoidSigner,
|
VoidSigner,
|
||||||
accessListify,
|
accessListify,
|
||||||
getAddress,
|
getAddress,
|
||||||
getBigInt,
|
|
||||||
getBytes,
|
getBytes,
|
||||||
hexlify,
|
hexlify,
|
||||||
toQuantity,
|
toQuantity,
|
||||||
@@ -49,11 +47,10 @@ const {
|
|||||||
// minutes long, which is not a wait anyone will sit through.
|
// minutes long, which is not a wait anyone will sit through.
|
||||||
const POPULATE_TIMEOUT_MS = 20000;
|
const POPULATE_TIMEOUT_MS = 20000;
|
||||||
|
|
||||||
// The request fields taken from the page, plus `gas`, which requestFrom()
|
// The request fields taken from the page. Anything else is dropped rather than
|
||||||
// takes as the gas limit. Anything else is dropped rather than passed to
|
// passed to ethers: the object is page-controlled, and a future ethers that
|
||||||
// ethers: the object is page-controlled, and a future ethers that learns to
|
// learns to carry a new transaction field must not start picking one up out of
|
||||||
// carry a new transaction field must not start picking one up out of it
|
// it without this module knowing.
|
||||||
// without this module knowing.
|
|
||||||
//
|
//
|
||||||
// The nonce is not taken from the page; it is always the account's next nonce
|
// The nonce is not taken from the page; it is always the account's next nonce
|
||||||
// from the network. A page that chose it could replace one of the user's
|
// from the network. A page that chose it could replace one of the user's
|
||||||
@@ -87,16 +84,6 @@ function present(v) {
|
|||||||
return v !== null && v !== undefined && v !== "";
|
return v !== null && v !== undefined && v !== "";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Whether two quantities from the page are the same number. One that is not a
|
|
||||||
// number matches nothing.
|
|
||||||
function sameQuantity(a, b) {
|
|
||||||
try {
|
|
||||||
return getBigInt(a) === getBigInt(b);
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// These strings reach the user through the requesting page, so they are full
|
// These strings reach the user through the requesting page, so they are full
|
||||||
// sentences even when the tail of one came from ethers or from the node.
|
// sentences even when the tail of one came from ethers or from the node.
|
||||||
function sentence(text) {
|
function sentence(text) {
|
||||||
@@ -124,20 +111,6 @@ function requestFrom(txParams, from) {
|
|||||||
for (const key of REQUEST_FIELDS) {
|
for (const key of REQUEST_FIELDS) {
|
||||||
if (present(txParams[key])) request[key] = txParams[key];
|
if (present(txParams[key])) request[key] = txParams[key];
|
||||||
}
|
}
|
||||||
// JSON-RPC calls the gas limit `gas`, and that is the name sites send.
|
|
||||||
// ethers only reads `gasLimit`: left as `gas` it would be dropped and an
|
|
||||||
// estimate signed in its place.
|
|
||||||
if (present(txParams.gas)) {
|
|
||||||
if (
|
|
||||||
present(request.gasLimit) &&
|
|
||||||
!sameQuantity(request.gasLimit, txParams.gas)
|
|
||||||
) {
|
|
||||||
throw fail(
|
|
||||||
"The site asked for two different gas limits for this transaction.",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
request.gasLimit = txParams.gas;
|
|
||||||
}
|
|
||||||
if (
|
if (
|
||||||
present(request.type) &&
|
present(request.type) &&
|
||||||
!ALLOWED_TX_TYPES.includes(Number(request.type))
|
!ALLOWED_TX_TYPES.includes(Number(request.type))
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ const {
|
|||||||
accessListify,
|
accessListify,
|
||||||
formatEther,
|
formatEther,
|
||||||
getAddress,
|
getAddress,
|
||||||
getBigInt,
|
|
||||||
getBytes,
|
getBytes,
|
||||||
toQuantity,
|
toQuantity,
|
||||||
verifyMessage,
|
verifyMessage,
|
||||||
@@ -636,33 +635,6 @@ function verifySignature(signParams, signature, expectedFrom) {
|
|||||||
return recovered;
|
return recovered;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Why typed data cannot be signed while `network` is the active network, as a
|
|
||||||
// sentence, or null when it can. EIP-712 has a wallet refuse typed data whose
|
|
||||||
// domain names another chain, because the signature is valid on that chain.
|
|
||||||
// ethers signs no chain id when the domain's is null or absent, and reads any
|
|
||||||
// other with getBigInt(), so 1, "1" and "0x1" are the same chain here too.
|
|
||||||
function typedDataChainRefusal(domain, network) {
|
|
||||||
const chainId = domain?.chainId;
|
|
||||||
if (chainId === undefined || chainId === null) return null;
|
|
||||||
let named;
|
|
||||||
try {
|
|
||||||
named = getBigInt(chainId);
|
|
||||||
} catch {
|
|
||||||
return "This typed data cannot be read, so it cannot be signed.";
|
|
||||||
}
|
|
||||||
const active = getBigInt(network.chainId);
|
|
||||||
if (named === active) return null;
|
|
||||||
return (
|
|
||||||
"This typed data is for chain id " +
|
|
||||||
named +
|
|
||||||
", but the active network is " +
|
|
||||||
network.name +
|
|
||||||
" (chain id " +
|
|
||||||
active +
|
|
||||||
"), so it cannot be signed."
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The stage a transaction approval failed at. Which stage it is decides
|
// The stage a transaction approval failed at. Which stage it is decides
|
||||||
// whether the approval survives the failure.
|
// whether the approval survives the failure.
|
||||||
const TX_STAGE_SIGN = "sign";
|
const TX_STAGE_SIGN = "sign";
|
||||||
@@ -824,7 +796,6 @@ function describeSigningFailure(response, fallbackMessage) {
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
verifySignedTx,
|
verifySignedTx,
|
||||||
verifySignature,
|
verifySignature,
|
||||||
typedDataChainRefusal,
|
|
||||||
assertNoForbiddenFields,
|
assertNoForbiddenFields,
|
||||||
assertNothingUnchecked,
|
assertNothingUnchecked,
|
||||||
assertCanonicalBytes,
|
assertCanonicalBytes,
|
||||||
|
|||||||
@@ -250,22 +250,6 @@ function windowsGetLastFocused() {
|
|||||||
return invoke(windowsApi(), "getLastFocused");
|
return invoke(windowsApi(), "getLastFocused");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns {Promise<Object>} the window the calling page is in.
|
|
||||||
*/
|
|
||||||
function windowsGetCurrent() {
|
|
||||||
return invoke(windowsApi(), "getCurrent");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {number} windowId
|
|
||||||
* @param {Object} updateInfo
|
|
||||||
* @returns {Promise<Object>} the updated window.
|
|
||||||
*/
|
|
||||||
function windowsUpdate(windowId, updateInfo) {
|
|
||||||
return invoke(windowsApi(), "update", windowId, updateInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {number} windowId
|
* @param {number} windowId
|
||||||
* @returns {Promise<void>}
|
* @returns {Promise<void>}
|
||||||
@@ -291,8 +275,6 @@ module.exports = {
|
|||||||
tabsSendMessage,
|
tabsSendMessage,
|
||||||
windowsApi,
|
windowsApi,
|
||||||
windowsCreate,
|
windowsCreate,
|
||||||
windowsGetCurrent,
|
|
||||||
windowsGetLastFocused,
|
windowsGetLastFocused,
|
||||||
windowsRemove,
|
windowsRemove,
|
||||||
windowsUpdate,
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -110,14 +110,11 @@ function hashListed(hash) {
|
|||||||
* Generate hostname variants for subdomain matching.
|
* Generate hostname variants for subdomain matching.
|
||||||
* "sub.evil.com" yields ["sub.evil.com", "evil.com"].
|
* "sub.evil.com" yields ["sub.evil.com", "evil.com"].
|
||||||
*
|
*
|
||||||
* A trailing dot is dropped: "evil.com." is the fully qualified spelling of
|
|
||||||
* "evil.com", and the browser loads the same site from either.
|
|
||||||
*
|
|
||||||
* @param {string} hostname
|
* @param {string} hostname
|
||||||
* @returns {string[]}
|
* @returns {string[]}
|
||||||
*/
|
*/
|
||||||
function hostnameVariants(hostname) {
|
function hostnameVariants(hostname) {
|
||||||
const h = hostname.toLowerCase().replace(/\.$/, "");
|
const h = hostname.toLowerCase();
|
||||||
const variants = [h];
|
const variants = [h];
|
||||||
const parts = h.split(".");
|
const parts = h.split(".");
|
||||||
// Parent domains: a.b.c.d -> b.c.d, c.d
|
// Parent domains: a.b.c.d -> b.c.d, c.d
|
||||||
|
|||||||
@@ -36,13 +36,11 @@ const DEFECTS = {
|
|||||||
"derivation path beneath that key instead of from a master " +
|
"derivation path beneath that key instead of from a master " +
|
||||||
"key, so the addresses listed here are not the ones that key " +
|
"key, so the addresses listed here are not the ones that key " +
|
||||||
"produces under the standard path.",
|
"produces under the standard path.",
|
||||||
"Signing, sending and private key export are disabled for this " +
|
"Signing and sending are disabled for this wallet. The addresses " +
|
||||||
"wallet. Anything these addresses hold can be reached outside " +
|
"do descend from the extended private key you imported, so " +
|
||||||
"this wallet with the extended private key you imported, if " +
|
"anything they hold is still reachable by software that " +
|
||||||
"you kept a copy of it, or with the master extended private " +
|
"repeats the same non-standard derivation. Check them in a " +
|
||||||
"key or recovery phrase it came from, in software that " +
|
"block explorer before deciding what to do.",
|
||||||
"repeats the same non-standard derivation. Check the " +
|
|
||||||
"addresses in a block explorer before deciding what to do.",
|
|
||||||
"To see the addresses this key produces under the standard path, " +
|
"To see the addresses this key produces under the standard path, " +
|
||||||
"import the master extended private key, or the recovery " +
|
"import the master extended private key, or the recovery " +
|
||||||
"phrase it came from, as a new wallet. Nothing here has been " +
|
"phrase it came from, as a new wallet. Nothing here has been " +
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
// requesting page or the RPC node can say turns it into an approval that
|
// requesting page or the RPC node can say turns it into an approval that
|
||||||
// should never have been raised.
|
// should never have been raised.
|
||||||
|
|
||||||
const { Network, Transaction, Wallet, toQuantity } = require("ethers");
|
const { Network, Wallet } = require("ethers");
|
||||||
const {
|
const {
|
||||||
prepareApprovalTx,
|
prepareApprovalTx,
|
||||||
serializeApprovedTx,
|
serializeApprovedTx,
|
||||||
@@ -138,43 +138,6 @@ describe("prepareApprovalTx", () => {
|
|||||||
expect(approved.maxFeePerGas).toBe("0x12a05f200");
|
expect(approved.maxFeePerGas).toBe("0x12a05f200");
|
||||||
});
|
});
|
||||||
|
|
||||||
// `gas` is the JSON-RPC name for the gas limit and the one sites send.
|
|
||||||
// The node would estimate 21000; the site's 200000 is what is shown and
|
|
||||||
// what is signed.
|
|
||||||
test("uses the gas limit a site sends as gas", async () => {
|
|
||||||
const approved = await prepareApprovalTx(
|
|
||||||
providerWith(),
|
|
||||||
signer.address,
|
|
||||||
{ ...TX_PARAMS, gas: "0x30d40" },
|
|
||||||
);
|
|
||||||
expect(approved.gasLimit).toBe("0x30d40");
|
|
||||||
const signed = Transaction.from(
|
|
||||||
await signer.signTransaction({ ...approved }),
|
|
||||||
);
|
|
||||||
expect(signed.gasLimit).toBe(200000n);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("accepts gas and gasLimit that name the same number", async () => {
|
|
||||||
const approved = await prepareApprovalTx(
|
|
||||||
providerWith(),
|
|
||||||
signer.address,
|
|
||||||
{ ...TX_PARAMS, gas: "0x30d40", gasLimit: 200000 },
|
|
||||||
);
|
|
||||||
expect(approved.gasLimit).toBe("0x30d40");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("refuses gas and gasLimit that disagree", async () => {
|
|
||||||
await expect(
|
|
||||||
prepareApprovalTx(providerWith(), signer.address, {
|
|
||||||
...TX_PARAMS,
|
|
||||||
gas: "0x30d40",
|
|
||||||
gasLimit: "0x5208",
|
|
||||||
}),
|
|
||||||
).rejects.toThrow(
|
|
||||||
"The site asked for two different gas limits for this transaction.",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("carries an access list the request asked for", async () => {
|
test("carries an access list the request asked for", async () => {
|
||||||
const approved = await prepareApprovalTx(
|
const approved = await prepareApprovalTx(
|
||||||
providerWith(),
|
providerWith(),
|
||||||
@@ -249,15 +212,6 @@ describe("prepareApprovalTx", () => {
|
|||||||
).rejects.toThrow(/gas limit no network this wallet supports/);
|
).rejects.toThrow(/gas limit no network this wallet supports/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("refuses a gas limit the site sent above the ceiling", async () => {
|
|
||||||
await expect(
|
|
||||||
prepareApprovalTx(providerWith(), signer.address, {
|
|
||||||
...TX_PARAMS,
|
|
||||||
gas: toQuantity(MAX_GAS_LIMIT + 1n),
|
|
||||||
}),
|
|
||||||
).rejects.toThrow(/gas limit no network this wallet supports/);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The combined bound at population: a gas limit and a fee that are each
|
// The combined bound at population: a gas limit and a fee that are each
|
||||||
// under their own ceiling but multiply to thousands of ETH is refused
|
// under their own ceiling but multiply to thousands of ETH is refused
|
||||||
// before the approval window opens, so the user is never shown a
|
// before the approval window opens, so the user is never shown a
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ const TX_PARAMS = {
|
|||||||
to: RECIPIENT,
|
to: RECIPIENT,
|
||||||
value: "0x2386f26fc10000",
|
value: "0x2386f26fc10000",
|
||||||
data: "0xdeadbeef",
|
data: "0xdeadbeef",
|
||||||
|
gas: "0x5208",
|
||||||
};
|
};
|
||||||
|
|
||||||
// The values populateTransaction() fills in when the dApp fixed none of them.
|
// The values populateTransaction() fills in when the dApp fixed none of them.
|
||||||
|
|||||||
@@ -45,50 +45,3 @@ test("the approval window shows no screen until the background describes the app
|
|||||||
expect(env.visibleViews()).toEqual(["approve-network"]);
|
expect(env.visibleViews()).toEqual(["approve-network"]);
|
||||||
expect(env.pageErrors).toEqual([]);
|
expect(env.pageErrors).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
// The background opens the approval window as wide as the page, but the
|
|
||||||
// browser counts the window's frame in that width
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/518). The browser suites run
|
|
||||||
// without frames, so the widening is checked here.
|
|
||||||
function windowsStub(type) {
|
|
||||||
const updates = [];
|
|
||||||
return {
|
|
||||||
updates,
|
|
||||||
getCurrent: (done) => done({ id: 7, type, width: 396 }),
|
|
||||||
update: (id, info, done) => {
|
|
||||||
updates.push({ id, info });
|
|
||||||
done({});
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const approvalRuntime = {
|
|
||||||
connect: () => ({ postMessage: () => {} }),
|
|
||||||
sendMessage: () => {},
|
|
||||||
};
|
|
||||||
|
|
||||||
test("the approval window widens itself by whatever its frame takes", async () => {
|
|
||||||
const windows = windowsStub("popup");
|
|
||||||
const env = await bootPopup(unversionedValidProfile(), {
|
|
||||||
search: "?approval=approval-1",
|
|
||||||
runtime: approvalRuntime,
|
|
||||||
windows,
|
|
||||||
documentElement: { scrollWidth: 396, clientWidth: 380 },
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(windows.updates).toEqual([{ id: 7, info: { width: 412 } }]);
|
|
||||||
expect(env.pageErrors).toEqual([]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a connection prompt in the toolbar popup leaves the browser window alone", async () => {
|
|
||||||
const windows = windowsStub("normal");
|
|
||||||
const env = await bootPopup(unversionedValidProfile(), {
|
|
||||||
search: "?approval=approval-1",
|
|
||||||
runtime: approvalRuntime,
|
|
||||||
windows,
|
|
||||||
documentElement: { scrollWidth: 396, clientWidth: 380 },
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(windows.updates).toEqual([]);
|
|
||||||
expect(env.pageErrors).toEqual([]);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -397,13 +397,7 @@ function loadBackground(options) {
|
|||||||
rpcResult = r;
|
rpcResult = r;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
return {
|
return { result: () => rpcResult };
|
||||||
id: () =>
|
|
||||||
new URL(created[created.length - 1].url).searchParams.get(
|
|
||||||
"approval",
|
|
||||||
),
|
|
||||||
result: () => rpcResult,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// A dApp asking to connect. The origin defaults to one the persisted
|
// A dApp asking to connect. The origin defaults to one the persisted
|
||||||
@@ -1490,55 +1484,6 @@ describe("what the approval is verified against", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Typed data whose domain names another chain is refused on the sign
|
|
||||||
// screen; a signature for it that reaches the background anyway is not
|
|
||||||
// handed to the page (https://git.eeqj.de/sneak/AutistMask/issues/519).
|
|
||||||
// TYPED_DATA names mainnet.
|
|
||||||
async function answerTypedData(bg, pending) {
|
|
||||||
const { domain, types, message } = JSON.parse(TYPED_DATA);
|
|
||||||
delete types.EIP712Domain;
|
|
||||||
const signature = await signer.signTypedData(domain, types, message);
|
|
||||||
const answer = bg.send(
|
|
||||||
{
|
|
||||||
type: "AUTISTMASK_SIGN_RESPONSE",
|
|
||||||
id: pending.id(),
|
|
||||||
approved: true,
|
|
||||||
signature,
|
|
||||||
},
|
|
||||||
{ url: bg.fromPopup.url },
|
|
||||||
);
|
|
||||||
await settle();
|
|
||||||
return { answer, signature };
|
|
||||||
}
|
|
||||||
|
|
||||||
test("typed data for the active chain is handed back signed", async () => {
|
|
||||||
const bg = loadBackground();
|
|
||||||
const pending = bg.requestTypedData();
|
|
||||||
await settle();
|
|
||||||
|
|
||||||
const { answer, signature } = await answerTypedData(bg, pending);
|
|
||||||
|
|
||||||
expect(answer.sendResponse).toHaveBeenCalledWith({ signature });
|
|
||||||
expect(pending.result()).toEqual({ result: signature });
|
|
||||||
});
|
|
||||||
|
|
||||||
test("typed data for another chain is refused, not handed back", async () => {
|
|
||||||
const bg = loadBackground();
|
|
||||||
bg.setNetwork(SEPOLIA);
|
|
||||||
const pending = bg.requestTypedData();
|
|
||||||
await settle();
|
|
||||||
|
|
||||||
const { answer } = await answerTypedData(bg, pending);
|
|
||||||
|
|
||||||
const refusal =
|
|
||||||
"This typed data is for chain id 1, but the active network is Sepolia Testnet (chain id 11155111), so it cannot be signed.";
|
|
||||||
expect(answer.sendResponse).toHaveBeenCalledWith({
|
|
||||||
error: refusal,
|
|
||||||
retryable: false,
|
|
||||||
});
|
|
||||||
expect(pending.result()).toEqual({ error: { message: refusal } });
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a sign request from another address raises no approval at all", async () => {
|
test("a sign request from another address raises no approval at all", async () => {
|
||||||
const bg = loadBackground();
|
const bg = loadBackground();
|
||||||
const pending = bg.requestSign(other.address);
|
const pending = bg.requestSign(other.address);
|
||||||
@@ -2805,7 +2750,7 @@ describe("where an approval window opens", () => {
|
|||||||
await settle();
|
await settle();
|
||||||
|
|
||||||
expect(bg.created).toHaveLength(1);
|
expect(bg.created).toHaveLength(1);
|
||||||
expect(bg.created[0]).toMatchObject({ left: 442, top: 60 });
|
expect(bg.created[0]).toMatchObject({ left: 460, top: 60 });
|
||||||
});
|
});
|
||||||
|
|
||||||
test("not centred on an approval window the user was last in", async () => {
|
test("not centred on an approval window the user was last in", async () => {
|
||||||
@@ -2822,7 +2767,7 @@ describe("where an approval window opens", () => {
|
|||||||
bg.requestSign();
|
bg.requestSign();
|
||||||
await settle();
|
await settle();
|
||||||
|
|
||||||
// Centred, it would be at left 882, the position the browser refused.
|
// Centred, it would be at left 900, the position the browser refused.
|
||||||
expect(bg.created).toHaveLength(1);
|
expect(bg.created).toHaveLength(1);
|
||||||
expect(bg.created[0].left).toBeUndefined();
|
expect(bg.created[0].left).toBeUndefined();
|
||||||
expect(bg.created[0].top).toBeUndefined();
|
expect(bg.created[0].top).toBeUndefined();
|
||||||
@@ -2844,7 +2789,7 @@ describe("where an approval window opens", () => {
|
|||||||
await settle();
|
await settle();
|
||||||
|
|
||||||
expect(bg.created).toHaveLength(2);
|
expect(bg.created).toHaveLength(2);
|
||||||
expect(bg.created[0]).toMatchObject({ left: 1502, top: 750 });
|
expect(bg.created[0]).toMatchObject({ left: 1520, top: 750 });
|
||||||
expect(bg.created[1].left).toBeUndefined();
|
expect(bg.created[1].left).toBeUndefined();
|
||||||
expect(bg.created[1].top).toBeUndefined();
|
expect(bg.created[1].top).toBeUndefined();
|
||||||
|
|
||||||
|
|||||||
@@ -16,9 +16,7 @@
|
|||||||
//
|
//
|
||||||
// The endpoint half of #308 lives in tests/networkEndpoints.test.js, which
|
// The endpoint half of #308 lives in tests/networkEndpoints.test.js, which
|
||||||
// covers the popup's chain switch; this file covers the background's, which
|
// covers the popup's chain switch; this file covers the background's, which
|
||||||
// goes through storage rather than the shared state singleton. The last block
|
// goes through storage rather than the shared state singleton.
|
||||||
// covers what the background tells open tabs when the user switches the
|
|
||||||
// network in Settings.
|
|
||||||
|
|
||||||
const { networkById } = require("../src/shared/networks");
|
const { networkById } = require("../src/shared/networks");
|
||||||
const { makeStorageStub } = require("./support/storageStub");
|
const { makeStorageStub } = require("./support/storageStub");
|
||||||
@@ -227,14 +225,6 @@ function loadBackground() {
|
|||||||
answerPrompt,
|
answerPrompt,
|
||||||
closePrompt,
|
closePrompt,
|
||||||
opened,
|
opened,
|
||||||
// A message to the background from `sender`, and its answer.
|
|
||||||
send: (msg, sender) => {
|
|
||||||
let reply = null;
|
|
||||||
messageListener(msg, sender, (r) => {
|
|
||||||
reply = r;
|
|
||||||
});
|
|
||||||
return reply;
|
|
||||||
},
|
|
||||||
walletState: () => storage.read("autistmask"),
|
walletState: () => storage.read("autistmask"),
|
||||||
chainChangedEvents: () =>
|
chainChangedEvents: () =>
|
||||||
toTabs.filter((m) => m.eventName === "chainChanged"),
|
toTabs.filter((m) => m.eventName === "chainChanged"),
|
||||||
@@ -400,109 +390,3 @@ describe("only the user switches the network", () => {
|
|||||||
expect(bg.walletState().rpcUrl).toBe(CUSTOM_RPC);
|
expect(bg.walletState().rpcUrl).toBe(CUSTOM_RPC);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Switching the network in Settings tells open pages, as an approved site
|
|
||||||
// request does (https://git.eeqj.de/sneak/AutistMask/issues/500). These drive
|
|
||||||
// the real Settings view over the background's storage, with what it sends
|
|
||||||
// delivered to the background from the extension's own page.
|
|
||||||
describe("switching the network in Settings tells every open tab", () => {
|
|
||||||
const POPUP = { url: EXT_URL + "src/popup/index.html" };
|
|
||||||
|
|
||||||
// A stand-in for one DOM node: enough of an element for init() to set
|
|
||||||
// properties on it and hang listeners off it.
|
|
||||||
function fakeElement() {
|
|
||||||
return {
|
|
||||||
value: "",
|
|
||||||
checked: false,
|
|
||||||
textContent: "",
|
|
||||||
style: {},
|
|
||||||
dataset: {},
|
|
||||||
classList: { add() {}, remove() {} },
|
|
||||||
listeners: {},
|
|
||||||
addEventListener(event, handler) {
|
|
||||||
this.listeners[event] = handler;
|
|
||||||
},
|
|
||||||
querySelectorAll: () => [],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Settings, opened the way the popup opens it. Returns its network
|
|
||||||
// selector.
|
|
||||||
async function openSettings(bg) {
|
|
||||||
const elements = {};
|
|
||||||
const element = (id) => (elements[id] ||= fakeElement());
|
|
||||||
jest.doMock("../src/popup/views/helpers", () => ({
|
|
||||||
$: element,
|
|
||||||
showView: () => {},
|
|
||||||
updateDebugBanner: () => {},
|
|
||||||
showFlash: () => {},
|
|
||||||
escapeHtml: (s) => s,
|
|
||||||
flashCopyFeedback: () => {},
|
|
||||||
goBack: () => {},
|
|
||||||
pushCurrentView: () => {},
|
|
||||||
onViewLeave: () => {},
|
|
||||||
VIEWS: [],
|
|
||||||
}));
|
|
||||||
global.chrome.runtime.sendMessage = (msg) => {
|
|
||||||
bg.send(msg, POPUP);
|
|
||||||
};
|
|
||||||
await require("../src/shared/state").loadState();
|
|
||||||
require("../src/popup/views/settings").init({
|
|
||||||
pageClosed: new AbortController().signal,
|
|
||||||
});
|
|
||||||
const select = element("settings-network");
|
|
||||||
select.value = "mainnet";
|
|
||||||
return select;
|
|
||||||
}
|
|
||||||
|
|
||||||
// The user picks `networkId` in the selector.
|
|
||||||
async function choose(select, networkId) {
|
|
||||||
select.value = networkId;
|
|
||||||
await select.listeners.change();
|
|
||||||
await settle();
|
|
||||||
}
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
jest.dontMock("../src/popup/views/helpers");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("switching to the other network sends chainChanged once, with its chain id", async () => {
|
|
||||||
const bg = loadBackground();
|
|
||||||
const select = await openSettings(bg);
|
|
||||||
|
|
||||||
await choose(select, "sepolia");
|
|
||||||
|
|
||||||
expect(bg.walletState().networkId).toBe("sepolia");
|
|
||||||
expect(bg.chainChangedEvents()).toEqual([
|
|
||||||
{
|
|
||||||
type: "AUTISTMASK_EVENT",
|
|
||||||
eventName: "chainChanged",
|
|
||||||
data: SEPOLIA.chainId,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("choosing the network already active changes nothing and sends nothing", async () => {
|
|
||||||
const bg = loadBackground();
|
|
||||||
const select = await openSettings(bg);
|
|
||||||
const before = bg.walletState();
|
|
||||||
|
|
||||||
await choose(select, "mainnet");
|
|
||||||
|
|
||||||
expect(bg.walletState()).toEqual(before);
|
|
||||||
expect(bg.chainChangedEvents()).toEqual([]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a page cannot make the background send chainChanged", async () => {
|
|
||||||
const bg = loadBackground();
|
|
||||||
|
|
||||||
const reply = bg.send(
|
|
||||||
{ type: "AUTISTMASK_NETWORK_CHANGED", chainId: SEPOLIA.chainId },
|
|
||||||
{ url: CONNECTED_ORIGIN + "/" },
|
|
||||||
);
|
|
||||||
await settle();
|
|
||||||
|
|
||||||
expect(reply).toEqual({ error: "Unauthorized sender" });
|
|
||||||
expect(bg.chainChangedEvents()).toEqual([]);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -279,18 +279,12 @@ class Driver {
|
|||||||
|
|
||||||
// Shown means shown: in the popup a view is switched by toggling a
|
// Shown means shown: in the popup a view is switched by toggling a
|
||||||
// "hidden" class, and an element that is present but collapsed is not
|
// "hidden" class, and an element that is present but collapsed is not
|
||||||
// the thing a test means by visible. Until the page's stylesheet has
|
// the thing a test means by visible.
|
||||||
// applied that class hides nothing and every view lays out, so the page
|
|
||||||
// must also have finished loading, which it does only after its
|
|
||||||
// stylesheet, and neither the element nor anything enclosing it may
|
|
||||||
// carry the class (https://git.eeqj.de/sneak/AutistMask/issues/502).
|
|
||||||
async waitVisible(selector, timeout = DEFAULT_WAIT_MS) {
|
async waitVisible(selector, timeout = DEFAULT_WAIT_MS) {
|
||||||
return this.waitFor(
|
return this.waitFor(
|
||||||
"selector " + selector + " to be visible",
|
"selector " + selector + " to be visible",
|
||||||
`const el = document.querySelector(arguments[0]);
|
`const el = document.querySelector(arguments[0]);
|
||||||
if (document.readyState !== "complete" || !el) return false;
|
if (!el) return false;
|
||||||
if (el.closest(".hidden")) return false;
|
|
||||||
if (getComputedStyle(el).visibility !== "visible") return false;
|
|
||||||
const r = el.getBoundingClientRect();
|
const r = el.getBoundingClientRect();
|
||||||
return r.width > 0 && r.height > 0;`,
|
return r.width > 0 && r.height > 0;`,
|
||||||
[selector],
|
[selector],
|
||||||
|
|||||||
@@ -128,18 +128,6 @@ step("the popup is drawn in the monospace font it declares", async (env) => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// The same check as the Chrome suite's (#456), so both browsers are held to
|
|
||||||
// the same size.
|
|
||||||
step("the popup's text is drawn at the 14px text-sm declares", async (env) => {
|
|
||||||
const size = await env.driver.execute(
|
|
||||||
"return getComputedStyle(document.body).fontSize;",
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
size === "14px",
|
|
||||||
"the popup's text is drawn at " + size + ", not at the 14px of text-sm",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The recovery screen (#361): the Chrome suite's four cases, run before any
|
// The recovery screen (#361): the Chrome suite's four cases, run before any
|
||||||
// wallet exists for the same reason. With no wallet nothing saves on a timer,
|
// wallet exists for the same reason. With no wallet nothing saves on a timer,
|
||||||
// so no save can write a good record over the unreadable one. The last of them
|
// so no save can write a good record over the unreadable one. The last of them
|
||||||
@@ -640,19 +628,6 @@ step(
|
|||||||
await d.switchToWindow(popup);
|
await d.switchToWindow(popup);
|
||||||
await d.waitVisible("#view-approve-sign");
|
await d.waitVisible("#view-approve-sign");
|
||||||
|
|
||||||
// The window is opened as wide as the page
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/518). This suite is
|
|
||||||
// where that is checked: the Chrome suite's approval windows open at
|
|
||||||
// 1280x720 whatever width the extension asks for.
|
|
||||||
const sideways = await d.execute(
|
|
||||||
"return document.documentElement.scrollWidth -" +
|
|
||||||
" document.documentElement.clientWidth;",
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
sideways <= 0,
|
|
||||||
"the sign prompt scrolls sideways by " + sideways + "px",
|
|
||||||
);
|
|
||||||
|
|
||||||
const screen = await d.execute(
|
const screen = await d.execute(
|
||||||
`return {
|
`return {
|
||||||
origin: document.getElementById("approve-sign-origin").textContent,
|
origin: document.getElementById("approve-sign-origin").textContent,
|
||||||
|
|||||||
+1
-26
@@ -333,33 +333,8 @@ async function launch(routeOpts) {
|
|||||||
|
|
||||||
const PASSWORD = "e2e-harness-password";
|
const PASSWORD = "e2e-harness-password";
|
||||||
|
|
||||||
// Waits until the page shows `selector`, not only until it lays out. Until the
|
|
||||||
// page's stylesheet has applied, the `hidden` class that showView() keeps on
|
|
||||||
// every view but the current one hides nothing and every view lays out, so a
|
|
||||||
// test could read a screen before the page's script had filled it
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/502). So the page must also
|
|
||||||
// have finished loading, which it does only after its stylesheet, and neither
|
|
||||||
// the element nor anything enclosing it may carry `hidden`. Polled on a timer:
|
|
||||||
// animation frames are not guaranteed to a window that is not in front.
|
|
||||||
async function visible(page, selector, timeout = 15000) {
|
async function visible(page, selector, timeout = 15000) {
|
||||||
await page
|
await page.waitForSelector(selector, { state: "visible", timeout });
|
||||||
.waitForFunction(
|
|
||||||
(sel) => {
|
|
||||||
const el = document.querySelector(sel);
|
|
||||||
if (document.readyState !== "complete" || !el) return false;
|
|
||||||
if (el.closest(".hidden")) return false;
|
|
||||||
if (getComputedStyle(el).visibility !== "visible") return false;
|
|
||||||
const r = el.getBoundingClientRect();
|
|
||||||
return r.width > 0 && r.height > 0;
|
|
||||||
},
|
|
||||||
selector,
|
|
||||||
{ polling: 50, timeout },
|
|
||||||
)
|
|
||||||
.catch((e) => {
|
|
||||||
throw new Error(
|
|
||||||
"the page did not show " + selector + ": " + e.message,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// An empty WebAssembly module: magic number and version header, no
|
// An empty WebAssembly module: magic number and version header, no
|
||||||
|
|||||||
@@ -113,18 +113,6 @@ test("the popup is drawn in the monospace font it declares (#418)", async (env)
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// The same stylesheet sets the size on body to 75%, which would draw the
|
|
||||||
// popup at 12px.
|
|
||||||
test("the popup's text is drawn at the 14px text-sm declares (#456)", async (env) => {
|
|
||||||
const size = await env.page.evaluate(
|
|
||||||
() => getComputedStyle(document.body).fontSize,
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
size === "14px",
|
|
||||||
"the popup's text is drawn at " + size + ", not at the 14px of text-sm",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The empirical half of #182. The manifest change is only a claim about
|
// The empirical half of #182. The manifest change is only a claim about
|
||||||
// what the CSP permits; this is the observation. Two things have to hold
|
// what the CSP permits; this is the observation. Two things have to hold
|
||||||
// together, and the run covers both: the popup realm compiles WASM (here),
|
// together, and the run covers both: the popup realm compiles WASM (here),
|
||||||
@@ -4550,42 +4538,6 @@ test("a site's network switch changes nothing until the user approves it (#408)"
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Switching the network in Settings tells the page too, as an approved site
|
|
||||||
// request does (https://git.eeqj.de/sneak/AutistMask/issues/500). The wallet
|
|
||||||
// goes back to mainnet the same way at the end.
|
|
||||||
test("a network switch in Settings tells the page (#500)", async (env) => {
|
|
||||||
const { mainnet, sepolia } = NETWORKS;
|
|
||||||
const before = await storedNetwork(env.page);
|
|
||||||
assert(
|
|
||||||
before.networkId === "mainnet",
|
|
||||||
"this test starts on mainnet, not on " + before.networkId,
|
|
||||||
);
|
|
||||||
const eventsBefore = (await chainChangedEvents(env.dapp)).length;
|
|
||||||
await openSettings(env.page);
|
|
||||||
|
|
||||||
await env.page.selectOption("#settings-network", "sepolia");
|
|
||||||
let events = await chainChangedEvents(env.dapp, eventsBefore + 1);
|
|
||||||
assert(
|
|
||||||
events.length === eventsBefore + 1 &&
|
|
||||||
events[events.length - 1].data === sepolia.chainId,
|
|
||||||
"the page was not told of the switch to Sepolia: " +
|
|
||||||
JSON.stringify(events),
|
|
||||||
);
|
|
||||||
|
|
||||||
await env.page.selectOption("#settings-network", "mainnet");
|
|
||||||
events = await chainChangedEvents(env.dapp, eventsBefore + 2);
|
|
||||||
assert(
|
|
||||||
events.length === eventsBefore + 2 &&
|
|
||||||
events[events.length - 1].data === mainnet.chainId,
|
|
||||||
"the page was not told of the switch back to mainnet: " +
|
|
||||||
JSON.stringify(events),
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
isDeepStrictEqual(await storedNetwork(env.page), before),
|
|
||||||
"switching back did not restore the mainnet network and endpoints",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The closing pass over both boundaries at once. Every message the section
|
// The closing pass over both boundaries at once. Every message the section
|
||||||
// put on either channel is re-read here and required to be free of the
|
// put on either channel is re-read here and required to be free of the
|
||||||
// password — and required to be there at all, method by method, so the
|
// password — and required to be there at all, method by method, so the
|
||||||
|
|||||||
@@ -89,12 +89,6 @@ describe("vendored blocklist", () => {
|
|||||||
expect(isPhishingDomain(LISTED[0].toUpperCase())).toBe(true);
|
expect(isPhishingDomain(LISTED[0].toUpperCase())).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("a hostname ending in a dot is the same host", () => {
|
|
||||||
expect(isPhishingDomain(LISTED[1] + ".")).toBe(true);
|
|
||||||
expect(isPhishingDomain("wallet." + LISTED[1] + ".")).toBe(true);
|
|
||||||
expect(isPhishingDomain(CLEAN[0] + ".")).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("returns false for an empty or missing hostname", () => {
|
test("returns false for an empty or missing hostname", () => {
|
||||||
expect(isPhishingDomain("")).toBe(false);
|
expect(isPhishingDomain("")).toBe(false);
|
||||||
expect(isPhishingDomain(null)).toBe(false);
|
expect(isPhishingDomain(null)).toBe(false);
|
||||||
@@ -139,13 +133,6 @@ describe("hostnameVariants", () => {
|
|||||||
test("lowercases hostnames", () => {
|
test("lowercases hostnames", () => {
|
||||||
expect(hostnameVariants("Evil.COM")).toEqual(["evil.com"]);
|
expect(hostnameVariants("Evil.COM")).toEqual(["evil.com"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("drops the trailing dot of a fully qualified hostname", () => {
|
|
||||||
expect(hostnameVariants("sub.evil.com.")).toEqual([
|
|
||||||
"sub.evil.com",
|
|
||||||
"evil.com",
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("domain hashing", () => {
|
describe("domain hashing", () => {
|
||||||
|
|||||||
@@ -242,11 +242,6 @@ async function settle() {
|
|||||||
* "?approval=" and an id for the popup opened as an approval window.
|
* "?approval=" and an id for the popup opened as an approval window.
|
||||||
* @param {object} [options.runtime] members of chrome.runtime that replace the
|
* @param {object} [options.runtime] members of chrome.runtime that replace the
|
||||||
* stub's own, for a test that has to answer the background's messages.
|
* stub's own, for a test that has to answer the background's messages.
|
||||||
* @param {object} [options.windows] chrome.windows, for a test of the approval
|
|
||||||
* window resizing itself.
|
|
||||||
* @param {object} [options.documentElement] members of document.documentElement
|
|
||||||
* that replace the stub's own: scrollWidth and clientWidth, which are equal
|
|
||||||
* unless a test says otherwise, so the page does not scroll sideways.
|
|
||||||
* @returns {Promise<object>} handles onto the booted page.
|
* @returns {Promise<object>} handles onto the booted page.
|
||||||
*/
|
*/
|
||||||
async function bootPopup(stored, options) {
|
async function bootPopup(stored, options) {
|
||||||
@@ -282,11 +277,6 @@ async function bootPopup(stored, options) {
|
|||||||
(options && options.storage) ||
|
(options && options.storage) ||
|
||||||
makeStorageStub(stored === undefined ? {} : { autistmask: stored });
|
makeStorageStub(stored === undefined ? {} : { autistmask: stored });
|
||||||
const document = makeDocument(POPUP_HTML);
|
const document = makeDocument(POPUP_HTML);
|
||||||
Object.assign(
|
|
||||||
document.documentElement,
|
|
||||||
{ scrollWidth: 396, clientWidth: 396 },
|
|
||||||
options && options.documentElement,
|
|
||||||
);
|
|
||||||
const reloads = [];
|
const reloads = [];
|
||||||
|
|
||||||
globalThis.chrome = {
|
globalThis.chrome = {
|
||||||
@@ -297,7 +287,6 @@ async function bootPopup(stored, options) {
|
|||||||
onMessage: { addListener: () => {} },
|
onMessage: { addListener: () => {} },
|
||||||
...(options && options.runtime),
|
...(options && options.runtime),
|
||||||
},
|
},
|
||||||
windows: options && options.windows,
|
|
||||||
};
|
};
|
||||||
globalThis.document = document;
|
globalThis.document = document;
|
||||||
globalThis.window = {
|
globalThis.window = {
|
||||||
|
|||||||
@@ -240,7 +240,6 @@ function request(data) {
|
|||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
state.trackedTokens = [];
|
state.trackedTokens = [];
|
||||||
state.wallets = [];
|
state.wallets = [];
|
||||||
state.networkId = "mainnet";
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("a token permission is warned about, naming spender and amount", () => {
|
describe("a token permission is warned about, naming spender and amount", () => {
|
||||||
@@ -533,66 +532,3 @@ describe("the sign screen refuses a mismatched primary type", () => {
|
|||||||
expect(node("btn-approve-sign").disabled).toBe(true);
|
expect(node("btn-approve-sign").disabled).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// EIP-712: a wallet refuses typed data whose domain names a chain other than
|
|
||||||
// the active one, because the signature is valid on the chain it names
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/519). The wallet is on Sepolia
|
|
||||||
// and the site asks for a mainnet USDC Permit.
|
|
||||||
describe("the sign screen refuses typed data for another chain", () => {
|
|
||||||
const REFUSAL =
|
|
||||||
"This typed data is for chain id 1, but the active network is Sepolia Testnet (chain id 11155111), so it cannot be signed.";
|
|
||||||
|
|
||||||
function withChainId(chainId) {
|
|
||||||
return { ...PERMIT, domain: { ...PERMIT.domain, chainId } };
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
decryptWithPassword.mockClear();
|
|
||||||
state.networkId = "sepolia";
|
|
||||||
});
|
|
||||||
|
|
||||||
test("another chain shows the error, with Sign disabled", async () => {
|
|
||||||
await openSignScreen(PERMIT);
|
|
||||||
expect(node("approve-sign-error").textContent).toBe(REFUSAL);
|
|
||||||
expect(node("btn-approve-sign").disabled).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("Sign clicked anyway decrypts and signs nothing", async () => {
|
|
||||||
const sent = await openSignScreen(PERMIT);
|
|
||||||
node("approve-sign-password").value = "any password";
|
|
||||||
await click("btn-approve-sign");
|
|
||||||
|
|
||||||
expect(decryptWithPassword).not.toHaveBeenCalled();
|
|
||||||
expect(sent.map((msg) => msg.type)).not.toContain(
|
|
||||||
"AUTISTMASK_SIGN_RESPONSE",
|
|
||||||
);
|
|
||||||
expect(node("approve-sign-error").textContent).toBe(REFUSAL);
|
|
||||||
});
|
|
||||||
|
|
||||||
// ethers signs 1, "1" and "0x1" as the same chain id.
|
|
||||||
test("the chain id is refused in each form ethers signs", () => {
|
|
||||||
for (const chainId of [1, "1", "0x1"]) {
|
|
||||||
expect(typedDataRefusal(request(withChainId(chainId)))).toBe(
|
|
||||||
REFUSAL,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a chain id that is not a number is refused", () => {
|
|
||||||
expect(typedDataRefusal(request(withChainId("mainnet")))).toBe(
|
|
||||||
"This typed data cannot be read, so it cannot be signed.",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("the active chain leaves Sign enabled", async () => {
|
|
||||||
await openSignScreen(withChainId("0xaa36a7"));
|
|
||||||
expect(node("approve-sign-error").textContent).toBe("");
|
|
||||||
expect(node("btn-approve-sign").disabled).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("no chain id leaves Sign enabled", async () => {
|
|
||||||
await openSignScreen(withChainId(undefined));
|
|
||||||
expect(node("approve-sign-error").textContent).toBe("");
|
|
||||||
expect(node("btn-approve-sign").disabled).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -153,18 +153,6 @@ describe("the explanatory copy", () => {
|
|||||||
expect(all).not.toMatch(/\blost\b|\bstolen\b|\bgone\b/i);
|
expect(all).not.toMatch(/\blost\b|\bstolen\b|\bgone\b/i);
|
||||||
});
|
});
|
||||||
|
|
||||||
// The wallet holds the imported key but will not export it, so the copy
|
|
||||||
// must name every key the user may hold that reaches the addresses
|
|
||||||
// outside it.
|
|
||||||
test("it names the keys that reach the addresses outside this wallet", () => {
|
|
||||||
const body = defect.paragraphs.join(" ");
|
|
||||||
|
|
||||||
expect(body).toMatch(/private key export are disabled/);
|
|
||||||
expect(body).toMatch(
|
|
||||||
/with the extended private key you imported, if you kept a copy of it, or with the master extended private key or recovery phrase it came from, in software that repeats the same non-standard derivation/,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("it says the wallet is not deleted and what the user can do", () => {
|
test("it says the wallet is not deleted and what the user can do", () => {
|
||||||
const body = defect.paragraphs.join(" ");
|
const body = defect.paragraphs.join(" ");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user