mirror of
https://github.com/zhom/donutbrowser.git
synced 2026-08-10 21:20:24 +02:00
Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5afde36790 | ||
|
|
325d8fae31 | ||
|
|
929f5a0ead | ||
|
|
32a1728dee | ||
|
|
a6b79341b3 | ||
|
|
a6b4108d82 | ||
|
|
11b130df46 | ||
|
|
b8e5b4f4e6 | ||
|
|
d80e127cd3 | ||
|
|
e11967509d | ||
|
|
6d9a44faad | ||
|
|
f8532be8af | ||
|
|
70a8deb7eb | ||
|
|
b89f002c1d | ||
|
|
3b1feb3f1b | ||
|
|
bc2b93d902 | ||
|
|
5c24e84eaf |
@@ -30,4 +30,9 @@ messages:
|
||||
### Documentation
|
||||
### Dependencies
|
||||
### Developer Experience
|
||||
model: openai/gpt-4.1
|
||||
# `auto` lets the Copilot CLI pick. Deliberately not a pinned model id: it is
|
||||
# the only value valid on every Copilot plan (Free and Student get auto
|
||||
# selection only), and it cannot go stale the way `openai/gpt-4.1` did when
|
||||
# GitHub Models was retired on 2026-07-30 and took both of these workflows
|
||||
# down with it.
|
||||
model: auto
|
||||
|
||||
@@ -20,4 +20,9 @@ messages:
|
||||
{{commits}}
|
||||
|
||||
Format: one short opening sentence, a blank line, then bullets starting with "- " (one per line). Nothing else.
|
||||
model: openai/gpt-4.1
|
||||
# `auto` lets the Copilot CLI pick. Deliberately not a pinned model id: it is
|
||||
# the only value valid on every Copilot plan (Free and Student get auto
|
||||
# selection only), and it cannot go stale the way `openai/gpt-4.1` did when
|
||||
# GitHub Models was retired on 2026-07-30 and took both of these workflows
|
||||
# down with it.
|
||||
model: auto
|
||||
|
||||
@@ -34,7 +34,7 @@ jobs:
|
||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1
|
||||
|
||||
- name: Set up pnpm package manager
|
||||
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 #v6.0.9
|
||||
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 #v6.0.10
|
||||
with:
|
||||
run_install: false
|
||||
|
||||
|
||||
@@ -96,7 +96,8 @@ jobs:
|
||||
-d "$PAYLOAD" || echo "000")
|
||||
|
||||
if [ "$STATUS" != "200" ]; then
|
||||
echo "::warning::GitHub Models returned HTTP $STATUS; treating as compliant"
|
||||
echo "::error::GitHub Models returned HTTP $STATUS; treating as compliant"
|
||||
printf '%s\n' "inference call failed with HTTP $STATUS" >> /tmp/ai-degraded
|
||||
echo '{"is_compliant": true, "non_compliance_reasons": []}' > /tmp/result.json
|
||||
exit 0
|
||||
fi
|
||||
@@ -107,7 +108,8 @@ jobs:
|
||||
# to a compliant result so a flaky model never closes a legitimate issue.
|
||||
sed -E 's/^```(json)?$//; s/```$//' /tmp/raw.txt > /tmp/result.json
|
||||
if ! jq -e . /tmp/result.json >/dev/null 2>&1; then
|
||||
echo "::warning::Model returned non-JSON; treating as compliant"
|
||||
echo "::error::Model returned non-JSON; treating as compliant"
|
||||
printf '%s\n' "model returned output that was not JSON" >> /tmp/ai-degraded
|
||||
echo '{"is_compliant": true, "non_compliance_reasons": []}' > /tmp/result.json
|
||||
fi
|
||||
echo "Compliance response validated"
|
||||
@@ -145,3 +147,16 @@ jobs:
|
||||
run: |
|
||||
gh issue comment "$ISSUE_NUMBER" --repo "$GITHUB_REPOSITORY" --body-file /tmp/comment.md
|
||||
gh issue close "$ISSUE_NUMBER" --repo "$GITHUB_REPOSITORY" --reason "not planned"
|
||||
|
||||
# The steps above deliberately degrade rather than block: an inference
|
||||
# outage must never close a contributor's issue or flag their pull
|
||||
# request. But a run that skipped the check it exists to perform has not
|
||||
# succeeded, and reporting green hides that the automation is dead.
|
||||
- name: Fail if the AI check did not actually run
|
||||
if: always()
|
||||
run: |
|
||||
if [ -f /tmp/ai-degraded ]; then
|
||||
echo "::error::This check degraded to a no-op and its result was not verified:"
|
||||
sed 's/^/ - /' /tmp/ai-degraded
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -257,7 +257,8 @@ jobs:
|
||||
if [ "$STATUS" = "200" ]; then
|
||||
jq -r '.choices[0].message.content // empty' /tmp/triage-response.json > /tmp/triage-raw.txt || : > /tmp/triage-raw.txt
|
||||
else
|
||||
echo "::warning::GitHub Models returned HTTP $STATUS for triage"
|
||||
echo "::error::GitHub Models returned HTTP $STATUS for triage"
|
||||
printf '%s\n' "triage inference call failed with HTTP $STATUS" >> /tmp/ai-degraded
|
||||
: > /tmp/triage-raw.txt
|
||||
fi
|
||||
|
||||
@@ -266,7 +267,8 @@ jobs:
|
||||
|
||||
# Fall back to a safe classification when the response is not JSON.
|
||||
if ! jq -e . /tmp/triage.json >/dev/null 2>&1; then
|
||||
echo "::warning::Triage returned non-JSON; using fallback classification"
|
||||
echo "::error::Triage returned non-JSON; using fallback classification"
|
||||
printf '%s\n' "triage returned output that was not JSON" >> /tmp/ai-degraded
|
||||
jq -n '{
|
||||
language: "en",
|
||||
classification: "bug-in-scope",
|
||||
@@ -436,7 +438,8 @@ jobs:
|
||||
-d "$PAYLOAD" || echo "000")
|
||||
|
||||
if [ "$STATUS" != "200" ]; then
|
||||
echo "::warning::GitHub Models returned HTTP $STATUS; skipping the triage comment"
|
||||
echo "::error::GitHub Models returned HTTP $STATUS; skipping the triage comment"
|
||||
printf '%s\n' "composer inference call failed with HTTP $STATUS" >> /tmp/ai-degraded
|
||||
echo "has_comment=false" >> "$GITHUB_OUTPUT"
|
||||
exit 0
|
||||
fi
|
||||
@@ -444,7 +447,8 @@ jobs:
|
||||
jq -r '.choices[0].message.content // empty' /tmp/compose-response.json > /tmp/ai-comment.txt || : > /tmp/ai-comment.txt
|
||||
|
||||
if [ ! -s /tmp/ai-comment.txt ]; then
|
||||
echo "::warning::Composer returned empty response; skipping the triage comment"
|
||||
echo "::error::Composer returned empty response; skipping the triage comment"
|
||||
printf '%s\n' "composer returned an empty response" >> /tmp/ai-degraded
|
||||
echo "has_comment=false" >> "$GITHUB_OUTPUT"
|
||||
exit 0
|
||||
fi
|
||||
@@ -482,6 +486,20 @@ jobs:
|
||||
run: |
|
||||
gh issue comment "$ISSUE_NUMBER" --repo "$GITHUB_REPOSITORY" --body-file /tmp/ai-comment.txt
|
||||
|
||||
|
||||
# The steps above deliberately degrade rather than block: an inference
|
||||
# outage must never close a contributor's issue or flag their pull
|
||||
# request. But a run that skipped the check it exists to perform has not
|
||||
# succeeded, and reporting green hides that the automation is dead.
|
||||
- name: Fail if the AI check did not actually run
|
||||
if: always()
|
||||
run: |
|
||||
if [ -f /tmp/ai-degraded ]; then
|
||||
echo "::error::This check degraded to a no-op and its result was not verified:"
|
||||
sed 's/^/ - /' /tmp/ai-degraded
|
||||
exit 1
|
||||
fi
|
||||
|
||||
analyze-pr:
|
||||
if: github.repository == 'zhom/donutbrowser' && github.event_name == 'pull_request_target' && github.actor != 'dependabot[bot]'
|
||||
runs-on: ubuntu-latest
|
||||
@@ -619,7 +637,8 @@ jobs:
|
||||
-d "$PAYLOAD" || echo "000")
|
||||
|
||||
if [ "$STATUS" != "200" ]; then
|
||||
echo "::warning::GitHub Models returned HTTP $STATUS; skipping the review comment"
|
||||
echo "::error::GitHub Models returned HTTP $STATUS; skipping the review comment"
|
||||
printf '%s\n' "PR review inference call failed with HTTP $STATUS" >> /tmp/ai-degraded
|
||||
echo "has_comment=false" >> "$GITHUB_OUTPUT"
|
||||
exit 0
|
||||
fi
|
||||
@@ -627,7 +646,8 @@ jobs:
|
||||
jq -r '.choices[0].message.content // empty' /tmp/pr-response.json > /tmp/ai-comment.txt || : > /tmp/ai-comment.txt
|
||||
|
||||
if [ ! -s /tmp/ai-comment.txt ]; then
|
||||
echo "::warning::AI response was empty; skipping the review comment"
|
||||
echo "::error::AI response was empty; skipping the review comment"
|
||||
printf '%s\n' "PR review returned an empty response" >> /tmp/ai-degraded
|
||||
echo "has_comment=false" >> "$GITHUB_OUTPUT"
|
||||
exit 0
|
||||
fi
|
||||
@@ -642,6 +662,20 @@ jobs:
|
||||
run: |
|
||||
gh pr comment "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --body-file /tmp/ai-comment.txt
|
||||
|
||||
|
||||
# The steps above deliberately degrade rather than block: an inference
|
||||
# outage must never close a contributor's issue or flag their pull
|
||||
# request. But a run that skipped the check it exists to perform has not
|
||||
# succeeded, and reporting green hides that the automation is dead.
|
||||
- name: Fail if the AI check did not actually run
|
||||
if: always()
|
||||
run: |
|
||||
if [ -f /tmp/ai-degraded ]; then
|
||||
echo "::error::This check degraded to a no-op and its result was not verified:"
|
||||
sed 's/^/ - /' /tmp/ai-degraded
|
||||
exit 1
|
||||
fi
|
||||
|
||||
opencode-command:
|
||||
if: |
|
||||
github.repository == 'zhom/donutbrowser' &&
|
||||
@@ -659,7 +693,7 @@ jobs:
|
||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1
|
||||
|
||||
- name: Run opencode
|
||||
uses: anomalyco/opencode/github@4da7bb44c84e013fa53e9c5d02ac753d1435c81a #v1.18.9
|
||||
uses: anomalyco/opencode/github@65cf14df16c191f3e9684f0d9a8bae69103ced6d #v1.18.14
|
||||
env:
|
||||
ZHIPU_API_KEY: ${{ secrets.ZHIPU_API_KEY }}
|
||||
TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1
|
||||
|
||||
- name: Set up pnpm package manager
|
||||
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 #v6.0.9
|
||||
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 #v6.0.10
|
||||
with:
|
||||
run_install: false
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1
|
||||
|
||||
- name: Set up pnpm package manager
|
||||
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 #v6.0.9
|
||||
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 #v6.0.10
|
||||
with:
|
||||
run_install: false
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ on:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
models: read
|
||||
copilot-requests: write
|
||||
|
||||
jobs:
|
||||
notify:
|
||||
@@ -123,17 +123,27 @@ jobs:
|
||||
echo "previous-tag=${PREV_TAG}" >> "$GITHUB_OUTPUT"
|
||||
echo "Collected $(wc -l < commits.txt) commits between ${PREV_TAG} and ${TAG}."
|
||||
|
||||
# The Copilot CLI is not preinstalled on GitHub-hosted runners, and
|
||||
# ai-inference v3 shells out to it.
|
||||
- name: Install Copilot CLI
|
||||
if: steps.gate.outputs.skip != 'true'
|
||||
run: npm install -g @github/copilot
|
||||
|
||||
- name: Generate summary with AI
|
||||
id: ai
|
||||
if: steps.gate.outputs.skip != 'true'
|
||||
uses: actions/ai-inference@a7805884c80886efc241e94a5351df715968a0ad # v2.1.1
|
||||
uses: actions/ai-inference@2c43c91ae16266ca159d311430343c67a5ffa222 # v3
|
||||
with:
|
||||
prompt-file: .github/prompts/telegram-release-summary.prompt.yml
|
||||
input: |
|
||||
version: ${{ steps.tag.outputs.tag }}
|
||||
file_input: |
|
||||
commits: ./commits.txt
|
||||
max-tokens: 1024
|
||||
env:
|
||||
# The Copilot CLI reads its credential from the environment; the
|
||||
# workflow token carries it under the `copilot-requests` permission
|
||||
# granted above, so no PAT is needed.
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Post release announcement to Telegram
|
||||
if: steps.gate.outputs.skip != 'true'
|
||||
|
||||
@@ -134,7 +134,8 @@ jobs:
|
||||
-d "$PAYLOAD" || echo "000")
|
||||
|
||||
if [ "$STATUS" != "200" ]; then
|
||||
echo "::warning::GitHub Models returned HTTP $STATUS; treating as compliant"
|
||||
echo "::error::GitHub Models returned HTTP $STATUS; treating as compliant"
|
||||
printf '%s\n' "inference call failed with HTTP $STATUS" >> /tmp/ai-degraded
|
||||
echo '{"compliant": true, "violations": []}' > /tmp/result.json
|
||||
exit 0
|
||||
fi
|
||||
@@ -146,7 +147,8 @@ jobs:
|
||||
# The deterministic trailer scan still stands on its own below.
|
||||
sed -E 's/^```(json)?$//; s/```$//' /tmp/raw.txt > /tmp/result.json
|
||||
if ! jq -e . /tmp/result.json >/dev/null 2>&1; then
|
||||
echo "::warning::Model returned non-JSON; treating as compliant"
|
||||
echo "::error::Model returned non-JSON; treating as compliant"
|
||||
printf '%s\n' "model returned output that was not JSON" >> /tmp/ai-degraded
|
||||
echo '{"compliant": true, "violations": []}' > /tmp/result.json
|
||||
fi
|
||||
echo "Policy response validated"
|
||||
@@ -205,3 +207,16 @@ jobs:
|
||||
run: |
|
||||
gh pr comment "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --body-file /tmp/comment.md
|
||||
gh pr close "$PR_NUMBER" --repo "$GITHUB_REPOSITORY"
|
||||
|
||||
# The steps above deliberately degrade rather than block: an inference
|
||||
# outage must never close a contributor's issue or flag their pull
|
||||
# request. But a run that skipped the check it exists to perform has not
|
||||
# succeeded, and reporting green hides that the automation is dead.
|
||||
- name: Fail if the AI check did not actually run
|
||||
if: always()
|
||||
run: |
|
||||
if [ -f /tmp/ai-degraded ]; then
|
||||
echo "::error::This check degraded to a no-op and its result was not verified:"
|
||||
sed 's/^/ - /' /tmp/ai-degraded
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -8,7 +8,7 @@ on:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
models: read
|
||||
copilot-requests: write
|
||||
|
||||
jobs:
|
||||
generate-release-notes:
|
||||
@@ -79,17 +79,27 @@ jobs:
|
||||
echo "commits-file=commits.txt" >> $GITHUB_OUTPUT
|
||||
echo "changes-file=changes.txt" >> $GITHUB_OUTPUT
|
||||
|
||||
# The Copilot CLI is not preinstalled on GitHub-hosted runners, and
|
||||
# ai-inference v3 shells out to it.
|
||||
- name: Install Copilot CLI
|
||||
if: steps.get-release.outputs.is-prerelease == 'false'
|
||||
run: npm install -g @github/copilot
|
||||
|
||||
- name: Generate release notes with AI
|
||||
id: generate-notes
|
||||
if: steps.get-release.outputs.is-prerelease == 'false'
|
||||
uses: actions/ai-inference@a7805884c80886efc241e94a5351df715968a0ad # v2.1.1
|
||||
uses: actions/ai-inference@2c43c91ae16266ca159d311430343c67a5ffa222 # v3
|
||||
with:
|
||||
prompt-file: .github/prompts/release-notes.prompt.yml
|
||||
input: |
|
||||
version: ${{ steps.get-previous-tag.outputs.current-tag }}
|
||||
file_input: |
|
||||
commits: ./commits.txt
|
||||
max-tokens: 4096
|
||||
env:
|
||||
# The Copilot CLI reads its credential from the environment; the
|
||||
# workflow token carries it under the `copilot-requests` permission
|
||||
# granted above, so no PAT is needed.
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Update release with generated notes
|
||||
if: steps.get-release.outputs.is-prerelease == 'false'
|
||||
|
||||
@@ -104,7 +104,7 @@ jobs:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1
|
||||
|
||||
- name: Setup pnpm
|
||||
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 #v6.0.9
|
||||
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 #v6.0.10
|
||||
with:
|
||||
run_install: false
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ jobs:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1
|
||||
|
||||
- name: Setup pnpm
|
||||
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 #v6.0.9
|
||||
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 #v6.0.10
|
||||
with:
|
||||
run_install: false
|
||||
|
||||
|
||||
@@ -23,4 +23,4 @@ jobs:
|
||||
- name: Checkout Actions Repository
|
||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1
|
||||
- name: Spell Check Repo
|
||||
uses: crate-ci/typos@bee27e3a4fd1ea2111cf90ab89cd076c870fce14 #v1.48.0
|
||||
uses: crate-ci/typos@8a48f81b6c64dcfea44b3633223084c4be58ac5f #v1.49.0
|
||||
|
||||
+151
@@ -1,6 +1,157 @@
|
||||
# Changelog
|
||||
|
||||
|
||||
## v0.29.1 (2026-08-08)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- prevent settings page from crashing on some systems
|
||||
|
||||
### Refactoring
|
||||
|
||||
- update logic and locks around vpn extensions
|
||||
|
||||
### Maintenance
|
||||
|
||||
- chore: linting
|
||||
- chore: update pnpm
|
||||
- chore: switch to ai-inference v3 and fail workflows on 410
|
||||
- chore: version bump
|
||||
- chore: update flake.nix for v0.29.0 [skip ci] (#542)
|
||||
|
||||
|
||||
## v0.29.0 (2026-08-08)
|
||||
|
||||
### Features
|
||||
|
||||
- prevent launch with inconsistent geodata
|
||||
- cookie bot
|
||||
- remote sessions
|
||||
- xray support
|
||||
- mass import via gui, api, and mcp
|
||||
- add Turkish (tr) language support
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- properly handle x-amz-meta-updated-at
|
||||
- improve UI interactions and page consistency
|
||||
|
||||
### Refactoring
|
||||
|
||||
- cleanup
|
||||
- cleanup
|
||||
- improve proxy lifetime management
|
||||
- cleanup
|
||||
- remote cleanup
|
||||
- cleanup cloud sync
|
||||
- cleanup
|
||||
- harden tests
|
||||
- block windows app update if the browser is running
|
||||
- ui refresh
|
||||
|
||||
### Documentation
|
||||
|
||||
- update CHANGELOG.md and README.md for v0.29.0 [skip ci] (#539)
|
||||
- contrib-readme-action has updated readme
|
||||
- contrib-readme-action has updated readme
|
||||
|
||||
### Maintenance
|
||||
|
||||
- chore: version bump
|
||||
- ci(deps): bump the github-actions group with 3 updates (#538)
|
||||
- chore: linting
|
||||
- chore: linting
|
||||
- chore: linting
|
||||
- chore: ci
|
||||
- chore: upload sidecars to cdn
|
||||
- chore: linting
|
||||
- ci(deps): bump the github-actions group with 4 updates
|
||||
- chore: linting
|
||||
- chore: disable e2e in ci
|
||||
- chore: linting
|
||||
- chore: linting
|
||||
- chore: ai compliance
|
||||
- chore: linting
|
||||
- ci(deps): bump the github-actions group across 1 directory with 3 updates (#514)
|
||||
- chore: linting
|
||||
- chore: linting
|
||||
- chore: add cross-platform webdriver tests
|
||||
- ci(deps): bump the github-actions group with 2 updates
|
||||
- chore: update flake.nix for v0.28.2 [skip ci] (#501)
|
||||
|
||||
### Other
|
||||
|
||||
- deps(deps): bump next from 16.2.10 to 16.2.11 (#515)
|
||||
- refactors: animations cleanup
|
||||
- restore settings redirect
|
||||
- fix group create translation key
|
||||
|
||||
|
||||
## v0.29.0 (2026-08-08)
|
||||
|
||||
### Features
|
||||
|
||||
- prevent launch with inconsistent geodata
|
||||
- cookie bot
|
||||
- remote sessions
|
||||
- xray support
|
||||
- mass import via gui, api, and mcp
|
||||
- add Turkish (tr) language support
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- properly handle x-amz-meta-updated-at
|
||||
- improve UI interactions and page consistency
|
||||
|
||||
### Refactoring
|
||||
|
||||
- cleanup
|
||||
- cleanup
|
||||
- improve proxy lifetime management
|
||||
- cleanup
|
||||
- remote cleanup
|
||||
- cleanup cloud sync
|
||||
- cleanup
|
||||
- harden tests
|
||||
- block windows app update if the browser is running
|
||||
- ui refresh
|
||||
|
||||
### Documentation
|
||||
|
||||
- contrib-readme-action has updated readme
|
||||
- contrib-readme-action has updated readme
|
||||
|
||||
### Maintenance
|
||||
|
||||
- ci(deps): bump the github-actions group with 3 updates (#538)
|
||||
- chore: linting
|
||||
- chore: linting
|
||||
- chore: linting
|
||||
- chore: ci
|
||||
- chore: upload sidecars to cdn
|
||||
- chore: linting
|
||||
- ci(deps): bump the github-actions group with 4 updates
|
||||
- chore: linting
|
||||
- chore: disable e2e in ci
|
||||
- chore: linting
|
||||
- chore: linting
|
||||
- chore: ai compliance
|
||||
- chore: linting
|
||||
- ci(deps): bump the github-actions group across 1 directory with 3 updates (#514)
|
||||
- chore: linting
|
||||
- chore: linting
|
||||
- chore: add cross-platform webdriver tests
|
||||
- ci(deps): bump the github-actions group with 2 updates
|
||||
- chore: update flake.nix for v0.28.2 [skip ci] (#501)
|
||||
|
||||
### Other
|
||||
|
||||
- deps(deps): bump next from 16.2.10 to 16.2.11 (#515)
|
||||
- refactors: animations cleanup
|
||||
- restore settings redirect
|
||||
- fix group create translation key
|
||||
|
||||
|
||||
## v0.28.2 (2026-07-12)
|
||||
|
||||
### Features
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
| | Apple Silicon | Intel |
|
||||
|---|---|---|
|
||||
| **DMG** | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_aarch64.dmg) | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_x64.dmg) |
|
||||
| **DMG** | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_aarch64.dmg) | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_x64.dmg) |
|
||||
|
||||
Or install via Homebrew:
|
||||
|
||||
@@ -56,15 +56,15 @@ brew install --cask donut
|
||||
|
||||
### Windows
|
||||
|
||||
[Download Windows Installer (x64)](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_x64-setup.exe) · [Portable (x64)](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_x64-portable.zip)
|
||||
[Download Windows Installer (x64)](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_x64-setup.exe) · [Portable (x64)](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_x64-portable.zip)
|
||||
|
||||
### Linux
|
||||
|
||||
| Format | x86_64 | ARM64 |
|
||||
|---|---|---|
|
||||
| **deb** | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_amd64.deb) | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_arm64.deb) |
|
||||
| **rpm** | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut-0.28.2-1.x86_64.rpm) | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut-0.28.2-1.aarch64.rpm) |
|
||||
| **AppImage** | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_amd64.AppImage) | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_aarch64.AppImage) |
|
||||
| **deb** | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_amd64.deb) | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_arm64.deb) |
|
||||
| **rpm** | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut-0.29.1-1.x86_64.rpm) | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut-0.29.1-1.aarch64.rpm) |
|
||||
| **AppImage** | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_amd64.AppImage) | [Download](https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_aarch64.AppImage) |
|
||||
<!-- install-links-end -->
|
||||
|
||||
Or install via package manager:
|
||||
|
||||
@@ -12,3 +12,7 @@ extend-exclude = [
|
||||
[default.extend-words]
|
||||
DBE = "DBE"
|
||||
nd = "nd"
|
||||
|
||||
[default.extend-identifiers]
|
||||
# Chrome Web Store extension name in the known-VPN list.
|
||||
VeePN = "VeePN"
|
||||
|
||||
@@ -13,3 +13,12 @@ S3_ACCESS_KEY_ID=CHANGE_ME
|
||||
S3_SECRET_ACCESS_KEY=CHANGE_ME
|
||||
S3_BUCKET=donut-sync
|
||||
S3_FORCE_PATH_STYLE=true
|
||||
|
||||
# The address Donut Browser is sent to for file transfers. Set this whenever
|
||||
# S3_ENDPOINT is only reachable from the server — running MinIO in the same
|
||||
# compose file makes S3_ENDPOINT a container name like http://minio:9000, which
|
||||
# resolves on the container network and nowhere else. Presigned URLs are signed
|
||||
# against the host they name, so leaving this unset there hands every client a
|
||||
# URL it cannot open: /health and /readyz stay green while every transfer fails.
|
||||
# Defaults to S3_ENDPOINT, which is correct when storage is already public.
|
||||
# S3_PUBLIC_ENDPOINT=https://storage.example.com
|
||||
|
||||
@@ -19,15 +19,25 @@ export class AppController {
|
||||
return { status: "ok" };
|
||||
}
|
||||
|
||||
// `storageEndpoint` is the host clients are handed in presigned URLs. The
|
||||
// server cannot tell whether a client can reach it, so report it and let
|
||||
// whoever is debugging a failing sync compare it against their network.
|
||||
// Self-hosted only — see getDiagnosticStorageEndpoint.
|
||||
@Get("readyz")
|
||||
async getReadiness(): Promise<{ status: string; s3: boolean }> {
|
||||
async getReadiness(): Promise<{
|
||||
status: string;
|
||||
s3: boolean;
|
||||
storageEndpoint?: string;
|
||||
}> {
|
||||
const s3Ready = await this.syncService.checkS3Connectivity();
|
||||
const storageEndpoint = this.syncService.getDiagnosticStorageEndpoint();
|
||||
const diagnostic = storageEndpoint ? { storageEndpoint } : {};
|
||||
if (!s3Ready) {
|
||||
throw new HttpException(
|
||||
{ status: "not ready", s3: false },
|
||||
{ status: "not ready", s3: false, ...diagnostic },
|
||||
HttpStatus.SERVICE_UNAVAILABLE,
|
||||
);
|
||||
}
|
||||
return { status: "ready", s3: true };
|
||||
return { status: "ready", s3: true, ...diagnostic };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,6 +82,10 @@ function sanitizeMetadata(
|
||||
export class SyncService implements OnModuleInit {
|
||||
private readonly logger = new Logger(SyncService.name);
|
||||
private s3Client: S3Client;
|
||||
// Signs the URLs handed to clients. Same instance as `s3Client` unless
|
||||
// `S3_PUBLIC_ENDPOINT` names a different, client-reachable address.
|
||||
private presignClient: S3Client;
|
||||
private publicEndpoint: string;
|
||||
private bucket: string;
|
||||
// Upper bound on presign batch array length (DoS guard).
|
||||
private static readonly MAX_BATCH_ITEMS = 1000;
|
||||
@@ -112,16 +116,34 @@ export class SyncService implements OnModuleInit {
|
||||
|
||||
this.bucket = requireEnv("S3_BUCKET");
|
||||
|
||||
const credentials = { accessKeyId, secretAccessKey };
|
||||
this.s3Client = new S3Client({
|
||||
endpoint,
|
||||
region,
|
||||
credentials: {
|
||||
accessKeyId,
|
||||
secretAccessKey,
|
||||
},
|
||||
credentials,
|
||||
forcePathStyle,
|
||||
});
|
||||
|
||||
// Presigned URLs are handed to a desktop client on another machine, so they
|
||||
// must name a host that client can reach. `S3_ENDPOINT` is often reachable
|
||||
// only from the server: the documented compose file points it at
|
||||
// `http://minio:9000`, a Docker service name that resolves on the compose
|
||||
// network and nowhere else. Signing is bound to the host, so the presign
|
||||
// client is a second client pinned to the public address rather than a
|
||||
// string rewrite of the signed URL.
|
||||
const publicEndpoint =
|
||||
this.configService.get<string>("S3_PUBLIC_ENDPOINT") || endpoint;
|
||||
this.publicEndpoint = publicEndpoint;
|
||||
this.presignClient =
|
||||
publicEndpoint === endpoint
|
||||
? this.s3Client
|
||||
: new S3Client({
|
||||
endpoint: publicEndpoint,
|
||||
region,
|
||||
credentials,
|
||||
forcePathStyle,
|
||||
});
|
||||
|
||||
this.backendInternalUrl = this.configService.get<string>(
|
||||
"BACKEND_INTERNAL_URL",
|
||||
);
|
||||
@@ -132,6 +154,51 @@ export class SyncService implements OnModuleInit {
|
||||
|
||||
async onModuleInit() {
|
||||
await this.ensureBucketExists();
|
||||
this.warnIfPresignEndpointIsServerOnly();
|
||||
}
|
||||
|
||||
/**
|
||||
* The address clients are sent to for object transfers, for `/readyz` to
|
||||
* report when a self-hoster is debugging a failing sync.
|
||||
*
|
||||
* Withheld in cloud mode: `/readyz` is unauthenticated, and a managed
|
||||
* deployment should not publish its storage host to anyone who can reach the
|
||||
* probe. Self-hosters own both ends, and the value is the whole point of the
|
||||
* diagnostic there.
|
||||
*/
|
||||
getDiagnosticStorageEndpoint(): string | undefined {
|
||||
const isCloud = Boolean(
|
||||
this.configService.get<string>("SYNC_JWT_PUBLIC_KEY"),
|
||||
);
|
||||
return isCloud ? undefined : this.publicEndpoint;
|
||||
}
|
||||
|
||||
/**
|
||||
* A single-label host (`minio`, `s3`) only resolves inside the container
|
||||
* network, so every presigned URL built from it is unreachable for the
|
||||
* desktop client even though the server's own S3 calls succeed. That failure
|
||||
* shows up as healthy `/health` and `/readyz` with every file transfer
|
||||
* failing at connect, which is near-impossible to diagnose from the client.
|
||||
* Say it once at boot instead.
|
||||
*/
|
||||
private warnIfPresignEndpointIsServerOnly(): void {
|
||||
let host: string;
|
||||
try {
|
||||
host = new URL(this.publicEndpoint).hostname;
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
|
||||
const isSingleLabel =
|
||||
!host.includes(".") && !host.includes(":") && host !== "localhost";
|
||||
if (!isSingleLabel) return;
|
||||
|
||||
this.logger.warn(
|
||||
`Storage endpoint '${this.publicEndpoint}' uses the container-only host '${host}'. ` +
|
||||
"Presigned URLs built from it cannot be reached by Donut Browser, so every " +
|
||||
"transfer will fail while /health and /readyz stay green. Set S3_PUBLIC_ENDPOINT " +
|
||||
"to an address your devices can reach (and publish that port).",
|
||||
);
|
||||
}
|
||||
|
||||
private async ensureBucketExists(): Promise<void> {
|
||||
@@ -332,7 +399,7 @@ export class SyncService implements OnModuleInit {
|
||||
const metadataHeaders = new Set(
|
||||
Object.keys(metadata ?? {}).map((name) => `x-amz-meta-${name}`),
|
||||
);
|
||||
const url = await getSignedUrl(this.s3Client, command, {
|
||||
const url = await getSignedUrl(this.presignClient, command, {
|
||||
expiresIn,
|
||||
// The AWS presigner otherwise hoists user metadata into the query string.
|
||||
// The client echoes the response metadata as headers, so those headers
|
||||
@@ -374,7 +441,7 @@ export class SyncService implements OnModuleInit {
|
||||
Key: key,
|
||||
});
|
||||
|
||||
const url = await getSignedUrl(this.s3Client, command, { expiresIn });
|
||||
const url = await getSignedUrl(this.presignClient, command, { expiresIn });
|
||||
|
||||
return {
|
||||
url,
|
||||
@@ -505,7 +572,9 @@ export class SyncService implements OnModuleInit {
|
||||
ContentType: item.contentType || "application/octet-stream",
|
||||
});
|
||||
|
||||
const url = await getSignedUrl(this.s3Client, command, { expiresIn });
|
||||
const url = await getSignedUrl(this.presignClient, command, {
|
||||
expiresIn,
|
||||
});
|
||||
|
||||
return {
|
||||
key: item.key,
|
||||
@@ -565,7 +634,9 @@ export class SyncService implements OnModuleInit {
|
||||
Key: key,
|
||||
});
|
||||
|
||||
const url = await getSignedUrl(this.s3Client, command, { expiresIn });
|
||||
const url = await getSignedUrl(this.presignClient, command, {
|
||||
expiresIn,
|
||||
});
|
||||
|
||||
return {
|
||||
key: rawKey,
|
||||
|
||||
@@ -0,0 +1,201 @@
|
||||
import { INestApplication } from "@nestjs/common";
|
||||
import { ConfigModule } from "@nestjs/config";
|
||||
import { Test, TestingModule } from "@nestjs/testing";
|
||||
import request from "supertest";
|
||||
import { App } from "supertest/types";
|
||||
import { AppController } from "./../src/app.controller.js";
|
||||
import { AppService } from "./../src/app.service.js";
|
||||
import { SyncModule } from "./../src/sync/sync.module.js";
|
||||
import {
|
||||
configureTestEnv,
|
||||
TEST_S3_ENDPOINT,
|
||||
TEST_SYNC_TOKEN,
|
||||
waitForTestS3,
|
||||
} from "./test-env.js";
|
||||
|
||||
// Presigning is offline, so this host never has to accept a connection — the
|
||||
// assertions are about which host ends up in the signed URL.
|
||||
const PUBLIC_ENDPOINT = "https://storage.example.com";
|
||||
|
||||
// Only needs to be present for the server to consider itself cloud-mode; no
|
||||
// token is verified against it in these assertions.
|
||||
const CLOUD_PUBLIC_KEY =
|
||||
"-----BEGIN PUBLIC KEY-----\nnot-a-real-key\n-----END PUBLIC KEY-----";
|
||||
|
||||
interface PresignResponse {
|
||||
url: string;
|
||||
}
|
||||
|
||||
interface PresignBatchResponse {
|
||||
items: Array<{ key: string; url: string }>;
|
||||
}
|
||||
|
||||
interface ReadyResponse {
|
||||
status: string;
|
||||
s3: boolean;
|
||||
storageEndpoint: string;
|
||||
}
|
||||
|
||||
async function bootstrap(publicEndpoint: string | undefined) {
|
||||
configureTestEnv();
|
||||
if (publicEndpoint) {
|
||||
process.env.S3_PUBLIC_ENDPOINT = publicEndpoint;
|
||||
} else {
|
||||
delete process.env.S3_PUBLIC_ENDPOINT;
|
||||
}
|
||||
await waitForTestS3();
|
||||
|
||||
const moduleFixture: TestingModule = await Test.createTestingModule({
|
||||
imports: [ConfigModule.forRoot({ isGlobal: true }), SyncModule],
|
||||
controllers: [AppController],
|
||||
providers: [AppService],
|
||||
}).compile();
|
||||
|
||||
const app = moduleFixture.createNestApplication<INestApplication<App>>();
|
||||
await app.listen(0);
|
||||
return app;
|
||||
}
|
||||
|
||||
// A self-hosted server usually reaches its storage over a private address the
|
||||
// desktop client has no route to. Signing client URLs against that address
|
||||
// handed every client a URL it could not open, so uploads failed at connect
|
||||
// while /health and /readyz stayed green.
|
||||
describe("presigned URL host", () => {
|
||||
describe("with S3_PUBLIC_ENDPOINT set", () => {
|
||||
let app: INestApplication<App>;
|
||||
|
||||
beforeAll(async () => {
|
||||
app = await bootstrap(PUBLIC_ENDPOINT);
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
delete process.env.S3_PUBLIC_ENDPOINT;
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("signs single upload URLs against the public endpoint", async () => {
|
||||
const response = await request(app.getHttpServer())
|
||||
.post("/v1/objects/presign-upload")
|
||||
.set("Authorization", `Bearer ${TEST_SYNC_TOKEN}`)
|
||||
.send({ key: "endpoint/single.txt" })
|
||||
.expect(200);
|
||||
|
||||
const { url } = response.body as PresignResponse;
|
||||
expect(url.startsWith(PUBLIC_ENDPOINT)).toBe(true);
|
||||
expect(url).not.toContain(TEST_S3_ENDPOINT);
|
||||
});
|
||||
|
||||
it("signs batch upload URLs against the public endpoint", async () => {
|
||||
const response = await request(app.getHttpServer())
|
||||
.post("/v1/objects/presign-upload-batch")
|
||||
.set("Authorization", `Bearer ${TEST_SYNC_TOKEN}`)
|
||||
.send({ items: [{ key: "endpoint/a.txt" }, { key: "endpoint/b.txt" }] })
|
||||
.expect(200);
|
||||
|
||||
const { items } = response.body as PresignBatchResponse;
|
||||
expect(items).toHaveLength(2);
|
||||
for (const item of items) {
|
||||
expect(item.url.startsWith(PUBLIC_ENDPOINT)).toBe(true);
|
||||
}
|
||||
});
|
||||
|
||||
it("signs download URLs against the public endpoint", async () => {
|
||||
const response = await request(app.getHttpServer())
|
||||
.post("/v1/objects/presign-download")
|
||||
.set("Authorization", `Bearer ${TEST_SYNC_TOKEN}`)
|
||||
.send({ key: "endpoint/single.txt" })
|
||||
.expect(200);
|
||||
|
||||
const { url } = response.body as PresignResponse;
|
||||
expect(url.startsWith(PUBLIC_ENDPOINT)).toBe(true);
|
||||
});
|
||||
|
||||
// The server's own S3 calls must keep using the private endpoint, or
|
||||
// pointing clients at a public address would break the server itself.
|
||||
it("still reaches storage over the private endpoint", async () => {
|
||||
const response = await request(app.getHttpServer())
|
||||
.post("/v1/objects/stat")
|
||||
.set("Authorization", `Bearer ${TEST_SYNC_TOKEN}`)
|
||||
.send({ key: "endpoint/does-not-exist" })
|
||||
.expect(200);
|
||||
|
||||
expect(response.body).toEqual({ exists: false });
|
||||
});
|
||||
|
||||
it("reports the client-facing endpoint from /readyz", async () => {
|
||||
const response = await request(app.getHttpServer())
|
||||
.get("/readyz")
|
||||
.expect(200);
|
||||
|
||||
const body = response.body as ReadyResponse;
|
||||
expect(body.s3).toBe(true);
|
||||
expect(body.storageEndpoint).toBe(PUBLIC_ENDPOINT);
|
||||
});
|
||||
});
|
||||
|
||||
// /readyz has no auth, so a managed deployment must not publish its storage
|
||||
// host to anyone who can reach the probe.
|
||||
describe("in cloud mode", () => {
|
||||
let app: INestApplication<App>;
|
||||
const previousKey = process.env.SYNC_JWT_PUBLIC_KEY;
|
||||
|
||||
beforeAll(async () => {
|
||||
process.env.SYNC_JWT_PUBLIC_KEY = CLOUD_PUBLIC_KEY;
|
||||
app = await bootstrap(PUBLIC_ENDPOINT);
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
if (previousKey === undefined) {
|
||||
delete process.env.SYNC_JWT_PUBLIC_KEY;
|
||||
} else {
|
||||
process.env.SYNC_JWT_PUBLIC_KEY = previousKey;
|
||||
}
|
||||
delete process.env.S3_PUBLIC_ENDPOINT;
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("withholds the storage endpoint from /readyz", async () => {
|
||||
const response = await request(app.getHttpServer())
|
||||
.get("/readyz")
|
||||
.expect(200);
|
||||
|
||||
const body = response.body as ReadyResponse;
|
||||
expect(body.s3).toBe(true);
|
||||
expect(body.storageEndpoint).toBeUndefined();
|
||||
expect(JSON.stringify(body)).not.toContain("storage.example.com");
|
||||
});
|
||||
});
|
||||
|
||||
describe("without S3_PUBLIC_ENDPOINT", () => {
|
||||
let app: INestApplication<App>;
|
||||
|
||||
beforeAll(async () => {
|
||||
app = await bootstrap(undefined);
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("falls back to S3_ENDPOINT", async () => {
|
||||
const response = await request(app.getHttpServer())
|
||||
.post("/v1/objects/presign-upload")
|
||||
.set("Authorization", `Bearer ${TEST_SYNC_TOKEN}`)
|
||||
.send({ key: "endpoint/fallback.txt" })
|
||||
.expect(200);
|
||||
|
||||
const { url } = response.body as PresignResponse;
|
||||
expect(url.startsWith(TEST_S3_ENDPOINT)).toBe(true);
|
||||
});
|
||||
|
||||
it("reports the fallback endpoint from /readyz", async () => {
|
||||
const response = await request(app.getHttpServer())
|
||||
.get("/readyz")
|
||||
.expect(200);
|
||||
|
||||
expect((response.body as ReadyResponse).storageEndpoint).toBe(
|
||||
TEST_S3_ENDPOINT,
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
Generated
+78
-3
@@ -680,6 +680,15 @@ dependencies = [
|
||||
"hybrid-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block-padding"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block-padding"
|
||||
version = "0.4.2"
|
||||
@@ -967,6 +976,15 @@ dependencies = [
|
||||
"toml 0.9.12+spec-1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cbc"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
|
||||
dependencies = [
|
||||
"cipher 0.4.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cbc"
|
||||
version = "0.2.1"
|
||||
@@ -1785,7 +1803,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "donutbrowser"
|
||||
version = "0.28.2"
|
||||
version = "0.29.1"
|
||||
dependencies = [
|
||||
"aes 0.9.1",
|
||||
"aes-gcm 0.11.0",
|
||||
@@ -1797,7 +1815,7 @@ dependencies = [
|
||||
"blake3",
|
||||
"boringtun",
|
||||
"bzip2",
|
||||
"cbc",
|
||||
"cbc 0.2.1",
|
||||
"chrono",
|
||||
"chrono-tz",
|
||||
"clap",
|
||||
@@ -1832,6 +1850,8 @@ dependencies = [
|
||||
"resvg",
|
||||
"ring",
|
||||
"rusqlite",
|
||||
"secret-service",
|
||||
"security-framework",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_yaml",
|
||||
@@ -3379,6 +3399,7 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
|
||||
dependencies = [
|
||||
"block-padding 0.3.3",
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
@@ -3388,7 +3409,7 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
|
||||
dependencies = [
|
||||
"block-padding",
|
||||
"block-padding 0.4.2",
|
||||
"hybrid-array",
|
||||
]
|
||||
|
||||
@@ -4085,6 +4106,20 @@ dependencies = [
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-complex",
|
||||
"num-integer",
|
||||
"num-iter",
|
||||
"num-rational",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-bigint"
|
||||
version = "0.4.8"
|
||||
@@ -4095,6 +4130,15 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-complex"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.2.2"
|
||||
@@ -4121,6 +4165,16 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-iter"
|
||||
version = "0.1.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
|
||||
dependencies = [
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-rational"
|
||||
version = "0.4.2"
|
||||
@@ -5713,6 +5767,25 @@ dependencies = [
|
||||
"syn 2.0.118",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "secret-service"
|
||||
version = "5.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a62d7f86047af0077255a29494136b9aaaf697c76ff70b8e49cded4e2623c14"
|
||||
dependencies = [
|
||||
"aes 0.8.4",
|
||||
"cbc 0.1.2",
|
||||
"futures-util",
|
||||
"generic-array",
|
||||
"getrandom 0.2.17",
|
||||
"hkdf",
|
||||
"num",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"sha2 0.10.9",
|
||||
"zbus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "security-framework"
|
||||
version = "3.7.0"
|
||||
@@ -7198,6 +7271,7 @@ dependencies = [
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"tracing",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
@@ -8985,6 +9059,7 @@ dependencies = [
|
||||
"rustix",
|
||||
"serde",
|
||||
"serde_repr",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"uds_windows",
|
||||
"uuid",
|
||||
|
||||
@@ -68,6 +68,7 @@ export class AppSession {
|
||||
extraEnv = {},
|
||||
args = [],
|
||||
seedVersionCache = true,
|
||||
seedDownloadedBrowser = false,
|
||||
onboardingCompleted = true,
|
||||
wayfernTermsAccepted = true,
|
||||
}) {
|
||||
@@ -80,6 +81,7 @@ export class AppSession {
|
||||
this.extraEnv = extraEnv;
|
||||
this.args = args;
|
||||
this.seedVersionCache = seedVersionCache;
|
||||
this.seedDownloadedBrowser = seedDownloadedBrowser;
|
||||
this.onboardingCompleted = onboardingCompleted;
|
||||
this.wayfernTermsAccepted = wayfernTermsAccepted;
|
||||
this.session = null;
|
||||
@@ -184,6 +186,54 @@ export class AppSession {
|
||||
}
|
||||
});
|
||||
}
|
||||
if (this.seedDownloadedBrowser) {
|
||||
// Registers a Wayfern version as "downloaded" without installing a
|
||||
// binary. Profile import derives its version from this registry and
|
||||
// fails with BROWSER_NOT_DOWNLOADED otherwise, so suites that exercise
|
||||
// import but never launch a browser need the entry and nothing else.
|
||||
const seededVersion =
|
||||
typeof this.seedDownloadedBrowser === "string"
|
||||
? this.seedDownloadedBrowser
|
||||
: "150.0.7871.100";
|
||||
const installDir = path.join(
|
||||
this.dataRoot,
|
||||
"data",
|
||||
"binaries",
|
||||
"wayfern",
|
||||
seededVersion,
|
||||
);
|
||||
await mkdir(installDir, { recursive: true });
|
||||
const registryPath = path.join(
|
||||
this.dataRoot,
|
||||
"data",
|
||||
"data",
|
||||
"downloaded_browsers.json",
|
||||
);
|
||||
await mkdir(path.dirname(registryPath), { recursive: true });
|
||||
await writeFile(
|
||||
registryPath,
|
||||
`${JSON.stringify(
|
||||
{
|
||||
browsers: {
|
||||
wayfern: {
|
||||
[seededVersion]: {
|
||||
browser: "wayfern",
|
||||
version: seededVersion,
|
||||
file_path: installDir,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
null,
|
||||
2,
|
||||
)}\n`,
|
||||
{ flag: "wx" },
|
||||
).catch((error) => {
|
||||
if (error.code !== "EEXIST") {
|
||||
throw error;
|
||||
}
|
||||
});
|
||||
}
|
||||
const env = isolatedEnvironment(this.root, {
|
||||
DONUT_E2E_DISABLE_STARTUP_NETWORK: "1",
|
||||
...(process.env.DONUT_E2E_FIXTURE_URL
|
||||
@@ -525,6 +575,7 @@ export function appFromEnvironment(name, options = {}) {
|
||||
extraEnv: options.extraEnv,
|
||||
args: options.args,
|
||||
seedVersionCache: options.seedVersionCache,
|
||||
seedDownloadedBrowser: options.seedDownloadedBrowser,
|
||||
onboardingCompleted: options.onboardingCompleted,
|
||||
wayfernTermsAccepted: options.wayfernTermsAccepted,
|
||||
});
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
} from "node:fs/promises";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import { DatabaseSync } from "node:sqlite";
|
||||
|
||||
export const TEST_BROWSER_VERSION = "150.0.7871.100";
|
||||
|
||||
@@ -220,3 +221,101 @@ export function currentHostOs() {
|
||||
? "windows"
|
||||
: "linux";
|
||||
}
|
||||
|
||||
/**
|
||||
* Write a Chromium cookie store at schema version 24 with plaintext values.
|
||||
*
|
||||
* Plaintext is deliberate: it is what a store looks like when the source
|
||||
* browser could not reach its keyring, and it lets the suite assert that
|
||||
* import seals every row with the target profile's key. Chromium reads a row
|
||||
* whose `encrypted_value` is empty, and drops any row where both columns are
|
||||
* set, so "value cleared and encrypted_value populated" is the only shape that
|
||||
* actually loads.
|
||||
*/
|
||||
export function writeChromiumCookies(dbPath, cookies) {
|
||||
const db = new DatabaseSync(dbPath);
|
||||
db.exec(`
|
||||
CREATE TABLE cookies(
|
||||
creation_utc INTEGER NOT NULL,
|
||||
host_key TEXT NOT NULL,
|
||||
top_frame_site_key TEXT NOT NULL,
|
||||
name TEXT NOT NULL,
|
||||
value TEXT NOT NULL,
|
||||
encrypted_value BLOB NOT NULL DEFAULT '',
|
||||
path TEXT NOT NULL,
|
||||
expires_utc INTEGER NOT NULL,
|
||||
is_secure INTEGER NOT NULL,
|
||||
is_httponly INTEGER NOT NULL,
|
||||
last_access_utc INTEGER NOT NULL,
|
||||
has_expires INTEGER NOT NULL DEFAULT 1,
|
||||
is_persistent INTEGER NOT NULL DEFAULT 1,
|
||||
priority INTEGER NOT NULL DEFAULT 1,
|
||||
samesite INTEGER NOT NULL DEFAULT -1,
|
||||
source_scheme INTEGER NOT NULL DEFAULT 0,
|
||||
source_port INTEGER NOT NULL DEFAULT -1,
|
||||
last_update_utc INTEGER NOT NULL DEFAULT 0,
|
||||
source_type INTEGER NOT NULL DEFAULT 0,
|
||||
has_cross_site_ancestor INTEGER NOT NULL DEFAULT 0
|
||||
);
|
||||
CREATE UNIQUE INDEX cookies_unique_index
|
||||
ON cookies(host_key, top_frame_site_key, name, path);
|
||||
CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY, value LONGVARCHAR);
|
||||
INSERT INTO meta VALUES('version', '24');
|
||||
INSERT INTO meta VALUES('last_compatible_version', '24');
|
||||
`);
|
||||
const insert = db.prepare(
|
||||
`INSERT INTO cookies(creation_utc, host_key, top_frame_site_key, name, value,
|
||||
encrypted_value, path, expires_utc, is_secure, is_httponly, last_access_utc)
|
||||
VALUES(?, ?, '', ?, ?, ?, '/', 0, 0, 0, 0)`,
|
||||
);
|
||||
// `encrypted` cookies are written the way Chromium's v23->v24 migration
|
||||
// does: BindString into a BLOB column, which leaves the storage class as
|
||||
// TEXT. Reading that as a strict blob returns empty and silently blanks the
|
||||
// cookie, so the suite has to reproduce it rather than only binding blobs.
|
||||
const insertAsText = db.prepare(
|
||||
`INSERT INTO cookies(creation_utc, host_key, top_frame_site_key, name, value,
|
||||
encrypted_value, path, expires_utc, is_secure, is_httponly, last_access_utc)
|
||||
VALUES(?, ?, '', ?, '', CAST(? AS TEXT), '/', 0, 0, 0, 0)`,
|
||||
);
|
||||
let creation = 13000000000000000;
|
||||
for (const cookie of cookies) {
|
||||
if (cookie.encryptedValueText === undefined) {
|
||||
insert.run(creation++, cookie.host, cookie.name, cookie.value, "");
|
||||
} else {
|
||||
insertAsText.run(
|
||||
creation++,
|
||||
cookie.host,
|
||||
cookie.name,
|
||||
cookie.encryptedValueText,
|
||||
);
|
||||
}
|
||||
}
|
||||
db.close();
|
||||
}
|
||||
|
||||
/** Write a Chromium History database holding the given URLs. */
|
||||
export function writeChromiumHistory(dbPath, urls) {
|
||||
const db = new DatabaseSync(dbPath);
|
||||
db.exec(`
|
||||
CREATE TABLE urls(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
url LONGVARCHAR,
|
||||
title LONGVARCHAR,
|
||||
visit_count INTEGER DEFAULT 0 NOT NULL,
|
||||
typed_count INTEGER DEFAULT 0 NOT NULL,
|
||||
last_visit_time INTEGER NOT NULL,
|
||||
hidden INTEGER DEFAULT 0 NOT NULL
|
||||
);
|
||||
CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY, value LONGVARCHAR);
|
||||
INSERT INTO meta VALUES('version', '69');
|
||||
INSERT INTO meta VALUES('last_compatible_version', '16');
|
||||
`);
|
||||
const insert = db.prepare(
|
||||
"INSERT INTO urls(url, title, visit_count, typed_count, last_visit_time, hidden) VALUES(?, ?, 1, 0, ?, 0)",
|
||||
);
|
||||
let visit = 13000000000000000;
|
||||
for (const url of urls) {
|
||||
insert.run(url, url, visit++);
|
||||
}
|
||||
db.close();
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { existsSync } from "node:fs";
|
||||
import { readdir, readFile, stat } from "node:fs/promises";
|
||||
import { mkdir, readdir, readFile, stat, writeFile } from "node:fs/promises";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import test from "node:test";
|
||||
@@ -270,6 +270,78 @@ test("real Wayfern fingerprinting, terms, API automation, CDP, cookies, and proc
|
||||
"a consent token is only minted when a cached mismatch is blocking",
|
||||
);
|
||||
|
||||
// Extension detection, against manifests written where Chromium puts
|
||||
// them. The three cases are the whole point of the classifier: a real VPN
|
||||
// is named as one, a known VPN with an unrevealing name is caught by its
|
||||
// id, and a download manager holding the same `proxy` permission is
|
||||
// reported as a capability and never as a VPN.
|
||||
// `DONUTBROWSER_DATA_ROOT` puts the data dir at <dataRoot>/data, so this
|
||||
// is app_dirs::profiles_dir() plus the layout Chromium itself uses.
|
||||
const extensionsDir = path.join(
|
||||
app.dataRoot,
|
||||
"data",
|
||||
"profiles",
|
||||
profile.id,
|
||||
"profile",
|
||||
"Default",
|
||||
"Extensions",
|
||||
);
|
||||
const seedExtension = async (id, version, manifest) => {
|
||||
const dir = path.join(extensionsDir, id, `${version}_0`);
|
||||
await mkdir(dir, { recursive: true });
|
||||
await writeFile(
|
||||
path.join(dir, "manifest.json"),
|
||||
JSON.stringify(manifest),
|
||||
);
|
||||
};
|
||||
const IDM_ID = "ngpampappnmepgilojfohadhhmbhlaek";
|
||||
const HOTSPOT_SHIELD_ID = "nlbejmccbhkncgokjcmghpfloaajcffj";
|
||||
const NAMED_VPN_ID = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
|
||||
await seedExtension(IDM_ID, "6.43.1", {
|
||||
name: "IDM Integration Module",
|
||||
version: "6.43.1",
|
||||
description: "Download files with Internet Download Manager",
|
||||
permissions: ["downloads", "storage", "proxy", "nativeMessaging"],
|
||||
});
|
||||
await seedExtension(HOTSPOT_SHIELD_ID, "10.0.0", {
|
||||
name: "Hotspot Shield",
|
||||
version: "10.0.0",
|
||||
permissions: ["proxy"],
|
||||
});
|
||||
await seedExtension(NAMED_VPN_ID, "1.0.0", {
|
||||
name: "Turbo VPN Free",
|
||||
version: "1.0.0",
|
||||
permissions: ["proxy"],
|
||||
});
|
||||
|
||||
const withExtensions = await app.invoke("get_profile_pre_launch_checks", {
|
||||
profileId: profile.id,
|
||||
});
|
||||
const detected = new Map(
|
||||
withExtensions.vpn_extensions.map((item) => [item.key, item]),
|
||||
);
|
||||
assert.equal(detected.size, 3, "every seeded extension must be reported");
|
||||
assert.equal(detected.get(`crx:${NAMED_VPN_ID}`).confidence, "confirmed");
|
||||
assert.equal(
|
||||
detected.get(`crx:${HOTSPOT_SHIELD_ID}`).confidence,
|
||||
"confirmed",
|
||||
"a known VPN id must be named even when its name gives nothing away",
|
||||
);
|
||||
assert.equal(
|
||||
detected.get(`crx:${IDM_ID}`).confidence,
|
||||
"capability",
|
||||
"a download manager holding the proxy permission is not a VPN",
|
||||
);
|
||||
assert.ok(
|
||||
detected.get(`crx:${IDM_ID}`).proxy_control,
|
||||
"it does still hold the permission, which is why it is listed at all",
|
||||
);
|
||||
assert.equal(
|
||||
withExtensions.exit_measurement_unreliable,
|
||||
true,
|
||||
"a proxy-capable extension makes the exit measurement a caveat",
|
||||
);
|
||||
|
||||
// Acknowledgements are per-profile and must be accepted for both kinds.
|
||||
await app.invoke("ack_launch_gate", {
|
||||
profileId: profile.id,
|
||||
@@ -279,8 +351,16 @@ test("real Wayfern fingerprinting, terms, API automation, CDP, cookies, and proc
|
||||
await app.invoke("ack_launch_gate", {
|
||||
profileId: profile.id,
|
||||
ackFingerprint: true,
|
||||
ackExtensionKeys: [],
|
||||
ackExtensionKeys: [`crx:${IDM_ID}`],
|
||||
});
|
||||
const afterAck = await app.invoke("get_profile_pre_launch_checks", {
|
||||
profileId: profile.id,
|
||||
});
|
||||
assert.deepEqual(
|
||||
afterAck.vpn_extensions.map((item) => item.key).sort(),
|
||||
[`crx:${HOTSPOT_SHIELD_ID}`, `crx:${NAMED_VPN_ID}`].sort(),
|
||||
"an acknowledged extension stops being reported, the others do not",
|
||||
);
|
||||
assert.match(
|
||||
await app.invokeError("get_profile_pre_launch_checks", {
|
||||
profileId: "00000000-0000-0000-0000-000000000000",
|
||||
|
||||
+456
-238
@@ -1,9 +1,16 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { mkdir, writeFile } from "node:fs/promises";
|
||||
import { existsSync } from "node:fs";
|
||||
import { mkdir, readFile, writeFile } from "node:fs/promises";
|
||||
import path from "node:path";
|
||||
import { DatabaseSync } from "node:sqlite";
|
||||
import test from "node:test";
|
||||
import { withApp } from "../lib/app.mjs";
|
||||
import { extensionZipBase64, wireGuardFixture } from "../lib/fixtures.mjs";
|
||||
import {
|
||||
extensionZipBase64,
|
||||
wireGuardFixture,
|
||||
writeChromiumCookies,
|
||||
writeChromiumHistory,
|
||||
} from "../lib/fixtures.mjs";
|
||||
|
||||
async function createProfile(app, name = "Entity Profile") {
|
||||
return app.invoke("create_browser_profile_new", {
|
||||
@@ -24,257 +31,468 @@ async function createProfile(app, name = "Entity Profile") {
|
||||
}
|
||||
|
||||
test("profile, group, proxy, tag, metadata, clone, and bulk-delete lifecycle", async () => {
|
||||
await withApp("entities-core", async (app) => {
|
||||
const group = await app.invoke("create_profile_group", {
|
||||
name: "Research",
|
||||
});
|
||||
assert.equal(group.name, "Research");
|
||||
const renamedGroup = await app.invoke("update_profile_group", {
|
||||
groupId: group.id,
|
||||
name: "Research Team",
|
||||
});
|
||||
assert.equal(renamedGroup.name, "Research Team");
|
||||
// Profile import derives its browser version from the downloaded-browsers
|
||||
// registry, so without an entry every import fails with
|
||||
// BROWSER_NOT_DOWNLOADED before it touches a single file.
|
||||
await withApp(
|
||||
"entities-core",
|
||||
async (app) => {
|
||||
const group = await app.invoke("create_profile_group", {
|
||||
name: "Research",
|
||||
});
|
||||
assert.equal(group.name, "Research");
|
||||
const renamedGroup = await app.invoke("update_profile_group", {
|
||||
groupId: group.id,
|
||||
name: "Research Team",
|
||||
});
|
||||
assert.equal(renamedGroup.name, "Research Team");
|
||||
|
||||
const duplicateError = await app.invokeError("create_profile_group", {
|
||||
name: "Research Team",
|
||||
});
|
||||
assert.match(duplicateError, /GROUP_ALREADY_EXISTS|already exists/i);
|
||||
const duplicateError = await app.invokeError("create_profile_group", {
|
||||
name: "Research Team",
|
||||
});
|
||||
assert.match(duplicateError, /GROUP_ALREADY_EXISTS|already exists/i);
|
||||
|
||||
const proxy = await app.invoke("create_stored_proxy", {
|
||||
name: "Local Dead Proxy",
|
||||
proxySettings: {
|
||||
proxy_type: "http",
|
||||
host: "127.0.0.1",
|
||||
port: 9,
|
||||
username: "e2e-user",
|
||||
password: "e2e-pass",
|
||||
},
|
||||
});
|
||||
assert.equal(proxy.proxy_settings.password, "e2e-pass");
|
||||
const updatedProxy = await app.invoke("update_stored_proxy", {
|
||||
proxyId: proxy.id,
|
||||
name: "Updated Proxy",
|
||||
proxySettings: {
|
||||
proxy_type: "socks5",
|
||||
host: "127.0.0.1",
|
||||
port: 9,
|
||||
username: null,
|
||||
password: null,
|
||||
},
|
||||
});
|
||||
assert.equal(updatedProxy.name, "Updated Proxy");
|
||||
assert.equal(updatedProxy.updated_at >= proxy.updated_at, true);
|
||||
const proxy = await app.invoke("create_stored_proxy", {
|
||||
name: "Local Dead Proxy",
|
||||
proxySettings: {
|
||||
proxy_type: "http",
|
||||
host: "127.0.0.1",
|
||||
port: 9,
|
||||
username: "e2e-user",
|
||||
password: "e2e-pass",
|
||||
},
|
||||
});
|
||||
assert.equal(proxy.proxy_settings.password, "e2e-pass");
|
||||
const updatedProxy = await app.invoke("update_stored_proxy", {
|
||||
proxyId: proxy.id,
|
||||
name: "Updated Proxy",
|
||||
proxySettings: {
|
||||
proxy_type: "socks5",
|
||||
host: "127.0.0.1",
|
||||
port: 9,
|
||||
username: null,
|
||||
password: null,
|
||||
},
|
||||
});
|
||||
assert.equal(updatedProxy.name, "Updated Proxy");
|
||||
assert.equal(updatedProxy.updated_at >= proxy.updated_at, true);
|
||||
|
||||
const parsed = await app.invoke("parse_txt_proxies", {
|
||||
content: [
|
||||
"http://one.example:8080",
|
||||
"two.example:1080:user:pass",
|
||||
"not a proxy",
|
||||
].join("\n"),
|
||||
});
|
||||
assert.equal(parsed.length, 3);
|
||||
assert.ok(parsed.some((result) => result.status === "parsed"));
|
||||
assert.ok(parsed.some((result) => result.status === "invalid"));
|
||||
const parsedProxy = parsed.find((result) => result.status === "parsed");
|
||||
const { status: _status, ...parsedProxyFields } = parsedProxy;
|
||||
const parsedImport = await app.invoke("import_proxies_from_parsed", {
|
||||
parsedProxies: [parsedProxyFields],
|
||||
namePrefix: "Parsed",
|
||||
});
|
||||
assert.equal(parsedImport.imported_count, 1);
|
||||
const parsed = await app.invoke("parse_txt_proxies", {
|
||||
content: [
|
||||
"http://one.example:8080",
|
||||
"two.example:1080:user:pass",
|
||||
"not a proxy",
|
||||
].join("\n"),
|
||||
});
|
||||
assert.equal(parsed.length, 3);
|
||||
assert.ok(parsed.some((result) => result.status === "parsed"));
|
||||
assert.ok(parsed.some((result) => result.status === "invalid"));
|
||||
const parsedProxy = parsed.find((result) => result.status === "parsed");
|
||||
const { status: _status, ...parsedProxyFields } = parsedProxy;
|
||||
const parsedImport = await app.invoke("import_proxies_from_parsed", {
|
||||
parsedProxies: [parsedProxyFields],
|
||||
namePrefix: "Parsed",
|
||||
});
|
||||
assert.equal(parsedImport.imported_count, 1);
|
||||
|
||||
const validityError = await app.invokeError("check_proxy_validity", {
|
||||
proxyId: proxy.id,
|
||||
proxySettings: null,
|
||||
});
|
||||
assert.match(validityError, /Proxy check failed|Could not connect/i);
|
||||
const cachedValidity = await app.invoke("get_cached_proxy_check", {
|
||||
proxyId: proxy.id,
|
||||
});
|
||||
assert.ok(cachedValidity === null || cachedValidity.is_valid === false);
|
||||
const validityError = await app.invokeError("check_proxy_validity", {
|
||||
proxyId: proxy.id,
|
||||
proxySettings: null,
|
||||
});
|
||||
assert.match(validityError, /Proxy check failed|Could not connect/i);
|
||||
const cachedValidity = await app.invoke("get_cached_proxy_check", {
|
||||
proxyId: proxy.id,
|
||||
});
|
||||
assert.ok(cachedValidity === null || cachedValidity.is_valid === false);
|
||||
|
||||
// Donut accepts one VLESS shape (REALITY + XTLS Vision over TCP). The form
|
||||
// uses this to tell the user WHICH part of their setup is unsupported
|
||||
// instead of implying they mistyped, so the reason must survive the IPC hop.
|
||||
const goodVless =
|
||||
"vless://6d6e21a1-4829-4d2b-bc7f-1b25707b61e4@example.com:443" +
|
||||
"?security=reality&flow=xtls-rprx-vision&encryption=none&type=tcp" +
|
||||
"&sni=a.com&pbk=mQB9jxUDHO7g49VaNXLEdcNQ_jLhTbLolUsMUNwb6W4&sid=00&fp=chrome";
|
||||
assert.equal(
|
||||
await app.invoke("validate_vless_uri", { uri: goodVless }),
|
||||
null,
|
||||
);
|
||||
|
||||
for (const [uri, reason] of [
|
||||
[goodVless.replace("security=reality", "security=tls"), "security"],
|
||||
[goodVless.replace("type=tcp", "type=ws"), "transport"],
|
||||
[goodVless.replace("flow=xtls-rprx-vision", "flow=none"), "flow"],
|
||||
]) {
|
||||
// invokeError returns the command's error wrapped in a message, so match
|
||||
// rather than JSON.parse the whole string.
|
||||
const error = await app.invokeError("validate_vless_uri", { uri });
|
||||
assert.match(error, /VLESS_CONFIG_INVALID/);
|
||||
assert.match(
|
||||
error,
|
||||
new RegExp(`"reason":"${reason}"`),
|
||||
`expected reason ${reason} for ${uri}, got: ${error}`,
|
||||
// Donut accepts one VLESS shape (REALITY + XTLS Vision over TCP). The form
|
||||
// uses this to tell the user WHICH part of their setup is unsupported
|
||||
// instead of implying they mistyped, so the reason must survive the IPC hop.
|
||||
const goodVless =
|
||||
"vless://6d6e21a1-4829-4d2b-bc7f-1b25707b61e4@example.com:443" +
|
||||
"?security=reality&flow=xtls-rprx-vision&encryption=none&type=tcp" +
|
||||
"&sni=a.com&pbk=mQB9jxUDHO7g49VaNXLEdcNQ_jLhTbLolUsMUNwb6W4&sid=00&fp=chrome";
|
||||
assert.equal(
|
||||
await app.invoke("validate_vless_uri", { uri: goodVless }),
|
||||
null,
|
||||
);
|
||||
}
|
||||
|
||||
const exported = JSON.parse(
|
||||
await app.invoke("export_proxies", { format: "json" }),
|
||||
);
|
||||
assert.equal(exported.proxies.length, 2);
|
||||
assert.ok(exported.proxies.some((item) => item.name === "Updated Proxy"));
|
||||
assert.ok(exported.proxies.some((item) => item.name === "Parsed Proxy 1"));
|
||||
const importResult = await app.invoke("import_proxies_json", {
|
||||
content: JSON.stringify({
|
||||
version: "1",
|
||||
source: "Donut Browser",
|
||||
exported_at: new Date().toISOString(),
|
||||
proxies: [
|
||||
for (const [uri, reason] of [
|
||||
[goodVless.replace("security=reality", "security=tls"), "security"],
|
||||
[goodVless.replace("type=tcp", "type=ws"), "transport"],
|
||||
[goodVless.replace("flow=xtls-rprx-vision", "flow=none"), "flow"],
|
||||
]) {
|
||||
// invokeError returns the command's error wrapped in a message, so match
|
||||
// rather than JSON.parse the whole string.
|
||||
const error = await app.invokeError("validate_vless_uri", { uri });
|
||||
assert.match(error, /VLESS_CONFIG_INVALID/);
|
||||
assert.match(
|
||||
error,
|
||||
new RegExp(`"reason":"${reason}"`),
|
||||
`expected reason ${reason} for ${uri}, got: ${error}`,
|
||||
);
|
||||
}
|
||||
|
||||
const exported = JSON.parse(
|
||||
await app.invoke("export_proxies", { format: "json" }),
|
||||
);
|
||||
assert.equal(exported.proxies.length, 2);
|
||||
assert.ok(exported.proxies.some((item) => item.name === "Updated Proxy"));
|
||||
assert.ok(
|
||||
exported.proxies.some((item) => item.name === "Parsed Proxy 1"),
|
||||
);
|
||||
const importResult = await app.invoke("import_proxies_json", {
|
||||
content: JSON.stringify({
|
||||
version: "1",
|
||||
source: "Donut Browser",
|
||||
exported_at: new Date().toISOString(),
|
||||
proxies: [
|
||||
{
|
||||
name: "Imported Proxy",
|
||||
type: "http",
|
||||
host: "127.0.0.1",
|
||||
port: 8081,
|
||||
},
|
||||
],
|
||||
}),
|
||||
});
|
||||
assert.equal(importResult.imported_count, 1);
|
||||
|
||||
const profile = await createProfile(app);
|
||||
assert.equal(profile.name, "Entity Profile");
|
||||
assert.equal(
|
||||
(
|
||||
await app.invoke("update_profile_proxy", {
|
||||
profileId: profile.id,
|
||||
proxyId: proxy.id,
|
||||
})
|
||||
).proxy_id,
|
||||
proxy.id,
|
||||
);
|
||||
await app.invoke("assign_profiles_to_group", {
|
||||
profileIds: [profile.id],
|
||||
groupId: group.id,
|
||||
});
|
||||
await app.invoke("rename_profile", {
|
||||
profileId: profile.id,
|
||||
newName: "Renamed Profile",
|
||||
});
|
||||
await app.invoke("update_profile_tags", {
|
||||
profileId: profile.id,
|
||||
tags: ["alpha", "automation"],
|
||||
});
|
||||
await app.invoke("update_profile_note", {
|
||||
profileId: profile.id,
|
||||
note: "Extensive E2E metadata",
|
||||
});
|
||||
await app.invoke("update_profile_window_color", {
|
||||
profileId: profile.id,
|
||||
windowColor: "#123456",
|
||||
});
|
||||
await app.invoke("update_profile_launch_hook", {
|
||||
profileId: profile.id,
|
||||
launchHook: `${process.env.DONUT_E2E_FIXTURE_URL}/launch-hook`,
|
||||
});
|
||||
const invalidHook = await app.invokeError("update_profile_launch_hook", {
|
||||
profileId: profile.id,
|
||||
launchHook: "file:///etc/passwd",
|
||||
});
|
||||
assert.match(invalidHook, /INVALID_LAUNCH_HOOK_URL/);
|
||||
await app.invoke("update_profile_proxy_bypass_rules", {
|
||||
profileId: profile.id,
|
||||
rules: ["localhost", "*.internal.example"],
|
||||
});
|
||||
await app.invoke("update_profile_dns_blocklist", {
|
||||
profileId: profile.id,
|
||||
dnsBlocklist: "light",
|
||||
});
|
||||
await app.invoke("update_profile_clear_on_close", {
|
||||
profileId: profile.id,
|
||||
clearOnClose: true,
|
||||
});
|
||||
|
||||
const profiles = await app.invoke("list_browser_profiles");
|
||||
const changed = profiles.find((item) => item.id === profile.id);
|
||||
assert.deepEqual(changed.tags, ["alpha", "automation"]);
|
||||
assert.equal(changed.note, "Extensive E2E metadata");
|
||||
assert.equal(changed.window_color, "#123456");
|
||||
assert.equal(changed.group_id, group.id);
|
||||
assert.deepEqual(changed.proxy_bypass_rules, [
|
||||
"localhost",
|
||||
"*.internal.example",
|
||||
]);
|
||||
assert.equal(changed.dns_blocklist, "light");
|
||||
assert.equal(changed.clear_on_close, true);
|
||||
assert.deepEqual((await app.invoke("get_all_tags")).sort(), [
|
||||
"alpha",
|
||||
"automation",
|
||||
]);
|
||||
|
||||
assert.ok(Array.isArray(await app.invoke("detect_existing_profiles")));
|
||||
const importRoot = path.join(app.root, "profile-import-fixture");
|
||||
const importProfile = path.join(importRoot, "Default");
|
||||
await mkdir(importProfile, { recursive: true });
|
||||
await writeFile(
|
||||
path.join(importProfile, "Preferences"),
|
||||
JSON.stringify({
|
||||
profile: { name: "Imported fixture", exit_type: "Crashed" },
|
||||
download: { default_directory: "/Users/someone-else/Downloads" },
|
||||
}),
|
||||
);
|
||||
// A Secure Preferences with MACs that can never validate under Wayfern,
|
||||
// one real (relative-path) extension and one component extension that
|
||||
// belongs to the source browser's bundle.
|
||||
await writeFile(
|
||||
path.join(importProfile, "Secure Preferences"),
|
||||
JSON.stringify({
|
||||
protection: { super_mac: "deadbeef", macs: { extensions: {} } },
|
||||
extensions: {
|
||||
settings: {
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: {
|
||||
path: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/1.0_0",
|
||||
},
|
||||
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: {
|
||||
path: "/Applications/Chromium.app/Contents/Resources/component",
|
||||
},
|
||||
},
|
||||
},
|
||||
}),
|
||||
);
|
||||
// Caches must not be copied, and site data must be.
|
||||
await mkdir(path.join(importProfile, "Cache"), { recursive: true });
|
||||
await writeFile(path.join(importProfile, "Cache", "data_0"), "junk");
|
||||
await mkdir(path.join(importProfile, "Local Storage", "leveldb"), {
|
||||
recursive: true,
|
||||
});
|
||||
await writeFile(
|
||||
path.join(importProfile, "Local Storage", "leveldb", "000003.log"),
|
||||
"site-data",
|
||||
);
|
||||
writeChromiumHistory(path.join(importProfile, "History"), [
|
||||
"https://example.com/",
|
||||
"https://example.org/",
|
||||
]);
|
||||
writeChromiumCookies(path.join(importProfile, "Cookies"), [
|
||||
{ host: "example.com", name: "sid", value: "session-token" },
|
||||
{ host: "example.org", name: "pref", value: "dark" },
|
||||
// Sealed with a key this machine does not have, and stored the way
|
||||
// Chromium's own v23->v24 migration stores it (TEXT in a BLOB column).
|
||||
// It must be reported as unrecoverable, never silently blanked and
|
||||
// counted as migrated.
|
||||
{
|
||||
host: "sealed.example",
|
||||
name: "sid",
|
||||
encryptedValueText: "v10\u0001\u0002\u0003unopenable-ciphertext",
|
||||
},
|
||||
]);
|
||||
|
||||
const scanned = await app.invoke("scan_folder_for_profiles", {
|
||||
folderPath: importRoot,
|
||||
});
|
||||
assert.equal(scanned.length, 1);
|
||||
assert.equal(scanned[0].mapped_browser, "wayfern");
|
||||
const importBatch = await app.invoke("import_browser_profiles", {
|
||||
items: [
|
||||
{
|
||||
name: "Imported Proxy",
|
||||
type: "http",
|
||||
host: "127.0.0.1",
|
||||
port: 8081,
|
||||
source_path: scanned[0].path,
|
||||
browser_type: scanned[0].browser,
|
||||
new_profile_name: "Imported Profile",
|
||||
proxy_id: null,
|
||||
vpn_id: null,
|
||||
},
|
||||
],
|
||||
}),
|
||||
});
|
||||
assert.equal(importResult.imported_count, 1);
|
||||
groupId: null,
|
||||
duplicateStrategy: "rename",
|
||||
// A stored fingerprint, as elsewhere in this suite: generating a real
|
||||
// one shells out to the Wayfern binary, which no CRUD suite installs.
|
||||
wayfernConfig: { fingerprint: "{}" },
|
||||
});
|
||||
assert.equal(
|
||||
importBatch.imported_count,
|
||||
1,
|
||||
`import must succeed: ${JSON.stringify(importBatch.results)}`,
|
||||
);
|
||||
|
||||
const profile = await createProfile(app);
|
||||
assert.equal(profile.name, "Entity Profile");
|
||||
assert.equal(
|
||||
(
|
||||
await app.invoke("update_profile_proxy", {
|
||||
profileId: profile.id,
|
||||
proxyId: proxy.id,
|
||||
})
|
||||
).proxy_id,
|
||||
proxy.id,
|
||||
);
|
||||
await app.invoke("assign_profiles_to_group", {
|
||||
profileIds: [profile.id],
|
||||
groupId: group.id,
|
||||
});
|
||||
await app.invoke("rename_profile", {
|
||||
profileId: profile.id,
|
||||
newName: "Renamed Profile",
|
||||
});
|
||||
await app.invoke("update_profile_tags", {
|
||||
profileId: profile.id,
|
||||
tags: ["alpha", "automation"],
|
||||
});
|
||||
await app.invoke("update_profile_note", {
|
||||
profileId: profile.id,
|
||||
note: "Extensive E2E metadata",
|
||||
});
|
||||
await app.invoke("update_profile_window_color", {
|
||||
profileId: profile.id,
|
||||
windowColor: "#123456",
|
||||
});
|
||||
await app.invoke("update_profile_launch_hook", {
|
||||
profileId: profile.id,
|
||||
launchHook: `${process.env.DONUT_E2E_FIXTURE_URL}/launch-hook`,
|
||||
});
|
||||
const invalidHook = await app.invokeError("update_profile_launch_hook", {
|
||||
profileId: profile.id,
|
||||
launchHook: "file:///etc/passwd",
|
||||
});
|
||||
assert.match(invalidHook, /INVALID_LAUNCH_HOOK_URL/);
|
||||
await app.invoke("update_profile_proxy_bypass_rules", {
|
||||
profileId: profile.id,
|
||||
rules: ["localhost", "*.internal.example"],
|
||||
});
|
||||
await app.invoke("update_profile_dns_blocklist", {
|
||||
profileId: profile.id,
|
||||
dnsBlocklist: "light",
|
||||
});
|
||||
await app.invoke("update_profile_clear_on_close", {
|
||||
profileId: profile.id,
|
||||
clearOnClose: true,
|
||||
});
|
||||
const imported = importBatch.results[0];
|
||||
// The assertion whose absence let the layout bug ship: an import that
|
||||
// carries nothing used to be indistinguishable from a successful one.
|
||||
assert.ok(
|
||||
imported.report,
|
||||
"an imported profile must report what it carried",
|
||||
);
|
||||
assert.equal(imported.report.cookies_migrated, 2);
|
||||
assert.equal(
|
||||
imported.report.cookies_unrecoverable,
|
||||
1,
|
||||
"a cookie no key can open must be counted, not silently emptied",
|
||||
);
|
||||
assert.equal(imported.report.history_entries, 2);
|
||||
assert.equal(imported.report.extensions_migrated, 1);
|
||||
assert.ok(imported.report.local_storage_origins > 0);
|
||||
|
||||
const profiles = await app.invoke("list_browser_profiles");
|
||||
const changed = profiles.find((item) => item.id === profile.id);
|
||||
assert.deepEqual(changed.tags, ["alpha", "automation"]);
|
||||
assert.equal(changed.note, "Extensive E2E metadata");
|
||||
assert.equal(changed.window_color, "#123456");
|
||||
assert.equal(changed.group_id, group.id);
|
||||
assert.deepEqual(changed.proxy_bypass_rules, [
|
||||
"localhost",
|
||||
"*.internal.example",
|
||||
]);
|
||||
assert.equal(changed.dns_blocklist, "light");
|
||||
assert.equal(changed.clear_on_close, true);
|
||||
assert.deepEqual((await app.invoke("get_all_tags")).sort(), [
|
||||
"alpha",
|
||||
"automation",
|
||||
]);
|
||||
const importedDir = path.join(
|
||||
app.dataRoot,
|
||||
"data",
|
||||
"profiles",
|
||||
imported.profile_id,
|
||||
"profile",
|
||||
);
|
||||
// Chromium reads <user-data-dir>/Default/, so anything at the root is
|
||||
// invisible to the browser no matter how faithfully it was copied.
|
||||
assert.ok(
|
||||
existsSync(path.join(importedDir, "Default", "Preferences")),
|
||||
"profile content must land under Default/",
|
||||
);
|
||||
assert.ok(
|
||||
!existsSync(path.join(importedDir, "Preferences")),
|
||||
"nothing profile-scoped may sit at the user-data-dir root",
|
||||
);
|
||||
assert.ok(
|
||||
existsSync(path.join(importedDir, "os_crypt_key")),
|
||||
"Wayfern reads its key from the user-data-dir root",
|
||||
);
|
||||
assert.ok(
|
||||
!existsSync(path.join(importedDir, "Default", "Cache")),
|
||||
"caches are pure waste and must not be copied",
|
||||
);
|
||||
assert.ok(
|
||||
existsSync(
|
||||
path.join(
|
||||
importedDir,
|
||||
"Default",
|
||||
"Local Storage",
|
||||
"leveldb",
|
||||
"000003.log",
|
||||
),
|
||||
),
|
||||
"site data must survive",
|
||||
);
|
||||
|
||||
assert.ok(Array.isArray(await app.invoke("detect_existing_profiles")));
|
||||
const importRoot = path.join(app.root, "profile-import-fixture");
|
||||
const importProfile = path.join(importRoot, "Default");
|
||||
await mkdir(importProfile, { recursive: true });
|
||||
await writeFile(
|
||||
path.join(importProfile, "Preferences"),
|
||||
JSON.stringify({ profile: { name: "Imported fixture" } }),
|
||||
);
|
||||
const scanned = await app.invoke("scan_folder_for_profiles", {
|
||||
folderPath: importRoot,
|
||||
});
|
||||
assert.equal(scanned.length, 1);
|
||||
assert.equal(scanned[0].mapped_browser, "wayfern");
|
||||
const importBatch = await app.invoke("import_browser_profiles", {
|
||||
items: [
|
||||
{
|
||||
source_path: scanned[0].path,
|
||||
browser_type: scanned[0].browser,
|
||||
new_profile_name: "Imported Profile",
|
||||
proxy_id: null,
|
||||
vpn_id: null,
|
||||
},
|
||||
],
|
||||
groupId: null,
|
||||
duplicateStrategy: "rename",
|
||||
wayfernConfig: null,
|
||||
});
|
||||
assert.equal(importBatch.imported_count + importBatch.failed_count, 1);
|
||||
const archivePath = path.join(app.root, "profile-import-fixture.zip");
|
||||
await writeFile(archivePath, Buffer.from(extensionZipBase64(), "base64"));
|
||||
const archiveScan = await app.invoke("scan_profile_archive", {
|
||||
archivePath,
|
||||
});
|
||||
assert.ok(Array.isArray(archiveScan.profiles));
|
||||
await app.invoke("cleanup_profile_import_scratch", {
|
||||
extractedDir: archiveScan.extracted_dir,
|
||||
});
|
||||
const importedCookies = path.join(
|
||||
importedDir,
|
||||
"Default",
|
||||
process.platform === "win32"
|
||||
? path.join("Network", "Cookies")
|
||||
: "Cookies",
|
||||
);
|
||||
assert.ok(
|
||||
existsSync(importedCookies),
|
||||
"cookies must sit where this platform's Chromium reads them",
|
||||
);
|
||||
// Chromium drops any row where both value and encrypted_value are set, so
|
||||
// a "migrated" cookie that kept its plaintext would never load.
|
||||
const cookieDb = new DatabaseSync(importedCookies, { readOnly: true });
|
||||
const rows = cookieDb
|
||||
.prepare(
|
||||
"SELECT host_key, value, length(encrypted_value) AS enc FROM cookies ORDER BY host_key",
|
||||
)
|
||||
.all();
|
||||
cookieDb.close();
|
||||
assert.equal(
|
||||
rows.length,
|
||||
2,
|
||||
"the unrecoverable row is dropped, not kept empty",
|
||||
);
|
||||
for (const row of rows) {
|
||||
assert.equal(row.value, "", `${row.host_key} kept a plaintext value`);
|
||||
assert.ok(row.enc > 0, `${row.host_key} was not re-encrypted`);
|
||||
}
|
||||
|
||||
const clone = await app.invoke("clone_profile", {
|
||||
profileId: profile.id,
|
||||
name: "Cloned Profile",
|
||||
});
|
||||
assert.notEqual(clone.id, profile.id);
|
||||
assert.equal(clone.name, "Cloned Profile");
|
||||
const counts = await app.invoke("get_groups_with_profile_counts");
|
||||
assert.equal(counts.find((item) => item.id === group.id).count, 2);
|
||||
assert.equal((await app.invoke("get_profile_groups")).length, 1);
|
||||
const securePrefs = JSON.parse(
|
||||
await readFile(
|
||||
path.join(importedDir, "Default", "Secure Preferences"),
|
||||
"utf8",
|
||||
),
|
||||
);
|
||||
assert.equal(
|
||||
securePrefs.protection,
|
||||
undefined,
|
||||
"MACs from another machine can never validate and must be stripped",
|
||||
);
|
||||
assert.ok(
|
||||
securePrefs.extensions.settings.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
|
||||
"the user's own extension must survive",
|
||||
);
|
||||
assert.equal(
|
||||
securePrefs.extensions.settings.bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
|
||||
undefined,
|
||||
"a component extension pointing into the source browser must be dropped",
|
||||
);
|
||||
|
||||
await app.invoke("delete_selected_profiles", {
|
||||
profileIds: [profile.id, clone.id],
|
||||
});
|
||||
assert.deepEqual(await app.invoke("list_browser_profiles"), []);
|
||||
await app.invoke("delete_profile_group", { groupId: group.id });
|
||||
await app.invoke("delete_stored_proxy", { proxyId: proxy.id });
|
||||
for (const importedProxy of (await app.invoke("get_stored_proxies")).filter(
|
||||
(item) =>
|
||||
item.name === "Imported Proxy" || item.name.startsWith("Parsed Proxy"),
|
||||
)) {
|
||||
await app.invoke("delete_stored_proxy", { proxyId: importedProxy.id });
|
||||
}
|
||||
});
|
||||
const prefs = JSON.parse(
|
||||
await readFile(
|
||||
path.join(importedDir, "Default", "Preferences"),
|
||||
"utf8",
|
||||
),
|
||||
);
|
||||
assert.equal(prefs.profile.exit_type, "Normal");
|
||||
assert.equal(prefs.download.default_directory, undefined);
|
||||
assert.equal(prefs.profile.name, "Imported fixture");
|
||||
|
||||
// A Gecko profile must say why it cannot be imported instead of silently
|
||||
// producing an empty one.
|
||||
const firefoxRoot = path.join(app.root, "firefox-profile-fixture");
|
||||
await mkdir(firefoxRoot, { recursive: true });
|
||||
await writeFile(path.join(firefoxRoot, "prefs.js"), "// prefs");
|
||||
await writeFile(path.join(firefoxRoot, "places.sqlite"), "");
|
||||
const geckoBatch = await app.invoke("import_browser_profiles", {
|
||||
items: [
|
||||
{
|
||||
source_path: firefoxRoot,
|
||||
browser_type: "firefox",
|
||||
new_profile_name: "Gecko Profile",
|
||||
proxy_id: null,
|
||||
vpn_id: null,
|
||||
},
|
||||
],
|
||||
groupId: null,
|
||||
duplicateStrategy: "rename",
|
||||
wayfernConfig: { fingerprint: "{}" },
|
||||
});
|
||||
assert.equal(geckoBatch.failed_count, 1);
|
||||
assert.match(
|
||||
geckoBatch.results[0].error,
|
||||
/IMPORT_SOURCE_NOT_CHROMIUM/,
|
||||
"a Firefox folder must be rejected by name, not imported empty",
|
||||
);
|
||||
const archivePath = path.join(app.root, "profile-import-fixture.zip");
|
||||
await writeFile(archivePath, Buffer.from(extensionZipBase64(), "base64"));
|
||||
const archiveScan = await app.invoke("scan_profile_archive", {
|
||||
archivePath,
|
||||
});
|
||||
assert.ok(Array.isArray(archiveScan.profiles));
|
||||
await app.invoke("cleanup_profile_import_scratch", {
|
||||
extractedDir: archiveScan.extracted_dir,
|
||||
});
|
||||
|
||||
const clone = await app.invoke("clone_profile", {
|
||||
profileId: profile.id,
|
||||
name: "Cloned Profile",
|
||||
});
|
||||
assert.notEqual(clone.id, profile.id);
|
||||
assert.equal(clone.name, "Cloned Profile");
|
||||
const counts = await app.invoke("get_groups_with_profile_counts");
|
||||
assert.equal(counts.find((item) => item.id === group.id).count, 2);
|
||||
assert.equal((await app.invoke("get_profile_groups")).length, 1);
|
||||
|
||||
await app.invoke("delete_selected_profiles", {
|
||||
profileIds: [profile.id, clone.id, imported.profile_id],
|
||||
});
|
||||
assert.deepEqual(await app.invoke("list_browser_profiles"), []);
|
||||
await app.invoke("delete_profile_group", { groupId: group.id });
|
||||
await app.invoke("delete_stored_proxy", { proxyId: proxy.id });
|
||||
for (const importedProxy of (
|
||||
await app.invoke("get_stored_proxies")
|
||||
).filter(
|
||||
(item) =>
|
||||
item.name === "Imported Proxy" ||
|
||||
item.name.startsWith("Parsed Proxy"),
|
||||
)) {
|
||||
await app.invoke("delete_stored_proxy", { proxyId: importedProxy.id });
|
||||
}
|
||||
},
|
||||
{ seedDownloadedBrowser: true },
|
||||
);
|
||||
});
|
||||
|
||||
test("extensions, extension groups, VPN storage, DNS rules, and event-backed assignments", async () => {
|
||||
|
||||
@@ -96,17 +96,17 @@
|
||||
pkgConfigPath = lib.makeSearchPath "lib/pkgconfig" (
|
||||
pkgConfigLibs ++ map lib.getDev pkgConfigLibs
|
||||
);
|
||||
releaseVersion = "0.28.2";
|
||||
releaseVersion = "0.29.1";
|
||||
releaseAppImage =
|
||||
if system == "x86_64-linux" then
|
||||
pkgs.fetchurl {
|
||||
url = "https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_amd64.AppImage";
|
||||
hash = "sha256-+CqHiPMg4oczNiPg+MC6jvp0CUcK4kb5yeyk+QDbAWY=";
|
||||
url = "https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_amd64.AppImage";
|
||||
hash = "sha256-8EI1aUe0nuW1JsYoRD+PhIDtGbZ1SiNqKBAhFRE/K1w=";
|
||||
}
|
||||
else if system == "aarch64-linux" then
|
||||
pkgs.fetchurl {
|
||||
url = "https://github.com/zhom/donutbrowser/releases/download/v0.28.2/Donut_0.28.2_aarch64.AppImage";
|
||||
hash = "sha256-HodokW2ySIpdpW7Hyqpwsm8whQ0hHldlSg11Sl1UW3k=";
|
||||
url = "https://github.com/zhom/donutbrowser/releases/download/v0.29.1/Donut_0.29.1_aarch64.AppImage";
|
||||
hash = "sha256-MLRZFU1y5dbgPhD7okCHYbC8pGrG79GT70kdD3yvqKk=";
|
||||
}
|
||||
else
|
||||
null;
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@
|
||||
"name": "donutbrowser",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0",
|
||||
"version": "0.28.2",
|
||||
"version": "0.29.2",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"predev": "pnpm licenses:generate",
|
||||
@@ -111,7 +111,7 @@
|
||||
"tw-animate-css": "^1.4.0",
|
||||
"typescript": "~6.0.3"
|
||||
},
|
||||
"packageManager": "pnpm@11.10.0",
|
||||
"packageManager": "pnpm@11.20.0",
|
||||
"lint-staged": {
|
||||
"**/*.{js,jsx,ts,tsx,json,css}": [
|
||||
"biome check --fix"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/dist/commonjs/index.d.ts b/dist/commonjs/index.d.ts
|
||||
index f3e2de9d87e1ce462517e49f35733bed8bdf85af..6c84d87835182d0670981dc15f488c2a7d061c98 100644
|
||||
index f3e2de9d87e1ce462517e49f35733bed8bdf85af..7a19917a209b84b30938957ea67d4ad60dd748c5 100644
|
||||
--- a/dist/commonjs/index.d.ts
|
||||
+++ b/dist/commonjs/index.d.ts
|
||||
@@ -5,4 +5,5 @@ export type BraceExpansionOptions = {
|
||||
@@ -8,18 +8,20 @@ index f3e2de9d87e1ce462517e49f35733bed8bdf85af..6c84d87835182d0670981dc15f488c2a
|
||||
export declare function expand(str: string, options?: BraceExpansionOptions): string[];
|
||||
+export default expand;
|
||||
//# sourceMappingURL=index.d.ts.map
|
||||
\ No newline at end of file
|
||||
diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
|
||||
index be9df86be09c7655787a65c55ae6da01858894c3..071ad97532f30155cb56d7f2662fa99122ca628a 100644
|
||||
index 869a6bee23807b9f01c18c99ab8e952b4b242f97..cd8fa65b1a1521aa0b27b3e661797763b8365138 100644
|
||||
--- a/dist/commonjs/index.js
|
||||
+++ b/dist/commonjs/index.js
|
||||
@@ -260,4 +260,5 @@ function expand_(str, max, maxLength, isTop) {
|
||||
@@ -286,4 +286,5 @@ function expand_(str, max, maxLength, isTop) {
|
||||
}
|
||||
return acc;
|
||||
}
|
||||
+module.exports = Object.assign(expand, exports);
|
||||
//# sourceMappingURL=index.js.map
|
||||
\ No newline at end of file
|
||||
diff --git a/dist/esm/index.d.ts b/dist/esm/index.d.ts
|
||||
index f3e2de9d87e1ce462517e49f35733bed8bdf85af..6c84d87835182d0670981dc15f488c2a7d061c98 100644
|
||||
index f3e2de9d87e1ce462517e49f35733bed8bdf85af..7a19917a209b84b30938957ea67d4ad60dd748c5 100644
|
||||
--- a/dist/esm/index.d.ts
|
||||
+++ b/dist/esm/index.d.ts
|
||||
@@ -5,4 +5,5 @@ export type BraceExpansionOptions = {
|
||||
@@ -28,11 +30,12 @@ index f3e2de9d87e1ce462517e49f35733bed8bdf85af..6c84d87835182d0670981dc15f488c2a
|
||||
export declare function expand(str: string, options?: BraceExpansionOptions): string[];
|
||||
+export default expand;
|
||||
//# sourceMappingURL=index.d.ts.map
|
||||
\ No newline at end of file
|
||||
diff --git a/dist/esm/index.js b/dist/esm/index.js
|
||||
index 6dc0392fc0feedb811e63d70a30be2736af17a3a..81ea182fa5dbc3c60fa4cec4cb549fa256a903e4 100644
|
||||
index fd68f57029207ac1bcafe7fb1c14ad5305b3ffa4..f3ef09ac8ad02d3fde8150e7f64f40ac874a47e3 100644
|
||||
--- a/dist/esm/index.js
|
||||
+++ b/dist/esm/index.js
|
||||
@@ -256,4 +256,5 @@ function expand_(str, max, maxLength, isTop) {
|
||||
@@ -282,4 +282,5 @@ function expand_(str, max, maxLength, isTop) {
|
||||
}
|
||||
return acc;
|
||||
}
|
||||
Generated
+29
-28
@@ -9,21 +9,22 @@ overrides:
|
||||
path-to-regexp@>=8.0.0 <8.4.0: '>=8.4.0'
|
||||
postcss@<8.5.18: '>=8.5.18'
|
||||
fast-xml-parser@<5.7.0: '>=5.7.2'
|
||||
fast-uri@<3.1.2: '>=3.1.2 <4'
|
||||
fast-uri@<3.1.5: '>=3.1.5 <4'
|
||||
fast-xml-builder@<1.2.0: '>=1.2.0'
|
||||
qs@>=6.11.1 <6.15.2: '>=6.15.2'
|
||||
js-cookie@<3.0.7: '>=3.0.7'
|
||||
nanoid@<3.3.17: '>=3.3.17 <4'
|
||||
fast-uri@>=4.0.0 <4.1.1: '>=4.1.1 <5'
|
||||
multer@>=2.0.0 <2.2.0: '>=2.2.0'
|
||||
form-data@>=4.0.0 <4.0.6: '>=4.0.6'
|
||||
js-yaml@<3.15.0: '>=3.15.0 <4'
|
||||
js-yaml@>=4.0.0 <4.3.0: '>=4.3.0 <5'
|
||||
js-yaml@<3.15.1: '>=3.15.1 <4'
|
||||
js-yaml@>=4.0.0 <4.3.1: '>=4.3.1 <5'
|
||||
'@babel/core@<7.29.6': '>=7.29.6 <8'
|
||||
brace-expansion@<5.0.8: 5.0.8
|
||||
brace-expansion@<5.0.9: 5.0.9
|
||||
sharp@<0.35.0: '>=0.35.0 <0.36'
|
||||
|
||||
patchedDependencies:
|
||||
brace-expansion@5.0.8: 6f8c2bb08760f9abf1133095a5475f8ac32a360b9dcbcb85e4750dd1b616339e
|
||||
brace-expansion@5.0.9: bb2702fb4e1ea6a45630f2a0384edbcbb57800ec9bfc3845e096d85c88aa8208
|
||||
|
||||
importers:
|
||||
|
||||
@@ -2852,8 +2853,8 @@ packages:
|
||||
bowser@2.14.1:
|
||||
resolution: {integrity: sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==}
|
||||
|
||||
brace-expansion@5.0.8:
|
||||
resolution: {integrity: sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==}
|
||||
brace-expansion@5.0.9:
|
||||
resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
|
||||
engines: {node: 20 || >=22}
|
||||
|
||||
browserslist@4.28.4:
|
||||
@@ -3340,8 +3341,8 @@ packages:
|
||||
fast-safe-stringify@2.1.1:
|
||||
resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
|
||||
|
||||
fast-uri@3.1.4:
|
||||
resolution: {integrity: sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==}
|
||||
fast-uri@3.1.5:
|
||||
resolution: {integrity: sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==}
|
||||
|
||||
fb-watchman@2.0.2:
|
||||
resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
|
||||
@@ -3773,12 +3774,12 @@ packages:
|
||||
js-tokens@4.0.0:
|
||||
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
|
||||
|
||||
js-yaml@3.15.0:
|
||||
resolution: {integrity: sha512-ttBQIIQPDeLjpPOohtUdXuXUVoA2uIB6fEH9HyJ7234s5mBJ5wTx20njxplLZQgLaOfpmPQA7X2t5AX6tIPbog==}
|
||||
js-yaml@3.15.1:
|
||||
resolution: {integrity: sha512-S99WuO3HlhO3XN41EtYUNl9zzXjoJx7QvmipxsJVxtCBT0YHEFy+iOJhjSvrmV12nYhWpZaM8lPHkJm0yUMbag==}
|
||||
hasBin: true
|
||||
|
||||
js-yaml@4.3.0:
|
||||
resolution: {integrity: sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==}
|
||||
js-yaml@4.3.1:
|
||||
resolution: {integrity: sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==}
|
||||
hasBin: true
|
||||
|
||||
jsesc@3.1.0:
|
||||
@@ -4093,8 +4094,8 @@ packages:
|
||||
resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==}
|
||||
engines: {node: ^18.17.0 || >=20.5.0}
|
||||
|
||||
nanoid@3.3.16:
|
||||
resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==}
|
||||
nanoid@3.3.17:
|
||||
resolution: {integrity: sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==}
|
||||
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
|
||||
hasBin: true
|
||||
|
||||
@@ -6040,7 +6041,7 @@ snapshots:
|
||||
camelcase: 5.3.1
|
||||
find-up: 4.1.0
|
||||
get-package-type: 0.1.0
|
||||
js-yaml: 3.15.0
|
||||
js-yaml: 3.15.1
|
||||
resolve-from: 5.0.0
|
||||
|
||||
'@istanbuljs/schema@0.1.6': {}
|
||||
@@ -7857,14 +7858,14 @@ snapshots:
|
||||
ajv@8.18.0:
|
||||
dependencies:
|
||||
fast-deep-equal: 3.1.3
|
||||
fast-uri: 3.1.4
|
||||
fast-uri: 3.1.5
|
||||
json-schema-traverse: 1.0.0
|
||||
require-from-string: 2.0.2
|
||||
|
||||
ajv@8.20.0:
|
||||
dependencies:
|
||||
fast-deep-equal: 3.1.3
|
||||
fast-uri: 3.1.4
|
||||
fast-uri: 3.1.5
|
||||
json-schema-traverse: 1.0.0
|
||||
require-from-string: 2.0.2
|
||||
|
||||
@@ -8038,7 +8039,7 @@ snapshots:
|
||||
|
||||
bowser@2.14.1: {}
|
||||
|
||||
brace-expansion@5.0.8(patch_hash=6f8c2bb08760f9abf1133095a5475f8ac32a360b9dcbcb85e4750dd1b616339e):
|
||||
brace-expansion@5.0.9(patch_hash=bb2702fb4e1ea6a45630f2a0384edbcbb57800ec9bfc3845e096d85c88aa8208):
|
||||
dependencies:
|
||||
balanced-match: 4.0.4
|
||||
|
||||
@@ -8232,7 +8233,7 @@ snapshots:
|
||||
cosmiconfig@8.3.6(typescript@5.9.3):
|
||||
dependencies:
|
||||
import-fresh: 3.3.1
|
||||
js-yaml: 4.3.0
|
||||
js-yaml: 4.3.1
|
||||
parse-json: 5.2.0
|
||||
path-type: 4.0.0
|
||||
optionalDependencies:
|
||||
@@ -8480,7 +8481,7 @@ snapshots:
|
||||
|
||||
fast-safe-stringify@2.1.1: {}
|
||||
|
||||
fast-uri@3.1.4: {}
|
||||
fast-uri@3.1.5: {}
|
||||
|
||||
fb-watchman@2.0.2:
|
||||
dependencies:
|
||||
@@ -9102,12 +9103,12 @@ snapshots:
|
||||
|
||||
js-tokens@4.0.0: {}
|
||||
|
||||
js-yaml@3.15.0:
|
||||
js-yaml@3.15.1:
|
||||
dependencies:
|
||||
argparse: 1.0.10
|
||||
esprima: 4.0.1
|
||||
|
||||
js-yaml@4.3.0:
|
||||
js-yaml@4.3.1:
|
||||
dependencies:
|
||||
argparse: 2.0.1
|
||||
|
||||
@@ -9332,15 +9333,15 @@ snapshots:
|
||||
|
||||
minimatch@10.2.5:
|
||||
dependencies:
|
||||
brace-expansion: 5.0.8(patch_hash=6f8c2bb08760f9abf1133095a5475f8ac32a360b9dcbcb85e4750dd1b616339e)
|
||||
brace-expansion: 5.0.9(patch_hash=bb2702fb4e1ea6a45630f2a0384edbcbb57800ec9bfc3845e096d85c88aa8208)
|
||||
|
||||
minimatch@3.1.5:
|
||||
dependencies:
|
||||
brace-expansion: 5.0.8(patch_hash=6f8c2bb08760f9abf1133095a5475f8ac32a360b9dcbcb85e4750dd1b616339e)
|
||||
brace-expansion: 5.0.9(patch_hash=bb2702fb4e1ea6a45630f2a0384edbcbb57800ec9bfc3845e096d85c88aa8208)
|
||||
|
||||
minimatch@9.0.9:
|
||||
dependencies:
|
||||
brace-expansion: 5.0.8(patch_hash=6f8c2bb08760f9abf1133095a5475f8ac32a360b9dcbcb85e4750dd1b616339e)
|
||||
brace-expansion: 5.0.9(patch_hash=bb2702fb4e1ea6a45630f2a0384edbcbb57800ec9bfc3845e096d85c88aa8208)
|
||||
|
||||
minimist@1.2.8: {}
|
||||
|
||||
@@ -9371,7 +9372,7 @@ snapshots:
|
||||
|
||||
mute-stream@2.0.0: {}
|
||||
|
||||
nanoid@3.3.16: {}
|
||||
nanoid@3.3.17: {}
|
||||
|
||||
napi-postinstall@0.3.4: {}
|
||||
|
||||
@@ -9535,7 +9536,7 @@ snapshots:
|
||||
|
||||
postcss@8.5.23:
|
||||
dependencies:
|
||||
nanoid: 3.3.16
|
||||
nanoid: 3.3.17
|
||||
picocolors: 1.1.1
|
||||
source-map-js: 1.2.1
|
||||
|
||||
|
||||
+6
-5
@@ -24,17 +24,18 @@ overrides:
|
||||
path-to-regexp@>=8.0.0 <8.4.0: '>=8.4.0'
|
||||
postcss@<8.5.18: '>=8.5.18'
|
||||
fast-xml-parser@<5.7.0: '>=5.7.2'
|
||||
fast-uri@<3.1.2: '>=3.1.2 <4'
|
||||
fast-uri@<3.1.5: '>=3.1.5 <4'
|
||||
fast-xml-builder@<1.2.0: '>=1.2.0'
|
||||
qs@>=6.11.1 <6.15.2: '>=6.15.2'
|
||||
js-cookie@<3.0.7: '>=3.0.7'
|
||||
nanoid@<3.3.17: '>=3.3.17 <4'
|
||||
fast-uri@>=4.0.0 <4.1.1: '>=4.1.1 <5'
|
||||
multer@>=2.0.0 <2.2.0: '>=2.2.0'
|
||||
form-data@>=4.0.0 <4.0.6: '>=4.0.6'
|
||||
js-yaml@<3.15.0: '>=3.15.0 <4'
|
||||
js-yaml@>=4.0.0 <4.3.0: '>=4.3.0 <5'
|
||||
js-yaml@<3.15.1: '>=3.15.1 <4'
|
||||
js-yaml@>=4.0.0 <4.3.1: '>=4.3.1 <5'
|
||||
'@babel/core@<7.29.6': '>=7.29.6 <8'
|
||||
brace-expansion@<5.0.8: 5.0.8
|
||||
brace-expansion@<5.0.9: 5.0.9
|
||||
sharp@<0.35.0: '>=0.35.0 <0.36'
|
||||
|
||||
allowBuilds:
|
||||
@@ -97,4 +98,4 @@ minimumReleaseAgeExclude:
|
||||
- '@aws-sdk/token-providers@3.1081.0'
|
||||
|
||||
patchedDependencies:
|
||||
brace-expansion@5.0.8: patches/brace-expansion@5.0.8.patch
|
||||
brace-expansion@5.0.9: patches/brace-expansion@5.0.9.patch
|
||||
|
||||
Generated
+80
-5
@@ -684,6 +684,15 @@ dependencies = [
|
||||
"hybrid-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block-padding"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block-padding"
|
||||
version = "0.4.2"
|
||||
@@ -971,6 +980,15 @@ dependencies = [
|
||||
"toml 0.9.12+spec-1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cbc"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
|
||||
dependencies = [
|
||||
"cipher 0.4.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cbc"
|
||||
version = "0.2.1"
|
||||
@@ -1797,7 +1815,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "donutbrowser"
|
||||
version = "0.28.2"
|
||||
version = "0.29.2"
|
||||
dependencies = [
|
||||
"aes 0.9.1",
|
||||
"aes-gcm 0.11.0",
|
||||
@@ -1809,7 +1827,7 @@ dependencies = [
|
||||
"blake3",
|
||||
"boringtun",
|
||||
"bzip2",
|
||||
"cbc",
|
||||
"cbc 0.2.1",
|
||||
"chrono",
|
||||
"chrono-tz",
|
||||
"clap",
|
||||
@@ -1844,6 +1862,8 @@ dependencies = [
|
||||
"resvg",
|
||||
"ring",
|
||||
"rusqlite",
|
||||
"secret-service",
|
||||
"security-framework",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_yaml",
|
||||
@@ -3323,6 +3343,7 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
|
||||
dependencies = [
|
||||
"block-padding 0.3.3",
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
@@ -3332,7 +3353,7 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
|
||||
dependencies = [
|
||||
"block-padding",
|
||||
"block-padding 0.4.2",
|
||||
"hybrid-array",
|
||||
]
|
||||
|
||||
@@ -4011,6 +4032,20 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-complex",
|
||||
"num-integer",
|
||||
"num-iter",
|
||||
"num-rational",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-bigint"
|
||||
version = "0.4.8"
|
||||
@@ -4021,6 +4056,15 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-complex"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.2.2"
|
||||
@@ -4047,6 +4091,16 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-iter"
|
||||
version = "0.1.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
|
||||
dependencies = [
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-rational"
|
||||
version = "0.4.2"
|
||||
@@ -4093,7 +4147,7 @@ version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
|
||||
dependencies = [
|
||||
"proc-macro-crate 1.3.1",
|
||||
"proc-macro-crate 3.5.0",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.118",
|
||||
@@ -5613,6 +5667,25 @@ dependencies = [
|
||||
"syn 2.0.118",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "secret-service"
|
||||
version = "5.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a62d7f86047af0077255a29494136b9aaaf697c76ff70b8e49cded4e2623c14"
|
||||
dependencies = [
|
||||
"aes 0.8.4",
|
||||
"cbc 0.1.2",
|
||||
"futures-util",
|
||||
"generic-array",
|
||||
"getrandom 0.2.17",
|
||||
"hkdf",
|
||||
"num",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"sha2 0.10.9",
|
||||
"zbus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "security-framework"
|
||||
version = "3.7.0"
|
||||
@@ -6861,7 +6934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
|
||||
dependencies = [
|
||||
"fastrand",
|
||||
"getrandom 0.3.4",
|
||||
"getrandom 0.4.3",
|
||||
"once_cell",
|
||||
"rustix",
|
||||
"windows-sys 0.61.2",
|
||||
@@ -7036,6 +7109,7 @@ dependencies = [
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"tracing",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
@@ -8808,6 +8882,7 @@ dependencies = [
|
||||
"rustix",
|
||||
"serde",
|
||||
"serde_repr",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"uds_windows",
|
||||
"uuid",
|
||||
|
||||
+10
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "donutbrowser"
|
||||
version = "0.28.2"
|
||||
version = "0.29.2"
|
||||
description = "Simple Yet Powerful Anti-Detect Browser"
|
||||
authors = ["zhom@github"]
|
||||
edition = "2021"
|
||||
@@ -119,9 +119,15 @@ nix = { version = "0.31", features = ["signal", "process"] }
|
||||
# Reading the desktop's titlebar button layout for the in-app window controls.
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
gtk = "0.18"
|
||||
# Reading the source browser's "<Brand> Safe Storage" secret during profile
|
||||
# import, so its cookies and passwords can be re-encrypted for Wayfern.
|
||||
secret-service = { version = "5", default-features = false, features = ["rt-tokio-crypto-rust"] }
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
core-foundation = "0.10"
|
||||
# Reading the source browser's "<Brand> Safe Storage" Keychain item during
|
||||
# profile import, so its cookies and passwords can be re-encrypted for Wayfern.
|
||||
security-framework = "3"
|
||||
objc2 = "0.6.4"
|
||||
objc2-app-kit = { version = "0.3.2", features = ["NSWindow", "NSApplication", "NSRunningApplication"] }
|
||||
|
||||
@@ -138,6 +144,9 @@ windows = { version = "0.62", features = [
|
||||
"Win32_Storage_FileSystem",
|
||||
"Win32_System_Registry",
|
||||
"Win32_UI_Shell",
|
||||
# CryptUnprotectData, for unwrapping the source browser's os_crypt key from
|
||||
# `Local State` during profile import.
|
||||
"Win32_Security_Cryptography",
|
||||
] }
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
+66
-22
@@ -60,8 +60,12 @@ export function requestedTarget() {
|
||||
return match[1].trim();
|
||||
}
|
||||
|
||||
function sha256(path) {
|
||||
return createHash("sha256").update(readFileSync(path)).digest("hex");
|
||||
function sha256(bytes) {
|
||||
return createHash("sha256").update(bytes).digest("hex");
|
||||
}
|
||||
|
||||
function sha256File(path) {
|
||||
return sha256(readFileSync(path));
|
||||
}
|
||||
|
||||
export function xrayBinaryName(target) {
|
||||
@@ -121,11 +125,60 @@ function extractArchive(archive, destinationDir, windowsTarget) {
|
||||
};
|
||||
}
|
||||
|
||||
/// Attempts for the archive download. A release asset fetch is a network call
|
||||
/// on every CI job, and a single transport error ("fetch failed") has taken
|
||||
/// whole builds down. Retrying is safe because the checksum below is verified
|
||||
/// on every attempt, so a truncated or substituted archive still cannot pass.
|
||||
const DOWNLOAD_ATTEMPTS = 3;
|
||||
|
||||
export async function downloadVerifiedArchive(url, archive, expectedSha256) {
|
||||
let lastError;
|
||||
|
||||
for (let attempt = 1; attempt <= DOWNLOAD_ATTEMPTS; attempt += 1) {
|
||||
try {
|
||||
const response = await fetch(url);
|
||||
if (!response.ok) {
|
||||
throw new Error(
|
||||
`Failed to download Xray-core (${response.status} ${response.statusText})`,
|
||||
);
|
||||
}
|
||||
|
||||
// The response body is verified in memory and only then written out, so
|
||||
// bytes that fail the pinned digest never reach the file system at all.
|
||||
// Writing first and checking afterwards left an unverified archive on
|
||||
// disk for the rest of the attempt, and any later reader of that path
|
||||
// would have been trusting a plain network download.
|
||||
const payload = Buffer.from(await response.arrayBuffer());
|
||||
const actual = sha256(payload);
|
||||
if (actual !== expectedSha256) {
|
||||
throw new Error(
|
||||
`Xray-core checksum mismatch: expected ${expectedSha256}, got ${actual}`,
|
||||
);
|
||||
}
|
||||
writeFileSync(archive, payload);
|
||||
return;
|
||||
} catch (error) {
|
||||
lastError = error;
|
||||
if (attempt < DOWNLOAD_ATTEMPTS) {
|
||||
console.warn(
|
||||
`Xray-core download attempt ${attempt} failed (${error.message}); retrying`,
|
||||
);
|
||||
await new Promise((resolve) => setTimeout(resolve, attempt * 2000));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
throw lastError;
|
||||
}
|
||||
|
||||
export async function downloadXray(target = requestedTarget()) {
|
||||
const asset = XRAY_ASSETS[target];
|
||||
if (!asset) {
|
||||
// `target` comes from --target/$TARGET, and it decides the file this writes
|
||||
// into src-tauri/binaries. Only an own key of the pinned table is a target;
|
||||
// a plain lookup also answers for inherited names like `constructor`.
|
||||
if (!Object.hasOwn(XRAY_ASSETS, target)) {
|
||||
throw new Error(`Xray-core is not packaged for Rust target '${target}'`);
|
||||
}
|
||||
const asset = XRAY_ASSETS[target];
|
||||
|
||||
const windowsTarget = target.includes("windows");
|
||||
const destinationDir = join(MANIFEST_DIR, "binaries");
|
||||
@@ -143,8 +196,8 @@ export async function downloadXray(target = requestedTarget()) {
|
||||
if (
|
||||
source.version === XRAY_VERSION &&
|
||||
source.archiveSha256 === asset.sha256 &&
|
||||
source.binarySha256 === sha256(destination) &&
|
||||
source.licenseSha256 === sha256(licenseDestination)
|
||||
source.binarySha256 === sha256File(destination) &&
|
||||
source.licenseSha256 === sha256File(licenseDestination)
|
||||
) {
|
||||
return destination;
|
||||
}
|
||||
@@ -157,20 +210,11 @@ export async function downloadXray(target = requestedTarget()) {
|
||||
const scratch = mkdtempSync(join(tmpdir(), "donut-xray-"));
|
||||
try {
|
||||
const archive = join(scratch, basename(asset.name));
|
||||
const response = await fetch(xrayDownloadUrl(asset.name));
|
||||
if (!response.ok) {
|
||||
throw new Error(
|
||||
`Failed to download Xray-core (${response.status} ${response.statusText})`,
|
||||
);
|
||||
}
|
||||
writeFileSync(archive, Buffer.from(await response.arrayBuffer()));
|
||||
|
||||
const actual = sha256(archive);
|
||||
if (actual !== asset.sha256) {
|
||||
throw new Error(
|
||||
`Xray-core checksum mismatch: expected ${asset.sha256}, got ${actual}`,
|
||||
);
|
||||
}
|
||||
await downloadVerifiedArchive(
|
||||
xrayDownloadUrl(asset.name),
|
||||
archive,
|
||||
asset.sha256,
|
||||
);
|
||||
|
||||
const extracted = extractArchive(archive, scratch, windowsTarget);
|
||||
if (!existsSync(extracted.binary) || !existsSync(extracted.license)) {
|
||||
@@ -189,8 +233,8 @@ export async function downloadXray(target = requestedTarget()) {
|
||||
{
|
||||
version: XRAY_VERSION,
|
||||
archiveSha256: asset.sha256,
|
||||
binarySha256: sha256(destination),
|
||||
licenseSha256: sha256(licenseDestination),
|
||||
binarySha256: sha256File(destination),
|
||||
licenseSha256: sha256File(licenseDestination),
|
||||
},
|
||||
null,
|
||||
2,
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { createHash } from "node:crypto";
|
||||
import { existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import { tmpdir } from "node:os";
|
||||
import { join } from "node:path";
|
||||
import test from "node:test";
|
||||
import {
|
||||
downloadVerifiedArchive,
|
||||
downloadXray,
|
||||
windowsExtractionInvocation,
|
||||
XRAY_ASSETS,
|
||||
@@ -122,3 +127,58 @@ test("rejects an unsupported target before downloading", async () => {
|
||||
/not packaged for Rust target/,
|
||||
);
|
||||
});
|
||||
|
||||
// `constructor`, `__proto__` and friends answer a plain `XRAY_ASSETS[target]`
|
||||
// lookup, and `target` picks the path this script writes into src-tauri.
|
||||
test("rejects inherited object keys as targets", async () => {
|
||||
for (const target of ["__proto__", "constructor", "toString"]) {
|
||||
await assert.rejects(
|
||||
downloadXray(target),
|
||||
/not packaged for Rust target/,
|
||||
target,
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
async function withStubbedFetch(body, run) {
|
||||
const scratch = mkdtempSync(join(tmpdir(), "donut-xray-test-"));
|
||||
const archive = join(scratch, "Xray-linux-64.zip");
|
||||
const realFetch = globalThis.fetch;
|
||||
globalThis.fetch = async () => new Response(body);
|
||||
try {
|
||||
await run(archive);
|
||||
} finally {
|
||||
globalThis.fetch = realFetch;
|
||||
rmSync(scratch, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
test("writes the archive once the pinned digest matches", async () => {
|
||||
const body = Buffer.from("xray archive bytes");
|
||||
const digest = createHash("sha256").update(body).digest("hex");
|
||||
|
||||
await withStubbedFetch(body, async (archive) => {
|
||||
await downloadVerifiedArchive(
|
||||
"https://example.invalid/x.zip",
|
||||
archive,
|
||||
digest,
|
||||
);
|
||||
assert.deepEqual(readFileSync(archive), body);
|
||||
});
|
||||
});
|
||||
|
||||
// The bytes are hashed in memory and only then written, so a substituted or
|
||||
// truncated response never lands on disk for a later step to pick up.
|
||||
test("leaves nothing on disk when the payload fails its checksum", async () => {
|
||||
await withStubbedFetch(Buffer.from("tampered"), async (archive) => {
|
||||
await assert.rejects(
|
||||
downloadVerifiedArchive(
|
||||
"https://example.invalid/x.zip",
|
||||
archive,
|
||||
"0".repeat(64),
|
||||
),
|
||||
/checksum mismatch/,
|
||||
);
|
||||
assert.equal(existsSync(archive), false);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -627,6 +627,7 @@ struct ImportProxiesResponse {
|
||||
crate::profile_importer::DuplicateStrategy,
|
||||
crate::profile_importer::ProfileImportItemResult,
|
||||
crate::profile_importer::ProfileImportBatchResult,
|
||||
crate::profile_import::report::ProfileImportReport,
|
||||
)),
|
||||
tags(
|
||||
(name = "profiles", description = "Profile management endpoints"),
|
||||
@@ -4445,13 +4446,29 @@ mod tests {
|
||||
}
|
||||
|
||||
let import_item = schema_required(&spec, "ImportProfileItem");
|
||||
for field in ["proxy_id", "vpn_id", "browser_type"] {
|
||||
for field in ["proxy_id", "vpn_id", "browser_type", "allow_running"] {
|
||||
assert!(
|
||||
!import_item.iter().any(|f| f == field),
|
||||
"{field} must be optional on import items, required list: {import_item:?}"
|
||||
);
|
||||
}
|
||||
|
||||
// The per-item report only exists for items that actually imported.
|
||||
let import_result = schema_required(&spec, "ProfileImportItemResult");
|
||||
assert!(
|
||||
!import_result.iter().any(|f| f == "report"),
|
||||
"report must be optional on import results, required list: {import_result:?}"
|
||||
);
|
||||
|
||||
// `ProfileImportItemResult` references it, so a missing registration would
|
||||
// leave a dangling $ref in the served spec.
|
||||
assert!(
|
||||
spec
|
||||
.pointer("/components/schemas/ProfileImportReport")
|
||||
.is_some(),
|
||||
"ProfileImportReport must be registered in ApiDoc components"
|
||||
);
|
||||
|
||||
// A remote launch with no URL just opens the browser; forcing generated
|
||||
// clients to send one would make the common case the awkward one.
|
||||
let run_remote = schema_required(&spec, "RunRemoteRequest");
|
||||
@@ -4549,6 +4566,7 @@ mod tests {
|
||||
assert!(parsed.group_id.is_none());
|
||||
assert!(parsed.duplicate_strategy.is_none());
|
||||
assert_eq!(parsed.items[0].browser_type, "chromium");
|
||||
assert_eq!(parsed.items[0].allow_running, None);
|
||||
}
|
||||
|
||||
// The served /openapi.json comes from the hand-maintained ApiDoc `paths(...)`
|
||||
|
||||
@@ -540,6 +540,25 @@ impl BrowserRunner {
|
||||
let profiles_dir = self.profile_manager.get_profiles_dir();
|
||||
let profile_data_path =
|
||||
crate::ephemeral_dirs::get_effective_profile_path(&updated_profile, &profiles_dir);
|
||||
|
||||
// Profiles imported by builds before the layout fix have their content at
|
||||
// the user-data-dir root instead of under `Default/`, so the browser has
|
||||
// never seen a byte of it. Move it into place now, while the profile is
|
||||
// provably not running. Secrets stay unreadable — the source key was
|
||||
// never captured and cannot be recovered after the fact — but history,
|
||||
// bookmarks, extensions and site data come back.
|
||||
match crate::profile_import::repair_legacy_layout(&profile_data_path) {
|
||||
Ok(true) => log::info!(
|
||||
"Repaired legacy import layout for profile: {}",
|
||||
updated_profile.name
|
||||
),
|
||||
Ok(false) => {}
|
||||
Err(e) => log::warn!(
|
||||
"Could not repair legacy import layout for {}: {e}",
|
||||
updated_profile.name
|
||||
),
|
||||
}
|
||||
|
||||
let profile_path_str = profile_data_path.to_string_lossy().to_string();
|
||||
|
||||
// Install extensions if an extension group is assigned
|
||||
|
||||
@@ -18,8 +18,13 @@ impl DefaultBrowser {
|
||||
#[cfg(target_os = "windows")]
|
||||
return windows::is_default_browser();
|
||||
|
||||
// Linux answers this by running `xdg-mime`, a shell script that forks
|
||||
// further. That is blocking work with no upper bound, and this command
|
||||
// runs on the same async runtime as every other command, the REST API and
|
||||
// the sync scheduler — so doing it inline occupies a worker for as long as
|
||||
// the desktop takes to answer. The Settings page polls this on a timer.
|
||||
#[cfg(target_os = "linux")]
|
||||
return linux::is_default_browser();
|
||||
return blocking(linux::is_default_browser).await;
|
||||
|
||||
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "linux")))]
|
||||
Err("Unsupported platform".to_string())
|
||||
@@ -32,14 +37,27 @@ impl DefaultBrowser {
|
||||
#[cfg(target_os = "windows")]
|
||||
return windows::set_as_default_browser();
|
||||
|
||||
// Same reasoning, and this one additionally sleeps 500ms before verifying.
|
||||
#[cfg(target_os = "linux")]
|
||||
return linux::set_as_default_browser();
|
||||
return blocking(linux::set_as_default_browser).await;
|
||||
|
||||
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "linux")))]
|
||||
Err("Unsupported platform".to_string())
|
||||
}
|
||||
}
|
||||
|
||||
/// Run blocking work off the async runtime's worker threads.
|
||||
#[cfg(target_os = "linux")]
|
||||
async fn blocking<T, F>(work: F) -> Result<T, String>
|
||||
where
|
||||
F: FnOnce() -> Result<T, String> + Send + 'static,
|
||||
T: Send + 'static,
|
||||
{
|
||||
tokio::task::spawn_blocking(work)
|
||||
.await
|
||||
.map_err(|e| format!("Default browser check did not run: {e}"))?
|
||||
}
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
mod macos {
|
||||
use core_foundation::base::OSStatus;
|
||||
|
||||
@@ -264,23 +264,16 @@ pub async fn enforce_fingerprint_gate(
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// Only now is the extension scan worth its disk walk. A confirmed
|
||||
// proxy-permission extension can redirect the browser's traffic away from the
|
||||
// upstream we just measured, so the measurement describes an exit the browser
|
||||
// may not take. Report it, but do not hard-block on a number known to be
|
||||
// unreliable.
|
||||
let measurement_unreliable =
|
||||
vpn_extension_detect::has_confirmed(&vpn_extension_detect::scan_profile(profile));
|
||||
|
||||
if matches!(gate, FingerprintGate::Advisory) || measurement_unreliable {
|
||||
// Automation is the only caller allowed past a measured mismatch, because it
|
||||
// has no dialog to answer. A proxy-capable extension in the profile does NOT
|
||||
// earn the same pass: it makes the measurement less trustworthy, and a route
|
||||
// that might be worse than measured is a reason for more scrutiny, not less.
|
||||
// Waiving the block on it also meant any download manager holding Chromium's
|
||||
// `proxy` permission silently disarmed the gate for good.
|
||||
if matches!(gate, FingerprintGate::Advisory) {
|
||||
log::warn!(
|
||||
"Fingerprint gate: {} launching with a {} exit mismatch ({})",
|
||||
"Fingerprint gate: {} launching with a known exit mismatch ({})",
|
||||
profile.name,
|
||||
if measurement_unreliable {
|
||||
"unverifiable"
|
||||
} else {
|
||||
"known"
|
||||
},
|
||||
result.mismatches.join(", ")
|
||||
);
|
||||
if let Err(e) = crate::events::emit("fingerprint-consistency-warning", &result) {
|
||||
@@ -304,8 +297,9 @@ pub struct PreLaunchChecks {
|
||||
/// True when the enforcing gate will still probe during the launch, so the
|
||||
/// UI can say the check is not finished rather than implying it passed.
|
||||
pub exit_probe_pending: bool,
|
||||
/// A confirmed proxy-permission extension is present, so any exit
|
||||
/// measurement describes a route the browser may not take.
|
||||
/// An extension holding the `proxy` permission is present, so any exit
|
||||
/// measurement describes a route the browser may not take. Informational
|
||||
/// only — it never relaxes the block.
|
||||
pub exit_measurement_unreliable: bool,
|
||||
/// Present only when a cached mismatch is already blocking, so "launch
|
||||
/// anyway" can proceed without a second round trip.
|
||||
@@ -325,6 +319,10 @@ fn load_profile(profile_id: &str) -> Result<BrowserProfile, String> {
|
||||
pub async fn get_profile_pre_launch_checks(profile_id: String) -> Result<PreLaunchChecks, String> {
|
||||
let profile = load_profile(&profile_id)?;
|
||||
|
||||
// The setting suppresses the extension report entirely, which is safe
|
||||
// precisely because nothing enforcing depends on it: the scan feeds the
|
||||
// dialog's warning and the "measurement may be unreliable" note, never the
|
||||
// decision to block.
|
||||
let scan = if extension_warning_disabled() {
|
||||
vpn_extension_detect::ExtensionScan {
|
||||
extensions: Vec::new(),
|
||||
@@ -344,7 +342,7 @@ pub async fn get_profile_pre_launch_checks(profile_id: String) -> Result<PreLaun
|
||||
})
|
||||
.cloned()
|
||||
.collect();
|
||||
let exit_measurement_unreliable = vpn_extension_detect::has_confirmed(&scan);
|
||||
let exit_measurement_unreliable = vpn_extension_detect::has_proxy_control(&scan);
|
||||
|
||||
let disabled = gate_disabled();
|
||||
let key = fingerprint_consistency::exit_cache_key(&profile);
|
||||
|
||||
@@ -80,6 +80,7 @@ mod launch_gate_prefs;
|
||||
mod log_redaction;
|
||||
mod platform_browser;
|
||||
mod profile;
|
||||
mod profile_import;
|
||||
mod profile_importer;
|
||||
mod proxy_manager;
|
||||
pub mod proxy_runner;
|
||||
|
||||
@@ -746,6 +746,14 @@ impl McpServer {
|
||||
"vpn_id": {
|
||||
"type": "string",
|
||||
"description": "Optional VPN UUID to assign to this profile"
|
||||
},
|
||||
"browser_type": {
|
||||
"type": "string",
|
||||
"description": "Source browser family (chromium, brave, edge, vivaldi, opera, arc, yandex, ...). Selects which OS keychain entry holds the key that unlocks the source's cookies and passwords, so an accurate value is what makes secrets survive the import"
|
||||
},
|
||||
"allow_running": {
|
||||
"type": "boolean",
|
||||
"description": "Import even though the source browser is running. Databases are still snapshotted consistently, but site data stored in LevelDB may be captured mid-write"
|
||||
}
|
||||
},
|
||||
"required": ["source_path", "new_profile_name"]
|
||||
|
||||
@@ -0,0 +1,551 @@
|
||||
//! Copying a source profile into the new one.
|
||||
//!
|
||||
//! Two things a plain recursive copy gets wrong, both of which produce a
|
||||
//! profile that looks imported and is not:
|
||||
//!
|
||||
//! - **Torn databases.** Users import from a browser they are still using. A
|
||||
//! naive walk copies `Cookies` and `Cookies-wal` at different instants, and
|
||||
//! Chromium's `sql::Database` razes the result on open. `VACUUM INTO` takes a
|
||||
//! transactionally consistent snapshot instead, WAL content included, even
|
||||
//! while the source holds the file.
|
||||
//! - **Multi-GB of caches.** `Cache/`, `Code Cache/`, `GPUCache/` and friends
|
||||
//! carry no user state and dominate both copy time and disk use.
|
||||
|
||||
use std::fs;
|
||||
use std::path::Path;
|
||||
|
||||
/// Directories that never carry user state. Matched on the path relative to the
|
||||
/// profile root, so `Service Worker/CacheStorage` is dropped while
|
||||
/// `Service Worker/Database` survives.
|
||||
const SKIP_DIRS: &[&str] = &[
|
||||
"Cache",
|
||||
"Code Cache",
|
||||
"GPUCache",
|
||||
"GrShaderCache",
|
||||
"ShaderCache",
|
||||
"DawnCache",
|
||||
"DawnGraphiteCache",
|
||||
"DawnWebGPUCache",
|
||||
"GraphiteDawnCache",
|
||||
"GPUPersistentCache",
|
||||
"Service Worker/CacheStorage",
|
||||
"Service Worker/ScriptCache",
|
||||
"blob_storage",
|
||||
"Crashpad",
|
||||
"Crash Reports",
|
||||
"BrowserMetrics",
|
||||
"optimization_guide_model_store",
|
||||
"optimization_guide_hint_cache_store",
|
||||
"Safe Browsing",
|
||||
"Safe Browsing Network",
|
||||
"component_crx_cache",
|
||||
"extensions_crx_cache",
|
||||
"Download Service",
|
||||
"Site Characteristics Database",
|
||||
"shared_proto_db",
|
||||
"segmentation_platform",
|
||||
"Sync App Settings",
|
||||
// SNSS command logs replay the source machine's windows and can embed
|
||||
// absolute local paths in PageState blobs.
|
||||
"Sessions",
|
||||
"Session Storage",
|
||||
];
|
||||
|
||||
/// Exact file names that are per-machine, per-run, or regenerated.
|
||||
const SKIP_FILES: &[&str] = &[
|
||||
"LOCK",
|
||||
"LOG",
|
||||
"LOG.old",
|
||||
"SingletonLock",
|
||||
"SingletonCookie",
|
||||
"SingletonSocket",
|
||||
"RunningChromeVersion",
|
||||
"Last Version",
|
||||
"first_party_sets.db",
|
||||
".DS_Store",
|
||||
"Thumbs.db",
|
||||
// The account-bound part of `Sync Data/`. The rest of that directory is the
|
||||
// local DataTypeStore — Reading List, Saved Tab Groups and friends, which
|
||||
// exist for users who never signed in — so the folder itself is carried.
|
||||
"Nigori.bin",
|
||||
// Signed-in ephemeral twins of the real stores. They are wiped on sign-out,
|
||||
// and the imported profile will not be signed in.
|
||||
"Login Data For Account",
|
||||
"Login Data For Account-journal",
|
||||
"Account Web Data",
|
||||
"Account Web Data-journal",
|
||||
];
|
||||
|
||||
/// Suffixes that belong to a database we snapshot separately, or to scratch
|
||||
/// state. Copying a `-wal` next to a vacuumed main file actively corrupts it.
|
||||
const SKIP_SUFFIXES: &[&str] = &["-journal", "-wal", "-shm", ".tmp", ".old", ".bak.tmp"];
|
||||
|
||||
/// SQLite stores worth a consistent snapshot. Anything not listed is copied
|
||||
/// byte-for-byte, which is correct for JSON, LevelDB and unpacked CRXs.
|
||||
const SQLITE_FILES: &[&str] = &[
|
||||
"Cookies",
|
||||
"History",
|
||||
"Favicons",
|
||||
"Top Sites",
|
||||
"Shortcuts",
|
||||
"Login Data",
|
||||
"Web Data",
|
||||
"Affiliation Database",
|
||||
"Network Action Predictor",
|
||||
"DIPS",
|
||||
"Trust Tokens",
|
||||
"BudgetDatabase",
|
||||
"AutofillStrikeDatabase",
|
||||
"Reporting and NEL",
|
||||
"SCT Auditing Pending Reports",
|
||||
"Device Bound Sessions",
|
||||
"MediaDeviceSalts",
|
||||
"PreferredApps",
|
||||
"heavy_ad_intervention_opt_out.db",
|
||||
"SharedStorage",
|
||||
"BrowsingTopicsSiteData",
|
||||
"ClientCertificates",
|
||||
"PersistentOriginTrials",
|
||||
"Web Applications",
|
||||
];
|
||||
|
||||
pub struct CopyOutcome {
|
||||
pub bytes_copied: u64,
|
||||
/// Names of stores that could not be snapshotted and were skipped rather
|
||||
/// than copied in a corrupt state.
|
||||
pub unreadable_stores: Vec<String>,
|
||||
}
|
||||
|
||||
fn is_skipped_dir(relative: &Path) -> bool {
|
||||
let normalized = relative.to_string_lossy().replace('\\', "/");
|
||||
SKIP_DIRS.iter().any(|skip| {
|
||||
normalized == *skip
|
||||
|| normalized.ends_with(&format!("/{skip}"))
|
||||
// `BrowserMetrics-spare.pma` and friends.
|
||||
|| normalized.starts_with(&format!("{skip}-"))
|
||||
})
|
||||
}
|
||||
|
||||
fn is_skipped_file(name: &str) -> bool {
|
||||
SKIP_FILES.contains(&name)
|
||||
|| SKIP_SUFFIXES.iter().any(|suffix| name.ends_with(suffix))
|
||||
|| name.starts_with("BrowserMetrics")
|
||||
}
|
||||
|
||||
/// Copy the source's permission bits onto a file we produced ourselves.
|
||||
///
|
||||
/// `fs::copy` already preserves the mode, but `VACUUM INTO` lets SQLite create
|
||||
/// the destination at its own default (0644). Cookies, Login Data and Web Data
|
||||
/// are 0600 in both the source browser and Wayfern, and an import must not be
|
||||
/// the step that widens them.
|
||||
#[cfg(unix)]
|
||||
fn mirror_mode(source: &Path, dest: &Path) {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
if let Ok(metadata) = fs::metadata(source) {
|
||||
let mode = metadata.permissions().mode() & 0o777;
|
||||
let _ = fs::set_permissions(dest, fs::Permissions::from_mode(mode));
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(unix))]
|
||||
fn mirror_mode(_source: &Path, _dest: &Path) {}
|
||||
|
||||
/// Create a directory owner-only, matching what Chromium gives a profile.
|
||||
fn create_private_dir(path: &Path) -> std::io::Result<()> {
|
||||
fs::create_dir_all(path)?;
|
||||
#[cfg(unix)]
|
||||
{
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let _ = fs::set_permissions(path, fs::Permissions::from_mode(0o700));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Take a consistent snapshot of a SQLite database.
|
||||
///
|
||||
/// Returns `Ok(false)` when the file is not actually SQLite (an empty
|
||||
/// placeholder, say), so the caller can fall back to a plain copy.
|
||||
fn vacuum_into(source: &Path, dest: &Path) -> Result<bool, String> {
|
||||
use rusqlite::{Connection, OpenFlags};
|
||||
|
||||
let conn = match Connection::open_with_flags(
|
||||
source,
|
||||
OpenFlags::SQLITE_OPEN_READ_ONLY | OpenFlags::SQLITE_OPEN_URI,
|
||||
) {
|
||||
Ok(conn) => conn,
|
||||
Err(e) => return Err(format!("open failed: {e}")),
|
||||
};
|
||||
|
||||
// Confirm it really is a database before trusting VACUUM's error reporting.
|
||||
if conn
|
||||
.query_row("SELECT count(*) FROM sqlite_master", [], |r| {
|
||||
r.get::<_, i64>(0)
|
||||
})
|
||||
.is_err()
|
||||
{
|
||||
return Ok(false);
|
||||
}
|
||||
|
||||
if dest.exists() {
|
||||
fs::remove_file(dest).map_err(|e| format!("could not replace destination: {e}"))?;
|
||||
}
|
||||
|
||||
// `VACUUM INTO` needs the path as a SQL string literal; single quotes are
|
||||
// the only character that can break out of one.
|
||||
let target = dest.to_string_lossy().replace('\'', "''");
|
||||
conn
|
||||
.execute_batch(&format!("VACUUM INTO '{target}'"))
|
||||
.map_err(|e| format!("VACUUM INTO failed: {e}"))?;
|
||||
mirror_mode(source, dest);
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
/// Copy `source` (a Chromium profile directory) into `dest`, skipping caches
|
||||
/// and snapshotting databases.
|
||||
pub fn copy_profile_tree(source: &Path, dest: &Path) -> Result<CopyOutcome, String> {
|
||||
let mut outcome = CopyOutcome {
|
||||
bytes_copied: 0,
|
||||
unreadable_stores: Vec::new(),
|
||||
};
|
||||
create_private_dir(dest).map_err(|e| format!("Failed to create {}: {e}", dest.display()))?;
|
||||
copy_dir(source, dest, Path::new(""), &mut outcome)?;
|
||||
Ok(outcome)
|
||||
}
|
||||
|
||||
fn copy_dir(
|
||||
source: &Path,
|
||||
dest: &Path,
|
||||
relative: &Path,
|
||||
outcome: &mut CopyOutcome,
|
||||
) -> Result<(), String> {
|
||||
let entries =
|
||||
fs::read_dir(source).map_err(|e| format!("Failed to read {}: {e}", source.display()))?;
|
||||
|
||||
for entry in entries.flatten() {
|
||||
let name = entry.file_name();
|
||||
let Some(name) = name.to_str() else { continue };
|
||||
let child_relative = relative.join(name);
|
||||
let source_path = entry.path();
|
||||
let dest_path = dest.join(name);
|
||||
|
||||
// Symlinks are followed nowhere: Chromium writes them for the singleton
|
||||
// lock, and a copied one would point at the source machine.
|
||||
let metadata = match fs::symlink_metadata(&source_path) {
|
||||
Ok(m) => m,
|
||||
Err(_) => continue,
|
||||
};
|
||||
if metadata.file_type().is_symlink() {
|
||||
continue;
|
||||
}
|
||||
|
||||
if metadata.is_dir() {
|
||||
if is_skipped_dir(&child_relative) {
|
||||
continue;
|
||||
}
|
||||
create_private_dir(&dest_path)
|
||||
.map_err(|e| format!("Failed to create {}: {e}", dest_path.display()))?;
|
||||
copy_dir(&source_path, &dest_path, &child_relative, outcome)?;
|
||||
continue;
|
||||
}
|
||||
|
||||
if is_skipped_file(name) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if SQLITE_FILES.contains(&name) {
|
||||
match vacuum_into(&source_path, &dest_path) {
|
||||
Ok(true) => {
|
||||
outcome.bytes_copied += fs::metadata(&dest_path).map(|m| m.len()).unwrap_or(0);
|
||||
continue;
|
||||
}
|
||||
Ok(false) => {
|
||||
// Not a database after all; fall through to a byte copy.
|
||||
}
|
||||
Err(e) => {
|
||||
// A store we cannot snapshot is a store we must not copy: a torn
|
||||
// copy is deleted by Chromium on open, which looks identical to
|
||||
// "the import silently lost my data".
|
||||
log::warn!("Skipping unreadable store {}: {e}", source_path.display());
|
||||
outcome.unreadable_stores.push(name.to_string());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
match fs::copy(&source_path, &dest_path) {
|
||||
Ok(bytes) => outcome.bytes_copied += bytes,
|
||||
Err(e) => log::warn!("Failed to copy {}: {e}", source_path.display()),
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Every `Default/`-level store that holds real user data, for reporting.
|
||||
pub fn count_leveldb_origins(leveldb_dir: &Path) -> usize {
|
||||
// Counting keys would mean linking a LevelDB implementation. The number of
|
||||
// `.ldb`/`.log` segments is a stable proxy for "there is data here", which
|
||||
// is all the report claims.
|
||||
let Ok(entries) = fs::read_dir(leveldb_dir) else {
|
||||
return 0;
|
||||
};
|
||||
entries
|
||||
.flatten()
|
||||
.filter(|e| {
|
||||
e.file_name()
|
||||
.to_str()
|
||||
.is_some_and(|n| n.ends_with(".ldb") || n.ends_with(".log"))
|
||||
})
|
||||
.count()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use rusqlite::Connection;
|
||||
use tempfile::TempDir;
|
||||
|
||||
fn touch(path: &Path, contents: &[u8]) {
|
||||
if let Some(parent) = path.parent() {
|
||||
fs::create_dir_all(parent).unwrap();
|
||||
}
|
||||
fs::write(path, contents).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn caches_are_not_copied() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
touch(&source.join("Cache").join("data_0"), &[0u8; 4096]);
|
||||
touch(
|
||||
&source.join("Code Cache").join("js").join("x"),
|
||||
&[0u8; 4096],
|
||||
);
|
||||
touch(
|
||||
&source.join("Service Worker").join("CacheStorage").join("y"),
|
||||
&[0u8; 4096],
|
||||
);
|
||||
touch(
|
||||
&source
|
||||
.join("Service Worker")
|
||||
.join("Database")
|
||||
.join("CURRENT"),
|
||||
b"MANIFEST-000001\n",
|
||||
);
|
||||
|
||||
copy_profile_tree(&source, &dest).unwrap();
|
||||
|
||||
assert!(dest.join("Preferences").exists());
|
||||
assert!(!dest.join("Cache").exists());
|
||||
assert!(!dest.join("Code Cache").exists());
|
||||
assert!(!dest.join("Service Worker").join("CacheStorage").exists());
|
||||
assert!(
|
||||
dest.join("Service Worker").join("Database").exists(),
|
||||
"the Service Worker registry is real data and must survive"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lock_and_journal_files_are_not_copied() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
touch(
|
||||
&source.join("Local Storage").join("leveldb").join("LOCK"),
|
||||
b"",
|
||||
);
|
||||
touch(
|
||||
&source.join("Local Storage").join("leveldb").join("CURRENT"),
|
||||
b"MANIFEST-000001\n",
|
||||
);
|
||||
touch(&source.join("History-journal"), b"junk");
|
||||
|
||||
copy_profile_tree(&source, &dest).unwrap();
|
||||
|
||||
assert!(!dest
|
||||
.join("Local Storage")
|
||||
.join("leveldb")
|
||||
.join("LOCK")
|
||||
.exists());
|
||||
assert!(dest
|
||||
.join("Local Storage")
|
||||
.join("leveldb")
|
||||
.join("CURRENT")
|
||||
.exists());
|
||||
assert!(!dest.join("History-journal").exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sqlite_stores_are_snapshotted_and_stay_queryable() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
fs::create_dir_all(&source).unwrap();
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
|
||||
let db = source.join("History");
|
||||
let conn = Connection::open(&db).unwrap();
|
||||
conn
|
||||
.execute_batch("CREATE TABLE urls(id INTEGER PRIMARY KEY, url TEXT); INSERT INTO urls(url) VALUES('https://example.com');")
|
||||
.unwrap();
|
||||
drop(conn);
|
||||
|
||||
copy_profile_tree(&source, &dest).unwrap();
|
||||
|
||||
let copied = Connection::open(dest.join("History")).unwrap();
|
||||
let count: i64 = copied
|
||||
.query_row("SELECT count(*) FROM urls", [], |r| r.get(0))
|
||||
.unwrap();
|
||||
assert_eq!(count, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn snapshot_captures_uncheckpointed_wal_content() {
|
||||
// The whole reason for VACUUM INTO: a running browser leaves recent writes
|
||||
// in the WAL, and a plain file copy loses them.
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
fs::create_dir_all(&source).unwrap();
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
|
||||
let db = source.join("History");
|
||||
let conn = Connection::open(&db).unwrap();
|
||||
conn.pragma_update(None, "journal_mode", "WAL").unwrap();
|
||||
conn
|
||||
.execute_batch("CREATE TABLE urls(id INTEGER PRIMARY KEY, url TEXT);")
|
||||
.unwrap();
|
||||
conn
|
||||
.execute("INSERT INTO urls(url) VALUES('https://in-wal.example')", [])
|
||||
.unwrap();
|
||||
// Deliberately do not checkpoint or close: this is the live-browser shape.
|
||||
|
||||
copy_profile_tree(&source, &dest).unwrap();
|
||||
drop(conn);
|
||||
|
||||
let copied = Connection::open(dest.join("History")).unwrap();
|
||||
let url: String = copied
|
||||
.query_row("SELECT url FROM urls", [], |r| r.get(0))
|
||||
.unwrap();
|
||||
assert_eq!(url, "https://in-wal.example");
|
||||
assert!(
|
||||
!dest.join("History-wal").exists(),
|
||||
"a stale -wal beside a vacuumed file corrupts it"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn symlinks_are_never_followed() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
let outside = dir.path().join("outside.txt");
|
||||
touch(&outside, b"secret");
|
||||
|
||||
#[cfg(unix)]
|
||||
std::os::unix::fs::symlink(&outside, source.join("SingletonLock")).unwrap();
|
||||
|
||||
copy_profile_tree(&source, &dest).unwrap();
|
||||
assert!(!dest.join("SingletonLock").exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn account_scoped_stores_are_dropped() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
touch(&source.join("Login Data For Account"), b"x");
|
||||
touch(&source.join("Sync Data").join("Nigori.bin"), b"x");
|
||||
touch(
|
||||
&source.join("Sync Data").join("LevelDB").join("CURRENT"),
|
||||
b"x",
|
||||
);
|
||||
|
||||
copy_profile_tree(&source, &dest).unwrap();
|
||||
|
||||
assert!(!dest.join("Login Data For Account").exists());
|
||||
assert!(
|
||||
!dest.join("Sync Data").join("Nigori.bin").exists(),
|
||||
"the Nigori keyset is bound to a Google account"
|
||||
);
|
||||
assert!(
|
||||
dest
|
||||
.join("Sync Data")
|
||||
.join("LevelDB")
|
||||
.join("CURRENT")
|
||||
.exists(),
|
||||
"the rest of Sync Data is local state such as the reading list"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(unix)]
|
||||
fn copied_databases_keep_the_browsers_private_permissions() {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
fs::create_dir_all(&source).unwrap();
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
|
||||
let db = source.join("Cookies");
|
||||
let conn = rusqlite::Connection::open(&db).unwrap();
|
||||
conn
|
||||
.execute_batch("CREATE TABLE cookies(x INTEGER);")
|
||||
.unwrap();
|
||||
drop(conn);
|
||||
fs::set_permissions(&db, fs::Permissions::from_mode(0o600)).unwrap();
|
||||
|
||||
copy_profile_tree(&source, &dest).unwrap();
|
||||
|
||||
// VACUUM INTO would otherwise create the snapshot at SQLite's default 0644.
|
||||
let mode = fs::metadata(dest.join("Cookies"))
|
||||
.unwrap()
|
||||
.permissions()
|
||||
.mode();
|
||||
assert_eq!(
|
||||
mode & 0o777,
|
||||
0o600,
|
||||
"an import must not widen a cookie store"
|
||||
);
|
||||
let dir_mode = fs::metadata(&dest).unwrap().permissions().mode();
|
||||
assert_eq!(dir_mode & 0o777, 0o700);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unreadable_store_is_reported_not_copied_corrupt() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
// A file that opens as SQLite but is structurally broken.
|
||||
touch(
|
||||
&source.join("Cookies"),
|
||||
b"SQLite format 3\0garbage-not-a-db",
|
||||
);
|
||||
|
||||
let outcome = copy_profile_tree(&source, &dest).unwrap();
|
||||
|
||||
assert!(
|
||||
!dest.join("Cookies").exists() || outcome.unreadable_stores.is_empty(),
|
||||
"a store is either snapshotted cleanly or skipped and reported"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn non_sqlite_file_with_a_store_name_still_copies() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("src");
|
||||
let dest = dir.path().join("dst");
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
touch(&source.join("Top Sites"), b"");
|
||||
|
||||
copy_profile_tree(&source, &dest).unwrap();
|
||||
assert!(dest.join("Top Sites").exists());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,392 @@
|
||||
//! Recovering the *source* browser's os_crypt key.
|
||||
//!
|
||||
//! Every Chromium-family browser seals cookies, passwords and payment data with
|
||||
//! a key held outside the profile: the macOS Keychain, a DPAPI blob in
|
||||
//! `Local State`, or the Freedesktop secret service. Import has to open that
|
||||
//! lock before it can re-seal anything with Wayfern's portable key
|
||||
//! ([`super::os_crypt::TargetKey`]).
|
||||
//!
|
||||
//! Failure here is never fatal. A declined Keychain prompt or a locked keyring
|
||||
//! degrades to "everything except the secrets came across", recorded as a
|
||||
//! warning, because a partial profile is worth far more than a failed import.
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
use super::os_crypt::CryptoKey;
|
||||
use super::os_crypt::SourceKeyring;
|
||||
#[cfg(target_os = "macos")]
|
||||
use super::os_crypt::MAC_ITERATIONS;
|
||||
#[cfg(any(target_os = "macos", target_os = "linux"))]
|
||||
use super::os_crypt::{derive_key, CryptoKey};
|
||||
#[cfg(target_os = "linux")]
|
||||
use super::os_crypt::{POSIX_FALLBACK_PASSWORD, POSIX_ITERATIONS};
|
||||
use super::report::warning;
|
||||
use std::path::Path;
|
||||
|
||||
/// Keychain / secret-service identities to try for a source family, most
|
||||
/// specific first.
|
||||
///
|
||||
/// Trying several is safe and costs nothing: a lookup for a service that does
|
||||
/// not exist fails without prompting, so at most one dialog appears — the one
|
||||
/// for the item that is actually there. That is what lets a single `chromium`
|
||||
/// family key cover both Google Chrome and vanilla Chromium, which share a
|
||||
/// detection entry but not a Keychain item.
|
||||
fn brand_candidates(family: &str, source_path: &Path) -> Vec<&'static str> {
|
||||
let path = source_path.to_string_lossy();
|
||||
let mut brands: Vec<&'static str> = match family {
|
||||
"chrome-beta" => vec!["Chrome Beta", "Chrome"],
|
||||
"chrome-dev" => vec!["Chrome Dev", "Chrome"],
|
||||
"chrome-canary" => vec!["Chrome Canary", "Chrome"],
|
||||
"brave" => vec!["Brave", "Brave Browser"],
|
||||
"brave-beta" => vec!["Brave Beta", "Brave Browser", "Brave"],
|
||||
"brave-nightly" => vec!["Brave Nightly", "Brave Browser", "Brave"],
|
||||
"edge" => vec!["Microsoft Edge", "Chromium"],
|
||||
"edge-beta" => vec!["Microsoft Edge Beta", "Microsoft Edge"],
|
||||
"edge-dev" => vec!["Microsoft Edge Dev", "Microsoft Edge"],
|
||||
"vivaldi" => vec!["Vivaldi", "Chromium"],
|
||||
"opera" => vec!["Opera", "Chromium"],
|
||||
"opera-gx" => vec!["Opera GX", "Opera", "Chromium"],
|
||||
"arc" => vec!["Arc", "Chromium"],
|
||||
"yandex" => vec!["Yandex", "Yandex Browser", "Chromium"],
|
||||
// "chromium" covers both Google Chrome and upstream Chromium; the install
|
||||
// path is the only thing that tells them apart.
|
||||
_ => vec!["Chrome", "Chromium"],
|
||||
};
|
||||
|
||||
if (family.is_empty() || family == "chromium")
|
||||
&& path.contains("Chromium")
|
||||
&& !path.contains("Google")
|
||||
{
|
||||
brands = vec!["Chromium", "Chrome"];
|
||||
}
|
||||
|
||||
brands
|
||||
}
|
||||
|
||||
/// Recover whatever key material the source browser used.
|
||||
///
|
||||
/// `source_user_data_dir` is the directory holding `Local State` (the parent of
|
||||
/// the profile directory), which is where Windows keeps its wrapped key. It is
|
||||
/// `None` when the user pointed at a bare profile folder with no parent we can
|
||||
/// trust.
|
||||
pub fn recover_source_keys(
|
||||
family: &str,
|
||||
source_path: &Path,
|
||||
source_user_data_dir: Option<&Path>,
|
||||
report: &mut super::report::ProfileImportReport,
|
||||
) -> SourceKeyring {
|
||||
let mut keyring = SourceKeyring::default();
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
let _ = source_user_data_dir;
|
||||
for brand in brand_candidates(family, source_path) {
|
||||
match macos_keychain_password(brand) {
|
||||
Ok(Some(password)) => {
|
||||
keyring.v10 = Some(CryptoKey::Aes128Cbc(derive_key(&password, MAC_ITERATIONS)));
|
||||
log::info!("Recovered os_crypt password for '{brand} Safe Storage'");
|
||||
break;
|
||||
}
|
||||
Ok(None) => continue,
|
||||
Err(e) => {
|
||||
log::warn!("Keychain lookup for '{brand} Safe Storage' failed: {e}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
let _ = source_path;
|
||||
if let Some(dir) = source_user_data_dir {
|
||||
match windows_local_state_key(dir) {
|
||||
Ok(Some(key)) => keyring.v10 = Some(CryptoKey::Aes256Gcm(key)),
|
||||
Ok(None) => {}
|
||||
Err(e) => log::warn!("DPAPI key recovery failed: {e}"),
|
||||
}
|
||||
if windows_has_app_bound_key(dir) {
|
||||
// Recorded up front: the cookie store will be full of `v20` records
|
||||
// and the user deserves to know why before they see the count.
|
||||
report.warn(warning::APP_BOUND_ENCRYPTED);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
{
|
||||
let _ = source_user_data_dir;
|
||||
// A profile can hold both tags at once, so populate both slots rather than
|
||||
// choosing one. v10 is always available: it is a hardcoded password.
|
||||
keyring.v10 = Some(CryptoKey::Aes128Cbc(derive_key(
|
||||
POSIX_FALLBACK_PASSWORD,
|
||||
POSIX_ITERATIONS,
|
||||
)));
|
||||
for brand in brand_candidates(family, source_path) {
|
||||
match linux_secret_service_password(brand) {
|
||||
Ok(Some(password)) => {
|
||||
keyring.v11 = Some(CryptoKey::Aes128Cbc(derive_key(
|
||||
&password,
|
||||
POSIX_ITERATIONS,
|
||||
)));
|
||||
log::info!("Recovered os_crypt secret for '{brand} Safe Storage'");
|
||||
break;
|
||||
}
|
||||
Ok(None) => continue,
|
||||
Err(e) => {
|
||||
log::warn!("Secret service lookup for '{brand} Safe Storage' failed: {e}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if keyring.is_empty() {
|
||||
report.warn(warning::SECRETS_NOT_MIGRATED);
|
||||
}
|
||||
|
||||
// Silence unused-parameter warnings on platforms that do not use every arg.
|
||||
let _ = (family, source_path, source_user_data_dir);
|
||||
keyring
|
||||
}
|
||||
|
||||
/// How long to wait on a keyring before giving up.
|
||||
///
|
||||
/// Both backends can put a dialog in front of the user — macOS asks whether
|
||||
/// Donut may read another app's Keychain item, and an unlocked-on-demand
|
||||
/// keyring prompts on Linux. That is fine interactively, but an import driven
|
||||
/// over REST or MCP would otherwise wedge forever with nobody at the screen.
|
||||
/// Long enough for a person to notice and click; short enough that automation
|
||||
/// recovers into "secrets not migrated", which is merely a partial import.
|
||||
#[cfg(any(target_os = "macos", target_os = "linux"))]
|
||||
const KEYRING_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(60);
|
||||
|
||||
/// Run a keyring lookup on its own OS thread, bounded by [`KEYRING_TIMEOUT`].
|
||||
///
|
||||
/// Off-thread rather than inline for two reasons: import already runs inside
|
||||
/// `spawn_blocking`, and zbus's blocking API drives a private tokio runtime, so
|
||||
/// keeping it off a runtime-owned thread sidesteps any nested-runtime question;
|
||||
/// and it turns a panic or a stuck IPC call into a recoverable warning instead
|
||||
/// of a failed import.
|
||||
#[cfg(any(target_os = "macos", target_os = "linux"))]
|
||||
fn run_keyring_lookup<F>(what: &str, lookup: F) -> Result<Option<Vec<u8>>, String>
|
||||
where
|
||||
F: FnOnce() -> Result<Option<Vec<u8>>, String> + Send + std::panic::UnwindSafe + 'static,
|
||||
{
|
||||
let (tx, rx) = std::sync::mpsc::channel();
|
||||
std::thread::spawn(move || {
|
||||
let result =
|
||||
std::panic::catch_unwind(lookup).unwrap_or_else(|_| Err("lookup panicked".to_string()));
|
||||
let _ = tx.send(result);
|
||||
});
|
||||
|
||||
match rx.recv_timeout(KEYRING_TIMEOUT) {
|
||||
Ok(result) => result,
|
||||
Err(_) => Err(format!("{what} did not respond")),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
fn macos_keychain_password(brand: &str) -> Result<Option<Vec<u8>>, String> {
|
||||
let brand = brand.to_string();
|
||||
run_keyring_lookup("keychain", move || macos_keychain_lookup(&brand))
|
||||
}
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
fn macos_keychain_lookup(brand: &str) -> Result<Option<Vec<u8>>, String> {
|
||||
use security_framework::passwords::get_generic_password;
|
||||
|
||||
let service = format!("{brand} Safe Storage");
|
||||
match get_generic_password(&service, brand) {
|
||||
Ok(password) => Ok(Some(password)),
|
||||
Err(e) => {
|
||||
// errSecItemNotFound: this brand simply is not installed. Anything else
|
||||
// (notably errSecAuthFailed / errSecUserCanceled when the user declines
|
||||
// the access dialog) is a real failure worth surfacing.
|
||||
if e.code() == -25300 {
|
||||
Ok(None)
|
||||
} else {
|
||||
Err(e.to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
fn read_local_state_os_crypt(dir: &Path) -> Option<serde_json::Value> {
|
||||
let raw = std::fs::read_to_string(dir.join("Local State")).ok()?;
|
||||
let parsed: serde_json::Value = serde_json::from_str(&raw).ok()?;
|
||||
parsed.get("os_crypt").cloned()
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
fn windows_has_app_bound_key(dir: &Path) -> bool {
|
||||
read_local_state_os_crypt(dir)
|
||||
.and_then(|v| {
|
||||
v.get("app_bound_encrypted_key")
|
||||
.and_then(|k| k.as_str().map(str::to_string))
|
||||
})
|
||||
.is_some_and(|k| !k.is_empty())
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
fn windows_local_state_key(dir: &Path) -> Result<Option<[u8; 32]>, String> {
|
||||
use base64::Engine;
|
||||
|
||||
let Some(os_crypt) = read_local_state_os_crypt(dir) else {
|
||||
return Ok(None);
|
||||
};
|
||||
let Some(encoded) = os_crypt.get("encrypted_key").and_then(|k| k.as_str()) else {
|
||||
return Ok(None);
|
||||
};
|
||||
|
||||
let decoded = base64::engine::general_purpose::STANDARD
|
||||
.decode(encoded)
|
||||
.map_err(|e| format!("encrypted_key is not valid base64: {e}"))?;
|
||||
|
||||
// The blob is "DPAPI" || CryptProtectData(key).
|
||||
const DPAPI_PREFIX: &[u8] = b"DPAPI";
|
||||
if !decoded.starts_with(DPAPI_PREFIX) {
|
||||
return Err("encrypted_key is missing the DPAPI header".to_string());
|
||||
}
|
||||
|
||||
let unwrapped = dpapi_unprotect(&decoded[DPAPI_PREFIX.len()..])?;
|
||||
let key: [u8; 32] = unwrapped
|
||||
.as_slice()
|
||||
.try_into()
|
||||
.map_err(|_| format!("expected a 32-byte AES key, got {} bytes", unwrapped.len()))?;
|
||||
Ok(Some(key))
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
fn dpapi_unprotect(ciphertext: &[u8]) -> Result<Vec<u8>, String> {
|
||||
use windows::Win32::Foundation::LocalFree;
|
||||
use windows::Win32::Security::Cryptography::{CryptUnprotectData, CRYPT_INTEGER_BLOB};
|
||||
|
||||
let mut input = CRYPT_INTEGER_BLOB {
|
||||
cbData: ciphertext.len() as u32,
|
||||
pbData: ciphertext.as_ptr() as *mut u8,
|
||||
};
|
||||
let mut output = CRYPT_INTEGER_BLOB::default();
|
||||
|
||||
// SAFETY: `input` points at a live slice for the duration of the call, and
|
||||
// `output` is freed via LocalFree exactly once below, as the API requires.
|
||||
unsafe {
|
||||
CryptUnprotectData(&mut input, None, None, None, None, 0, &mut output)
|
||||
.map_err(|e| format!("CryptUnprotectData failed: {e}"))?;
|
||||
|
||||
let plaintext = std::slice::from_raw_parts(output.pbData, output.cbData as usize).to_vec();
|
||||
let _ = LocalFree(Some(windows::Win32::Foundation::HLOCAL(
|
||||
output.pbData as *mut core::ffi::c_void,
|
||||
)));
|
||||
Ok(plaintext)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
fn linux_secret_service_password(brand: &str) -> Result<Option<Vec<u8>>, String> {
|
||||
let brand = brand.to_string();
|
||||
run_keyring_lookup("secret service", move || {
|
||||
linux_secret_service_lookup(&brand)
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
fn linux_secret_service_lookup(brand: &str) -> Result<Option<Vec<u8>>, String> {
|
||||
use secret_service::blocking::SecretService;
|
||||
use secret_service::EncryptionType;
|
||||
use std::collections::HashMap;
|
||||
|
||||
let service =
|
||||
SecretService::connect(EncryptionType::Dh).map_err(|e| format!("no secret service: {e}"))?;
|
||||
let collection = service
|
||||
.get_default_collection()
|
||||
.map_err(|e| format!("no default collection: {e}"))?;
|
||||
if collection.is_locked().unwrap_or(true) {
|
||||
collection
|
||||
.unlock()
|
||||
.map_err(|e| format!("keyring is locked: {e}"))?;
|
||||
}
|
||||
|
||||
// Match on the item's LABEL, not on its `application` attribute.
|
||||
//
|
||||
// `freedesktop_secret_key_provider.cc` stores two attributes —
|
||||
// `application: kAppName` and `xdg:schema` — and sets the label to
|
||||
// `kKeyName`, which is always "<Brand> Safe Storage". `kAppName` is a
|
||||
// per-fork branding string ("chrome", "chromium", …) that we cannot derive
|
||||
// from a display name: lowercasing "Microsoft Edge" gives "microsoft edge",
|
||||
// which matches nothing, and the search would silently return zero items.
|
||||
// The label is the one identifier that is the same across every fork and is
|
||||
// exactly the string we already build for the macOS Keychain.
|
||||
let label = format!("{brand} Safe Storage");
|
||||
|
||||
// The schema attribute narrows the scan to os_crypt secrets; it is shared by
|
||||
// every Chromium fork, so it costs nothing in portability.
|
||||
let mut attributes = HashMap::new();
|
||||
attributes.insert("xdg:schema", "chrome_libsecret_os_crypt_password_v2");
|
||||
let mut items = collection
|
||||
.search_items(attributes)
|
||||
.map_err(|e| format!("search failed: {e}"))?;
|
||||
if items.is_empty() {
|
||||
// Older Chromium releases used a v1 schema, and some forks omit it.
|
||||
items = collection
|
||||
.get_all_items()
|
||||
.map_err(|e| format!("could not list items: {e}"))?;
|
||||
}
|
||||
|
||||
for item in &items {
|
||||
if item.get_label().is_ok_and(|found| found == label) {
|
||||
return item
|
||||
.get_secret()
|
||||
.map(Some)
|
||||
.map_err(|e| format!("could not read secret: {e}"));
|
||||
}
|
||||
}
|
||||
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::path::PathBuf;
|
||||
|
||||
#[test]
|
||||
fn chromium_family_disambiguates_chrome_from_chromium_by_path() {
|
||||
let chrome = PathBuf::from("/Users/x/Library/Application Support/Google/Chrome/Default");
|
||||
assert_eq!(brand_candidates("chromium", &chrome)[0], "Chrome");
|
||||
|
||||
let chromium = PathBuf::from("/Users/x/Library/Application Support/Chromium/Default");
|
||||
assert_eq!(brand_candidates("chromium", &chromium)[0], "Chromium");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn every_brand_falls_back_to_a_second_candidate() {
|
||||
// A single candidate means one wrong guess loses the secrets entirely, so
|
||||
// each family must offer a fallback identity.
|
||||
for family in [
|
||||
"chrome-beta",
|
||||
"chrome-dev",
|
||||
"chrome-canary",
|
||||
"brave",
|
||||
"edge",
|
||||
"vivaldi",
|
||||
"opera",
|
||||
"opera-gx",
|
||||
"arc",
|
||||
"yandex",
|
||||
"chromium",
|
||||
] {
|
||||
let candidates = brand_candidates(family, Path::new("/tmp/profile"));
|
||||
assert!(
|
||||
candidates.len() >= 2,
|
||||
"{family} needs a fallback brand candidate"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unknown_family_still_yields_candidates() {
|
||||
let candidates = brand_candidates("something-new", Path::new("/tmp/profile"));
|
||||
assert!(!candidates.is_empty());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,380 @@
|
||||
//! Working out what the user pointed at, and where its files have to land.
|
||||
//!
|
||||
//! Two layout facts drive everything here:
|
||||
//!
|
||||
//! 1. Donut launches with `--user-data-dir` and no `--profile-directory`, so
|
||||
//! Chromium reads `<user-data-dir>/Default/` (`chrome_constants.cc`
|
||||
//! `kInitialProfile`). A source *profile* directory therefore has to be
|
||||
//! copied one level down, not onto the root.
|
||||
//! 2. Network state (`Cookies`, `TransportSecurity`, …) lives in
|
||||
//! `Default/Network/` on Windows and in `Default/` everywhere else. That
|
||||
//! split is not cosmetic: `kTriggerNetworkDataMigration` is enabled by
|
||||
//! default only on Windows, and on the other platforms Chromium actively
|
||||
//! redirects reads back to `Default/`. A profile exported from Windows is
|
||||
//! invisible on macOS until its files are moved up, and vice versa.
|
||||
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
/// Files Chromium keeps under `Default/Network/` on Windows and directly under
|
||||
/// `Default/` on macOS and Linux.
|
||||
pub const NETWORK_DATA_FILES: &[&str] = &[
|
||||
"Cookies",
|
||||
"Cookies-journal",
|
||||
"Network Persistent State",
|
||||
"Reporting and NEL",
|
||||
"SCT Auditing Pending Reports",
|
||||
"Trust Tokens",
|
||||
"Trust Tokens-journal",
|
||||
"TransportSecurity",
|
||||
"Device Bound Sessions",
|
||||
"Device Bound Sessions-journal",
|
||||
];
|
||||
|
||||
/// What the user handed us.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum SourceKind {
|
||||
/// A profile directory (holds `Preferences`): `.../Chrome/Default`.
|
||||
ProfileDir,
|
||||
/// A user-data directory whose profile lives at its root — Opera's layout.
|
||||
RootProfileUserDataDir,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct SourceShape {
|
||||
pub kind: SourceKind,
|
||||
/// The directory holding `Preferences` — the content that becomes `Default/`.
|
||||
pub profile_dir: PathBuf,
|
||||
/// The directory holding `Local State`, when there is one. Windows keeps the
|
||||
/// DPAPI-wrapped os_crypt key there, so losing it loses every secret.
|
||||
pub user_data_dir: Option<PathBuf>,
|
||||
}
|
||||
|
||||
/// Why a directory cannot be imported.
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub enum RejectReason {
|
||||
/// Recognisably a Gecko profile. Worth naming explicitly: silently returning
|
||||
/// "nothing found" for a Firefox folder is what made import feel broken.
|
||||
Firefox,
|
||||
/// Not a browser profile we recognise at all.
|
||||
NotChromium,
|
||||
}
|
||||
|
||||
/// Markers that identify a real Chromium profile directory. `Preferences` is
|
||||
/// the usual one, but a profile whose prefs were wiped still has data worth
|
||||
/// carrying, so any of these counts.
|
||||
const CHROMIUM_PROFILE_MARKERS: &[&str] = &[
|
||||
"Preferences",
|
||||
"Secure Preferences",
|
||||
"History",
|
||||
"Cookies",
|
||||
"Bookmarks",
|
||||
"Web Data",
|
||||
"Login Data",
|
||||
];
|
||||
|
||||
fn looks_like_chromium_profile(dir: &Path) -> bool {
|
||||
CHROMIUM_PROFILE_MARKERS
|
||||
.iter()
|
||||
.any(|marker| dir.join(marker).exists())
|
||||
// Windows-layout profiles keep Cookies one level down.
|
||||
|| dir.join("Network").join("Cookies").exists()
|
||||
}
|
||||
|
||||
fn looks_like_firefox_profile(dir: &Path) -> bool {
|
||||
// Any one of these alone can appear elsewhere; together they are conclusive.
|
||||
let markers = ["prefs.js", "places.sqlite", "cookies.sqlite", "key4.db"];
|
||||
markers.iter().filter(|m| dir.join(m).exists()).count() >= 2
|
||||
}
|
||||
|
||||
/// Classify an import source, or explain why it cannot be one.
|
||||
pub fn classify(source: &Path) -> Result<SourceShape, RejectReason> {
|
||||
if looks_like_firefox_profile(source) {
|
||||
return Err(RejectReason::Firefox);
|
||||
}
|
||||
if !looks_like_chromium_profile(source) {
|
||||
return Err(RejectReason::NotChromium);
|
||||
}
|
||||
|
||||
// A directory that holds both profile markers and `Local State` is Opera's
|
||||
// root-profile layout: the user-data dir and the profile are the same place.
|
||||
let kind = if source.join("Local State").exists() {
|
||||
SourceKind::RootProfileUserDataDir
|
||||
} else {
|
||||
SourceKind::ProfileDir
|
||||
};
|
||||
|
||||
let user_data_dir = match kind {
|
||||
SourceKind::RootProfileUserDataDir => Some(source.to_path_buf()),
|
||||
// For `.../Chrome/Default`, `Local State` is in `.../Chrome`. Only accept
|
||||
// the parent if it really holds one, so a profile copied to a random
|
||||
// folder does not make us read a stranger's `Local State`.
|
||||
SourceKind::ProfileDir => source.parent().and_then(|parent| {
|
||||
if parent.join("Local State").exists() {
|
||||
return Some(parent.to_path_buf());
|
||||
}
|
||||
// Opera keeps its extra profiles at `<user-data-dir>/_side_profiles/<id>`
|
||||
// but still launches them against the same user-data dir, so the
|
||||
// DPAPI-wrapped os_crypt key sits one further level up. Without this,
|
||||
// every Opera side profile imports on Windows with no secrets at all.
|
||||
if parent.file_name() == Some(std::ffi::OsStr::new("_side_profiles")) {
|
||||
return parent
|
||||
.parent()
|
||||
.filter(|root| root.join("Local State").exists())
|
||||
.map(Path::to_path_buf);
|
||||
}
|
||||
None
|
||||
}),
|
||||
};
|
||||
|
||||
Ok(SourceShape {
|
||||
kind,
|
||||
profile_dir: source.to_path_buf(),
|
||||
user_data_dir,
|
||||
})
|
||||
}
|
||||
|
||||
/// Move network data into the position the *host* Chromium build reads from.
|
||||
///
|
||||
/// Host, not source: the files were written by whatever browser produced them,
|
||||
/// but they will be read by Wayfern running here. Getting this backwards is a
|
||||
/// silent, total cookie loss on any cross-platform import.
|
||||
pub fn normalize_network_dir(default_dir: &Path) -> std::io::Result<()> {
|
||||
let network_dir = default_dir.join("Network");
|
||||
|
||||
let (from, to) = if cfg!(target_os = "windows") {
|
||||
(default_dir.to_path_buf(), network_dir.clone())
|
||||
} else {
|
||||
(network_dir.clone(), default_dir.to_path_buf())
|
||||
};
|
||||
|
||||
if !from.exists() {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
for name in NETWORK_DATA_FILES {
|
||||
let src = from.join(name);
|
||||
if !src.is_file() {
|
||||
continue;
|
||||
}
|
||||
std::fs::create_dir_all(&to)?;
|
||||
let dest = to.join(name);
|
||||
if dest.exists() {
|
||||
// Both positions hold the file. The one in the source position is the
|
||||
// stale duplicate: on Windows, Chromium's migration would copy it over
|
||||
// the newer file ("overwrite the new file with the old file even if it
|
||||
// exists already", network_sandbox.cc), so it has to go.
|
||||
std::fs::remove_file(&src)?;
|
||||
continue;
|
||||
}
|
||||
std::fs::rename(&src, &dest).or_else(|_| {
|
||||
// Rename across devices can fail even within one tree on some setups.
|
||||
std::fs::copy(&src, &dest).and_then(|_| std::fs::remove_file(&src))?;
|
||||
Ok::<(), std::io::Error>(())
|
||||
})?;
|
||||
}
|
||||
|
||||
if !cfg!(target_os = "windows") {
|
||||
// Chromium's migration checkpoint, and the reason an otherwise-correct
|
||||
// move is not enough. `network_sandbox.cc:478` treats the presence of
|
||||
// `NetworkDataMigrated` as proof the migration already ran, keeps the (now
|
||||
// empty) `Network/` as the data directory, and then `CleanUpOldData` at
|
||||
// `:536-540` DELETES the files we just moved up into `Default/`. A profile
|
||||
// exported from Windows would lose every cookie on first launch.
|
||||
let _ = std::fs::remove_file(network_dir.join("NetworkDataMigrated"));
|
||||
|
||||
// Leave no empty `Network/` behind: harmless, but it makes a profile look
|
||||
// like it still holds network state.
|
||||
if network_dir.is_dir() && std::fs::read_dir(&network_dir)?.next().is_none() {
|
||||
let _ = std::fs::remove_dir(&network_dir);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Where the cookie store ends up for the host platform.
|
||||
pub fn host_cookie_path(default_dir: &Path) -> PathBuf {
|
||||
if cfg!(target_os = "windows") {
|
||||
default_dir.join("Network").join("Cookies")
|
||||
} else {
|
||||
default_dir.join("Cookies")
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use tempfile::TempDir;
|
||||
|
||||
fn touch(path: &Path) {
|
||||
if let Some(parent) = path.parent() {
|
||||
std::fs::create_dir_all(parent).unwrap();
|
||||
}
|
||||
std::fs::write(path, b"x").unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plain_profile_dir_is_classified_without_a_user_data_dir() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let profile = dir.path().join("Default");
|
||||
touch(&profile.join("Preferences"));
|
||||
|
||||
let shape = classify(&profile).expect("should classify");
|
||||
assert_eq!(shape.kind, SourceKind::ProfileDir);
|
||||
assert_eq!(shape.user_data_dir, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn profile_dir_finds_local_state_in_its_parent() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let profile = dir.path().join("Default");
|
||||
touch(&profile.join("Preferences"));
|
||||
touch(&dir.path().join("Local State"));
|
||||
|
||||
let shape = classify(&profile).expect("should classify");
|
||||
// Windows keeps the wrapped os_crypt key here; missing it means no secrets.
|
||||
assert_eq!(shape.user_data_dir.as_deref(), Some(dir.path()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn opera_root_layout_is_its_own_user_data_dir() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
touch(&dir.path().join("Preferences"));
|
||||
touch(&dir.path().join("Local State"));
|
||||
|
||||
let shape = classify(dir.path()).expect("should classify");
|
||||
assert_eq!(shape.kind, SourceKind::RootProfileUserDataDir);
|
||||
assert_eq!(shape.user_data_dir.as_deref(), Some(dir.path()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn firefox_profile_is_rejected_by_name() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
touch(&dir.path().join("prefs.js"));
|
||||
touch(&dir.path().join("places.sqlite"));
|
||||
assert_eq!(classify(dir.path()), Err(RejectReason::Firefox));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_directory_is_rejected() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
assert_eq!(classify(dir.path()), Err(RejectReason::NotChromium));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn windows_layout_profile_is_recognised_without_root_markers() {
|
||||
// A profile whose only surviving data is Windows-layout cookies.
|
||||
let dir = TempDir::new().unwrap();
|
||||
touch(&dir.path().join("Network").join("Cookies"));
|
||||
assert!(classify(dir.path()).is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn opera_side_profile_finds_local_state_two_levels_up() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let profile = dir.path().join("_side_profiles").join("gaming");
|
||||
touch(&profile.join("Preferences"));
|
||||
touch(&dir.path().join("Local State"));
|
||||
|
||||
let shape = classify(&profile).expect("should classify");
|
||||
assert_eq!(
|
||||
shape.user_data_dir.as_deref(),
|
||||
Some(dir.path()),
|
||||
"Windows keeps the os_crypt key in the root Local State, not beside the profile"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_profile_in_an_unrelated_folder_does_not_adopt_a_strangers_local_state() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let profile = dir.path().join("_side_profiles").join("gaming");
|
||||
touch(&profile.join("Preferences"));
|
||||
// No Local State anywhere above it.
|
||||
let shape = classify(&profile).expect("should classify");
|
||||
assert_eq!(shape.user_data_dir, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn migration_checkpoint_is_removed_so_chromium_does_not_delete_the_moved_files() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let default_dir = dir.path().join("Default");
|
||||
touch(&default_dir.join("Network").join("Cookies"));
|
||||
touch(&default_dir.join("Network").join("NetworkDataMigrated"));
|
||||
|
||||
normalize_network_dir(&default_dir).unwrap();
|
||||
|
||||
assert!(host_cookie_path(&default_dir).is_file());
|
||||
if !cfg!(target_os = "windows") {
|
||||
assert!(
|
||||
!default_dir
|
||||
.join("Network")
|
||||
.join("NetworkDataMigrated")
|
||||
.exists(),
|
||||
"the checkpoint makes Chromium delete the files we just moved up"
|
||||
);
|
||||
assert!(!default_dir.join("Network").exists());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn network_files_are_moved_into_the_host_position() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let default_dir = dir.path().join("Default");
|
||||
|
||||
// Seed the file in the position the host does NOT read from.
|
||||
if cfg!(target_os = "windows") {
|
||||
touch(&default_dir.join("Cookies"));
|
||||
} else {
|
||||
touch(&default_dir.join("Network").join("Cookies"));
|
||||
}
|
||||
|
||||
normalize_network_dir(&default_dir).unwrap();
|
||||
|
||||
assert!(
|
||||
host_cookie_path(&default_dir).is_file(),
|
||||
"cookies must end up where this platform's Chromium reads them"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stale_duplicate_in_the_source_position_is_removed() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let default_dir = dir.path().join("Default");
|
||||
touch(&default_dir.join("Cookies"));
|
||||
touch(&default_dir.join("Network").join("Cookies"));
|
||||
|
||||
normalize_network_dir(&default_dir).unwrap();
|
||||
|
||||
assert!(host_cookie_path(&default_dir).is_file());
|
||||
let stale = if cfg!(target_os = "windows") {
|
||||
default_dir.join("Cookies")
|
||||
} else {
|
||||
default_dir.join("Network").join("Cookies")
|
||||
};
|
||||
assert!(
|
||||
!stale.exists(),
|
||||
"the duplicate would be copied over the live file by Chromium's migration"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn normalize_is_idempotent() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let default_dir = dir.path().join("Default");
|
||||
touch(&default_dir.join("Network").join("Cookies"));
|
||||
|
||||
normalize_network_dir(&default_dir).unwrap();
|
||||
normalize_network_dir(&default_dir).unwrap();
|
||||
|
||||
assert!(host_cookie_path(&default_dir).is_file());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn normalize_on_a_profile_with_no_network_data_is_a_no_op() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let default_dir = dir.path().join("Default");
|
||||
std::fs::create_dir_all(&default_dir).unwrap();
|
||||
normalize_network_dir(&default_dir).unwrap();
|
||||
assert!(!host_cookie_path(&default_dir).exists());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,372 @@
|
||||
//! Turning someone else's browser profile into one Wayfern will actually load.
|
||||
//!
|
||||
//! The old importer copied a source profile directory verbatim onto the new
|
||||
//! profile's `--user-data-dir`. Chromium reads `<user-data-dir>/Default/`, so
|
||||
//! every imported file sat one level above where the browser looked and the
|
||||
//! profile came up empty — and even in the right place the secrets would not
|
||||
//! have opened, because they are sealed with a key held in the source
|
||||
//! machine's Keychain / DPAPI / secret service that Wayfern never consults.
|
||||
//!
|
||||
//! This module does the whole job: classify the source, recover its key, copy
|
||||
//! with consistent database snapshots, put the files where Chromium reads them,
|
||||
//! re-seal every secret with Wayfern's portable key, and report exactly what
|
||||
//! came across.
|
||||
|
||||
pub mod copy;
|
||||
pub mod keyring;
|
||||
pub mod layout;
|
||||
pub mod os_crypt;
|
||||
pub mod report;
|
||||
pub mod rewrite;
|
||||
|
||||
use layout::RejectReason;
|
||||
use report::{warning, ProfileImportReport};
|
||||
use std::path::Path;
|
||||
|
||||
/// The profile subdirectory Chromium reads when no `--profile-directory` is
|
||||
/// passed (`chrome_constants.cc` `kInitialProfile`). Donut never passes one.
|
||||
pub const INITIAL_PROFILE_DIR: &str = "Default";
|
||||
|
||||
/// Import `source` into `dest_user_data_dir`, which becomes the new profile's
|
||||
/// `--user-data-dir`.
|
||||
///
|
||||
/// Never fails because part of the data could not be carried: partial results
|
||||
/// plus an honest report beat an all-or-nothing import that leaves the user
|
||||
/// with nothing and no explanation. It fails only when the source is not
|
||||
/// importable at all, or when the target key cannot be established — without
|
||||
/// that key, anything written would be unreadable forever.
|
||||
pub fn import_into(
|
||||
source: &Path,
|
||||
dest_user_data_dir: &Path,
|
||||
source_family: &str,
|
||||
allow_running: bool,
|
||||
) -> Result<ProfileImportReport, String> {
|
||||
let shape = layout::classify(source).map_err(|reason| match reason {
|
||||
RejectReason::Firefox => serde_json::json!({
|
||||
"code": "IMPORT_SOURCE_NOT_CHROMIUM",
|
||||
"params": { "family": "Firefox" }
|
||||
})
|
||||
.to_string(),
|
||||
RejectReason::NotChromium => serde_json::json!({
|
||||
"code": "IMPORT_SOURCE_NOT_CHROMIUM",
|
||||
"params": { "family": "" }
|
||||
})
|
||||
.to_string(),
|
||||
})?;
|
||||
|
||||
let mut report = ProfileImportReport::default();
|
||||
|
||||
if let Some(running) = running_source_browser(&shape) {
|
||||
if !allow_running {
|
||||
return Err(
|
||||
serde_json::json!({
|
||||
"code": "IMPORT_SOURCE_BROWSER_RUNNING",
|
||||
"params": { "browser": running }
|
||||
})
|
||||
.to_string(),
|
||||
);
|
||||
}
|
||||
// Databases are snapshotted transactionally, but LevelDB site data is
|
||||
// copied as files and can be mid-write.
|
||||
report.warn(warning::SOURCE_BROWSER_RUNNING);
|
||||
}
|
||||
|
||||
// Mint the target key first. Everything after this point is written to be
|
||||
// readable with it, and a profile whose key could not be persisted would
|
||||
// lose every secret the first time the browser exits.
|
||||
let target = os_crypt::TargetKey::ensure(dest_user_data_dir)?;
|
||||
|
||||
// Recover the source key before the copy: on macOS this may prompt, and
|
||||
// asking before a multi-GB copy respects the user's time.
|
||||
let source_keys = keyring::recover_source_keys(
|
||||
source_family,
|
||||
&shape.profile_dir,
|
||||
shape.user_data_dir.as_deref(),
|
||||
&mut report,
|
||||
);
|
||||
|
||||
let default_dir = dest_user_data_dir.join(INITIAL_PROFILE_DIR);
|
||||
let outcome = copy::copy_profile_tree(&shape.profile_dir, &default_dir)?;
|
||||
report.bytes_copied = outcome.bytes_copied;
|
||||
if !outcome.unreadable_stores.is_empty() {
|
||||
report.warn(warning::STORE_UNREADABLE);
|
||||
}
|
||||
|
||||
layout::normalize_network_dir(&default_dir)
|
||||
.map_err(|e| format!("Failed to place network data: {e}"))?;
|
||||
|
||||
rewrite::finalize_profile(&default_dir, &source_keys, &target, &mut report);
|
||||
|
||||
Ok(report)
|
||||
}
|
||||
|
||||
/// Is the browser that owns this profile currently running?
|
||||
///
|
||||
/// Matched on the profile path in the process command line rather than on the
|
||||
/// executable name: the user may well have Chrome open on a *different*
|
||||
/// profile, which is no reason to block the import.
|
||||
fn running_source_browser(shape: &layout::SourceShape) -> Option<String> {
|
||||
use sysinfo::{ProcessRefreshKind, RefreshKind, System};
|
||||
|
||||
let system = System::new_with_specifics(
|
||||
RefreshKind::nothing().with_processes(ProcessRefreshKind::everything()),
|
||||
);
|
||||
|
||||
let needle = shape
|
||||
.user_data_dir
|
||||
.as_deref()
|
||||
.unwrap_or(&shape.profile_dir)
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
if needle.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
for process in system.processes().values() {
|
||||
let name = process.name().to_string_lossy().to_lowercase();
|
||||
let looks_like_a_browser = name.contains("chrome")
|
||||
|| name.contains("chromium")
|
||||
|| name.contains("brave")
|
||||
|| name.contains("edge")
|
||||
|| name.contains("vivaldi")
|
||||
|| name.contains("opera")
|
||||
|| name.contains("arc")
|
||||
|| name.contains("yandex");
|
||||
if !looks_like_a_browser {
|
||||
continue;
|
||||
}
|
||||
// Donut's own browser is Wayfern; never report it as the source.
|
||||
if name.contains("wayfern") {
|
||||
continue;
|
||||
}
|
||||
if process
|
||||
.cmd()
|
||||
.iter()
|
||||
.any(|arg| arg.to_string_lossy().contains(&needle))
|
||||
{
|
||||
return Some(process.name().to_string_lossy().to_string());
|
||||
}
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
/// Move a profile that an earlier build imported into the broken root layout
|
||||
/// down into `Default/`, where the browser reads it.
|
||||
///
|
||||
/// Without this, everything those users imported stays stranded: their real
|
||||
/// data sits at `profile/Cookies` while Wayfern reads and writes
|
||||
/// `profile/Default/Cookies`. Their secrets remain unreadable — the source key
|
||||
/// was never captured and cannot be recovered after the fact — but history,
|
||||
/// bookmarks, extensions and site data become visible again.
|
||||
///
|
||||
/// Returns `Ok(true)` when a repair was performed.
|
||||
pub fn repair_legacy_layout(user_data_dir: &Path) -> Result<bool, String> {
|
||||
let default_dir = user_data_dir.join(INITIAL_PROFILE_DIR);
|
||||
|
||||
// The broken shape is exactly: profile markers at the root, and no `Default/`
|
||||
// for the browser to have used instead.
|
||||
let has_root_profile = user_data_dir.join("Preferences").exists()
|
||||
|| user_data_dir.join("History").exists()
|
||||
|| user_data_dir.join("Cookies").exists();
|
||||
if !has_root_profile || default_dir.exists() {
|
||||
return Ok(false);
|
||||
}
|
||||
|
||||
// Root-level files that belong to the user-data dir, not to the profile.
|
||||
const ROOT_LEVEL: &[&str] = &[
|
||||
"Local State",
|
||||
"os_crypt_key",
|
||||
"First Run",
|
||||
"Last Version",
|
||||
"Variations",
|
||||
"ChromeFeatureState",
|
||||
"RunningChromeVersion",
|
||||
"SingletonLock",
|
||||
"SingletonCookie",
|
||||
"SingletonSocket",
|
||||
"user.js",
|
||||
"metadata.json",
|
||||
".donut-sync",
|
||||
];
|
||||
|
||||
let staging = user_data_dir.join(".donut-import-repair");
|
||||
if staging.exists() {
|
||||
std::fs::remove_dir_all(&staging).map_err(|e| format!("Failed to clear staging: {e}"))?;
|
||||
}
|
||||
std::fs::create_dir_all(&staging).map_err(|e| format!("Failed to create staging: {e}"))?;
|
||||
|
||||
let entries =
|
||||
std::fs::read_dir(user_data_dir).map_err(|e| format!("Failed to read profile: {e}"))?;
|
||||
for entry in entries.flatten() {
|
||||
let name = entry.file_name();
|
||||
let Some(name_str) = name.to_str() else {
|
||||
continue;
|
||||
};
|
||||
if ROOT_LEVEL.contains(&name_str) || name_str == ".donut-import-repair" {
|
||||
continue;
|
||||
}
|
||||
std::fs::rename(entry.path(), staging.join(name_str))
|
||||
.map_err(|e| format!("Failed to relocate {name_str}: {e}"))?;
|
||||
}
|
||||
|
||||
std::fs::rename(&staging, &default_dir)
|
||||
.map_err(|e| format!("Failed to install {INITIAL_PROFILE_DIR}: {e}"))?;
|
||||
|
||||
// Now that the files are in the right place, put the network data where this
|
||||
// platform reads it too.
|
||||
let _ = layout::normalize_network_dir(&default_dir);
|
||||
// And make sure the profile has a key, so the browser does not mint one
|
||||
// mid-session and lose whatever it writes.
|
||||
let _ = os_crypt::TargetKey::ensure(user_data_dir);
|
||||
|
||||
log::info!(
|
||||
"Repaired legacy import layout at {} (moved profile content into {INITIAL_PROFILE_DIR}/)",
|
||||
user_data_dir.display()
|
||||
);
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use tempfile::TempDir;
|
||||
|
||||
fn touch(path: &Path, contents: &[u8]) {
|
||||
if let Some(parent) = path.parent() {
|
||||
std::fs::create_dir_all(parent).unwrap();
|
||||
}
|
||||
std::fs::write(path, contents).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_places_everything_under_default() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("Chrome").join("Default");
|
||||
let dest = dir.path().join("profile");
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
touch(&source.join("Bookmarks"), b"{\"roots\":{}}");
|
||||
|
||||
let report = import_into(&source, &dest, "chromium", true).expect("import");
|
||||
|
||||
assert!(
|
||||
dest.join("Default").join("Preferences").exists(),
|
||||
"Chromium reads Default/, not the user-data-dir root"
|
||||
);
|
||||
assert!(
|
||||
!dest.join("Preferences").exists(),
|
||||
"nothing profile-scoped belongs at the root"
|
||||
);
|
||||
assert!(dest.join(os_crypt::KEY_FILE_NAME).exists());
|
||||
assert!(report.bytes_copied > 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_rejects_a_firefox_profile_by_name() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("xyz.default-release");
|
||||
let dest = dir.path().join("profile");
|
||||
touch(&source.join("prefs.js"), b"");
|
||||
touch(&source.join("places.sqlite"), b"");
|
||||
|
||||
let err = import_into(&source, &dest, "firefox", true).expect_err("must reject");
|
||||
assert!(err.contains("IMPORT_SOURCE_NOT_CHROMIUM"));
|
||||
assert!(
|
||||
err.contains("Firefox"),
|
||||
"the user needs to be told why, not just that it failed"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_rejects_an_arbitrary_folder() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("holiday-photos");
|
||||
let dest = dir.path().join("profile");
|
||||
touch(&source.join("IMG_0001.jpg"), b"not a profile");
|
||||
|
||||
let err = import_into(&source, &dest, "chromium", true).expect_err("must reject");
|
||||
assert!(err.contains("IMPORT_SOURCE_NOT_CHROMIUM"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_is_rerunnable_over_the_same_destination() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let source = dir.path().join("Default");
|
||||
let dest = dir.path().join("profile");
|
||||
touch(&source.join("Preferences"), b"{}");
|
||||
|
||||
import_into(&source, &dest, "chromium", true).expect("first");
|
||||
let key = std::fs::read(dest.join(os_crypt::KEY_FILE_NAME)).unwrap();
|
||||
import_into(&source, &dest, "chromium", true).expect("second");
|
||||
assert_eq!(
|
||||
std::fs::read(dest.join(os_crypt::KEY_FILE_NAME)).unwrap(),
|
||||
key,
|
||||
"re-running must not orphan what the first run encrypted"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn legacy_layout_is_repaired_into_default() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let profile = dir.path().join("profile");
|
||||
// Exactly what the old importer produced.
|
||||
touch(&profile.join("Preferences"), b"{}");
|
||||
touch(&profile.join("History"), b"");
|
||||
touch(
|
||||
&profile
|
||||
.join("Local Storage")
|
||||
.join("leveldb")
|
||||
.join("CURRENT"),
|
||||
b"",
|
||||
);
|
||||
touch(&profile.join("Local State"), b"{}");
|
||||
|
||||
assert!(repair_legacy_layout(&profile).unwrap());
|
||||
|
||||
assert!(profile.join("Default").join("Preferences").exists());
|
||||
assert!(profile.join("Default").join("History").exists());
|
||||
assert!(profile
|
||||
.join("Default")
|
||||
.join("Local Storage")
|
||||
.join("leveldb")
|
||||
.join("CURRENT")
|
||||
.exists());
|
||||
assert!(
|
||||
profile.join("Local State").exists(),
|
||||
"Local State belongs to the user-data dir, not the profile"
|
||||
);
|
||||
assert!(profile.join(os_crypt::KEY_FILE_NAME).exists());
|
||||
assert!(!profile.join(".donut-import-repair").exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn repair_leaves_a_healthy_profile_alone() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let profile = dir.path().join("profile");
|
||||
touch(&profile.join("Default").join("Preferences"), b"{}");
|
||||
touch(&profile.join("Local State"), b"{}");
|
||||
|
||||
assert!(!repair_legacy_layout(&profile).unwrap());
|
||||
assert!(profile.join("Default").join("Preferences").exists());
|
||||
assert!(!profile.join("Default").join("Default").exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn repair_is_a_no_op_on_an_empty_profile() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let profile = dir.path().join("profile");
|
||||
std::fs::create_dir_all(&profile).unwrap();
|
||||
assert!(!repair_legacy_layout(&profile).unwrap());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn repair_is_idempotent() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let profile = dir.path().join("profile");
|
||||
touch(&profile.join("Preferences"), b"{}");
|
||||
|
||||
assert!(repair_legacy_layout(&profile).unwrap());
|
||||
assert!(!repair_legacy_layout(&profile).unwrap());
|
||||
assert!(profile.join("Default").join("Preferences").exists());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,560 @@
|
||||
//! Key material for profile import.
|
||||
//!
|
||||
//! Wayfern deliberately does not use the OS keyring. Every `os_crypt_async`
|
||||
//! key provider is patched to read (or mint) `<user-data-dir>/os_crypt_key`
|
||||
//! instead, so a profile directory is self-contained and portable. See
|
||||
//! `wayfern/patches/extra/fingerprint/components-os_crypt-async-browser-*`.
|
||||
//!
|
||||
//! That portability is exactly why an imported Chrome profile carries nothing:
|
||||
//! its secrets are sealed with a key held in the macOS Keychain / Windows DPAPI
|
||||
//! / the Freedesktop secret service, and Wayfern never looks there. Import has
|
||||
//! to open the source's lock and re-seal everything with Wayfern's.
|
||||
//!
|
||||
//! The on-disk format is per-platform and NOT interchangeable, matching the
|
||||
//! provider that owns each tag in the patched Chromium 151 tree:
|
||||
//!
|
||||
//! | Host | `os_crypt_key` | Derivation | Cipher | Tag |
|
||||
//! |---------|---------------------|-------------------------------------|--------------|-------|
|
||||
//! | macOS | `base64(16 bytes)` | PBKDF2-HMAC-SHA1(saltysalt, 1003) | AES-128-CBC | `v10` |
|
||||
//! | Linux | `base64(16 bytes)` | PBKDF2-HMAC-SHA1(saltysalt, 1) | AES-128-CBC | `v11` |
|
||||
//! | Windows | 32 raw bytes | none, the bytes are the key | AES-256-GCM | `v10` |
|
||||
//!
|
||||
//! Linux must write `v11`, not `v10`: `PosixKeyProvider` owns `v10` with the
|
||||
//! hardcoded "peanuts" password and `Encryptor::DecryptData` dispatches on the
|
||||
//! tag prefix, so a `v10` record on Linux would be decrypted with the wrong key
|
||||
//! forever.
|
||||
|
||||
use aes::cipher::{block_padding::Pkcs7, BlockModeDecrypt, BlockModeEncrypt, KeyIvInit};
|
||||
use aes_gcm::aead::{Aead, KeyInit, Payload};
|
||||
use aes_gcm::{Aes256Gcm, Key, Nonce};
|
||||
use base64::Engine;
|
||||
use rand::RngExt;
|
||||
use ring::pbkdf2;
|
||||
use std::num::NonZeroU32;
|
||||
use std::path::Path;
|
||||
|
||||
type Aes128CbcDec = cbc::Decryptor<aes::Aes128>;
|
||||
type Aes128CbcEnc = cbc::Encryptor<aes::Aes128>;
|
||||
|
||||
/// Chromium's fixed PBKDF2 salt for every CBC-based os_crypt provider.
|
||||
pub const SALT: &[u8] = b"saltysalt";
|
||||
/// Chromium's fixed CBC IV: sixteen spaces.
|
||||
pub const CBC_IV: [u8; 16] = [b' '; 16];
|
||||
/// AES-256-GCM nonce length, prepended to the ciphertext by `Encryptor::Key::Encrypt`.
|
||||
const GCM_NONCE_LEN: usize = 12;
|
||||
/// The `os_crypt_key` name, at the root of the user-data dir.
|
||||
pub const KEY_FILE_NAME: &str = "os_crypt_key";
|
||||
|
||||
/// `PBKDF2-HMAC-SHA1(password = "", salt = "saltysalt", iterations = 1)`.
|
||||
///
|
||||
/// Chromium retries every failed AES-128-CBC decrypt with this key
|
||||
/// (`encryptor.cc`, crbug.com/40055416) because profiles created while the
|
||||
/// keyring was unavailable were sealed with an empty password. Import has to do
|
||||
/// the same or those records look corrupt.
|
||||
pub const EMPTY_PASSWORD_KEY: [u8; 16] = [
|
||||
0xd0, 0xd0, 0xec, 0x9c, 0x7d, 0x77, 0xd4, 0x3a, 0xc5, 0x41, 0x87, 0xfa, 0x48, 0x18, 0xd1, 0x7f,
|
||||
];
|
||||
|
||||
/// The password Chromium's `PosixKeyProvider` uses when no secret service is
|
||||
/// available (`--password-store=basic`). Records sealed with it carry `v10`.
|
||||
// Read on Linux and by the known-answer tests; unreferenced on other hosts.
|
||||
#[allow(dead_code)]
|
||||
pub const POSIX_FALLBACK_PASSWORD: &[u8] = b"peanuts";
|
||||
|
||||
/// PBKDF2 iteration counts, per the provider that owns each platform.
|
||||
// Each host only ever derives with its own count, but both are needed to read
|
||||
// a profile produced on the other one.
|
||||
#[allow(dead_code)]
|
||||
pub const MAC_ITERATIONS: u32 = 1003;
|
||||
#[allow(dead_code)]
|
||||
pub const POSIX_ITERATIONS: u32 = 1;
|
||||
|
||||
/// Derive a 16-byte AES-128 key the way every CBC os_crypt provider does.
|
||||
///
|
||||
/// `password` is the raw bytes, never trimmed: Chromium passes the exact
|
||||
/// `ReadFileToString` result to the KDF, so normalising here would silently
|
||||
/// produce a different key and every decrypt would fail.
|
||||
pub fn derive_key(password: &[u8], iterations: u32) -> [u8; 16] {
|
||||
let mut key = [0u8; 16];
|
||||
// ring rather than the `pbkdf2` crate: sha1 0.11 (digest 0.11) and
|
||||
// pbkdf2 0.12 (digest 0.10) cannot coexist. ring is self-contained.
|
||||
pbkdf2::derive(
|
||||
pbkdf2::PBKDF2_HMAC_SHA1,
|
||||
NonZeroU32::new(iterations).expect("iterations must be non-zero"),
|
||||
SALT,
|
||||
password,
|
||||
&mut key,
|
||||
);
|
||||
key
|
||||
}
|
||||
|
||||
/// One os_crypt cipher, keyed. Which variant applies is decided by the tag the
|
||||
/// record carries, never by the host platform.
|
||||
#[derive(Clone)]
|
||||
pub enum CryptoKey {
|
||||
Aes128Cbc([u8; 16]),
|
||||
// Only Windows keys with GCM, but the variant has to exist everywhere so the
|
||||
// tag dispatch in `SourceKeyring` stays platform-independent.
|
||||
#[allow(dead_code)]
|
||||
Aes256Gcm([u8; 32]),
|
||||
}
|
||||
|
||||
impl CryptoKey {
|
||||
/// Decrypt a *tagless* ciphertext (the caller has already stripped the
|
||||
/// 3-byte version prefix).
|
||||
pub fn decrypt(&self, ciphertext: &[u8]) -> Option<Vec<u8>> {
|
||||
match self {
|
||||
Self::Aes128Cbc(key) => {
|
||||
if ciphertext.is_empty() {
|
||||
return Some(Vec::new());
|
||||
}
|
||||
let mut buf = ciphertext.to_vec();
|
||||
Aes128CbcDec::new(key.into(), &CBC_IV.into())
|
||||
.decrypt_padded::<Pkcs7>(&mut buf)
|
||||
.ok()
|
||||
.map(<[u8]>::to_vec)
|
||||
}
|
||||
Self::Aes256Gcm(key) => {
|
||||
if ciphertext.len() < GCM_NONCE_LEN {
|
||||
return None;
|
||||
}
|
||||
let (nonce, body) = ciphertext.split_at(GCM_NONCE_LEN);
|
||||
let nonce: [u8; GCM_NONCE_LEN] = nonce.try_into().ok()?;
|
||||
Aes256Gcm::new(&Key::<Aes256Gcm>::from(*key))
|
||||
.decrypt(
|
||||
&Nonce::from(nonce),
|
||||
Payload {
|
||||
msg: body,
|
||||
aad: &[],
|
||||
},
|
||||
)
|
||||
.ok()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Encrypt to a *tagless* ciphertext. The caller prepends the tag.
|
||||
pub fn encrypt(&self, plaintext: &[u8]) -> Option<Vec<u8>> {
|
||||
match self {
|
||||
Self::Aes128Cbc(key) => {
|
||||
let mut buf = vec![0u8; plaintext.len() + 16];
|
||||
buf[..plaintext.len()].copy_from_slice(plaintext);
|
||||
Aes128CbcEnc::new(key.into(), &CBC_IV.into())
|
||||
.encrypt_padded::<Pkcs7>(&mut buf, plaintext.len())
|
||||
.ok()
|
||||
.map(<[u8]>::to_vec)
|
||||
}
|
||||
Self::Aes256Gcm(key) => {
|
||||
let nonce: [u8; GCM_NONCE_LEN] = rand::rng().random();
|
||||
let sealed = Aes256Gcm::new(&Key::<Aes256Gcm>::from(*key))
|
||||
.encrypt(
|
||||
&Nonce::from(nonce),
|
||||
Payload {
|
||||
msg: plaintext,
|
||||
aad: &[],
|
||||
},
|
||||
)
|
||||
.ok()?;
|
||||
// The nonce goes at the front, matching `Encryptor::Key::Encrypt`.
|
||||
let mut out = Vec::with_capacity(GCM_NONCE_LEN + sealed.len());
|
||||
out.extend_from_slice(&nonce);
|
||||
out.extend_from_slice(&sealed);
|
||||
Some(out)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Wayfern's key for the profile being created.
|
||||
pub struct TargetKey {
|
||||
key: CryptoKey,
|
||||
tag: &'static [u8; 3],
|
||||
}
|
||||
|
||||
impl TargetKey {
|
||||
/// The tag the host platform's key provider claims.
|
||||
pub const fn host_tag() -> &'static [u8; 3] {
|
||||
#[cfg(target_os = "linux")]
|
||||
{
|
||||
b"v11"
|
||||
}
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
{
|
||||
b"v10"
|
||||
}
|
||||
}
|
||||
|
||||
/// Build the key from the raw `os_crypt_key` file contents.
|
||||
///
|
||||
/// Returns `None` when the contents cannot key the host cipher — on Windows
|
||||
/// that means anything other than exactly 32 bytes, which is what
|
||||
/// `DPAPIKeyProvider` requires before it will adopt a portable key.
|
||||
fn from_file_contents(contents: &[u8]) -> Option<Self> {
|
||||
if contents.is_empty() {
|
||||
return None;
|
||||
}
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
let bytes: [u8; 32] = contents.try_into().ok()?;
|
||||
Some(Self {
|
||||
key: CryptoKey::Aes256Gcm(bytes),
|
||||
tag: Self::host_tag(),
|
||||
})
|
||||
}
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
Some(Self {
|
||||
key: CryptoKey::Aes128Cbc(derive_key(contents, MAC_ITERATIONS)),
|
||||
tag: Self::host_tag(),
|
||||
})
|
||||
}
|
||||
#[cfg(target_os = "linux")]
|
||||
{
|
||||
Some(Self {
|
||||
key: CryptoKey::Aes128Cbc(derive_key(contents, POSIX_ITERATIONS)),
|
||||
tag: Self::host_tag(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// Fresh key material in the host platform's `os_crypt_key` format.
|
||||
fn generate_file_contents() -> Vec<u8> {
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
// Windows stores the AES-256 key itself, so it must be 32 bytes.
|
||||
let key: [u8; 32] = rand::rng().random();
|
||||
key.to_vec()
|
||||
}
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
{
|
||||
// mac/Linux store a *password* that is fed to PBKDF2. Wayfern mints
|
||||
// `base64(16 random bytes)`; match it so the file is indistinguishable
|
||||
// from one the browser wrote itself.
|
||||
let raw: [u8; 16] = rand::rng().random();
|
||||
base64::engine::general_purpose::STANDARD
|
||||
.encode(raw)
|
||||
.into_bytes()
|
||||
}
|
||||
}
|
||||
|
||||
/// Read the existing `os_crypt_key`, or mint and persist one.
|
||||
///
|
||||
/// Writing eagerly at import time — rather than letting the first launch do
|
||||
/// it — is deliberate. The mac and Linux patches have no `else` branch when
|
||||
/// the write fails, so the browser would run on an in-memory key that dies
|
||||
/// with the process and orphans everything it wrote. Failing here instead
|
||||
/// turns that silent data loss into a visible import error.
|
||||
pub fn ensure(user_data_dir: &Path) -> Result<Self, String> {
|
||||
let key_file = user_data_dir.join(KEY_FILE_NAME);
|
||||
|
||||
if let Ok(existing) = std::fs::read(&key_file) {
|
||||
if let Some(key) = Self::from_file_contents(&existing) {
|
||||
return Ok(key);
|
||||
}
|
||||
// Present but unusable (a Windows-format key on macOS, say, or a
|
||||
// truncated write). Replacing it is safe only because import always
|
||||
// re-encrypts into whatever key we end up with.
|
||||
log::warn!(
|
||||
"Replacing unusable {KEY_FILE_NAME} ({} bytes) at {}",
|
||||
existing.len(),
|
||||
key_file.display()
|
||||
);
|
||||
}
|
||||
|
||||
std::fs::create_dir_all(user_data_dir)
|
||||
.map_err(|e| format!("Failed to create profile directory: {e}"))?;
|
||||
let contents = Self::generate_file_contents();
|
||||
std::fs::write(&key_file, &contents)
|
||||
.map_err(|e| format!("Failed to write os_crypt_key: {e}"))?;
|
||||
|
||||
#[cfg(unix)]
|
||||
{
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let _ = std::fs::set_permissions(&key_file, std::fs::Permissions::from_mode(0o600));
|
||||
}
|
||||
|
||||
// Read back rather than trust the write: a key that did not land is the
|
||||
// one failure mode that silently destroys every secret we are about to
|
||||
// write with it.
|
||||
let written =
|
||||
std::fs::read(&key_file).map_err(|e| format!("Failed to verify os_crypt_key: {e}"))?;
|
||||
if written != contents {
|
||||
return Err("os_crypt_key verification failed after write".to_string());
|
||||
}
|
||||
|
||||
Self::from_file_contents(&contents).ok_or_else(|| "Failed to derive os_crypt_key".to_string())
|
||||
}
|
||||
|
||||
/// Seal a value the way Wayfern will expect to find it: `tag || ciphertext`.
|
||||
pub fn encrypt(&self, plaintext: &[u8]) -> Option<Vec<u8>> {
|
||||
let body = self.key.encrypt(plaintext)?;
|
||||
let mut out = Vec::with_capacity(3 + body.len());
|
||||
out.extend_from_slice(self.tag);
|
||||
out.extend_from_slice(&body);
|
||||
Some(out)
|
||||
}
|
||||
}
|
||||
|
||||
/// What a decrypt attempt produced.
|
||||
pub enum Decrypted {
|
||||
/// Recovered plaintext.
|
||||
Value(Vec<u8>),
|
||||
/// Already plaintext — no recognised version tag.
|
||||
NotEncrypted,
|
||||
/// Correctly identified but not openable: no key for the tag (Windows
|
||||
/// App-Bound `v20`), or every candidate key failed.
|
||||
Unrecoverable,
|
||||
}
|
||||
|
||||
/// The source browser's keys, indexed by the tag the records carry.
|
||||
///
|
||||
/// Indexing by tag rather than by platform is not pedantry: a single Linux
|
||||
/// profile can legitimately hold both `v10` (peanuts) and `v11` (keyring)
|
||||
/// records, because the available secret service changes between sessions.
|
||||
#[derive(Default)]
|
||||
pub struct SourceKeyring {
|
||||
pub v10: Option<CryptoKey>,
|
||||
pub v11: Option<CryptoKey>,
|
||||
/// Seen at least one `v20` (Windows App-Bound) record, which no third party
|
||||
/// can open. Tracked so the import report can say so explicitly.
|
||||
pub saw_app_bound: std::cell::Cell<bool>,
|
||||
}
|
||||
|
||||
impl SourceKeyring {
|
||||
pub fn is_empty(&self) -> bool {
|
||||
self.v10.is_none() && self.v11.is_none()
|
||||
}
|
||||
|
||||
/// Open one stored value, dispatching on its version tag exactly as
|
||||
/// `Encryptor::DecryptData` does.
|
||||
pub fn decrypt(&self, stored: &[u8]) -> Decrypted {
|
||||
if stored.len() < 3 {
|
||||
return if stored.is_empty() {
|
||||
Decrypted::Value(Vec::new())
|
||||
} else {
|
||||
Decrypted::NotEncrypted
|
||||
};
|
||||
}
|
||||
|
||||
let (tag, body) = stored.split_at(3);
|
||||
let key = match tag {
|
||||
b"v10" => self.v10.as_ref(),
|
||||
b"v11" => self.v11.as_ref(),
|
||||
b"v20" => {
|
||||
// App-Bound Encryption. The key is wrapped by the SYSTEM-level Chrome
|
||||
// Elevation Service, which validates the calling binary. There is no
|
||||
// legitimate way for us to unwrap it.
|
||||
self.saw_app_bound.set(true);
|
||||
return Decrypted::Unrecoverable;
|
||||
}
|
||||
_ => return Decrypted::NotEncrypted,
|
||||
};
|
||||
|
||||
let Some(key) = key else {
|
||||
return Decrypted::Unrecoverable;
|
||||
};
|
||||
|
||||
if let Some(plaintext) = key.decrypt(body) {
|
||||
return Decrypted::Value(plaintext);
|
||||
}
|
||||
|
||||
// Chromium's own fallback for CBC records sealed with an empty password.
|
||||
if matches!(key, CryptoKey::Aes128Cbc(_)) {
|
||||
if let Some(plaintext) = CryptoKey::Aes128Cbc(EMPTY_PASSWORD_KEY).decrypt(body) {
|
||||
return Decrypted::Value(plaintext);
|
||||
}
|
||||
}
|
||||
|
||||
Decrypted::Unrecoverable
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use tempfile::TempDir;
|
||||
|
||||
#[test]
|
||||
fn empty_password_key_matches_chromium_constant() {
|
||||
// Locks the constant against the value Chromium hardcodes in encryptor.cc.
|
||||
assert_eq!(derive_key(b"", POSIX_ITERATIONS), EMPTY_PASSWORD_KEY);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn peanuts_key_matches_known_vector() {
|
||||
// PBKDF2-HMAC-SHA1("peanuts", "saltysalt", 1, 16). Any drift here silently
|
||||
// breaks every Linux `--password-store=basic` import.
|
||||
assert_eq!(
|
||||
derive_key(POSIX_FALLBACK_PASSWORD, POSIX_ITERATIONS),
|
||||
[
|
||||
0xfd, 0x62, 0x1f, 0xe5, 0xa2, 0xb4, 0x02, 0x53, 0x9d, 0xfa, 0x14, 0x7c, 0xa9, 0x27, 0x27,
|
||||
0x78
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cbc_round_trip() {
|
||||
let key = CryptoKey::Aes128Cbc(derive_key(b"hunter2", MAC_ITERATIONS));
|
||||
let sealed = key.encrypt(b"session-token").expect("encrypt");
|
||||
assert_eq!(key.decrypt(&sealed).expect("decrypt"), b"session-token");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cbc_round_trip_empty_plaintext() {
|
||||
let key = CryptoKey::Aes128Cbc(derive_key(b"hunter2", MAC_ITERATIONS));
|
||||
let sealed = key.encrypt(b"").expect("encrypt");
|
||||
// PKCS7 always emits a full padding block, so this must not be empty.
|
||||
assert_eq!(sealed.len(), 16);
|
||||
assert!(key.decrypt(&sealed).expect("decrypt").is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gcm_round_trip_with_fresh_nonce_each_time() {
|
||||
let key = CryptoKey::Aes256Gcm([7u8; 32]);
|
||||
let a = key.encrypt(b"session-token").expect("encrypt");
|
||||
let b = key.encrypt(b"session-token").expect("encrypt");
|
||||
assert_ne!(a, b, "nonce must be random per call");
|
||||
assert_eq!(key.decrypt(&a).expect("decrypt"), b"session-token");
|
||||
assert_eq!(key.decrypt(&b).expect("decrypt"), b"session-token");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gcm_rejects_tampered_ciphertext() {
|
||||
let key = CryptoKey::Aes256Gcm([7u8; 32]);
|
||||
let mut sealed = key.encrypt(b"session-token").expect("encrypt");
|
||||
let last = sealed.len() - 1;
|
||||
sealed[last] ^= 0xff;
|
||||
assert!(key.decrypt(&sealed).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn target_key_is_stable_across_calls() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
let first = TargetKey::ensure(dir.path()).expect("mint");
|
||||
let sealed = first.encrypt(b"value").expect("encrypt");
|
||||
|
||||
let second = TargetKey::ensure(dir.path()).expect("reuse");
|
||||
// Re-running import over the same directory must not orphan what the
|
||||
// previous run wrote.
|
||||
let key_file = std::fs::read(dir.path().join(KEY_FILE_NAME)).unwrap();
|
||||
let reloaded = TargetKey::from_file_contents(&key_file).expect("reload");
|
||||
assert_eq!(
|
||||
reloaded.encrypt(b"probe").map(|v| v[..3].to_vec()),
|
||||
second.encrypt(b"probe").map(|v| v[..3].to_vec())
|
||||
);
|
||||
|
||||
let mut keyring = SourceKeyring::default();
|
||||
let contents = std::fs::read(dir.path().join(KEY_FILE_NAME)).unwrap();
|
||||
install_host_key(&mut keyring, &contents);
|
||||
match keyring.decrypt(&sealed) {
|
||||
Decrypted::Value(v) => assert_eq!(v, b"value"),
|
||||
_ => panic!("target key must round-trip through the source keyring"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn minted_key_matches_wayfern_file_format() {
|
||||
let dir = TempDir::new().unwrap();
|
||||
TargetKey::ensure(dir.path()).expect("mint");
|
||||
let contents = std::fs::read(dir.path().join(KEY_FILE_NAME)).unwrap();
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
assert_eq!(
|
||||
contents.len(),
|
||||
32,
|
||||
"DPAPIKeyProvider only adopts a 32-byte portable key"
|
||||
);
|
||||
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
{
|
||||
// Wayfern writes base64(16 random bytes) = 24 ASCII chars.
|
||||
assert_eq!(contents.len(), 24);
|
||||
let text = String::from_utf8(contents).expect("ascii");
|
||||
assert!(
|
||||
base64::engine::general_purpose::STANDARD
|
||||
.decode(&text)
|
||||
.map(|b| b.len())
|
||||
== Ok(16),
|
||||
"expected base64 of 16 bytes, got {text}"
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
{
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let mode = std::fs::metadata(dir.path().join(KEY_FILE_NAME))
|
||||
.unwrap()
|
||||
.permissions()
|
||||
.mode();
|
||||
assert_eq!(mode & 0o777, 0o600);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unknown_tag_is_treated_as_plaintext_not_as_loss() {
|
||||
let keyring = SourceKeyring::default();
|
||||
assert!(matches!(
|
||||
keyring.decrypt(b"plain cookie value"),
|
||||
Decrypted::NotEncrypted
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn app_bound_records_are_flagged_unrecoverable() {
|
||||
let keyring = SourceKeyring::default();
|
||||
let mut sealed = b"v20".to_vec();
|
||||
sealed.extend_from_slice(&[0u8; 40]);
|
||||
assert!(matches!(keyring.decrypt(&sealed), Decrypted::Unrecoverable));
|
||||
assert!(
|
||||
keyring.saw_app_bound.get(),
|
||||
"v20 must be reported to the user, not silently dropped"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn missing_key_for_known_tag_is_unrecoverable() {
|
||||
let keyring = SourceKeyring::default();
|
||||
let mut sealed = b"v10".to_vec();
|
||||
sealed.extend_from_slice(&[0u8; 32]);
|
||||
assert!(matches!(keyring.decrypt(&sealed), Decrypted::Unrecoverable));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_password_fallback_recovers_the_record() {
|
||||
// A record sealed with the empty-password key must still open when the
|
||||
// keyring holds a different primary key, mirroring Chromium.
|
||||
let sealed_body = CryptoKey::Aes128Cbc(EMPTY_PASSWORD_KEY)
|
||||
.encrypt(b"legacy")
|
||||
.unwrap();
|
||||
let mut stored = b"v10".to_vec();
|
||||
stored.extend_from_slice(&sealed_body);
|
||||
|
||||
let keyring = SourceKeyring {
|
||||
v10: Some(CryptoKey::Aes128Cbc(derive_key(b"a different key", 1003))),
|
||||
..Default::default()
|
||||
};
|
||||
match keyring.decrypt(&stored) {
|
||||
Decrypted::Value(v) => assert_eq!(v, b"legacy"),
|
||||
_ => panic!("empty-password fallback must be attempted"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Load the host-format key into a keyring under the host tag, for tests
|
||||
/// that need to verify what we wrote is what Wayfern will read.
|
||||
fn install_host_key(keyring: &mut SourceKeyring, contents: &[u8]) {
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
let bytes: [u8; 32] = contents.try_into().unwrap();
|
||||
keyring.v10 = Some(CryptoKey::Aes256Gcm(bytes));
|
||||
}
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
keyring.v10 = Some(CryptoKey::Aes128Cbc(derive_key(contents, MAC_ITERATIONS)));
|
||||
}
|
||||
#[cfg(target_os = "linux")]
|
||||
{
|
||||
keyring.v11 = Some(CryptoKey::Aes128Cbc(derive_key(contents, POSIX_ITERATIONS)));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
//! What an import actually carried across.
|
||||
//!
|
||||
//! Import is best-effort by nature: a locked keychain, a Windows App-Bound
|
||||
//! cookie store or a schema too old for Chromium to migrate all mean some
|
||||
//! subset does not survive, and none of them should abort the whole operation.
|
||||
//! The report is how that stays honest — every skipped store is a counted
|
||||
//! warning rather than a silent zero.
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// Stable warning codes. The frontend maps these to
|
||||
/// `importProfile.warnings.*`, so they are part of the API contract: rename one
|
||||
/// and the user sees a missing translation.
|
||||
pub mod warning {
|
||||
/// The source browser's key could not be read, so cookies/passwords were
|
||||
/// left encrypted and are unreadable in the new profile.
|
||||
pub const SECRETS_NOT_MIGRATED: &str = "secretsNotMigrated";
|
||||
/// Windows App-Bound Encryption (Chrome 127+). Unrecoverable by design.
|
||||
pub const APP_BOUND_ENCRYPTED: &str = "appBoundEncrypted";
|
||||
/// A store's schema predates what Chromium will migrate; it would have been
|
||||
/// deleted on first launch, so it was skipped instead.
|
||||
pub const STORE_TOO_OLD: &str = "storeTooOld";
|
||||
/// A store's schema is newer than this Chromium can read.
|
||||
pub const STORE_TOO_NEW: &str = "storeTooNew";
|
||||
/// The source browser was running; databases were snapshotted but LevelDB
|
||||
/// site data may be incomplete.
|
||||
pub const SOURCE_BROWSER_RUNNING: &str = "sourceBrowserRunning";
|
||||
/// Tracked preferences lost their MACs and will reset to defaults.
|
||||
pub const SECURE_PREFERENCES_RESET: &str = "securePreferencesReset";
|
||||
/// At least one extension could not be carried.
|
||||
pub const EXTENSIONS_PARTIAL: &str = "extensionsPartial";
|
||||
/// A database was unreadable and was skipped rather than copied corrupt.
|
||||
pub const STORE_UNREADABLE: &str = "storeUnreadable";
|
||||
}
|
||||
|
||||
/// Per-profile outcome, returned alongside each item in a batch import.
|
||||
#[derive(Debug, Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
|
||||
pub struct ProfileImportReport {
|
||||
/// Cookies whose value is readable in the new profile.
|
||||
pub cookies_migrated: usize,
|
||||
/// Cookies carried over as rows but whose value could not be recovered.
|
||||
pub cookies_unrecoverable: usize,
|
||||
pub passwords_migrated: usize,
|
||||
pub passwords_unrecoverable: usize,
|
||||
/// Saved cards / IBANs / autofill secrets re-encrypted.
|
||||
pub payment_methods_migrated: usize,
|
||||
pub payment_methods_unrecoverable: usize,
|
||||
pub extensions_migrated: usize,
|
||||
pub history_entries: usize,
|
||||
pub bookmarks: usize,
|
||||
/// Origins with Local Storage data.
|
||||
pub local_storage_origins: usize,
|
||||
pub bytes_copied: u64,
|
||||
/// Stable codes from [`warning`], deduplicated, in insertion order.
|
||||
pub warnings: Vec<String>,
|
||||
}
|
||||
|
||||
impl ProfileImportReport {
|
||||
pub fn warn(&mut self, code: &str) {
|
||||
if !self.warnings.iter().any(|w| w == code) {
|
||||
self.warnings.push(code.to_string());
|
||||
}
|
||||
}
|
||||
|
||||
/// True when nothing readable came across. Used to decide whether the UI
|
||||
/// should present the import as a success or as a warning.
|
||||
pub fn is_empty_import(&self) -> bool {
|
||||
self.cookies_migrated == 0
|
||||
&& self.passwords_migrated == 0
|
||||
&& self.history_entries == 0
|
||||
&& self.bookmarks == 0
|
||||
&& self.local_storage_origins == 0
|
||||
&& self.extensions_migrated == 0
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn warnings_are_deduplicated_in_order() {
|
||||
let mut report = ProfileImportReport::default();
|
||||
report.warn(warning::STORE_TOO_OLD);
|
||||
report.warn(warning::SECRETS_NOT_MIGRATED);
|
||||
report.warn(warning::STORE_TOO_OLD);
|
||||
assert_eq!(
|
||||
report.warnings,
|
||||
vec![
|
||||
warning::STORE_TOO_OLD.to_string(),
|
||||
warning::SECRETS_NOT_MIGRATED.to_string()
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_import_detection_ignores_unrecoverable_counts() {
|
||||
let mut report = ProfileImportReport {
|
||||
cookies_unrecoverable: 500,
|
||||
..Default::default()
|
||||
};
|
||||
assert!(
|
||||
report.is_empty_import(),
|
||||
"500 unreadable cookies is still nothing carried"
|
||||
);
|
||||
report.history_entries = 1;
|
||||
assert!(!report.is_empty_import());
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,6 +9,7 @@ use crate::downloaded_browsers_registry::DownloadedBrowsersRegistry;
|
||||
use crate::events;
|
||||
use crate::profile::types::{get_host_os, BrowserProfile, SyncMode};
|
||||
use crate::profile::ProfileManager;
|
||||
use crate::profile_import::report::ProfileImportReport;
|
||||
use crate::proxy_manager::PROXY_MANAGER;
|
||||
use crate::wayfern_manager::WayfernConfig;
|
||||
|
||||
@@ -28,6 +29,9 @@ pub struct DetectedProfile {
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, utoipa::ToSchema)]
|
||||
pub struct ImportProfileItem {
|
||||
pub source_path: String,
|
||||
/// The source browser family (`chromium`, `brave`, `edge`, …). Load-bearing:
|
||||
/// it selects which Keychain / secret-service item holds the key that
|
||||
/// unlocks the source's cookies and passwords.
|
||||
#[serde(default = "default_import_browser_type")]
|
||||
pub browser_type: String,
|
||||
pub new_profile_name: String,
|
||||
@@ -35,6 +39,10 @@ pub struct ImportProfileItem {
|
||||
pub proxy_id: Option<String>,
|
||||
#[serde(default)]
|
||||
pub vpn_id: Option<String>,
|
||||
/// Import even though the source browser is running. Databases are still
|
||||
/// snapshotted consistently, but LevelDB site data may be mid-write.
|
||||
#[serde(default)]
|
||||
pub allow_running: Option<bool>,
|
||||
}
|
||||
|
||||
fn default_import_browser_type() -> String {
|
||||
@@ -61,6 +69,8 @@ pub struct ProfileImportItemResult {
|
||||
pub profile_id: Option<String>,
|
||||
/// Structured `{"code": …}` error string when status is "failed".
|
||||
pub error: Option<String>,
|
||||
/// What actually came across. Present when status is "imported".
|
||||
pub report: Option<ProfileImportReport>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, utoipa::ToSchema)]
|
||||
@@ -719,6 +729,7 @@ impl ProfileImporter {
|
||||
status: "failed".to_string(),
|
||||
profile_id: None,
|
||||
error: Some(serde_json::json!({ "code": "NAME_CANNOT_BE_EMPTY" }).to_string()),
|
||||
report: None,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
@@ -735,6 +746,7 @@ impl ProfileImporter {
|
||||
status: "skipped".to_string(),
|
||||
profile_id: None,
|
||||
error: None,
|
||||
report: None,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
@@ -757,10 +769,11 @@ impl ProfileImporter {
|
||||
item.vpn_id.clone(),
|
||||
group_id.clone(),
|
||||
wayfern_config.clone(),
|
||||
item.allow_running.unwrap_or(false),
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(profile) => {
|
||||
Ok((profile, report)) => {
|
||||
imported_count += 1;
|
||||
completed += 1;
|
||||
emit_import_progress(total, completed, index, &final_name, "imported");
|
||||
@@ -771,6 +784,7 @@ impl ProfileImporter {
|
||||
status: "imported".to_string(),
|
||||
profile_id: Some(profile.id.to_string()),
|
||||
error: None,
|
||||
report: Some(report),
|
||||
});
|
||||
}
|
||||
Err(e) => {
|
||||
@@ -785,6 +799,7 @@ impl ProfileImporter {
|
||||
status: "failed".to_string(),
|
||||
profile_id: None,
|
||||
error: Some(error_to_code_string(e)),
|
||||
report: None,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -809,7 +824,8 @@ impl ProfileImporter {
|
||||
vpn_id: Option<String>,
|
||||
group_id: Option<String>,
|
||||
wayfern_config: Option<WayfernConfig>,
|
||||
) -> Result<BrowserProfile, Box<dyn std::error::Error>> {
|
||||
allow_running: bool,
|
||||
) -> Result<(BrowserProfile, ProfileImportReport), Box<dyn std::error::Error>> {
|
||||
let source_path = Path::new(source_path);
|
||||
if !source_path.exists() {
|
||||
return Err(
|
||||
@@ -847,39 +863,54 @@ impl ProfileImporter {
|
||||
create_dir_all(&new_profile_uuid_dir)?;
|
||||
create_dir_all(&new_profile_data_dir)?;
|
||||
|
||||
// Profile dirs can be multiple GB — keep the copy off the async runtime.
|
||||
let copy_source = source_path.to_path_buf();
|
||||
let copy_dest = new_profile_data_dir.clone();
|
||||
let copy_result = match tokio::task::spawn_blocking(move || {
|
||||
Self::copy_directory_recursive(©_source, ©_dest).map_err(|e| e.to_string())
|
||||
// Profile dirs can be multiple GB and the migration hits SQLite and the
|
||||
// OS keyring — keep all of it off the async runtime.
|
||||
let migrate_source = source_path.to_path_buf();
|
||||
let migrate_dest = new_profile_data_dir.clone();
|
||||
let source_family = browser_type.to_string();
|
||||
let migrate_result = match tokio::task::spawn_blocking(move || {
|
||||
crate::profile_import::import_into(
|
||||
&migrate_source,
|
||||
&migrate_dest,
|
||||
&source_family,
|
||||
allow_running,
|
||||
)
|
||||
})
|
||||
.await
|
||||
{
|
||||
Ok(r) => r,
|
||||
Err(e) => {
|
||||
// The copy task died (panic, or runtime shutdown mid-import). Clean up
|
||||
// like every other error path here, or the half-copied — possibly
|
||||
// multi-GB — directory is orphaned with no metadata pointing at it, so
|
||||
// nothing ever reclaims it.
|
||||
// The task died (panic, or runtime shutdown mid-import). Clean up like
|
||||
// every other error path here, or the half-copied — possibly multi-GB
|
||||
// — directory is orphaned with no metadata pointing at it, so nothing
|
||||
// ever reclaims it.
|
||||
let _ = fs::remove_dir_all(&new_profile_uuid_dir);
|
||||
return Err(
|
||||
serde_json::json!({
|
||||
"code": "INTERNAL_ERROR",
|
||||
"params": { "detail": format!("Profile copy task failed: {e}") },
|
||||
"params": { "detail": format!("Profile import task failed: {e}") },
|
||||
})
|
||||
.to_string()
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
};
|
||||
if let Err(e) = copy_result {
|
||||
let _ = fs::remove_dir_all(&new_profile_uuid_dir);
|
||||
return Err(
|
||||
serde_json::json!({ "code": "INTERNAL_ERROR", "params": { "detail": e } })
|
||||
.to_string()
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
let report = match migrate_result {
|
||||
Ok(report) => report,
|
||||
Err(e) => {
|
||||
let _ = fs::remove_dir_all(&new_profile_uuid_dir);
|
||||
// Structured codes (an unimportable source, a running browser) pass
|
||||
// through so the frontend can translate them; anything else is
|
||||
// internal.
|
||||
return Err(if e.starts_with('{') {
|
||||
e.into()
|
||||
} else {
|
||||
serde_json::json!({ "code": "INTERNAL_ERROR", "params": { "detail": e } })
|
||||
.to_string()
|
||||
.into()
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
let version = match self.get_default_version_for_browser(mapped) {
|
||||
Ok(version) => version,
|
||||
@@ -1017,13 +1048,30 @@ impl ProfileImporter {
|
||||
|
||||
self.profile_manager.save_profile(&profile)?;
|
||||
|
||||
log::info!(
|
||||
"Successfully imported profile '{}' from '{}'",
|
||||
new_profile_name,
|
||||
source_path.display()
|
||||
);
|
||||
if report.is_empty_import() {
|
||||
// Not an error — an empty source profile imports legitimately — but it is
|
||||
// the exact symptom the old layout bug produced, so it is worth a loud
|
||||
// line in the log rather than a silent success.
|
||||
log::warn!(
|
||||
"Imported profile '{}' from '{}' carried no readable data (warnings: {:?})",
|
||||
new_profile_name,
|
||||
source_path.display(),
|
||||
report.warnings
|
||||
);
|
||||
} else {
|
||||
log::info!(
|
||||
"Imported profile '{}' from '{}': {} cookies, {} passwords, {} history entries ({} unrecoverable secrets, warnings: {:?})",
|
||||
new_profile_name,
|
||||
source_path.display(),
|
||||
report.cookies_migrated,
|
||||
report.passwords_migrated,
|
||||
report.history_entries,
|
||||
report.cookies_unrecoverable + report.passwords_unrecoverable,
|
||||
report.warnings
|
||||
);
|
||||
}
|
||||
|
||||
Ok(profile)
|
||||
Ok((profile, report))
|
||||
}
|
||||
|
||||
fn get_default_version_for_browser(
|
||||
|
||||
@@ -382,34 +382,52 @@ pub fn schedule_pull(app_handle: tauri::AppHandle, profile_id: String) {
|
||||
});
|
||||
}
|
||||
|
||||
/// Serialises every test that can reach [`STORE`], wherever it lives.
|
||||
///
|
||||
/// `remote_session`'s tests drive session transitions through `note_running`
|
||||
/// and `note_ended`, so they mutate this module's global store too — with the
|
||||
/// same `p1`/`p2` fixture ids. Two mutexes meant the two groups could interleave
|
||||
/// and clobber each other, which showed up as an intermittent failure in the
|
||||
/// suite guarding a data-loss bug.
|
||||
#[cfg(test)]
|
||||
pub(crate) static TEST_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
|
||||
|
||||
/// Take the store lock and start from an empty store. Callers must hold the
|
||||
/// returned guard for the whole test.
|
||||
#[cfg(test)]
|
||||
pub(crate) fn lock_for_test() -> std::sync::MutexGuard<'static, ()> {
|
||||
let lock = TEST_LOCK
|
||||
.lock()
|
||||
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||
*STORE
|
||||
.write()
|
||||
.unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Store::new());
|
||||
lock
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::collections::HashSet;
|
||||
|
||||
/// Serialises the tests.
|
||||
///
|
||||
/// `TEST_DATA_DIR` is thread-local but [`STORE`] is process-global, so two
|
||||
/// tests running at once would share one store while pointing at different
|
||||
/// directories. That fails intermittently, which is the worst way for a test
|
||||
/// guarding a data-loss bug to fail.
|
||||
static TEST_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
|
||||
|
||||
/// Point the store at a scratch directory and start it empty.
|
||||
///
|
||||
/// Everything returned must outlive the test body: dropping the guard
|
||||
/// restores the real data directory, and a test that let it drop early would
|
||||
/// write a gate file into the developer's own app data.
|
||||
/// write a gate file into the developer's own app data. `TEST_DATA_DIR` is
|
||||
/// thread-local but [`STORE`] is process-global, so [`lock_for_test`] is what
|
||||
/// keeps two tests from sharing one store while pointing at different
|
||||
/// directories.
|
||||
fn isolated() -> (
|
||||
tempfile::TempDir,
|
||||
crate::app_dirs::TestDirGuard,
|
||||
std::sync::MutexGuard<'static, ()>,
|
||||
) {
|
||||
let lock = TEST_LOCK
|
||||
.lock()
|
||||
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||
let lock = lock_for_test();
|
||||
let dir = tempfile::TempDir::new().expect("a scratch directory");
|
||||
let guard = crate::app_dirs::set_test_data_dir(dir.path().to_path_buf());
|
||||
// Re-taken after the data dir is redirected, so nothing loads from the
|
||||
// real one.
|
||||
*STORE
|
||||
.write()
|
||||
.unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Store::new());
|
||||
|
||||
@@ -1569,6 +1569,14 @@ mod tests {
|
||||
let _guard = INDEX_TESTS
|
||||
.lock()
|
||||
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||
// Applying a session transition also drives `remote_handoff`: it mutates
|
||||
// that module's process-global store and persists the launch gate to the
|
||||
// data directory. Its lock keeps the two test groups from clobbering each
|
||||
// other's `p1`/`p2` fixtures, and the scratch directory keeps the gate file
|
||||
// out of the developer's own app data.
|
||||
let _handoff = crate::remote_handoff::lock_for_test();
|
||||
let dir = tempfile::TempDir::new().expect("a scratch directory");
|
||||
let _data_dir = crate::app_dirs::set_test_data_dir(dir.path().to_path_buf());
|
||||
with_index(|map| map.clear());
|
||||
with_endpoints(|map| map.clear());
|
||||
INDEX_AUTHORITATIVE.store(false, Ordering::SeqCst);
|
||||
|
||||
@@ -109,6 +109,37 @@ fn is_critical_file(path: &str) -> bool {
|
||||
.any(|pattern| path.contains(pattern))
|
||||
}
|
||||
|
||||
/// How many failed paths to name before collapsing the rest into a count.
|
||||
const MAX_LISTED_FAILURES: usize = 10;
|
||||
|
||||
/// Aggregate a batch of failed transfers into the message the user sees.
|
||||
///
|
||||
/// Whatever breaks a sync usually breaks every file the same way — one
|
||||
/// unreachable storage host, one rejected signature — so the per-file causes
|
||||
/// were dropped and only the paths survived into the message. That left users
|
||||
/// staring at a list of filenames with nothing to act on. Carry the first
|
||||
/// cause through, and stop pasting hundreds of paths into a toast.
|
||||
fn critical_failure_message(action: &str, failures: &[(String, String)]) -> String {
|
||||
let listed: Vec<&str> = failures
|
||||
.iter()
|
||||
.take(MAX_LISTED_FAILURES)
|
||||
.map(|(path, _)| path.as_str())
|
||||
.collect();
|
||||
let hidden = failures.len().saturating_sub(listed.len());
|
||||
let files = if hidden > 0 {
|
||||
format!("{} (and {} more)", listed.join(", "), hidden)
|
||||
} else {
|
||||
listed.join(", ")
|
||||
};
|
||||
|
||||
match failures.first() {
|
||||
Some((_, cause)) => format!(
|
||||
"Critical files failed to {action}: {files}. Cause: {cause}. Sync aborted to prevent data loss."
|
||||
),
|
||||
None => format!("Critical files failed to {action}: {files}. Sync aborted to prevent data loss."),
|
||||
}
|
||||
}
|
||||
|
||||
/// Validate that a manifest-supplied relative file path is safe to join onto a
|
||||
/// profile directory before writing/deleting. The manifest is remote-controlled
|
||||
/// (a self-hosted or compromised sync server, a MITM on a plaintext Regular-mode
|
||||
@@ -1283,10 +1314,9 @@ impl SyncEngine {
|
||||
}
|
||||
|
||||
if !critical_failures.is_empty() {
|
||||
let file_list: Vec<&str> = critical_failures.iter().map(|(p, _)| p.as_str()).collect();
|
||||
return Err(SyncError::IoError(format!(
|
||||
"Critical files failed to upload: {}. Sync aborted to prevent data loss.",
|
||||
file_list.join(", ")
|
||||
return Err(SyncError::IoError(critical_failure_message(
|
||||
"upload",
|
||||
&critical_failures,
|
||||
)));
|
||||
}
|
||||
|
||||
@@ -1559,10 +1589,9 @@ impl SyncEngine {
|
||||
}
|
||||
|
||||
if !critical_failures.is_empty() {
|
||||
let file_list: Vec<&str> = critical_failures.iter().map(|(p, _)| p.as_str()).collect();
|
||||
return Err(SyncError::IoError(format!(
|
||||
"Critical files failed to download: {}. Sync aborted to prevent data loss.",
|
||||
file_list.join(", ")
|
||||
return Err(SyncError::IoError(critical_failure_message(
|
||||
"download",
|
||||
&critical_failures,
|
||||
)));
|
||||
}
|
||||
|
||||
@@ -4247,6 +4276,40 @@ pub async fn rollover_encryption_for_all_entities(
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_critical_failure_message_carries_the_cause() {
|
||||
// A self-hosted server that hands out unreachable presigned URLs fails
|
||||
// every file with the same connect error. Naming only the files told the
|
||||
// user nothing about why, which is what made this undiagnosable.
|
||||
let failures = vec![
|
||||
(
|
||||
"Default/Cookies".to_string(),
|
||||
"Failed to upload Default/Cookies after 3 retries: error sending request".to_string(),
|
||||
),
|
||||
("Local State".to_string(), "same".to_string()),
|
||||
];
|
||||
|
||||
let message = critical_failure_message("upload", &failures);
|
||||
assert!(message.contains("Default/Cookies"));
|
||||
assert!(message.contains("Local State"));
|
||||
assert!(message.contains("Cause: Failed to upload Default/Cookies"));
|
||||
assert!(message.contains("Sync aborted to prevent data loss."));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_critical_failure_message_collapses_long_lists() {
|
||||
let failures: Vec<(String, String)> = (0..25)
|
||||
.map(|i| (format!("file-{i}"), "connect error".to_string()))
|
||||
.collect();
|
||||
|
||||
let message = critical_failure_message("download", &failures);
|
||||
assert!(message.contains("file-0"));
|
||||
assert!(message.contains(&format!("file-{}", MAX_LISTED_FAILURES - 1)));
|
||||
assert!(!message.contains(&format!("file-{MAX_LISTED_FAILURES}")));
|
||||
assert!(message.contains("(and 15 more)"));
|
||||
assert!(message.contains("failed to download"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_is_safe_manifest_path() {
|
||||
// Legitimate profile-relative paths are accepted.
|
||||
|
||||
@@ -10,8 +10,8 @@ use std::path::{Path, PathBuf};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use super::rules::{
|
||||
classify, keyword_hit, lookup_message, manifest_str, message_placeholder_key, signal_labels,
|
||||
signals_from_manifest, version_dir_sort_key, DetectedVpnExtension,
|
||||
classify, lookup_message, manifest_str, message_placeholder_key, signal_labels,
|
||||
signals_from_manifest, version_dir_sort_key, vpn_keyword_hit, DetectedVpnExtension,
|
||||
};
|
||||
|
||||
/// Upper bound on extension directories walked per profile. A launch must not
|
||||
@@ -262,8 +262,8 @@ fn detect_in_version_dir(crx_id: &str, version_dir: &Path) -> Option<DetectedVpn
|
||||
});
|
||||
|
||||
let signals = signals_from_manifest(&manifest);
|
||||
let keyword = keyword_hit(&name, description.as_deref());
|
||||
let confidence = classify(&signals, keyword)?;
|
||||
let keyword = vpn_keyword_hit(&name, description.as_deref());
|
||||
let confidence = classify(Some(crx_id), &signals, keyword)?;
|
||||
|
||||
Some(DetectedVpnExtension {
|
||||
key: format!("crx:{crx_id}"),
|
||||
@@ -271,7 +271,8 @@ fn detect_in_version_dir(crx_id: &str, version_dir: &Path) -> Option<DetectedVpn
|
||||
version: manifest_str(&manifest, "version"),
|
||||
source: "browser".to_string(),
|
||||
confidence: confidence.to_string(),
|
||||
signals: signal_labels(&signals, keyword),
|
||||
proxy_control: signals.proxy_permission,
|
||||
signals: signal_labels(Some(crx_id), &signals, keyword),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -489,6 +490,50 @@ mod tests {
|
||||
assert_eq!(out[0].name, CRX_ID, "never show a raw __MSG_ placeholder");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scan_reports_a_proxy_holding_download_manager_as_a_capability() {
|
||||
// End-to-end shape of the false positive that prompted the audit: the
|
||||
// extension must still be surfaced (it really can change the proxy) but
|
||||
// never as a VPN.
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let root = tmp.path();
|
||||
write(
|
||||
&root
|
||||
.join("Default")
|
||||
.join("Extensions")
|
||||
.join("ngpampappnmepgilojfohadhhmbhlaek")
|
||||
.join("6.43.1_0")
|
||||
.join("manifest.json"),
|
||||
r#"{"name":"IDM Integration Module","version":"6.43.1","description":"Download files with Internet Download Manager","permissions":["downloads","storage","proxy","nativeMessaging"]}"#,
|
||||
);
|
||||
|
||||
let mut out = Vec::new();
|
||||
assert!(scan_browser_extensions(root, &mut out, Instant::now()));
|
||||
assert_eq!(out.len(), 1);
|
||||
assert_eq!(out[0].confidence, "capability");
|
||||
assert!(out[0].proxy_control);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scan_confirms_a_known_vpn_whose_name_gives_nothing_away() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let root = tmp.path();
|
||||
write(
|
||||
&root
|
||||
.join("Default")
|
||||
.join("Extensions")
|
||||
.join("nlbejmccbhkncgokjcmghpfloaajcffj")
|
||||
.join("10.0.0_0")
|
||||
.join("manifest.json"),
|
||||
r#"{"name":"Hotspot Shield","version":"10.0.0","permissions":["proxy"]}"#,
|
||||
);
|
||||
|
||||
let mut out = Vec::new();
|
||||
assert!(scan_browser_extensions(root, &mut out, Instant::now()));
|
||||
assert_eq!(out.len(), 1);
|
||||
assert_eq!(out[0].confidence, "confirmed");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scan_ignores_an_ordinary_extension() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
//! except Donut cannot observe it from the outside — hence a launch-time
|
||||
//! warning rather than a measurement.
|
||||
//!
|
||||
//! That permission is a capability, not an identity. Chromium exposes no
|
||||
//! read-only variant of it, so a download manager replicating the browser's
|
||||
//! route for its own transfers declares exactly what a VPN hijacking it
|
||||
//! declares. The two are reported as different things — see `rules::classify`.
|
||||
//!
|
||||
//! Two sources, deliberately both: Donut-managed extensions live in the app's
|
||||
//! own store and are handed to Chromium via `--load-extension` from *outside*
|
||||
//! the profile directory, while extensions the user installed from the Web
|
||||
@@ -17,7 +22,7 @@ mod rules;
|
||||
|
||||
// `message_placeholder_key`/`lookup_message` are shared with
|
||||
// `extension_manager`, which resolves the same placeholders out of a zip.
|
||||
use rules::{classify, keyword_hit, manifest_str, signal_labels, signals_from_manifest};
|
||||
use rules::{classify, manifest_str, signal_labels, signals_from_manifest, vpn_keyword_hit};
|
||||
pub use rules::{lookup_message, message_placeholder_key, DetectedVpnExtension};
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
@@ -90,8 +95,11 @@ fn scan_donut_extensions(profile: &BrowserProfile, out: &mut Vec<DetectedVpnExte
|
||||
});
|
||||
|
||||
let signals = signals_from_manifest(&manifest);
|
||||
let keyword = keyword_hit(&name, description.as_deref());
|
||||
let Some(confidence) = classify(&signals, keyword) else {
|
||||
let keyword = vpn_keyword_hit(&name, description.as_deref());
|
||||
// A Donut-managed extension is stored under Donut's own uuid, not the Web
|
||||
// Store id the known-VPN list is keyed on, so it is classified on what its
|
||||
// manifest says about itself.
|
||||
let Some(confidence) = classify(None, &signals, keyword) else {
|
||||
continue;
|
||||
};
|
||||
|
||||
@@ -101,7 +109,8 @@ fn scan_donut_extensions(profile: &BrowserProfile, out: &mut Vec<DetectedVpnExte
|
||||
version: manifest_str(&manifest, "version").or_else(|| ext.version.clone()),
|
||||
source: "donut".to_string(),
|
||||
confidence: confidence.to_string(),
|
||||
signals: signal_labels(&signals, keyword),
|
||||
proxy_control: signals.proxy_permission,
|
||||
signals: signal_labels(None, &signals, keyword),
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -144,9 +153,8 @@ pub fn scan_profile(profile: &BrowserProfile) -> ExtensionScan {
|
||||
|
||||
// Collapse only exact duplicates of the same extension. `key` is the real
|
||||
// identity (`donut:<uuid>` / `crx:<id>`); name+version is not, and two
|
||||
// distinct extensions sharing a display name would silently fold into one —
|
||||
// dropping a `confirmed` detection would then flip `has_confirmed()` and stop
|
||||
// the gate treating its own exit measurement as unreliable.
|
||||
// distinct extensions sharing a display name would silently fold into one,
|
||||
// hiding a real detection behind an unrelated namesake.
|
||||
let mut seen = HashSet::new();
|
||||
extensions.retain(|e| seen.insert(e.key.clone()));
|
||||
|
||||
@@ -156,8 +164,13 @@ pub fn scan_profile(profile: &BrowserProfile) -> ExtensionScan {
|
||||
}
|
||||
}
|
||||
|
||||
/// True when at least one detection is `confirmed` — the extension holds the
|
||||
/// `proxy` permission and can actually redirect the browser's traffic.
|
||||
pub fn has_confirmed(scan: &ExtensionScan) -> bool {
|
||||
scan.extensions.iter().any(|e| e.confidence == "confirmed")
|
||||
/// True when at least one extension holds the `proxy` permission outright, so
|
||||
/// it can redirect the browser's traffic without asking for anything further.
|
||||
///
|
||||
/// Informational: it tells the user an exit measurement may describe a route
|
||||
/// the browser will not take. It deliberately does not relax the gate — a
|
||||
/// measurement that might be wrong is a reason for more scrutiny, not less,
|
||||
/// and this signal is true for every download manager on the machine.
|
||||
pub fn has_proxy_control(scan: &ExtensionScan) -> bool {
|
||||
scan.extensions.iter().any(|e| e.proxy_control)
|
||||
}
|
||||
|
||||
@@ -8,21 +8,67 @@
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// Substrings that corroborate a request-blocking extension being a VPN.
|
||||
/// Matched case-insensitively against name + description.
|
||||
const KEYWORDS: &[&str] = &[
|
||||
"vpn",
|
||||
"proxy",
|
||||
"tunnel",
|
||||
"unblock",
|
||||
"wireguard",
|
||||
"shadowsocks",
|
||||
"socks",
|
||||
/// Chrome Web Store ids of extensions whose whole purpose is routing the
|
||||
/// browser somewhere else. Sorted, so membership is a binary search.
|
||||
///
|
||||
/// This list is what lets a VPN with an unrevealing name — "Hotspot Shield"
|
||||
/// says nothing about what it does — be named as one instead of appearing as
|
||||
/// an anonymous holder of the proxy permission. Every id was verified by
|
||||
/// downloading the extension and reading its manifest; a wrong id is worse
|
||||
/// than a missing one, because a stale list only ever loses recall while a
|
||||
/// wrong one accuses the wrong extension.
|
||||
const KNOWN_VPN_EXTENSION_IDS: &[&str] = &[
|
||||
"adlpodnneegcnbophopdmhedicjbcgco", // Troywell VPN
|
||||
"ailoabdmgclmfmhdagmlohpjlbpffblp", // Surfshark
|
||||
"akcocjjpkmlniicdeemdceeajlmoabhg", // 1VPN
|
||||
"apbcbecdpjefgklcokinpapmmdekecah", // Ninja VPN
|
||||
"bihmplhobchoageeokmgbdihknkjbknd", // Touch VPN (delisted 2025, still installed in old profiles)
|
||||
"blapeiihifiknfmceddkceklnpopgclm", // Proxy Switcher Pro
|
||||
"bnlofglpdlboacepdieejiecfbfpmhlb", // Turbo VPN
|
||||
"dookpfaalaaappcdneeahomimbllocnb", // FoxyProxy Basic
|
||||
"eppiocemhmnlbhjplcgkofciiegomcon", // Urban VPN
|
||||
"fcfhplploccackoneaefokcmbjfbkenj", // 1clickVPN
|
||||
"fdcgdnkidjaadafnichfpabhfomcebme", // ZenMate (delisted 2025)
|
||||
"ffbkglfijbcbgblgflchnbphjdllaogb", // CyberGhost
|
||||
"fgddmllnllkalaagkghckoinaemmogpe", // ExpressVPN
|
||||
"fjoaledfpmneenckfbpdfhkmimnjocfa", // NordVPN
|
||||
"gcknhkkoolaabfmlnjonogaaifnjlfnp", // FoxyProxy
|
||||
"gdpehpfhegefkjelaifkdbppjbhilaom", // Proxy-Cheap Proxy Manager
|
||||
"gjakohbhfclfjmhhlenfdkldieofkpjl", // IPRoyal Proxy Manager
|
||||
"gjknjjomckknofjidppipffbpoekiipm", // Betternet
|
||||
"gkojfkhlekighikafcpjkiklfbnlmeio", // Hola VPN
|
||||
"hnmpcagpplmpfojmgmnngilcnanddlhb", // Windscribe
|
||||
"jaoafpkngncfpfggjefnekilbkcpjdgp", // uVPN
|
||||
"jedieiamjmoflcknjdjhpieklepfglin", // FastestVPN
|
||||
"jpadbaildllggkcgibilkeacpcodailn", // Planet VPN lite
|
||||
"jplgfhpmjnbigmhklmmbgecoobifkmpa", // Proton VPN
|
||||
"jplnlifepflhkbkgonidnobkakhmpnmh", // Private Internet Access
|
||||
"kgepmkaldicdcljckhamnhkigddnbcbd", // PACify Proxy Manager
|
||||
"kpiecbcckbofpmkkkdibbllpinceiihk", // DotVPN
|
||||
"majdfhpaihoncoakbjgbdhglocklcgno", // VeePN
|
||||
"nbcojefnccbanplpoffopkoepjmhgdgh", // Hoxx VPN
|
||||
"nlbejmccbhkncgokjcmghpfloaajcffj", // Hotspot Shield
|
||||
"ohjocgmpmlfahafbipehkhbaacoemojp", // hide.me Proxy
|
||||
"omdakjcmkglenbhjadbccaookpfjihpa", // TunnelBear
|
||||
"omghfjlpggmjjaagoclmmobgdodcjboh", // Browsec
|
||||
"onnfghpihccifgojkpnnncpagjcdbjod", // Proxy Switcher and Manager
|
||||
"oofgbpoabipfcfjapgnbbjjaenockbdp", // SetupVPN
|
||||
"padekgcemlokbadohgkifijomclgjgif", // Proxy SwitchyOmega
|
||||
"pphgdbgldlmicfdkhondlafkiomnelnk", // 1ClickVPN Proxy
|
||||
];
|
||||
|
||||
/// Matched as a whole token rather than a substring — too short to be safe
|
||||
/// inside other words ("warped", "warpaint").
|
||||
const TOKEN_KEYWORDS: &[&str] = &["warp"];
|
||||
/// Terms specific enough to name a VPN wherever they appear, including in a
|
||||
/// 132-character manifest description.
|
||||
const STRONG_KEYWORDS: &[&str] = &["vpn", "wireguard", "shadowsocks", "openvpn"];
|
||||
|
||||
/// Terms that only mean "VPN" in a product's *name*. In a description they are
|
||||
/// ordinary English — "no proxy setup required", "carpal tunnel", "unblock
|
||||
/// right click" — and matching them there is where the noise comes from.
|
||||
const NAME_ONLY_KEYWORDS: &[&str] = &["proxy", "unblock"];
|
||||
|
||||
/// Matched as whole tokens rather than substrings, and in the name only. Too
|
||||
/// short to be safe inside other words ("tussocks", "tunnelling").
|
||||
const NAME_TOKEN_KEYWORDS: &[&str] = &["socks", "socks5", "tunnel"];
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
pub struct DetectedVpnExtension {
|
||||
@@ -32,8 +78,14 @@ pub struct DetectedVpnExtension {
|
||||
pub version: Option<String>,
|
||||
/// `"donut"` (managed by Donut) or `"browser"` (installed inside the profile).
|
||||
pub source: String,
|
||||
/// `"confirmed"` or `"likely"`.
|
||||
/// `"confirmed"` and `"likely"` are claims that this IS a VPN/proxy tool.
|
||||
/// `"capability"` claims only that it *could* change the proxy.
|
||||
pub confidence: String,
|
||||
/// Whether the manifest holds Chromium's `proxy` permission outright, so the
|
||||
/// extension can call `chrome.proxy.settings.set` without asking again.
|
||||
/// Separate from `confidence`: a download manager reading the browser's
|
||||
/// proxy declares the identical permission as a VPN hijacking it.
|
||||
pub proxy_control: bool,
|
||||
/// Why it matched, for the dialog's detail line.
|
||||
pub signals: Vec<String>,
|
||||
}
|
||||
@@ -90,50 +142,93 @@ pub fn signals_from_manifest(manifest: &serde_json::Value) -> ManifestSignals {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn keyword_hit(name: &str, description: Option<&str>) -> bool {
|
||||
let mut haystack = name.to_lowercase();
|
||||
if let Some(d) = description {
|
||||
haystack.push(' ');
|
||||
haystack.push_str(&d.to_lowercase());
|
||||
}
|
||||
if KEYWORDS.iter().any(|k| haystack.contains(k)) {
|
||||
return true;
|
||||
}
|
||||
haystack
|
||||
.split(|c: char| !c.is_alphanumeric())
|
||||
.any(|token| TOKEN_KEYWORDS.contains(&token))
|
||||
/// True when this is the id of an extension known to route browser traffic.
|
||||
pub fn is_known_vpn_extension(extension_id: &str) -> bool {
|
||||
KNOWN_VPN_EXTENSION_IDS.binary_search(&extension_id).is_ok()
|
||||
}
|
||||
|
||||
/// Classify an extension from its manifest signals.
|
||||
fn has_token(haystack: &str, tokens: &[&str]) -> bool {
|
||||
haystack
|
||||
.split(|c: char| !c.is_alphanumeric())
|
||||
.any(|token| tokens.contains(&token))
|
||||
}
|
||||
|
||||
/// Does the extension describe itself as a VPN or proxy tool?
|
||||
///
|
||||
/// The `proxy` permission is the only signal that *proves* the capability: it
|
||||
/// is what Chromium requires to call `chrome.proxy`, and it stays in
|
||||
/// `permissions` under both manifest versions because it is an API permission,
|
||||
/// not a host pattern.
|
||||
/// The name is weighted far more heavily than the description, because that is
|
||||
/// where the evidence actually lives: a VPN vendor puts "VPN" in the name — it
|
||||
/// is how the store surfaces them — while a description is 132 characters of
|
||||
/// ordinary prose in which "proxy", "tunnel" and "unblock" are all innocent.
|
||||
/// Matching those three against descriptions is what flags carpal-tunnel
|
||||
/// reminders, right-click unblockers, and tools whose pitch is that they need
|
||||
/// *no* proxy setup.
|
||||
pub fn vpn_keyword_hit(name: &str, description: Option<&str>) -> bool {
|
||||
let name = name.to_lowercase();
|
||||
if STRONG_KEYWORDS.iter().any(|k| name.contains(k))
|
||||
|| NAME_ONLY_KEYWORDS.iter().any(|k| name.contains(k))
|
||||
|| has_token(&name, NAME_TOKEN_KEYWORDS)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
description
|
||||
.map(str::to_lowercase)
|
||||
.is_some_and(|d| STRONG_KEYWORDS.iter().any(|k| d.contains(k)))
|
||||
}
|
||||
|
||||
/// Classify an extension from its id, manifest signals and self-description.
|
||||
///
|
||||
/// The request-blocking tier additionally requires a keyword, and that
|
||||
/// corroboration is not optional: `declarativeNetRequest` plus `<all_urls>`
|
||||
/// describes every content blocker in the ecosystem, so without it the warning
|
||||
/// fires on uBlock Origin — which would teach users to dismiss the dialog on
|
||||
/// sight, destroying the value of the mismatch block that shares it.
|
||||
pub fn classify(signals: &ManifestSignals, keyword: bool) -> Option<&'static str> {
|
||||
if signals.proxy_permission {
|
||||
/// Two different questions are answered here, and fusing them is what made an
|
||||
/// ordinary download manager get reported as a VPN. Chromium has no read-only
|
||||
/// variant of the `proxy` permission: `chrome.proxy.settings.get()` and
|
||||
/// `.set()` sit behind the same manifest string, so an extension replicating
|
||||
/// the browser's proxy for its own transfers declares exactly what a VPN
|
||||
/// hijacking it declares. The permission therefore proves a *capability* and
|
||||
/// nothing more; naming something a VPN needs separate evidence — a known id,
|
||||
/// or the extension saying so itself.
|
||||
///
|
||||
/// The request-blocking tier's keyword requirement is not optional either:
|
||||
/// `declarativeNetRequest` plus `<all_urls>` describes every content blocker in
|
||||
/// the ecosystem, so without it the warning fires on uBlock Origin — which
|
||||
/// would teach users to dismiss the dialog on sight, destroying the value of
|
||||
/// the mismatch block that shares it.
|
||||
///
|
||||
/// An `optional_permissions` entry the user has never granted is deliberately
|
||||
/// not a capability at all: the extension cannot call `chrome.proxy` until it
|
||||
/// asks and is allowed.
|
||||
pub fn classify(
|
||||
extension_id: Option<&str>,
|
||||
signals: &ManifestSignals,
|
||||
keyword: bool,
|
||||
) -> Option<&'static str> {
|
||||
if extension_id.is_some_and(is_known_vpn_extension) {
|
||||
return Some("confirmed");
|
||||
}
|
||||
if signals.optional_proxy_permission {
|
||||
return Some("likely");
|
||||
if keyword {
|
||||
if signals.proxy_permission {
|
||||
return Some("confirmed");
|
||||
}
|
||||
if signals.optional_proxy_permission
|
||||
|| ((signals.declarative_net_request || signals.web_request_blocking)
|
||||
&& signals.broad_host_permissions)
|
||||
{
|
||||
return Some("likely");
|
||||
}
|
||||
}
|
||||
if (signals.declarative_net_request || signals.web_request_blocking)
|
||||
&& signals.broad_host_permissions
|
||||
&& keyword
|
||||
{
|
||||
return Some("likely");
|
||||
if signals.proxy_permission {
|
||||
return Some("capability");
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
pub fn signal_labels(signals: &ManifestSignals, keyword: bool) -> Vec<String> {
|
||||
pub fn signal_labels(
|
||||
extension_id: Option<&str>,
|
||||
signals: &ManifestSignals,
|
||||
keyword: bool,
|
||||
) -> Vec<String> {
|
||||
let mut out = Vec::new();
|
||||
if extension_id.is_some_and(is_known_vpn_extension) {
|
||||
out.push("knownVpnExtension".to_string());
|
||||
}
|
||||
if signals.proxy_permission {
|
||||
out.push("permissions:proxy".to_string());
|
||||
}
|
||||
@@ -201,11 +296,23 @@ mod tests {
|
||||
signals_from_manifest(&manifest)
|
||||
}
|
||||
|
||||
fn classify_named(
|
||||
manifest: serde_json::Value,
|
||||
name: &str,
|
||||
description: Option<&str>,
|
||||
) -> Option<&'static str> {
|
||||
let s = signals_of(manifest);
|
||||
classify(None, &s, vpn_keyword_hit(name, description))
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn classify_confirms_on_proxy_permission() {
|
||||
fn classify_confirms_a_self_described_vpn_holding_the_proxy_permission() {
|
||||
let s = signals_of(json!({ "permissions": ["proxy", "storage"] }));
|
||||
assert!(s.proxy_permission);
|
||||
assert_eq!(classify(&s, false), Some("confirmed"));
|
||||
assert_eq!(
|
||||
classify(None, &s, vpn_keyword_hit("Turbo VPN", None)),
|
||||
Some("confirmed")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -216,13 +323,57 @@ mod tests {
|
||||
"manifest_version": 2,
|
||||
"permissions": ["proxy", "<all_urls>", "webRequest"]
|
||||
}));
|
||||
assert_eq!(classify(&s, false), Some("confirmed"));
|
||||
assert_eq!(
|
||||
classify(None, &s, vpn_keyword_hit("Hoxx VPN Proxy", None)),
|
||||
Some("confirmed")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn classify_likely_on_optional_proxy() {
|
||||
let s = signals_of(json!({ "optional_permissions": ["proxy"] }));
|
||||
assert_eq!(classify(&s, false), Some("likely"));
|
||||
fn a_download_manager_is_reported_as_a_capability_never_as_a_vpn() {
|
||||
// The bug this whole split exists for. IDM Integration Module declares
|
||||
// `proxy` so the desktop binary can replicate the browser's route for a
|
||||
// handed-off download, and says nothing about VPNs anywhere. Verified
|
||||
// against the real published manifest.
|
||||
let verdict = classify_named(
|
||||
json!({
|
||||
"permissions": [
|
||||
"scripting", "tabs", "cookies", "contextMenus", "webNavigation",
|
||||
"webRequest", "declarativeNetRequest", "downloads", "downloads.shelf",
|
||||
"downloads.ui", "management", "storage", "proxy", "nativeMessaging"
|
||||
]
|
||||
}),
|
||||
"IDM Integration Module",
|
||||
Some("Download files with Internet Download Manager"),
|
||||
);
|
||||
assert_eq!(verdict, Some("capability"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_known_vpn_is_confirmed_from_its_id_alone() {
|
||||
// Hotspot Shield's name contains no keyword at all, so without the id list
|
||||
// the biggest VPN in the store would be indistinguishable from a download
|
||||
// manager.
|
||||
let s = signals_of(json!({ "permissions": ["proxy"] }));
|
||||
let id = "nlbejmccbhkncgokjcmghpfloaajcffj";
|
||||
assert_eq!(
|
||||
classify(Some(id), &s, vpn_keyword_hit("Hotspot Shield", None)),
|
||||
Some("confirmed")
|
||||
);
|
||||
assert!(signal_labels(Some(id), &s, false).contains(&"knownVpnExtension".to_string()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_known_vpn_id_list_is_sorted_and_well_formed() {
|
||||
// Membership is a binary search, so an unsorted entry is silently missed.
|
||||
assert!(KNOWN_VPN_EXTENSION_IDS.windows(2).all(|w| w[0] < w[1]));
|
||||
for id in KNOWN_VPN_EXTENSION_IDS {
|
||||
assert_eq!(id.len(), 32, "{id} is not a Chrome extension id");
|
||||
assert!(
|
||||
id.bytes().all(|b| (b'a'..=b'p').contains(&b)),
|
||||
"{id} is not a Chrome extension id"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -234,7 +385,10 @@ mod tests {
|
||||
"host_permissions": ["<all_urls>"]
|
||||
}));
|
||||
assert!(s.declarative_net_request && s.broad_host_permissions);
|
||||
assert_eq!(classify(&s, keyword_hit("uBlock Origin", None)), None);
|
||||
assert_eq!(
|
||||
classify(None, &s, vpn_keyword_hit("uBlock Origin", None)),
|
||||
None
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -244,16 +398,34 @@ mod tests {
|
||||
"host_permissions": ["<all_urls>"]
|
||||
}));
|
||||
assert_eq!(
|
||||
classify(&s, keyword_hit("Free VPN Proxy", None)),
|
||||
classify(None, &s, vpn_keyword_hit("Free VPN Proxy", None)),
|
||||
Some("likely")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn classify_likely_on_optional_proxy_plus_keyword() {
|
||||
// Optional and ungranted is not a capability, so it only matters when the
|
||||
// extension also says what it is.
|
||||
let s = signals_of(json!({ "optional_permissions": ["proxy"] }));
|
||||
assert_eq!(
|
||||
classify(None, &s, vpn_keyword_hit("Some VPN", None)),
|
||||
Some("likely")
|
||||
);
|
||||
assert_eq!(
|
||||
classify(None, &s, vpn_keyword_hit("Request Interceptor", None)),
|
||||
None
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn classify_ignores_keyword_only() {
|
||||
// A name alone proves nothing; without a capability signal this is noise.
|
||||
let s = signals_of(json!({ "permissions": ["storage"] }));
|
||||
assert_eq!(classify(&s, keyword_hit("VPN Deals Finder", None)), None);
|
||||
assert_eq!(
|
||||
classify(None, &s, vpn_keyword_hit("VPN Deals Finder", None)),
|
||||
None
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -262,7 +434,7 @@ mod tests {
|
||||
"permissions": ["declarativeNetRequest"],
|
||||
"host_permissions": ["https://example.com/*"]
|
||||
}));
|
||||
assert_eq!(classify(&s, keyword_hit("Some VPN", None)), None);
|
||||
assert_eq!(classify(None, &s, vpn_keyword_hit("Some VPN", None)), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -283,19 +455,41 @@ mod tests {
|
||||
"permissions": ["webRequest", "webRequestBlocking", "<all_urls>"]
|
||||
}));
|
||||
assert!(s.broad_host_permissions);
|
||||
assert_eq!(classify(&s, keyword_hit("Turbo VPN", None)), Some("likely"));
|
||||
assert_eq!(
|
||||
classify(None, &s, vpn_keyword_hit("Turbo VPN", None)),
|
||||
Some("likely")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn keyword_matching_is_substring_but_token_bound_for_short_terms() {
|
||||
assert!(keyword_hit("TouchVPN", None));
|
||||
assert!(keyword_hit("Unblock Sites", None));
|
||||
assert!(keyword_hit("Cloudflare WARP", None));
|
||||
// "warp" only matches as a whole token, so this must not hit.
|
||||
assert!(!keyword_hit("Time Warped Clock", None));
|
||||
assert!(keyword_hit(
|
||||
fn keyword_matching_reads_the_name_broadly_and_the_description_narrowly() {
|
||||
assert!(vpn_keyword_hit("TouchVPN", None));
|
||||
assert!(vpn_keyword_hit("Unblock Sites", None));
|
||||
assert!(vpn_keyword_hit("Shadowsocks Client", None));
|
||||
// Whole-token terms must not match inside longer words. "socks" in a name
|
||||
// is the protocol often enough to keep; "tussocks" and "tunnelling" are
|
||||
// exactly why it cannot be a substring.
|
||||
assert!(vpn_keyword_hit("SOCKS5 Configurator", None));
|
||||
assert!(!vpn_keyword_hit("Tussocks Field Guide", None));
|
||||
assert!(!vpn_keyword_hit("Tunnelling Contractors CRM", None));
|
||||
|
||||
// A description says "VPN" only when it means one...
|
||||
assert!(vpn_keyword_hit(
|
||||
"Anything",
|
||||
Some("a fast tunnel for your browser")
|
||||
Some("a free VPN for your browser")
|
||||
));
|
||||
// ...but these three are ordinary English and must not promote anything.
|
||||
assert!(!vpn_keyword_hit(
|
||||
"Requestly",
|
||||
Some("Modify HTTP requests, no proxy setup required")
|
||||
));
|
||||
assert!(!vpn_keyword_hit(
|
||||
"Stretch Reminder",
|
||||
Some("Avoid carpal tunnel syndrome while you work")
|
||||
));
|
||||
assert!(!vpn_keyword_hit(
|
||||
"Absolute Right Click",
|
||||
Some("Unblock right click and text selection on any site")
|
||||
));
|
||||
}
|
||||
|
||||
@@ -330,6 +524,6 @@ mod tests {
|
||||
// Arrays of non-strings, wrong types, and missing keys must not panic.
|
||||
let s = signals_of(json!({ "permissions": [1, 2, {"a": "b"}], "host_permissions": "nope" }));
|
||||
assert_eq!(s, ManifestSignals::default());
|
||||
assert_eq!(classify(&s, true), None);
|
||||
assert_eq!(classify(None, &s, true), None);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -721,12 +721,10 @@ impl WayfernManager {
|
||||
};
|
||||
|
||||
if key_path.exists() {
|
||||
let key_text = std::fs::read_to_string(&key_path).unwrap_or_default();
|
||||
log::info!(
|
||||
"Pre-launch: os_crypt_key present ({} bytes, content: '{}')",
|
||||
key_text.len(),
|
||||
key_text.trim()
|
||||
);
|
||||
// Length only. The contents are the profile's encryption key, and this
|
||||
// log is the first thing a user attaches to a bug report.
|
||||
let key_len = std::fs::metadata(&key_path).map(|m| m.len()).unwrap_or(0);
|
||||
log::info!("Pre-launch: os_crypt_key present ({key_len} bytes)");
|
||||
} else {
|
||||
log::warn!("Pre-launch: os_crypt_key NOT FOUND");
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "Donut",
|
||||
"version": "0.28.2",
|
||||
"version": "0.29.2",
|
||||
"identifier": "com.donutbrowser",
|
||||
"build": {
|
||||
"beforeDevCommand": "pnpm copy-proxy-binary && pnpm dev",
|
||||
|
||||
@@ -627,6 +627,37 @@ async fn cleanup_runtime() {
|
||||
test_harness::stop_vpn_servers().await;
|
||||
}
|
||||
|
||||
/// Request through the proxy until the tunnel behind it actually carries the
|
||||
/// traffic, or the deadline passes.
|
||||
///
|
||||
/// Returns the last response either way, so a genuine failure still asserts
|
||||
/// against the real body rather than a timeout message.
|
||||
async fn wait_for_tunnel(
|
||||
local_port: u16,
|
||||
url: &str,
|
||||
host_header: &str,
|
||||
timeout: Duration,
|
||||
) -> Result<String, Box<dyn std::error::Error + Send + Sync>> {
|
||||
let deadline = tokio::time::Instant::now() + timeout;
|
||||
|
||||
loop {
|
||||
let last = match raw_http_request_via_proxy(local_port, url, host_header).await {
|
||||
Ok(response) => {
|
||||
if response.contains("WG-TUNNEL-OK") {
|
||||
return Ok(response);
|
||||
}
|
||||
response
|
||||
}
|
||||
Err(e) => format!("request error: {e}"),
|
||||
};
|
||||
|
||||
if tokio::time::Instant::now() >= deadline {
|
||||
return Ok(last);
|
||||
}
|
||||
sleep(Duration::from_millis(250)).await;
|
||||
}
|
||||
}
|
||||
|
||||
async fn wait_for_file(
|
||||
path: &std::path::Path,
|
||||
timeout: Duration,
|
||||
@@ -661,12 +692,22 @@ async fn run_proxy_feature_suite(
|
||||
let proxy =
|
||||
start_proxy_with_upstream(binary_path, &vpn_upstream, &[], None, Some(&profile_id)).await?;
|
||||
|
||||
sleep(Duration::from_millis(500)).await;
|
||||
|
||||
let internal_url = format!("http://{}:8080/", server_tunnel_ip);
|
||||
let internal_host = format!("{}:8080", server_tunnel_ip);
|
||||
let http_response =
|
||||
raw_http_request_via_proxy(proxy.local_port, &internal_url, &internal_host).await?;
|
||||
|
||||
// The proxy answers as soon as it is listening, but the route behind it is
|
||||
// not ready until the WireGuard handshake completes and the in-tunnel server
|
||||
// accepts. A fixed sleep raced that on a loaded runner and came back
|
||||
// `502 Bad Gateway`, which is the tunnel not being up yet rather than
|
||||
// anything under test being wrong. Poll to a deadline instead, the same way
|
||||
// `wait_for_file` does below.
|
||||
let http_response = wait_for_tunnel(
|
||||
proxy.local_port,
|
||||
&internal_url,
|
||||
&internal_host,
|
||||
Duration::from_secs(20),
|
||||
)
|
||||
.await?;
|
||||
assert!(
|
||||
http_response.contains("WG-TUNNEL-OK"),
|
||||
"HTTP traffic through donut-proxy+VPN tunnel should succeed, got: {}",
|
||||
|
||||
+64
-26
@@ -409,9 +409,19 @@ export default function Home() {
|
||||
// a bulk run enqueues one per profile, and every waiter must settle or the
|
||||
// Promise.allSettled below it never resolves and the bulk spinner sticks.
|
||||
const gateQueueRef = useRef<
|
||||
Array<{ req: GateRequest; resolve: (decision: GateDecision) => void }>
|
||||
Array<{
|
||||
id: number;
|
||||
req: GateRequest;
|
||||
/// The bulk run this request belongs to, or undefined for a single
|
||||
/// launch. Carried per entry so a blanket "apply to the rest" can only
|
||||
/// ever claim the run its own dialog came from.
|
||||
runId: number | undefined;
|
||||
resolve: (decision: GateDecision) => void;
|
||||
}>
|
||||
>([]);
|
||||
const gateRequestSeqRef = useRef(0);
|
||||
const [gateState, setGateState] = useState<{
|
||||
id: number;
|
||||
req: GateRequest;
|
||||
remaining: number;
|
||||
} | null>(null);
|
||||
@@ -993,19 +1003,15 @@ export default function Home() {
|
||||
[selectedGroupId, t],
|
||||
);
|
||||
|
||||
// Show the queue's head, and how many are waiting behind it.
|
||||
// The backend gate downgrades to advisory rather than blocking when it
|
||||
// cannot trust its own measurement (a confirmed VPN extension can reroute
|
||||
// traffic away from the proxy it just probed), and for unattended launches.
|
||||
// Without a listener that finding was emitted into the void.
|
||||
// Unattended launches — REST and MCP automation — are the only ones the
|
||||
// backend gate lets past a measured mismatch, because there is no dialog for
|
||||
// them to answer. Without a listener that finding was emitted into the void.
|
||||
useEffect(() => {
|
||||
const unlisten = listen<ConsistencyResult>(
|
||||
"fingerprint-consistency-warning",
|
||||
(event) => {
|
||||
const { exit_timezone, fingerprint_timezone } = event.payload;
|
||||
showErrorToast(t("backendErrors.fingerprintExitMismatch"), {
|
||||
// The cause differs by path (an unverifiable measurement vs an
|
||||
// unattended launch), so state the measurement rather than guess.
|
||||
description:
|
||||
exit_timezone && fingerprint_timezone
|
||||
? t("consistencyWarning.timezoneDetail", {
|
||||
@@ -1024,11 +1030,12 @@ export default function Home() {
|
||||
};
|
||||
}, [t]);
|
||||
|
||||
// Show the queue's head, and how many are waiting behind it.
|
||||
const syncGateUi = useCallback(() => {
|
||||
const queue = gateQueueRef.current;
|
||||
setGateState(
|
||||
queue.length > 0
|
||||
? { req: queue[0].req, remaining: queue.length - 1 }
|
||||
? { id: queue[0].id, req: queue[0].req, remaining: queue.length - 1 }
|
||||
: null,
|
||||
);
|
||||
}, []);
|
||||
@@ -1053,7 +1060,13 @@ export default function Home() {
|
||||
});
|
||||
}
|
||||
return new Promise<GateDecision>((resolve) => {
|
||||
gateQueueRef.current.push({ req, resolve });
|
||||
gateRequestSeqRef.current += 1;
|
||||
gateQueueRef.current.push({
|
||||
id: gateRequestSeqRef.current,
|
||||
req,
|
||||
runId,
|
||||
resolve,
|
||||
});
|
||||
syncGateUi();
|
||||
});
|
||||
},
|
||||
@@ -1063,24 +1076,37 @@ export default function Home() {
|
||||
const settleGate = useCallback(
|
||||
(decision: GateDecision) => {
|
||||
const entry = gateQueueRef.current.shift();
|
||||
entry?.resolve(decision);
|
||||
if (!entry) {
|
||||
return;
|
||||
}
|
||||
entry.resolve(decision);
|
||||
if (decision.applyToRemaining) {
|
||||
const coversBlocking = entry?.req.findings.fingerprint !== null;
|
||||
blanketGateDecisionRef.current = {
|
||||
decision,
|
||||
coversBlocking,
|
||||
runId: bulkRunIdRef.current,
|
||||
};
|
||||
const coversBlocking = entry.req.findings.fingerprint !== null;
|
||||
// Only a bulk run gets a standing blanket, and it claims the run the
|
||||
// answered dialog belonged to — never whichever run happens to be in
|
||||
// flight when the dialog is settled. Outside a run there is nothing to
|
||||
// scope one to, and a session-wide blanket would silently answer
|
||||
// unrelated launches later. The queue is still drained either way,
|
||||
// which is what the checkbox actually promises.
|
||||
if (entry.runId !== undefined) {
|
||||
blanketGateDecisionRef.current = {
|
||||
decision,
|
||||
coversBlocking,
|
||||
runId: entry.runId,
|
||||
};
|
||||
}
|
||||
// Drain the queue rather than leaving promises pending forever — but
|
||||
// only those the blanket actually covers. A hard block still deserves
|
||||
// its own dialog even after the user blanket-approved a warning.
|
||||
// its own dialog even after the user blanket-approved a warning, and a
|
||||
// launch started outside this run was never part of the answer.
|
||||
const remaining = gateQueueRef.current.splice(0);
|
||||
const kept = remaining.filter(
|
||||
(queued) =>
|
||||
!coversBlocking && queued.req.findings.fingerprint !== null,
|
||||
);
|
||||
const kept = [];
|
||||
for (const queued of remaining) {
|
||||
if (kept.includes(queued)) {
|
||||
const covered =
|
||||
queued.runId === entry.runId &&
|
||||
(coversBlocking || queued.req.findings.fingerprint === null);
|
||||
if (!covered) {
|
||||
kept.push(queued);
|
||||
continue;
|
||||
}
|
||||
queued.resolve({
|
||||
@@ -1167,6 +1193,12 @@ export default function Home() {
|
||||
// verdict. No network, no worker started, so a profile whose exit is
|
||||
// already known blocks before the launch touches anything.
|
||||
let consentToken: string | null = null;
|
||||
// Kept for the tier-2 dialog below: the extensions are the same ones,
|
||||
// and a mismatch measured mid-launch is exactly when knowing that one of
|
||||
// them can change the proxy matters most. Minus anything the user just
|
||||
// acknowledged, so a box they ticked seconds ago is not shown again.
|
||||
let localChecks: PreLaunchChecks | null = null;
|
||||
let ackedExtensionKeys: string[] = [];
|
||||
try {
|
||||
// One-shot migration of the old per-profile "don't warn again" flag,
|
||||
// so a user who already dismissed this profile isn't hard-blocked by
|
||||
@@ -1188,6 +1220,7 @@ export default function Home() {
|
||||
"get_profile_pre_launch_checks",
|
||||
{ profileId: profile.id },
|
||||
);
|
||||
localChecks = checks;
|
||||
const blocked =
|
||||
checks.consistency.checked && !checks.consistency.consistent;
|
||||
if (blocked || checks.vpn_extensions.length > 0) {
|
||||
@@ -1208,6 +1241,7 @@ export default function Home() {
|
||||
if (!decision.proceed) {
|
||||
return { status: "cancelled" };
|
||||
}
|
||||
ackedExtensionKeys = decision.ackExtensionKeys;
|
||||
consentToken = checks.consent_token;
|
||||
}
|
||||
} catch (err) {
|
||||
@@ -1234,10 +1268,13 @@ export default function Home() {
|
||||
{
|
||||
profile,
|
||||
findings: {
|
||||
vpnExtensions: [],
|
||||
scanState: "scanned",
|
||||
vpnExtensions: (localChecks?.vpn_extensions ?? []).filter(
|
||||
(ext) => !ackedExtensionKeys.includes(ext.key),
|
||||
),
|
||||
scanState: localChecks?.scan_state ?? "scanned",
|
||||
fingerprint: consistencyFromErrorParams(parsed.params),
|
||||
measurementUnreliable: false,
|
||||
measurementUnreliable:
|
||||
localChecks?.exit_measurement_unreliable ?? false,
|
||||
probePending: false,
|
||||
},
|
||||
},
|
||||
@@ -2186,6 +2223,7 @@ export default function Home() {
|
||||
isOpen={gateState !== null}
|
||||
profileName={gateState?.req.profile.name ?? ""}
|
||||
profileId={gateState?.req.profile.id ?? ""}
|
||||
requestId={gateState?.id ?? 0}
|
||||
findings={gateState?.req.findings ?? null}
|
||||
remainingCount={gateState?.remaining ?? 0}
|
||||
onResult={settleGate}
|
||||
|
||||
@@ -53,10 +53,88 @@ import type {
|
||||
ImportProfileItem,
|
||||
ProfileImportBatchResult,
|
||||
ProfileImportProgress,
|
||||
ProfileImportReport,
|
||||
WayfernConfig,
|
||||
} from "@/types";
|
||||
import { RippleButton } from "./ui/ripple";
|
||||
|
||||
/**
|
||||
* What an import actually carried, and what it could not.
|
||||
*
|
||||
* The counts matter more than they look: an import that reports zero of
|
||||
* everything is the exact symptom of the bug where copied data landed where
|
||||
* the browser never reads it, and it used to be indistinguishable from success.
|
||||
*/
|
||||
function ImportReportSummary({ report }: { report: ProfileImportReport }) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
// Label-then-value rather than "{{count}} cookies": it keeps the row scannable
|
||||
// and sidesteps needing correct plural forms in ten languages.
|
||||
const carried = (
|
||||
[
|
||||
["importProfile.reportCookies", report.cookies_migrated],
|
||||
["importProfile.reportPasswords", report.passwords_migrated],
|
||||
["importProfile.reportAutofill", report.payment_methods_migrated],
|
||||
["importProfile.reportExtensions", report.extensions_migrated],
|
||||
["importProfile.reportHistory", report.history_entries],
|
||||
["importProfile.reportBookmarks", report.bookmarks],
|
||||
["importProfile.reportLocalStorage", report.local_storage_origins],
|
||||
] as const
|
||||
)
|
||||
.filter(([, count]) => count > 0)
|
||||
.map(([key, count]) => `${t(key)} ${count.toLocaleString()}`);
|
||||
|
||||
const unrecoverable =
|
||||
report.cookies_unrecoverable +
|
||||
report.passwords_unrecoverable +
|
||||
report.payment_methods_unrecoverable;
|
||||
|
||||
return (
|
||||
<div className="mt-0.5 space-y-0.5 pl-1 text-xs text-muted-foreground">
|
||||
<p>
|
||||
{carried.length > 0
|
||||
? carried.join(" · ")
|
||||
: t("importProfile.reportNothingCarried")}
|
||||
</p>
|
||||
{unrecoverable > 0 && (
|
||||
<p>
|
||||
{t("importProfile.reportUnrecoverable", { count: unrecoverable })}
|
||||
</p>
|
||||
)}
|
||||
{report.warnings.map((code) => (
|
||||
<p key={code} className="text-warning-text">
|
||||
{t(`importProfile.warnings.${code}`)}
|
||||
</p>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fold a retry's results back into the batch it came from.
|
||||
*
|
||||
* A retry only resubmits the items that failed, so the previous batch is still
|
||||
* authoritative for every other row. Replacing it wholesale would make the
|
||||
* successful imports disappear from the summary.
|
||||
*/
|
||||
function mergeImportResults(
|
||||
previous: ProfileImportBatchResult,
|
||||
retry: ProfileImportBatchResult,
|
||||
): ProfileImportBatchResult {
|
||||
const byPath = new Map(retry.results.map((item) => [item.source_path, item]));
|
||||
const results = previous.results.map(
|
||||
(item) => byPath.get(item.source_path) ?? item,
|
||||
);
|
||||
const count = (status: string) =>
|
||||
results.filter((item) => item.status === status).length;
|
||||
return {
|
||||
imported_count: count("imported"),
|
||||
skipped_count: count("skipped"),
|
||||
failed_count: count("failed"),
|
||||
results,
|
||||
};
|
||||
}
|
||||
|
||||
interface ImportProfileDialogProps {
|
||||
isOpen: boolean;
|
||||
onClose: () => void;
|
||||
@@ -283,69 +361,99 @@ export function ImportProfileDialog({
|
||||
}
|
||||
};
|
||||
|
||||
const handleImport = useCallback(async () => {
|
||||
if (selectedProfiles.length === 0) {
|
||||
toast.error(t("importProfile.selectAtLeastOne"));
|
||||
return;
|
||||
}
|
||||
if (
|
||||
selectedProfiles.some((p) => !(profileNames[p.path] ?? p.name).trim())
|
||||
) {
|
||||
toast.error(t("importProfile.emptyNames"));
|
||||
return;
|
||||
}
|
||||
|
||||
const items: ImportProfileItem[] = selectedProfiles.map((p, index) => ({
|
||||
source_path: p.path,
|
||||
browser_type: p.browser,
|
||||
new_profile_name: (profileNames[p.path] ?? p.name).trim(),
|
||||
proxy_id: proxyIdForIndex(index),
|
||||
vpn_id: vpnAssignment === "none" ? null : vpnAssignment,
|
||||
}));
|
||||
|
||||
setCurrentStep("importing");
|
||||
setIsImporting(true);
|
||||
setProgress(null);
|
||||
setResult(null);
|
||||
try {
|
||||
const batchResult = await invoke<ProfileImportBatchResult>(
|
||||
"import_browser_profiles",
|
||||
{
|
||||
items,
|
||||
groupId: selectedGroupId === "none" ? null : selectedGroupId,
|
||||
duplicateStrategy: duplicateStrategy,
|
||||
wayfernConfig,
|
||||
},
|
||||
);
|
||||
setResult(batchResult);
|
||||
toast.success(
|
||||
t("importProfile.resultsSummary", {
|
||||
imported: batchResult.imported_count,
|
||||
skipped: batchResult.skipped_count,
|
||||
failed: batchResult.failed_count,
|
||||
}),
|
||||
);
|
||||
if (batchResult.imported_count > 0 && !reducedMotion) {
|
||||
fireSprinkleConfetti();
|
||||
const handleImport = useCallback(
|
||||
async (allowRunning = false, retryPaths?: ReadonlySet<string>) => {
|
||||
if (selectedProfiles.length === 0) {
|
||||
toast.error(t("importProfile.selectAtLeastOne"));
|
||||
return;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Failed to import profiles:", error);
|
||||
toast.error(translateBackendError(t, error));
|
||||
setCurrentStep("configure");
|
||||
} finally {
|
||||
setIsImporting(false);
|
||||
}
|
||||
}, [
|
||||
selectedProfiles,
|
||||
profileNames,
|
||||
proxyIdForIndex,
|
||||
vpnAssignment,
|
||||
selectedGroupId,
|
||||
duplicateStrategy,
|
||||
wayfernConfig,
|
||||
reducedMotion,
|
||||
t,
|
||||
]);
|
||||
if (
|
||||
selectedProfiles.some((p) => !(profileNames[p.path] ?? p.name).trim())
|
||||
) {
|
||||
toast.error(t("importProfile.emptyNames"));
|
||||
return;
|
||||
}
|
||||
|
||||
// Filter AFTER the map, so a retry keeps the proxy each profile was
|
||||
// originally assigned by the index-based round-robin.
|
||||
const items: ImportProfileItem[] = selectedProfiles
|
||||
.map((p, index) => ({
|
||||
source_path: p.path,
|
||||
browser_type: p.browser,
|
||||
new_profile_name: (profileNames[p.path] ?? p.name).trim(),
|
||||
proxy_id: proxyIdForIndex(index),
|
||||
vpn_id: vpnAssignment === "none" ? null : vpnAssignment,
|
||||
allow_running: allowRunning,
|
||||
}))
|
||||
.filter((item) => !retryPaths || retryPaths.has(item.source_path));
|
||||
|
||||
if (items.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
setCurrentStep("importing");
|
||||
setIsImporting(true);
|
||||
setProgress(null);
|
||||
// A retry covers only the failed subset, so the earlier results are still
|
||||
// the truth for everything else and must not be thrown away.
|
||||
const previous = retryPaths ? result : null;
|
||||
setResult(null);
|
||||
try {
|
||||
const batchResult = await invoke<ProfileImportBatchResult>(
|
||||
"import_browser_profiles",
|
||||
{
|
||||
items,
|
||||
groupId: selectedGroupId === "none" ? null : selectedGroupId,
|
||||
duplicateStrategy: duplicateStrategy,
|
||||
wayfernConfig,
|
||||
},
|
||||
);
|
||||
setResult(
|
||||
previous ? mergeImportResults(previous, batchResult) : batchResult,
|
||||
);
|
||||
toast.success(
|
||||
t("importProfile.resultsSummary", {
|
||||
imported: batchResult.imported_count,
|
||||
skipped: batchResult.skipped_count,
|
||||
failed: batchResult.failed_count,
|
||||
}),
|
||||
);
|
||||
if (batchResult.imported_count > 0 && !reducedMotion) {
|
||||
fireSprinkleConfetti();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Failed to import profiles:", error);
|
||||
toast.error(translateBackendError(t, error));
|
||||
setCurrentStep("configure");
|
||||
} finally {
|
||||
setIsImporting(false);
|
||||
}
|
||||
},
|
||||
[
|
||||
selectedProfiles,
|
||||
profileNames,
|
||||
proxyIdForIndex,
|
||||
vpnAssignment,
|
||||
selectedGroupId,
|
||||
duplicateStrategy,
|
||||
wayfernConfig,
|
||||
reducedMotion,
|
||||
result,
|
||||
t,
|
||||
],
|
||||
);
|
||||
|
||||
// A source browser that is still running is the one failure the user can fix
|
||||
// without starting over, so offer the override right where it happened.
|
||||
const hasRunningBrowserFailure = useMemo(
|
||||
() =>
|
||||
(result?.results ?? []).some(
|
||||
(item) =>
|
||||
item.status === "failed" &&
|
||||
item.error?.includes("IMPORT_SOURCE_BROWSER_RUNNING"),
|
||||
),
|
||||
[result],
|
||||
);
|
||||
|
||||
const handleClose = () => {
|
||||
void cleanupExtractedDir(extractedDir);
|
||||
@@ -840,38 +948,74 @@ export function ImportProfileDialog({
|
||||
</h3>
|
||||
<div className="max-h-64 space-y-1 overflow-y-auto rounded-lg border border-border p-2">
|
||||
{result.results.map((item) => (
|
||||
<div
|
||||
key={item.source_path}
|
||||
className="flex items-center gap-2 p-1 text-sm"
|
||||
>
|
||||
<span
|
||||
className={cn(
|
||||
"shrink-0 text-xs font-medium",
|
||||
item.status === "imported" && "text-success-text",
|
||||
item.status === "skipped" &&
|
||||
"text-muted-foreground",
|
||||
item.status === "failed" &&
|
||||
"text-destructive-text",
|
||||
)}
|
||||
>
|
||||
{item.status === "imported" &&
|
||||
t("importProfile.statusImported")}
|
||||
{item.status === "skipped" &&
|
||||
t("importProfile.statusSkipped")}
|
||||
{item.status === "failed" &&
|
||||
t("importProfile.statusFailed")}
|
||||
</span>
|
||||
<span className="min-w-0 flex-1 truncate">
|
||||
{item.name || item.source_path}
|
||||
</span>
|
||||
{item.error && (
|
||||
<span className="min-w-0 flex-1 truncate text-xs text-destructive-text">
|
||||
{translateBackendError(t, new Error(item.error))}
|
||||
<div key={item.source_path} className="p-1 text-sm">
|
||||
<div className="flex items-center gap-2">
|
||||
<span
|
||||
className={cn(
|
||||
"shrink-0 text-xs font-medium",
|
||||
item.status === "imported" &&
|
||||
"text-success-text",
|
||||
item.status === "skipped" &&
|
||||
"text-muted-foreground",
|
||||
item.status === "failed" &&
|
||||
"text-destructive-text",
|
||||
)}
|
||||
>
|
||||
{item.status === "imported" &&
|
||||
t("importProfile.statusImported")}
|
||||
{item.status === "skipped" &&
|
||||
t("importProfile.statusSkipped")}
|
||||
{item.status === "failed" &&
|
||||
t("importProfile.statusFailed")}
|
||||
</span>
|
||||
<span className="min-w-0 flex-1 truncate">
|
||||
{item.name || item.source_path}
|
||||
</span>
|
||||
{item.error && (
|
||||
<span className="min-w-0 flex-1 truncate text-xs text-destructive-text">
|
||||
{translateBackendError(
|
||||
t,
|
||||
new Error(item.error),
|
||||
)}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
{item.report && (
|
||||
<ImportReportSummary report={item.report} />
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{hasRunningBrowserFailure && (
|
||||
<Alert>
|
||||
<AlertDescription className="space-y-2">
|
||||
<p>{t("importProfile.closeSourceBrowserHint")}</p>
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => {
|
||||
void handleImport(
|
||||
true,
|
||||
new Set(
|
||||
result.results
|
||||
.filter(
|
||||
(item) =>
|
||||
item.status === "failed" &&
|
||||
item.error?.includes(
|
||||
"IMPORT_SOURCE_BROWSER_RUNNING",
|
||||
),
|
||||
)
|
||||
.map((item) => item.source_path),
|
||||
),
|
||||
);
|
||||
}}
|
||||
>
|
||||
{t("importProfile.importAnyway")}
|
||||
</Button>
|
||||
</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"use client";
|
||||
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { useEffect, useState } from "react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { LuTriangleAlert } from "react-icons/lu";
|
||||
import { Checkbox } from "@/components/ui/checkbox";
|
||||
@@ -15,16 +15,21 @@ import {
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { translateBackendError } from "@/lib/backend-errors";
|
||||
import { showErrorToast, showSuccessToast } from "@/lib/toast-utils";
|
||||
import type { ConsistencyResult, DetectedVpnExtension } from "@/types";
|
||||
import type {
|
||||
ConsistencyResult,
|
||||
DetectedVpnExtension,
|
||||
ExtensionScanState,
|
||||
} from "@/types";
|
||||
import { RippleButton } from "./ui/ripple";
|
||||
|
||||
export interface GateFindings {
|
||||
/// Extensions that can reroute traffic. A warning: the user may proceed.
|
||||
/// Extensions that could reroute traffic. A warning: the user may proceed.
|
||||
vpnExtensions: DetectedVpnExtension[];
|
||||
scanState: string;
|
||||
scanState: ExtensionScanState;
|
||||
/// A measured exit/fingerprint mismatch. A block: the browser has not started.
|
||||
fingerprint: ConsistencyResult | null;
|
||||
/// A confirmed proxy-permission extension makes any exit measurement suspect.
|
||||
/// An extension holds the proxy permission, so the exit measurement may not
|
||||
/// describe the route the browser takes. A caveat on the block, not a waiver.
|
||||
measurementUnreliable: boolean;
|
||||
/// The exit has not been measured yet; the launch itself will still check.
|
||||
probePending: boolean;
|
||||
@@ -41,6 +46,9 @@ interface PreLaunchGateDialogProps {
|
||||
isOpen: boolean;
|
||||
profileName: string;
|
||||
profileId: string;
|
||||
/// Identifies this specific request, so state resets even when one gate
|
||||
/// replaces another without the dialog ever closing.
|
||||
requestId: number;
|
||||
findings: GateFindings | null;
|
||||
/// How many further profiles are queued behind this one; >0 offers to apply
|
||||
/// the same decision to all of them.
|
||||
@@ -50,51 +58,155 @@ interface PreLaunchGateDialogProps {
|
||||
onResult: (decision: GateDecision) => void;
|
||||
}
|
||||
|
||||
/// Everything the user can change while one gate is on screen, stamped with
|
||||
/// the gate it belongs to.
|
||||
interface GateAnswerState {
|
||||
requestId: number;
|
||||
ackFingerprint: boolean;
|
||||
ackExtensions: boolean;
|
||||
applyToRemaining: boolean;
|
||||
isMatching: boolean;
|
||||
decided: boolean;
|
||||
}
|
||||
|
||||
/// How long after a decision the footer stops accepting another one. Long
|
||||
/// enough that a double-click cannot answer the gate promoted by its first
|
||||
/// half, short enough that nobody deliberately answering two queued gates in a
|
||||
/// row notices it.
|
||||
const DECISION_COOLDOWN_MS = 500;
|
||||
|
||||
function answersFor(requestId: number): GateAnswerState {
|
||||
return {
|
||||
requestId,
|
||||
ackFingerprint: false,
|
||||
ackExtensions: false,
|
||||
applyToRemaining: false,
|
||||
isMatching: false,
|
||||
decided: false,
|
||||
};
|
||||
}
|
||||
|
||||
function ExtensionEntry({ extension }: { extension: DetectedVpnExtension }) {
|
||||
const { t } = useTranslation();
|
||||
const capability = t(
|
||||
extension.confidence === "confirmed"
|
||||
? "prelaunchGate.vpnExtensionConfirmed"
|
||||
: extension.confidence === "likely"
|
||||
? "prelaunchGate.vpnExtensionLikely"
|
||||
: "prelaunchGate.vpnExtensionCapability",
|
||||
);
|
||||
const source = t(
|
||||
extension.source === "donut"
|
||||
? "prelaunchGate.sourceDonut"
|
||||
: "prelaunchGate.sourceBrowser",
|
||||
);
|
||||
|
||||
return (
|
||||
<li className="text-xs">
|
||||
<span className="font-medium">{extension.name}</span>
|
||||
<span className="text-muted-foreground">
|
||||
{/* A version-less manifest is legal, and interpolating an empty string
|
||||
into the one template left a doubled space before the dash. */}
|
||||
{extension.version
|
||||
? t("prelaunchGate.vpnExtensionEntry", {
|
||||
version: extension.version,
|
||||
capability,
|
||||
source,
|
||||
})
|
||||
: t("prelaunchGate.vpnExtensionEntryNoVersion", {
|
||||
capability,
|
||||
source,
|
||||
})}
|
||||
</span>
|
||||
</li>
|
||||
);
|
||||
}
|
||||
|
||||
export function PreLaunchGateDialog({
|
||||
isOpen,
|
||||
profileName,
|
||||
profileId,
|
||||
requestId,
|
||||
findings,
|
||||
remainingCount,
|
||||
onResult,
|
||||
}: PreLaunchGateDialogProps) {
|
||||
const { t } = useTranslation();
|
||||
const [ackFingerprint, setAckFingerprint] = useState(false);
|
||||
const [ackExtensions, setAckExtensions] = useState(false);
|
||||
const [applyToRemaining, setApplyToRemaining] = useState(false);
|
||||
const [isMatching, setIsMatching] = useState(false);
|
||||
// The dialog node is reused as the queue advances, so without this a double
|
||||
// click would decide for the next profile too.
|
||||
const [decided, setDecided] = useState(false);
|
||||
// All mutable state is stamped with the request it belongs to, and anything
|
||||
// stamped with an older request is ignored rather than reset. The dialog
|
||||
// never unmounts and a queued gate promotes the next profile without ever
|
||||
// closing it, so state carried across that boundary would tick a checkbox
|
||||
// for a profile the user never saw — and `decided` carried across it left
|
||||
// every button disabled on a dialog that also refused Escape, which is the
|
||||
// freeze this shape exists to make unrepresentable.
|
||||
//
|
||||
// Deliberately not an effect keyed on `requestId`: a reset effect whose body
|
||||
// reads none of its dependencies is exactly what a lint autofix reduces to
|
||||
// `[]`, and that is how the freeze shipped.
|
||||
const [state, setState] = useState<GateAnswerState>(() => answersFor(0));
|
||||
const answers = state.requestId === requestId ? state : answersFor(requestId);
|
||||
|
||||
// Keyed on profileId, not just isOpen: a queued gate promotes the next
|
||||
// profile without ever closing the dialog, so an isOpen-only reset would
|
||||
// carry the previous profile's ticked boxes — and persist an acknowledgement
|
||||
// against a profile the user never saw.
|
||||
// The gate on screen right now, readable from an async callback whose
|
||||
// closure was captured while an earlier gate was showing.
|
||||
const liveRequestRef = useRef(requestId);
|
||||
useEffect(() => {
|
||||
setAckFingerprint(false);
|
||||
setAckExtensions(false);
|
||||
setIsMatching(false);
|
||||
setDecided(false);
|
||||
}, []);
|
||||
liveRequestRef.current = requestId;
|
||||
}, [requestId]);
|
||||
|
||||
useEffect(() => {
|
||||
if (isOpen) {
|
||||
setApplyToRemaining(false);
|
||||
const patch = (next: Partial<GateAnswerState>) => {
|
||||
// A callback that resumes after its gate was answered must not write into
|
||||
// the slot the next gate is now using — that would silently untick boxes
|
||||
// the user has since ticked on a different profile.
|
||||
if (liveRequestRef.current !== requestId) {
|
||||
return;
|
||||
}
|
||||
}, [isOpen]);
|
||||
setState((prev) => ({
|
||||
...(prev.requestId === requestId ? prev : answersFor(requestId)),
|
||||
...next,
|
||||
requestId,
|
||||
}));
|
||||
};
|
||||
const {
|
||||
ackFingerprint,
|
||||
ackExtensions,
|
||||
applyToRemaining,
|
||||
isMatching,
|
||||
decided,
|
||||
} = answers;
|
||||
|
||||
const fingerprint = findings?.fingerprint ?? null;
|
||||
const extensions = findings?.vpnExtensions ?? [];
|
||||
// Two different claims, kept visually apart. The first names extensions as
|
||||
// VPN/proxy tools; the second says only that an extension holds Chromium's
|
||||
// proxy permission, which a download manager needs to route its own
|
||||
// transfers and which says nothing about what the extension is.
|
||||
const vpnExtensions = extensions.filter((e) => e.confidence !== "capability");
|
||||
const proxyCapableExtensions = extensions.filter(
|
||||
(e) => e.confidence === "capability",
|
||||
);
|
||||
const mismatches = fingerprint?.mismatches ?? [];
|
||||
const exitIp = fingerprint?.exit_ip ?? null;
|
||||
const isBlocked = fingerprint !== null;
|
||||
|
||||
// Two guards, because answering a gate promotes the next one into the same
|
||||
// DOM node rather than closing the dialog. The ref settles one gate exactly
|
||||
// once even if two clicks land in the same React batch; the cooldown stops
|
||||
// the second half of a double-click from answering a dialog that appeared
|
||||
// between the two clicks and that nobody has read.
|
||||
const decidedRef = useRef<number | null>(null);
|
||||
const lastDecisionAtRef = useRef(Number.NEGATIVE_INFINITY);
|
||||
|
||||
const decide = (proceed: boolean) => {
|
||||
if (decided) {
|
||||
if (decided || decidedRef.current === requestId) {
|
||||
return;
|
||||
}
|
||||
setDecided(true);
|
||||
const now = performance.now();
|
||||
if (now - lastDecisionAtRef.current < DECISION_COOLDOWN_MS) {
|
||||
return;
|
||||
}
|
||||
decidedRef.current = requestId;
|
||||
lastDecisionAtRef.current = now;
|
||||
patch({ decided: true });
|
||||
onResult({
|
||||
proceed,
|
||||
ackFingerprint: ackFingerprint && isBlocked,
|
||||
@@ -107,21 +219,29 @@ export function PreLaunchGateDialog({
|
||||
if (!exitIp) {
|
||||
return;
|
||||
}
|
||||
setIsMatching(true);
|
||||
const request = requestId;
|
||||
patch({ isMatching: true });
|
||||
try {
|
||||
await invoke("match_profile_fingerprint_to_exit", {
|
||||
profileId,
|
||||
exitIp,
|
||||
});
|
||||
showSuccessToast(t("consistencyWarning.matchSuccess"));
|
||||
patch({ isMatching: false });
|
||||
// Rewriting the fingerprint takes long enough for the user to dismiss
|
||||
// this gate meanwhile. The profile change still stands, but the launch
|
||||
// it belonged to is already settled, and deciding now would answer
|
||||
// whichever gate took its place.
|
||||
if (liveRequestRef.current !== request) {
|
||||
return;
|
||||
}
|
||||
// The fingerprint the block was measured against no longer exists, so
|
||||
// this launch is abandoned rather than forced through with a stale
|
||||
// consent token; the user relaunches against the corrected profile.
|
||||
decide(false);
|
||||
} catch (e) {
|
||||
showErrorToast(translateBackendError(t, e));
|
||||
} finally {
|
||||
setIsMatching(false);
|
||||
patch({ isMatching: false });
|
||||
}
|
||||
};
|
||||
|
||||
@@ -141,8 +261,19 @@ export function PreLaunchGateDialog({
|
||||
})();
|
||||
|
||||
return (
|
||||
<Dialog open={isOpen}>
|
||||
<DialogContent className="sm:max-w-md" dismissible={false}>
|
||||
// Dismissible on purpose: cancelling is the safe outcome, so every way out
|
||||
// of this dialog — Escape, the close X, a click outside — resolves the
|
||||
// waiting launch as "don't start". A gate that can only be answered by two
|
||||
// buttons is one disabled button away from trapping the whole app.
|
||||
<Dialog
|
||||
open={isOpen}
|
||||
onOpenChange={(open) => {
|
||||
if (!open) {
|
||||
decide(false);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<DialogContent className="sm:max-w-md">
|
||||
<DialogHeader>
|
||||
<DialogTitle className="flex items-center gap-2">
|
||||
<LuTriangleAlert className="size-5 text-warning-text" />
|
||||
@@ -184,7 +315,7 @@ export function PreLaunchGateDialog({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{extensions.length > 0 && (
|
||||
{vpnExtensions.length > 0 && (
|
||||
<div className="space-y-2 rounded-md border border-warning/50 bg-warning/10 p-3">
|
||||
<p className="font-medium">
|
||||
{t("prelaunchGate.vpnExtensionHeading")}
|
||||
@@ -193,23 +324,8 @@ export function PreLaunchGateDialog({
|
||||
{t("prelaunchGate.vpnExtensionIntro")}
|
||||
</p>
|
||||
<ul className="space-y-1">
|
||||
{extensions.map((ext) => (
|
||||
<li key={ext.key} className="text-xs">
|
||||
<span className="font-medium">{ext.name}</span>
|
||||
<span className="text-muted-foreground">
|
||||
{t("prelaunchGate.vpnExtensionEntry", {
|
||||
version: ext.version ?? "",
|
||||
capability:
|
||||
ext.confidence === "confirmed"
|
||||
? t("prelaunchGate.vpnExtensionConfirmed")
|
||||
: t("prelaunchGate.vpnExtensionLikely"),
|
||||
source:
|
||||
ext.source === "donut"
|
||||
? t("prelaunchGate.sourceDonut")
|
||||
: t("prelaunchGate.sourceBrowser"),
|
||||
})}
|
||||
</span>
|
||||
</li>
|
||||
{vpnExtensions.map((ext) => (
|
||||
<ExtensionEntry key={ext.key} extension={ext} />
|
||||
))}
|
||||
</ul>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
@@ -218,6 +334,22 @@ export function PreLaunchGateDialog({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{proxyCapableExtensions.length > 0 && (
|
||||
<div className="space-y-2 rounded-md border border-border bg-muted/40 p-3">
|
||||
<p className="font-medium">
|
||||
{t("prelaunchGate.proxyCapableHeading")}
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("prelaunchGate.proxyCapableIntro")}
|
||||
</p>
|
||||
<ul className="space-y-1">
|
||||
{proxyCapableExtensions.map((ext) => (
|
||||
<ExtensionEntry key={ext.key} extension={ext} />
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{findings?.measurementUnreliable && isBlocked && (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("prelaunchGate.measurementUnreliable")}
|
||||
@@ -240,7 +372,7 @@ export function PreLaunchGateDialog({
|
||||
<Checkbox
|
||||
id="gate-ack-fingerprint"
|
||||
checked={ackFingerprint}
|
||||
onCheckedChange={(v) => setAckFingerprint(v === true)}
|
||||
onCheckedChange={(v) => patch({ ackFingerprint: v === true })}
|
||||
/>
|
||||
<Label htmlFor="gate-ack-fingerprint" className="text-xs">
|
||||
{t("prelaunchGate.dontBlockAgain")}
|
||||
@@ -252,7 +384,7 @@ export function PreLaunchGateDialog({
|
||||
<Checkbox
|
||||
id="gate-ack-extensions"
|
||||
checked={ackExtensions}
|
||||
onCheckedChange={(v) => setAckExtensions(v === true)}
|
||||
onCheckedChange={(v) => patch({ ackExtensions: v === true })}
|
||||
/>
|
||||
<Label htmlFor="gate-ack-extensions" className="text-xs">
|
||||
{t("prelaunchGate.dontWarnExtensions")}
|
||||
@@ -264,7 +396,9 @@ export function PreLaunchGateDialog({
|
||||
<Checkbox
|
||||
id="gate-apply-remaining"
|
||||
checked={applyToRemaining}
|
||||
onCheckedChange={(v) => setApplyToRemaining(v === true)}
|
||||
onCheckedChange={(v) =>
|
||||
patch({ applyToRemaining: v === true })
|
||||
}
|
||||
/>
|
||||
<Label htmlFor="gate-apply-remaining" className="text-xs">
|
||||
{t("prelaunchGate.applyToRemaining")}
|
||||
@@ -276,11 +410,14 @@ export function PreLaunchGateDialog({
|
||||
|
||||
<DialogFooter className="flex-row justify-between sm:justify-between">
|
||||
{/* Cancel is the default action: the browser has not started, and
|
||||
not starting it is the safe outcome. */}
|
||||
not starting it is the safe outcome. Never disabled by `decided`
|
||||
— `decide` is already idempotent, and the one control that ends
|
||||
the dialog safely must not be something a stale flag can switch
|
||||
off. */}
|
||||
<RippleButton
|
||||
variant="outline"
|
||||
onClick={() => decide(false)}
|
||||
disabled={isMatching || decided}
|
||||
disabled={isMatching}
|
||||
autoFocus
|
||||
>
|
||||
{t("common.buttons.cancel")}
|
||||
|
||||
@@ -232,16 +232,30 @@ export function SettingsDialog({
|
||||
[t],
|
||||
);
|
||||
|
||||
const applyCustomTheme = useCallback((vars: Record<string, string>) => {
|
||||
withThemeTransition(() => {
|
||||
applyThemeColors(vars);
|
||||
});
|
||||
}, []);
|
||||
// `animate: false` on the restore paths. Opening Settings re-applies the
|
||||
// theme already on screen, so a whole-document cross-fade to an identical
|
||||
// palette animates nothing. Worse, the mount effect below did it twice in a
|
||||
// row, and the second transition aborts the first mid-snapshot.
|
||||
const applyCustomTheme = useCallback(
|
||||
(vars: Record<string, string>, options?: { animate?: boolean }) => {
|
||||
const apply = () => {
|
||||
applyThemeColors(vars);
|
||||
};
|
||||
if (options?.animate === false) {
|
||||
apply();
|
||||
return;
|
||||
}
|
||||
withThemeTransition(apply);
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
const clearCustomTheme = useCallback(() => {
|
||||
withThemeTransition(() => {
|
||||
const clearCustomTheme = useCallback((options?: { animate?: boolean }) => {
|
||||
if (options?.animate === false) {
|
||||
clearThemeColors();
|
||||
});
|
||||
return;
|
||||
}
|
||||
withThemeTransition(clearThemeColors);
|
||||
}, []);
|
||||
|
||||
const loadSettings = useCallback(async () => {
|
||||
@@ -363,12 +377,24 @@ export function SettingsDialog({
|
||||
isMicrophoneAccessGranted,
|
||||
]);
|
||||
|
||||
// The Linux implementation shells out to `which` plus two `xdg-mime query`
|
||||
// calls, and `xdg-mime` is a shell script that forks further. Without this
|
||||
// guard a slow desktop lets the poll below stack one unfinished call on top
|
||||
// of another every few seconds, and each one occupies a worker of the same
|
||||
// runtime every other Tauri command shares.
|
||||
const defaultBrowserCheckInFlight = useRef(false);
|
||||
const checkDefaultBrowserStatus = useCallback(async () => {
|
||||
if (defaultBrowserCheckInFlight.current) {
|
||||
return;
|
||||
}
|
||||
defaultBrowserCheckInFlight.current = true;
|
||||
try {
|
||||
const isDefault = await invoke<boolean>("is_default_browser");
|
||||
setIsDefaultBrowser(isDefault);
|
||||
} catch (error) {
|
||||
console.error("Failed to check default browser status:", error);
|
||||
} finally {
|
||||
defaultBrowserCheckInFlight.current = false;
|
||||
}
|
||||
}, []);
|
||||
|
||||
@@ -565,11 +591,13 @@ export function SettingsDialog({
|
||||
|
||||
const handleClose = useCallback(() => {
|
||||
// Restore original theme when closing without saving
|
||||
// Only a revert the user can see is worth animating.
|
||||
const changed = originalSettings.theme !== settings.theme;
|
||||
if (originalSettings.theme === "custom" && originalSettings.custom_theme) {
|
||||
applyCustomTheme(originalSettings.custom_theme);
|
||||
applyCustomTheme(originalSettings.custom_theme, { animate: changed });
|
||||
} else {
|
||||
clearCustomTheme();
|
||||
setTheme(originalSettings.theme);
|
||||
clearCustomTheme({ animate: false });
|
||||
setTheme(originalSettings.theme, { animate: changed });
|
||||
}
|
||||
|
||||
// Reset custom theme state to original
|
||||
@@ -589,16 +617,29 @@ export function SettingsDialog({
|
||||
clearCustomTheme,
|
||||
onClose,
|
||||
setTheme,
|
||||
settings.theme,
|
||||
]);
|
||||
|
||||
// Only clear custom theme when switching away from custom, don't apply live
|
||||
// changes. Gated on the async settings load: before it resolves the state
|
||||
// still holds the "system" default, and clearing then wipes the user's
|
||||
// custom theme vars on every Settings visit (the theme-reverts-to-dark bug).
|
||||
//
|
||||
// This effect is both the restore-on-open and the live switch when the user
|
||||
// picks a theme, so it animates only a real change: the first run after the
|
||||
// settings load is re-applying the palette already on screen. Clearing the
|
||||
// inline custom vars is never the animated half — switching to a stylesheet
|
||||
// palette makes them invisible either way, and running two transitions
|
||||
// back to back just aborts the first one mid-snapshot.
|
||||
const appliedThemeRef = useRef<string | null>(null);
|
||||
useEffect(() => {
|
||||
if (hasLoadedSettings && settings.theme !== "custom") {
|
||||
clearCustomTheme();
|
||||
setTheme(settings.theme);
|
||||
const previous = appliedThemeRef.current;
|
||||
appliedThemeRef.current = settings.theme;
|
||||
clearCustomTheme({ animate: false });
|
||||
setTheme(settings.theme, {
|
||||
animate: previous !== null && previous !== settings.theme,
|
||||
});
|
||||
}
|
||||
}, [hasLoadedSettings, settings.theme, clearCustomTheme, setTheme]);
|
||||
|
||||
@@ -616,7 +657,7 @@ export function SettingsDialog({
|
||||
// stylesheet palette — strip any leftover inline custom vars so a
|
||||
// just-saved switch away from custom isn't reverted on unmount.
|
||||
clearThemeColors();
|
||||
setTheme(s.theme);
|
||||
setTheme(s.theme, { animate: false });
|
||||
}
|
||||
};
|
||||
}, [setTheme]);
|
||||
@@ -634,12 +675,15 @@ export function SettingsDialog({
|
||||
loadPermissions();
|
||||
}
|
||||
|
||||
// Set up interval to check default browser status
|
||||
// Re-check periodically so the badge follows a change the user made in
|
||||
// their desktop settings. Ten seconds rather than two: on Linux each
|
||||
// check is three subprocesses, and nobody flips their default browser
|
||||
// often enough to notice the difference.
|
||||
const intervalId = setInterval(() => {
|
||||
checkDefaultBrowserStatus().catch((err: unknown) => {
|
||||
console.error(err);
|
||||
});
|
||||
}, 2000);
|
||||
}, 10000);
|
||||
|
||||
// Cleanup interval on component unmount or dialog close
|
||||
return () => {
|
||||
|
||||
@@ -80,19 +80,49 @@ export function SyncConfigDialog({
|
||||
const [connectionStatus, setConnectionStatus] = useState<
|
||||
"unknown" | "testing" | "connected" | "error"
|
||||
>("unknown");
|
||||
const [storageEndpoint, setStorageEndpoint] = useState<string | null>(null);
|
||||
const hasConfig = Boolean(serverUrl && token);
|
||||
|
||||
const testConnection = useCallback(async (url: string) => {
|
||||
setConnectionStatus("testing");
|
||||
try {
|
||||
const healthUrl = `${url.replace(/\/$/, "")}/health`;
|
||||
const response = await fetch(healthUrl);
|
||||
setConnectionStatus(response.ok ? "connected" : "error");
|
||||
} catch {
|
||||
setConnectionStatus("error");
|
||||
// `/health` is a bare liveness probe: it answers ok on a server whose storage
|
||||
// is unreachable or misconfigured, which is how a green "connected" could sit
|
||||
// next to a sync where every single file failed. `/readyz` checks storage and
|
||||
// reports the endpoint clients are handed in presigned URLs, so surface that
|
||||
// too — when transfers fail, it is the value worth checking first.
|
||||
const probeServer = useCallback(async (url: string) => {
|
||||
const base = url.replace(/\/$/, "");
|
||||
const response = await fetch(`${base}/readyz`);
|
||||
|
||||
// A server old enough to predate /readyz is still a working server, so
|
||||
// fall back rather than reporting a healthy setup as broken.
|
||||
if (response.status === 404) {
|
||||
const health = await fetch(`${base}/health`);
|
||||
return { ok: health.ok, storageEndpoint: undefined };
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
return { ok: false as const, storageEndpoint: undefined };
|
||||
}
|
||||
const body = (await response.json()) as {
|
||||
storageEndpoint?: string;
|
||||
} | null;
|
||||
return { ok: true as const, storageEndpoint: body?.storageEndpoint };
|
||||
}, []);
|
||||
|
||||
const testConnection = useCallback(
|
||||
async (url: string) => {
|
||||
setConnectionStatus("testing");
|
||||
try {
|
||||
const result = await probeServer(url);
|
||||
setStorageEndpoint(result.storageEndpoint ?? null);
|
||||
setConnectionStatus(result.ok ? "connected" : "error");
|
||||
} catch {
|
||||
setStorageEndpoint(null);
|
||||
setConnectionStatus("error");
|
||||
}
|
||||
},
|
||||
[probeServer],
|
||||
);
|
||||
|
||||
const loadSettings = useCallback(async () => {
|
||||
setIsLoading(true);
|
||||
try {
|
||||
@@ -142,9 +172,9 @@ export function SyncConfigDialog({
|
||||
setIsTesting(true);
|
||||
setConnectionStatus("testing");
|
||||
try {
|
||||
const healthUrl = `${serverUrl.replace(/\/$/, "")}/health`;
|
||||
const response = await fetch(healthUrl);
|
||||
if (response.ok) {
|
||||
const result = await probeServer(serverUrl);
|
||||
setStorageEndpoint(result.storageEndpoint ?? null);
|
||||
if (result.ok) {
|
||||
setConnectionStatus("connected");
|
||||
showSuccessToast(t("sync.config.connectionSuccess"));
|
||||
} else {
|
||||
@@ -152,12 +182,13 @@ export function SyncConfigDialog({
|
||||
showErrorToast(t("sync.config.serverError"));
|
||||
}
|
||||
} catch {
|
||||
setStorageEndpoint(null);
|
||||
setConnectionStatus("error");
|
||||
showErrorToast(t("sync.config.connectFailed"));
|
||||
} finally {
|
||||
setIsTesting(false);
|
||||
}
|
||||
}, [serverUrl, t]);
|
||||
}, [serverUrl, t, probeServer]);
|
||||
|
||||
const handleSave = useCallback(async () => {
|
||||
setIsSaving(true);
|
||||
@@ -440,9 +471,18 @@ export function SyncConfigDialog({
|
||||
</div>
|
||||
)}
|
||||
{connectionStatus === "connected" && (
|
||||
<div className="flex items-center gap-2 text-sm text-muted-foreground">
|
||||
<div className="size-2 rounded-full bg-success" />
|
||||
{t("sync.status.connected")}
|
||||
<div className="flex flex-col gap-1">
|
||||
<div className="flex items-center gap-2 text-sm text-muted-foreground">
|
||||
<div className="size-2 rounded-full bg-success" />
|
||||
{t("sync.status.connected")}
|
||||
</div>
|
||||
{storageEndpoint && (
|
||||
<span className="text-xs text-muted-foreground break-all">
|
||||
{t("sync.config.storageEndpoint", {
|
||||
endpoint: storageEndpoint,
|
||||
})}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{connectionStatus === "error" && (
|
||||
|
||||
@@ -22,7 +22,9 @@ interface AppSettings {
|
||||
|
||||
interface ThemeContextValue {
|
||||
theme: string;
|
||||
setTheme: (theme: string) => void;
|
||||
/// `animate: false` applies the theme without a view transition, for the
|
||||
/// restore paths where nothing visually changes.
|
||||
setTheme: (theme: string, options?: { animate?: boolean }) => void;
|
||||
}
|
||||
|
||||
const ThemeContext = createContext<ThemeContextValue>({
|
||||
@@ -56,14 +58,26 @@ export function CustomThemeProvider({ children }: CustomThemeProviderProps) {
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [theme, setThemeState] = useState("system");
|
||||
|
||||
const setTheme = useCallback((newTheme: string) => {
|
||||
setThemeState(newTheme);
|
||||
withThemeTransition(() => {
|
||||
if (newTheme !== "custom") {
|
||||
applyClassToHtml(newTheme);
|
||||
// `animate: false` is for restoring the theme the app is already showing —
|
||||
// opening or leaving Settings re-applies the current theme, and cross-fading
|
||||
// the whole document to the palette already on screen animates nothing while
|
||||
// still paying for a full-document snapshot.
|
||||
const setTheme = useCallback(
|
||||
(newTheme: string, options?: { animate?: boolean }) => {
|
||||
setThemeState(newTheme);
|
||||
const apply = () => {
|
||||
if (newTheme !== "custom") {
|
||||
applyClassToHtml(newTheme);
|
||||
}
|
||||
};
|
||||
if (options?.animate === false) {
|
||||
apply();
|
||||
return;
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
withThemeTransition(apply);
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
// Load initial theme from Tauri settings
|
||||
useEffect(() => {
|
||||
|
||||
@@ -1855,10 +1855,18 @@
|
||||
"name": "ntapi",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
},
|
||||
{
|
||||
"name": "num",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
},
|
||||
{
|
||||
"name": "num-bigint",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
},
|
||||
{
|
||||
"name": "num-complex",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
},
|
||||
{
|
||||
"name": "num-conv",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
@@ -1871,6 +1879,10 @@
|
||||
"name": "num-integer",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
},
|
||||
{
|
||||
"name": "num-iter",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
},
|
||||
{
|
||||
"name": "num-rational",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
@@ -2407,6 +2419,10 @@
|
||||
"name": "sealed",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
},
|
||||
{
|
||||
"name": "secret-service",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
},
|
||||
{
|
||||
"name": "security-framework",
|
||||
"license": "Apache-2.0 OR MIT"
|
||||
|
||||
+38
-10
@@ -635,6 +635,7 @@
|
||||
"connectionSuccess": "Connection successful!",
|
||||
"serverError": "Server responded with an error",
|
||||
"connectFailed": "Failed to connect to server",
|
||||
"storageEndpoint": "Storage: {{endpoint}}",
|
||||
"settingsSaved": "Sync settings saved",
|
||||
"saveFailed": "Failed to save settings",
|
||||
"disconnected": "Sync disconnected",
|
||||
@@ -1467,7 +1468,28 @@
|
||||
"vpnOptional": "VPN (Optional)",
|
||||
"noVpn": "No VPN",
|
||||
"advancedOptions": "Advanced options",
|
||||
"configureFingerprint": "Configure fingerprint (optional)"
|
||||
"configureFingerprint": "Configure fingerprint (optional)",
|
||||
"reportCookies": "Cookies",
|
||||
"reportPasswords": "Passwords",
|
||||
"reportAutofill": "Payment methods",
|
||||
"reportExtensions": "Extensions",
|
||||
"reportHistory": "History",
|
||||
"reportBookmarks": "Bookmarks",
|
||||
"reportLocalStorage": "Site data",
|
||||
"reportNothingCarried": "No readable data was carried over",
|
||||
"reportUnrecoverable": "Could not be decrypted: {{count}}",
|
||||
"closeSourceBrowserHint": "Close the source browser and try again for a complete copy, or import now and accept that site data may be incomplete.",
|
||||
"importAnyway": "Import anyway",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "Cookies and passwords could not be unlocked, so you will need to sign in again.",
|
||||
"appBoundEncrypted": "Chrome 127+ on Windows locks cookies to the browser itself; those cookies cannot be migrated by any other app.",
|
||||
"storeTooOld": "A database was too old for this browser to open and was skipped.",
|
||||
"storeTooNew": "A database came from a newer browser than this one and was skipped.",
|
||||
"sourceBrowserRunning": "The source browser was running, so site data may be incomplete.",
|
||||
"securePreferencesReset": "Protected settings such as the homepage and search engine reset to defaults.",
|
||||
"extensionsPartial": "Some extensions belonged to the source browser and were not carried over.",
|
||||
"storeUnreadable": "A database could not be read and was skipped rather than copied damaged."
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "Syncing...",
|
||||
@@ -1914,7 +1936,10 @@
|
||||
"malformed": "The VLESS URI is invalid."
|
||||
},
|
||||
"camoufoxRemoved": "Camoufox is no longer supported. Recreate this profile with Wayfern.",
|
||||
"noE2ePasswordSet": "No end-to-end encryption password is set. Set one before syncing encrypted data."
|
||||
"noE2ePasswordSet": "No end-to-end encryption password is set. Set one before syncing encrypted data.",
|
||||
"importSourceNotChromium": "This folder is not a Chromium browser profile",
|
||||
"importSourceNotChromiumNamed": "{{family}} profiles cannot be imported; only Chromium-based browsers are supported",
|
||||
"importSourceBrowserRunning": "Close {{browser}} first, or choose to import anyway"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "Profiles",
|
||||
@@ -2178,7 +2203,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot warms your profiles overnight on a remote machine, so they keep their cookies and their history without your computer being on. It needs a Pro or Team plan."
|
||||
"hint": "Cookie Bot warms your profiles overnight on a remote machine, so they keep their cookies and their history without your computer being on. It needs a paid plan."
|
||||
},
|
||||
"empty": {
|
||||
"title": "No profiles are enrolled",
|
||||
@@ -2428,7 +2453,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Enrol in Cookie Bot",
|
||||
"proRequired": "Cookie Bot requires a Pro or Team plan",
|
||||
"proRequired": "Cookie Bot requires a paid plan",
|
||||
"noneEligible": "None of the selected profiles can be warmed remotely"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2488,15 +2513,18 @@
|
||||
"titleBlocked": "Launch blocked",
|
||||
"titleWarning": "Before you launch",
|
||||
"intro": "Review these issues with \"{{name}}\" before starting the browser.",
|
||||
"fingerprintHeading": "Proxy exit doesn't match the fingerprint",
|
||||
"vpnExtensionHeading": "VPN extension detected",
|
||||
"fingerprintHeading": "The measured exit doesn't match the fingerprint",
|
||||
"vpnExtensionHeading": "VPN or proxy extension detected",
|
||||
"vpnExtensionIntro": "Extensions in this profile that can reroute the browser's traffic:",
|
||||
"vpnExtensionConfirmed": "Can change the proxy",
|
||||
"vpnExtensionLikely": "May change the proxy",
|
||||
"vpnExtensionConfirmed": "Known VPN or proxy tool",
|
||||
"vpnExtensionLikely": "Looks like a VPN or proxy tool",
|
||||
"vpnExtensionCapability": "Holds the proxy permission",
|
||||
"vpnExtensionExplainer": "If one of these routes your traffic elsewhere, the browser's real location will no longer match the timezone, language and geolocation this profile was created with, and Donut cannot detect that from the outside.",
|
||||
"proxyCapableHeading": "Extensions that can change the proxy",
|
||||
"proxyCapableIntro": "These don't look like VPNs, but they hold Chromium's proxy permission, which download managers and debugging tools need too. Donut cannot tell whether any of them is using it:",
|
||||
"sourceDonut": "Managed by Donut",
|
||||
"sourceBrowser": "Installed in the profile",
|
||||
"measurementUnreliable": "Because a VPN extension can override the proxy, the exit check may not describe the route the browser actually takes.",
|
||||
"measurementUnreliable": "An extension in this profile holds the proxy permission, so the exit check may not describe the route the browser actually takes.",
|
||||
"scanIncompleteEncrypted": "This profile is encrypted, so only Donut-managed extensions could be checked.",
|
||||
"scanIncompleteEphemeral": "This profile has no data yet, so only Donut-managed extensions could be checked.",
|
||||
"scanIncompletePartial": "The extension scan was cut short, so some extensions may not be listed.",
|
||||
@@ -2506,8 +2534,8 @@
|
||||
"dontWarnExtensions": "Don't warn again about these extensions",
|
||||
"applyToRemaining": "Apply this choice to the remaining profiles",
|
||||
"cancelledSummary": "{{cancelled}} of {{total}} launches cancelled",
|
||||
"cancelled": "Launch cancelled",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}, {{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}, {{source}}",
|
||||
"scanIncompleteMissing": "This profile has not been launched yet, so only Donut-managed extensions could be checked."
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -636,6 +636,7 @@
|
||||
"connectionSuccess": "¡Conexión exitosa!",
|
||||
"serverError": "El servidor respondió con un error",
|
||||
"connectFailed": "Error al conectar con el servidor",
|
||||
"storageEndpoint": "Almacenamiento: {{endpoint}}",
|
||||
"settingsSaved": "Ajustes de sincronización guardados",
|
||||
"saveFailed": "Error al guardar los ajustes",
|
||||
"disconnected": "Sincronización desconectada",
|
||||
@@ -1471,7 +1472,28 @@
|
||||
"vpnOptional": "VPN (opcional)",
|
||||
"noVpn": "Sin VPN",
|
||||
"advancedOptions": "Opciones avanzadas",
|
||||
"configureFingerprint": "Configurar huella digital (opcional)"
|
||||
"configureFingerprint": "Configurar huella digital (opcional)",
|
||||
"reportCookies": "Cookies",
|
||||
"reportPasswords": "Contraseñas",
|
||||
"reportAutofill": "Métodos de pago",
|
||||
"reportExtensions": "Extensiones",
|
||||
"reportHistory": "Historial",
|
||||
"reportBookmarks": "Marcadores",
|
||||
"reportLocalStorage": "Datos de sitios",
|
||||
"reportNothingCarried": "No se transfirió ningún dato legible",
|
||||
"reportUnrecoverable": "No se pudo descifrar: {{count}}",
|
||||
"closeSourceBrowserHint": "Cierra el navegador de origen y vuelve a intentarlo para obtener una copia completa, o importa ahora aceptando que los datos de sitios pueden quedar incompletos.",
|
||||
"importAnyway": "Importar de todos modos",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "No se pudieron desbloquear las cookies ni las contraseñas, así que tendrás que iniciar sesión de nuevo.",
|
||||
"appBoundEncrypted": "Chrome 127+ en Windows vincula las cookies al propio navegador; ninguna otra aplicación puede migrarlas.",
|
||||
"storeTooOld": "Una base de datos era demasiado antigua para este navegador y se omitió.",
|
||||
"storeTooNew": "Una base de datos procede de un navegador más reciente que este y se omitió.",
|
||||
"sourceBrowserRunning": "El navegador de origen estaba en ejecución, por lo que los datos de sitios pueden estar incompletos.",
|
||||
"securePreferencesReset": "Los ajustes protegidos, como la página de inicio y el buscador, volvieron a sus valores predeterminados.",
|
||||
"extensionsPartial": "Algunas extensiones pertenecían al navegador de origen y no se transfirieron.",
|
||||
"storeUnreadable": "No se pudo leer una base de datos y se omitió en lugar de copiarla dañada."
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "Sincronizando...",
|
||||
@@ -1921,7 +1943,10 @@
|
||||
"malformed": "La URI VLESS no es válida."
|
||||
},
|
||||
"camoufoxRemoved": "Camoufox ya no es compatible. Vuelve a crear este perfil con Wayfern.",
|
||||
"noE2ePasswordSet": "No hay contraseña de cifrado de extremo a extremo. Establece una antes de sincronizar datos cifrados."
|
||||
"noE2ePasswordSet": "No hay contraseña de cifrado de extremo a extremo. Establece una antes de sincronizar datos cifrados.",
|
||||
"importSourceNotChromium": "Esta carpeta no es un perfil de navegador Chromium",
|
||||
"importSourceNotChromiumNamed": "Los perfiles de {{family}} no se pueden importar; solo se admiten navegadores basados en Chromium",
|
||||
"importSourceBrowserRunning": "Cierra {{browser}} primero o elige importar de todos modos"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "Perfiles",
|
||||
@@ -2185,7 +2210,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot calienta tus perfiles por la noche en una máquina remota, así conservan sus cookies y su historial sin que tu ordenador esté encendido. Requiere un plan Pro o Team."
|
||||
"hint": "Cookie Bot calienta tus perfiles por la noche en una máquina remota, así conservan sus cookies y su historial sin que tu ordenador esté encendido. Requiere un plan de pago."
|
||||
},
|
||||
"empty": {
|
||||
"title": "No hay perfiles inscritos",
|
||||
@@ -2456,7 +2481,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Inscribir en Cookie Bot",
|
||||
"proRequired": "Cookie Bot requiere un plan Pro o Team",
|
||||
"proRequired": "Cookie Bot requiere un plan de pago",
|
||||
"noneEligible": "Ninguno de los perfiles seleccionados se puede calentar en remoto"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2517,15 +2542,18 @@
|
||||
"titleBlocked": "Inicio bloqueado",
|
||||
"titleWarning": "Antes de iniciar",
|
||||
"intro": "Revisa estos problemas de \"{{name}}\" antes de iniciar el navegador.",
|
||||
"fingerprintHeading": "La salida del proxy no coincide con la huella digital",
|
||||
"vpnExtensionHeading": "Extensión VPN detectada",
|
||||
"fingerprintHeading": "La salida medida no coincide con la huella digital",
|
||||
"vpnExtensionHeading": "Extensión de VPN o proxy detectada",
|
||||
"vpnExtensionIntro": "Extensiones de este perfil que pueden redirigir el tráfico del navegador:",
|
||||
"vpnExtensionConfirmed": "Puede cambiar el proxy",
|
||||
"vpnExtensionLikely": "Podría cambiar el proxy",
|
||||
"vpnExtensionConfirmed": "Herramienta de VPN o proxy conocida",
|
||||
"vpnExtensionLikely": "Parece una herramienta de VPN o proxy",
|
||||
"vpnExtensionCapability": "Tiene el permiso de proxy",
|
||||
"vpnExtensionExplainer": "Si alguna de ellas redirige tu tráfico a otro lugar, la ubicación real del navegador dejará de coincidir con la zona horaria, el idioma y la geolocalización con los que se creó este perfil, y Donut no puede detectarlo desde fuera.",
|
||||
"proxyCapableHeading": "Extensiones que pueden cambiar el proxy",
|
||||
"proxyCapableIntro": "No parecen VPN, pero tienen el permiso de proxy de Chromium, que también necesitan los gestores de descargas y las herramientas de depuración. Donut no puede saber si alguna lo está usando:",
|
||||
"sourceDonut": "Gestionada por Donut",
|
||||
"sourceBrowser": "Instalada en el perfil",
|
||||
"measurementUnreliable": "Como una extensión VPN puede anular el proxy, la comprobación de salida podría no reflejar la ruta que el navegador usa realmente.",
|
||||
"measurementUnreliable": "Una extensión de este perfil tiene el permiso de proxy, así que la comprobación de salida podría no reflejar la ruta que el navegador usa realmente.",
|
||||
"scanIncompleteEncrypted": "Este perfil está cifrado, así que solo se pudieron comprobar las extensiones gestionadas por Donut.",
|
||||
"scanIncompleteEphemeral": "Este perfil aún no tiene datos, así que solo se pudieron comprobar las extensiones gestionadas por Donut.",
|
||||
"scanIncompletePartial": "El análisis de extensiones se interrumpió, así que puede que falten algunas.",
|
||||
@@ -2535,8 +2563,8 @@
|
||||
"dontWarnExtensions": "No volver a avisar sobre estas extensiones",
|
||||
"applyToRemaining": "Aplicar esta decisión a los perfiles restantes",
|
||||
"cancelledSummary": "{{cancelled}} de {{total}} inicios cancelados",
|
||||
"cancelled": "Inicio cancelado",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}, {{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}, {{source}}",
|
||||
"scanIncompleteMissing": "Este perfil aún no se ha iniciado, así que solo se pudieron comprobar las extensiones gestionadas por Donut."
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -636,6 +636,7 @@
|
||||
"connectionSuccess": "Connexion réussie !",
|
||||
"serverError": "Le serveur a répondu avec une erreur",
|
||||
"connectFailed": "Échec de la connexion au serveur",
|
||||
"storageEndpoint": "Stockage : {{endpoint}}",
|
||||
"settingsSaved": "Paramètres de synchronisation enregistrés",
|
||||
"saveFailed": "Échec de l’enregistrement des paramètres",
|
||||
"disconnected": "Synchronisation déconnectée",
|
||||
@@ -1471,7 +1472,28 @@
|
||||
"vpnOptional": "VPN (facultatif)",
|
||||
"noVpn": "Sans VPN",
|
||||
"advancedOptions": "Options avancées",
|
||||
"configureFingerprint": "Configurer l'empreinte (facultatif)"
|
||||
"configureFingerprint": "Configurer l'empreinte (facultatif)",
|
||||
"reportCookies": "Cookies",
|
||||
"reportPasswords": "Mots de passe",
|
||||
"reportAutofill": "Moyens de paiement",
|
||||
"reportExtensions": "Extensions",
|
||||
"reportHistory": "Historique",
|
||||
"reportBookmarks": "Favoris",
|
||||
"reportLocalStorage": "Données de sites",
|
||||
"reportNothingCarried": "Aucune donnée lisible n'a été transférée",
|
||||
"reportUnrecoverable": "Déchiffrement impossible : {{count}}",
|
||||
"closeSourceBrowserHint": "Fermez le navigateur source et réessayez pour obtenir une copie complète, ou importez maintenant en acceptant que les données de sites soient incomplètes.",
|
||||
"importAnyway": "Importer quand même",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "Les cookies et les mots de passe n'ont pas pu être déverrouillés : vous devrez vous reconnecter.",
|
||||
"appBoundEncrypted": "Chrome 127+ sous Windows lie les cookies au navigateur lui-même ; aucune autre application ne peut les migrer.",
|
||||
"storeTooOld": "Une base de données était trop ancienne pour ce navigateur et a été ignorée.",
|
||||
"storeTooNew": "Une base de données provient d'un navigateur plus récent que celui-ci et a été ignorée.",
|
||||
"sourceBrowserRunning": "Le navigateur source était en cours d'exécution, les données de sites peuvent donc être incomplètes.",
|
||||
"securePreferencesReset": "Les réglages protégés, comme la page d'accueil et le moteur de recherche, sont revenus aux valeurs par défaut.",
|
||||
"extensionsPartial": "Certaines extensions appartenaient au navigateur source et n'ont pas été transférées.",
|
||||
"storeUnreadable": "Une base de données n'a pas pu être lue et a été ignorée plutôt que copiée endommagée."
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "Synchronisation...",
|
||||
@@ -1921,7 +1943,10 @@
|
||||
"malformed": "L'URI VLESS n'est pas valide."
|
||||
},
|
||||
"camoufoxRemoved": "Camoufox n'est plus pris en charge. Recréez ce profil avec Wayfern.",
|
||||
"noE2ePasswordSet": "Aucun mot de passe de chiffrement de bout en bout n'est défini. Définissez-en un avant de synchroniser des données chiffrées."
|
||||
"noE2ePasswordSet": "Aucun mot de passe de chiffrement de bout en bout n'est défini. Définissez-en un avant de synchroniser des données chiffrées.",
|
||||
"importSourceNotChromium": "Ce dossier n'est pas un profil de navigateur Chromium",
|
||||
"importSourceNotChromiumNamed": "Les profils {{family}} ne peuvent pas être importés ; seuls les navigateurs basés sur Chromium sont pris en charge",
|
||||
"importSourceBrowserRunning": "Fermez d'abord {{browser}}, ou choisissez d'importer quand même"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "Profils",
|
||||
@@ -2185,7 +2210,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot chauffe vos profils la nuit sur une machine distante : ils conservent leurs cookies et leur historique sans que votre ordinateur soit allumé. Nécessite un forfait Pro ou Team."
|
||||
"hint": "Cookie Bot chauffe vos profils la nuit sur une machine distante : ils conservent leurs cookies et leur historique sans que votre ordinateur soit allumé. Nécessite un forfait payant."
|
||||
},
|
||||
"empty": {
|
||||
"title": "Aucun profil inscrit",
|
||||
@@ -2456,7 +2481,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Inscrire à Cookie Bot",
|
||||
"proRequired": "Cookie Bot nécessite un forfait Pro ou Team",
|
||||
"proRequired": "Cookie Bot nécessite un forfait payant",
|
||||
"noneEligible": "Aucun des profils sélectionnés ne peut être chauffé à distance"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2517,15 +2542,18 @@
|
||||
"titleBlocked": "Lancement bloqué",
|
||||
"titleWarning": "Avant de lancer",
|
||||
"intro": "Examinez ces problèmes concernant « {{name}} » avant de démarrer le navigateur.",
|
||||
"fingerprintHeading": "La sortie du proxy ne correspond pas à l'empreinte",
|
||||
"vpnExtensionHeading": "Extension VPN détectée",
|
||||
"fingerprintHeading": "La sortie mesurée ne correspond pas à l'empreinte",
|
||||
"vpnExtensionHeading": "Extension VPN ou proxy détectée",
|
||||
"vpnExtensionIntro": "Extensions de ce profil pouvant rerouter le trafic du navigateur :",
|
||||
"vpnExtensionConfirmed": "Peut changer le proxy",
|
||||
"vpnExtensionLikely": "Pourrait changer le proxy",
|
||||
"vpnExtensionConfirmed": "Outil VPN ou proxy connu",
|
||||
"vpnExtensionLikely": "Semble être un outil VPN ou proxy",
|
||||
"vpnExtensionCapability": "Détient l'autorisation proxy",
|
||||
"vpnExtensionExplainer": "Si l'une d'elles redirige votre trafic ailleurs, la position réelle du navigateur ne correspondra plus au fuseau horaire, à la langue et à la géolocalisation avec lesquels ce profil a été créé, et Donut ne peut pas le détecter de l'extérieur.",
|
||||
"proxyCapableHeading": "Extensions pouvant changer le proxy",
|
||||
"proxyCapableIntro": "Elles ne ressemblent pas à des VPN, mais elles détiennent l'autorisation proxy de Chromium, dont les gestionnaires de téléchargement et les outils de débogage ont aussi besoin. Donut ne peut pas savoir si l'une d'elles s'en sert :",
|
||||
"sourceDonut": "Gérée par Donut",
|
||||
"sourceBrowser": "Installée dans le profil",
|
||||
"measurementUnreliable": "Comme une extension VPN peut remplacer le proxy, la vérification de la sortie peut ne pas refléter la route réellement empruntée par le navigateur.",
|
||||
"measurementUnreliable": "Une extension de ce profil détient l'autorisation proxy, la vérification de la sortie peut donc ne pas refléter la route réellement empruntée par le navigateur.",
|
||||
"scanIncompleteEncrypted": "Ce profil est chiffré : seules les extensions gérées par Donut ont pu être vérifiées.",
|
||||
"scanIncompleteEphemeral": "Ce profil n'a pas encore de données : seules les extensions gérées par Donut ont pu être vérifiées.",
|
||||
"scanIncompletePartial": "L'analyse des extensions a été interrompue, certaines peuvent manquer.",
|
||||
@@ -2535,8 +2563,8 @@
|
||||
"dontWarnExtensions": "Ne plus m'avertir à propos de ces extensions",
|
||||
"applyToRemaining": "Appliquer ce choix aux profils restants",
|
||||
"cancelledSummary": "{{cancelled}} lancements sur {{total}} annulés",
|
||||
"cancelled": "Lancement annulé",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}, {{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}, {{source}}",
|
||||
"scanIncompleteMissing": "Ce profil n'a jamais été lancé : seules les extensions gérées par Donut ont pu être vérifiées."
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -635,6 +635,7 @@
|
||||
"connectionSuccess": "接続に成功しました!",
|
||||
"serverError": "サーバーがエラーで応答しました",
|
||||
"connectFailed": "サーバーへの接続に失敗しました",
|
||||
"storageEndpoint": "ストレージ: {{endpoint}}",
|
||||
"settingsSaved": "同期設定を保存しました",
|
||||
"saveFailed": "設定の保存に失敗しました",
|
||||
"disconnected": "同期を切断しました",
|
||||
@@ -1467,7 +1468,28 @@
|
||||
"vpnOptional": "VPN(任意)",
|
||||
"noVpn": "VPNなし",
|
||||
"advancedOptions": "詳細オプション",
|
||||
"configureFingerprint": "フィンガープリントを設定(任意)"
|
||||
"configureFingerprint": "フィンガープリントを設定(任意)",
|
||||
"reportCookies": "Cookie",
|
||||
"reportPasswords": "パスワード",
|
||||
"reportAutofill": "お支払い方法",
|
||||
"reportExtensions": "拡張機能",
|
||||
"reportHistory": "履歴",
|
||||
"reportBookmarks": "ブックマーク",
|
||||
"reportLocalStorage": "サイトデータ",
|
||||
"reportNothingCarried": "読み取り可能なデータは引き継がれませんでした",
|
||||
"reportUnrecoverable": "復号できませんでした: {{count}}",
|
||||
"closeSourceBrowserHint": "完全にコピーするには、元のブラウザーを閉じてからもう一度お試しください。サイトデータが不完全になることを承知のうえで、このままインポートすることもできます。",
|
||||
"importAnyway": "このままインポート",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "Cookie とパスワードのロックを解除できなかったため、再度サインインが必要です。",
|
||||
"appBoundEncrypted": "Windows の Chrome 127 以降は Cookie をブラウザー自体に紐付けるため、他のアプリからは移行できません。",
|
||||
"storeTooOld": "このブラウザーでは開けない古いデータベースがあったため、スキップしました。",
|
||||
"storeTooNew": "このブラウザーより新しいブラウザーのデータベースだったため、スキップしました。",
|
||||
"sourceBrowserRunning": "元のブラウザーが実行中だったため、サイトデータが不完全な可能性があります。",
|
||||
"securePreferencesReset": "ホームページや検索エンジンなど、保護された設定は既定値に戻りました。",
|
||||
"extensionsPartial": "一部の拡張機能は元のブラウザー付属のもので、引き継がれませんでした。",
|
||||
"storeUnreadable": "読み取れないデータベースがあったため、破損したままコピーせずスキップしました。"
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "同期中...",
|
||||
@@ -1914,7 +1936,10 @@
|
||||
"malformed": "VLESS URIが無効です。"
|
||||
},
|
||||
"camoufoxRemoved": "Camoufoxはサポートされなくなりました。Wayfernでこのプロファイルを作り直してください。",
|
||||
"noE2ePasswordSet": "エンドツーエンド暗号化のパスワードが設定されていません。暗号化データを同期する前に設定してください。"
|
||||
"noE2ePasswordSet": "エンドツーエンド暗号化のパスワードが設定されていません。暗号化データを同期する前に設定してください。",
|
||||
"importSourceNotChromium": "このフォルダーは Chromium ブラウザーのプロファイルではありません",
|
||||
"importSourceNotChromiumNamed": "{{family}} のプロファイルはインポートできません。Chromium 系ブラウザーのみ対応しています",
|
||||
"importSourceBrowserRunning": "先に {{browser}} を閉じるか、このままインポートを選択してください"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "プロファイル",
|
||||
@@ -2178,7 +2203,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot はリモートマシンで夜間にプロファイルをウォームアップするため、お使いのコンピューターを起動していなくても Cookie と履歴が維持されます。Pro または Team プランが必要です。"
|
||||
"hint": "Cookie Bot はリモートマシンで夜間にプロファイルをウォームアップするため、お使いのコンピューターを起動していなくても Cookie と履歴が維持されます。有料プランが必要です。"
|
||||
},
|
||||
"empty": {
|
||||
"title": "登録されたプロファイルはありません",
|
||||
@@ -2428,7 +2453,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Cookie Bot に登録",
|
||||
"proRequired": "Cookie Bot には Pro または Team プランが必要です",
|
||||
"proRequired": "Cookie Bot には有料プランが必要です",
|
||||
"noneEligible": "選択したプロファイルはいずれもリモートでウォームアップできません"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2488,15 +2513,18 @@
|
||||
"titleBlocked": "起動をブロックしました",
|
||||
"titleWarning": "起動する前に",
|
||||
"intro": "ブラウザーを起動する前に、「{{name}}」に関する次の問題を確認してください。",
|
||||
"fingerprintHeading": "プロキシの出口がフィンガープリントと一致しません",
|
||||
"vpnExtensionHeading": "VPN拡張機能を検出しました",
|
||||
"fingerprintHeading": "測定した出口がフィンガープリントと一致しません",
|
||||
"vpnExtensionHeading": "VPN・プロキシ拡張機能を検出しました",
|
||||
"vpnExtensionIntro": "このプロファイル内で、ブラウザーの通信を経路変更できる拡張機能:",
|
||||
"vpnExtensionConfirmed": "プロキシを変更できます",
|
||||
"vpnExtensionLikely": "プロキシを変更する可能性があります",
|
||||
"vpnExtensionConfirmed": "既知のVPN・プロキシツール",
|
||||
"vpnExtensionLikely": "VPN・プロキシツールと思われます",
|
||||
"vpnExtensionCapability": "プロキシ権限を持っています",
|
||||
"vpnExtensionExplainer": "いずれかが通信を別の経路に変えると、ブラウザーの実際の所在地は、このプロファイルの作成時に設定されたタイムゾーン・言語・位置情報と一致しなくなります。Donutは外部からそれを検出できません。",
|
||||
"proxyCapableHeading": "プロキシを変更できる拡張機能",
|
||||
"proxyCapableIntro": "VPNには見えませんが、Chromiumのプロキシ権限を持っています。ダウンロードマネージャーやデバッグツールにも必要な権限で、実際に使っているかどうかをDonutは判別できません:",
|
||||
"sourceDonut": "Donutが管理",
|
||||
"sourceBrowser": "プロファイルにインストール済み",
|
||||
"measurementUnreliable": "VPN拡張機能はプロキシを上書きできるため、出口の確認結果がブラウザーの実際の経路を表していない可能性があります。",
|
||||
"measurementUnreliable": "このプロファイルの拡張機能がプロキシ権限を持っているため、出口の確認結果がブラウザーの実際の経路を表していない可能性があります。",
|
||||
"scanIncompleteEncrypted": "このプロファイルは暗号化されているため、Donutが管理する拡張機能のみ確認できました。",
|
||||
"scanIncompleteEphemeral": "このプロファイルにはまだデータがないため、Donutが管理する拡張機能のみ確認できました。",
|
||||
"scanIncompletePartial": "拡張機能のスキャンが途中で終了したため、一部が表示されていない可能性があります。",
|
||||
@@ -2506,8 +2534,8 @@
|
||||
"dontWarnExtensions": "これらの拡張機能について今後警告しない",
|
||||
"applyToRemaining": "この選択を残りのプロファイルにも適用",
|
||||
"cancelledSummary": "{{total}}件中{{cancelled}}件の起動をキャンセルしました",
|
||||
"cancelled": "起動をキャンセルしました",
|
||||
"vpnExtensionEntry": " {{version}}({{capability}}、{{source}})",
|
||||
"vpnExtensionEntryNoVersion": "({{capability}}、{{source}})",
|
||||
"scanIncompleteMissing": "このプロファイルはまだ起動されていないため、Donutが管理する拡張機能のみ確認できました。"
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -635,6 +635,7 @@
|
||||
"connectionSuccess": "연결 성공!",
|
||||
"serverError": "서버가 오류로 응답했습니다",
|
||||
"connectFailed": "서버에 연결하지 못했습니다",
|
||||
"storageEndpoint": "스토리지: {{endpoint}}",
|
||||
"settingsSaved": "동기화 설정이 저장되었습니다",
|
||||
"saveFailed": "설정 저장 실패",
|
||||
"disconnected": "동기화 연결 끊김",
|
||||
@@ -1467,7 +1468,28 @@
|
||||
"vpnOptional": "VPN (선택 사항)",
|
||||
"noVpn": "VPN 없음",
|
||||
"advancedOptions": "고급 옵션",
|
||||
"configureFingerprint": "핑거프린트 구성 (선택 사항)"
|
||||
"configureFingerprint": "핑거프린트 구성 (선택 사항)",
|
||||
"reportCookies": "쿠키",
|
||||
"reportPasswords": "비밀번호",
|
||||
"reportAutofill": "결제 수단",
|
||||
"reportExtensions": "확장 프로그램",
|
||||
"reportHistory": "방문 기록",
|
||||
"reportBookmarks": "북마크",
|
||||
"reportLocalStorage": "사이트 데이터",
|
||||
"reportNothingCarried": "읽을 수 있는 데이터가 이전되지 않았습니다",
|
||||
"reportUnrecoverable": "복호화할 수 없음: {{count}}",
|
||||
"closeSourceBrowserHint": "완전하게 복사하려면 원본 브라우저를 닫고 다시 시도하세요. 사이트 데이터가 불완전할 수 있음을 감수하고 지금 가져올 수도 있습니다.",
|
||||
"importAnyway": "그래도 가져오기",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "쿠키와 비밀번호를 잠금 해제하지 못해 다시 로그인해야 합니다.",
|
||||
"appBoundEncrypted": "Windows의 Chrome 127 이상은 쿠키를 브라우저 자체에 묶어 두므로 다른 앱에서는 이전할 수 없습니다.",
|
||||
"storeTooOld": "이 브라우저가 열 수 없을 만큼 오래된 데이터베이스가 있어 건너뛰었습니다.",
|
||||
"storeTooNew": "이 브라우저보다 최신 브라우저의 데이터베이스여서 건너뛰었습니다.",
|
||||
"sourceBrowserRunning": "원본 브라우저가 실행 중이어서 사이트 데이터가 불완전할 수 있습니다.",
|
||||
"securePreferencesReset": "홈페이지와 검색 엔진 같은 보호된 설정이 기본값으로 초기화되었습니다.",
|
||||
"extensionsPartial": "일부 확장 프로그램은 원본 브라우저의 것이어서 이전되지 않았습니다.",
|
||||
"storeUnreadable": "읽을 수 없는 데이터베이스가 있어 손상된 채로 복사하지 않고 건너뛰었습니다."
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "동기화 중...",
|
||||
@@ -1914,7 +1936,10 @@
|
||||
"malformed": "VLESS URI가 올바르지 않습니다."
|
||||
},
|
||||
"camoufoxRemoved": "Camoufox는 더 이상 지원되지 않습니다. Wayfern으로 이 프로필을 다시 만드세요.",
|
||||
"noE2ePasswordSet": "종단 간 암호화 비밀번호가 설정되지 않았습니다. 암호화된 데이터를 동기화하기 전에 설정하세요."
|
||||
"noE2ePasswordSet": "종단 간 암호화 비밀번호가 설정되지 않았습니다. 암호화된 데이터를 동기화하기 전에 설정하세요.",
|
||||
"importSourceNotChromium": "이 폴더는 Chromium 브라우저 프로필이 아닙니다",
|
||||
"importSourceNotChromiumNamed": "{{family}} 프로필은 가져올 수 없습니다. Chromium 기반 브라우저만 지원합니다",
|
||||
"importSourceBrowserRunning": "{{browser}}을(를) 먼저 닫거나 그래도 가져오기를 선택하세요"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "프로필",
|
||||
@@ -2178,7 +2203,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot은 원격 머신에서 밤새 프로필을 예열해, 내 컴퓨터를 켜 두지 않아도 쿠키와 방문 기록이 유지됩니다. Pro 또는 Team 요금제가 필요합니다."
|
||||
"hint": "Cookie Bot은 원격 머신에서 밤새 프로필을 예열해, 내 컴퓨터를 켜 두지 않아도 쿠키와 방문 기록이 유지됩니다. 유료 요금제가 필요합니다."
|
||||
},
|
||||
"empty": {
|
||||
"title": "등록된 프로필이 없습니다",
|
||||
@@ -2428,7 +2453,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Cookie Bot에 등록",
|
||||
"proRequired": "Cookie Bot에는 Pro 또는 Team 요금제가 필요합니다",
|
||||
"proRequired": "Cookie Bot에는 유료 요금제가 필요합니다",
|
||||
"noneEligible": "선택한 프로필 중 원격으로 예열할 수 있는 것이 없습니다"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2488,15 +2513,18 @@
|
||||
"titleBlocked": "실행이 차단됨",
|
||||
"titleWarning": "실행하기 전에",
|
||||
"intro": "브라우저를 시작하기 전에 \"{{name}}\"의 다음 문제를 확인하세요.",
|
||||
"fingerprintHeading": "프록시 출구가 핑거프린트와 일치하지 않음",
|
||||
"vpnExtensionHeading": "VPN 확장 프로그램 감지됨",
|
||||
"fingerprintHeading": "측정된 출구가 핑거프린트와 일치하지 않음",
|
||||
"vpnExtensionHeading": "VPN 또는 프록시 확장 프로그램 감지됨",
|
||||
"vpnExtensionIntro": "이 프로필에서 브라우저 트래픽의 경로를 바꿀 수 있는 확장 프로그램:",
|
||||
"vpnExtensionConfirmed": "프록시를 변경할 수 있음",
|
||||
"vpnExtensionLikely": "프록시를 변경할 수 있음(추정)",
|
||||
"vpnExtensionConfirmed": "알려진 VPN 또는 프록시 도구",
|
||||
"vpnExtensionLikely": "VPN 또는 프록시 도구로 보임",
|
||||
"vpnExtensionCapability": "프록시 권한을 보유함",
|
||||
"vpnExtensionExplainer": "이 중 하나가 트래픽을 다른 곳으로 보내면 브라우저의 실제 위치가 이 프로필을 만들 때 사용한 시간대, 언어, 지리 정보와 더 이상 일치하지 않으며, Donut은 외부에서 이를 감지할 수 없습니다.",
|
||||
"proxyCapableHeading": "프록시를 변경할 수 있는 확장 프로그램",
|
||||
"proxyCapableIntro": "VPN으로 보이지는 않지만 Chromium의 프록시 권한을 가지고 있습니다. 다운로드 관리자나 디버깅 도구에도 필요한 권한이며, 실제로 사용하는지는 Donut이 알 수 없습니다:",
|
||||
"sourceDonut": "Donut이 관리",
|
||||
"sourceBrowser": "프로필에 설치됨",
|
||||
"measurementUnreliable": "VPN 확장 프로그램이 프록시를 덮어쓸 수 있으므로, 출구 확인 결과가 브라우저의 실제 경로와 다를 수 있습니다.",
|
||||
"measurementUnreliable": "이 프로필의 확장 프로그램이 프록시 권한을 가지고 있어, 출구 확인 결과가 브라우저의 실제 경로와 다를 수 있습니다.",
|
||||
"scanIncompleteEncrypted": "이 프로필은 암호화되어 있어 Donut이 관리하는 확장 프로그램만 확인할 수 있었습니다.",
|
||||
"scanIncompleteEphemeral": "이 프로필에는 아직 데이터가 없어 Donut이 관리하는 확장 프로그램만 확인할 수 있었습니다.",
|
||||
"scanIncompletePartial": "확장 프로그램 검사가 중단되어 일부가 표시되지 않을 수 있습니다.",
|
||||
@@ -2506,8 +2534,8 @@
|
||||
"dontWarnExtensions": "이 확장 프로그램에 대해 다시 경고하지 않기",
|
||||
"applyToRemaining": "이 선택을 나머지 프로필에 적용",
|
||||
"cancelledSummary": "{{total}}개 중 {{cancelled}}개의 실행이 취소됨",
|
||||
"cancelled": "실행이 취소됨",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}, {{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}, {{source}}",
|
||||
"scanIncompleteMissing": "이 프로필은 아직 실행된 적이 없어 Donut이 관리하는 확장 프로그램만 확인할 수 있었습니다."
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -636,6 +636,7 @@
|
||||
"connectionSuccess": "Conexão bem-sucedida!",
|
||||
"serverError": "O servidor respondeu com um erro",
|
||||
"connectFailed": "Falha ao conectar ao servidor",
|
||||
"storageEndpoint": "Armazenamento: {{endpoint}}",
|
||||
"settingsSaved": "Configurações de sincronização salvas",
|
||||
"saveFailed": "Falha ao salvar as configurações",
|
||||
"disconnected": "Sincronização desconectada",
|
||||
@@ -1471,7 +1472,28 @@
|
||||
"vpnOptional": "VPN (opcional)",
|
||||
"noVpn": "Sem VPN",
|
||||
"advancedOptions": "Opções avançadas",
|
||||
"configureFingerprint": "Configurar impressão digital (opcional)"
|
||||
"configureFingerprint": "Configurar impressão digital (opcional)",
|
||||
"reportCookies": "Cookies",
|
||||
"reportPasswords": "Senhas",
|
||||
"reportAutofill": "Formas de pagamento",
|
||||
"reportExtensions": "Extensões",
|
||||
"reportHistory": "Histórico",
|
||||
"reportBookmarks": "Favoritos",
|
||||
"reportLocalStorage": "Dados de sites",
|
||||
"reportNothingCarried": "Nenhum dado legível foi transferido",
|
||||
"reportUnrecoverable": "Não foi possível descriptografar: {{count}}",
|
||||
"closeSourceBrowserHint": "Feche o navegador de origem e tente de novo para obter uma cópia completa, ou importe agora aceitando que os dados de sites podem ficar incompletos.",
|
||||
"importAnyway": "Importar mesmo assim",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "Não foi possível desbloquear cookies e senhas, então você precisará entrar novamente.",
|
||||
"appBoundEncrypted": "O Chrome 127+ no Windows vincula os cookies ao próprio navegador; nenhum outro aplicativo consegue migrá-los.",
|
||||
"storeTooOld": "Um banco de dados era antigo demais para este navegador e foi ignorado.",
|
||||
"storeTooNew": "Um banco de dados veio de um navegador mais novo que este e foi ignorado.",
|
||||
"sourceBrowserRunning": "O navegador de origem estava aberto, então os dados de sites podem estar incompletos.",
|
||||
"securePreferencesReset": "Configurações protegidas, como página inicial e mecanismo de busca, voltaram ao padrão.",
|
||||
"extensionsPartial": "Algumas extensões pertenciam ao navegador de origem e não foram transferidas.",
|
||||
"storeUnreadable": "Não foi possível ler um banco de dados, que foi ignorado em vez de copiado danificado."
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "Sincronizando...",
|
||||
@@ -1921,7 +1943,10 @@
|
||||
"malformed": "A URI VLESS é inválida."
|
||||
},
|
||||
"camoufoxRemoved": "O Camoufox não é mais compatível. Recrie este perfil com o Wayfern.",
|
||||
"noE2ePasswordSet": "Nenhuma senha de criptografia de ponta a ponta foi definida. Defina uma antes de sincronizar dados criptografados."
|
||||
"noE2ePasswordSet": "Nenhuma senha de criptografia de ponta a ponta foi definida. Defina uma antes de sincronizar dados criptografados.",
|
||||
"importSourceNotChromium": "Esta pasta não é um perfil de navegador Chromium",
|
||||
"importSourceNotChromiumNamed": "Perfis do {{family}} não podem ser importados; apenas navegadores baseados em Chromium são compatíveis",
|
||||
"importSourceBrowserRunning": "Feche o {{browser}} primeiro ou escolha importar mesmo assim"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "Perfis",
|
||||
@@ -2185,7 +2210,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "O Cookie Bot aquece seus perfis durante a noite em uma máquina remota, para que mantenham os cookies e o histórico sem o seu computador ligado. Requer um plano Pro ou Team."
|
||||
"hint": "O Cookie Bot aquece seus perfis durante a noite em uma máquina remota, para que mantenham os cookies e o histórico sem o seu computador ligado. Requer um plano pago."
|
||||
},
|
||||
"empty": {
|
||||
"title": "Nenhum perfil inscrito",
|
||||
@@ -2456,7 +2481,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Inscrever no Cookie Bot",
|
||||
"proRequired": "O Cookie Bot requer um plano Pro ou Team",
|
||||
"proRequired": "O Cookie Bot requer um plano pago",
|
||||
"noneEligible": "Nenhum dos perfis selecionados pode ser aquecido remotamente"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2517,15 +2542,18 @@
|
||||
"titleBlocked": "Inicialização bloqueada",
|
||||
"titleWarning": "Antes de iniciar",
|
||||
"intro": "Revise estes problemas de \"{{name}}\" antes de iniciar o navegador.",
|
||||
"fingerprintHeading": "A saída do proxy não corresponde à impressão digital",
|
||||
"vpnExtensionHeading": "Extensão VPN detectada",
|
||||
"fingerprintHeading": "A saída medida não corresponde à impressão digital",
|
||||
"vpnExtensionHeading": "Extensão de VPN ou proxy detectada",
|
||||
"vpnExtensionIntro": "Extensões neste perfil que podem redirecionar o tráfego do navegador:",
|
||||
"vpnExtensionConfirmed": "Pode alterar o proxy",
|
||||
"vpnExtensionLikely": "Talvez altere o proxy",
|
||||
"vpnExtensionConfirmed": "Ferramenta de VPN ou proxy conhecida",
|
||||
"vpnExtensionLikely": "Parece uma ferramenta de VPN ou proxy",
|
||||
"vpnExtensionCapability": "Tem a permissão de proxy",
|
||||
"vpnExtensionExplainer": "Se alguma delas redirecionar seu tráfego, a localização real do navegador deixará de corresponder ao fuso horário, ao idioma e à geolocalização com que este perfil foi criado, e o Donut não consegue detectar isso de fora.",
|
||||
"proxyCapableHeading": "Extensões que podem alterar o proxy",
|
||||
"proxyCapableIntro": "Não parecem VPNs, mas têm a permissão de proxy do Chromium, que gerenciadores de download e ferramentas de depuração também precisam. O Donut não consegue saber se alguma delas a está usando:",
|
||||
"sourceDonut": "Gerenciada pelo Donut",
|
||||
"sourceBrowser": "Instalada no perfil",
|
||||
"measurementUnreliable": "Como uma extensão VPN pode substituir o proxy, a verificação de saída pode não refletir a rota que o navegador realmente usa.",
|
||||
"measurementUnreliable": "Uma extensão neste perfil tem a permissão de proxy, então a verificação de saída pode não refletir a rota que o navegador realmente usa.",
|
||||
"scanIncompleteEncrypted": "Este perfil está criptografado, portanto só foi possível verificar as extensões gerenciadas pelo Donut.",
|
||||
"scanIncompleteEphemeral": "Este perfil ainda não tem dados, portanto só foi possível verificar as extensões gerenciadas pelo Donut.",
|
||||
"scanIncompletePartial": "A verificação de extensões foi interrompida, então algumas podem não estar listadas.",
|
||||
@@ -2535,8 +2563,8 @@
|
||||
"dontWarnExtensions": "Não avisar novamente sobre estas extensões",
|
||||
"applyToRemaining": "Aplicar esta escolha aos perfis restantes",
|
||||
"cancelledSummary": "{{cancelled}} de {{total}} inicializações canceladas",
|
||||
"cancelled": "Inicialização cancelada",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}, {{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}, {{source}}",
|
||||
"scanIncompleteMissing": "Este perfil ainda não foi iniciado, portanto só foi possível verificar as extensões gerenciadas pelo Donut."
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -637,6 +637,7 @@
|
||||
"connectionSuccess": "Подключение успешно!",
|
||||
"serverError": "Сервер вернул ошибку",
|
||||
"connectFailed": "Не удалось подключиться к серверу",
|
||||
"storageEndpoint": "Хранилище: {{endpoint}}",
|
||||
"settingsSaved": "Настройки синхронизации сохранены",
|
||||
"saveFailed": "Не удалось сохранить настройки",
|
||||
"disconnected": "Синхронизация отключена",
|
||||
@@ -1475,7 +1476,28 @@
|
||||
"vpnOptional": "VPN (необязательно)",
|
||||
"noVpn": "Без VPN",
|
||||
"advancedOptions": "Дополнительные параметры",
|
||||
"configureFingerprint": "Настроить отпечаток (необязательно)"
|
||||
"configureFingerprint": "Настроить отпечаток (необязательно)",
|
||||
"reportCookies": "Файлы cookie",
|
||||
"reportPasswords": "Пароли",
|
||||
"reportAutofill": "Способы оплаты",
|
||||
"reportExtensions": "Расширения",
|
||||
"reportHistory": "История",
|
||||
"reportBookmarks": "Закладки",
|
||||
"reportLocalStorage": "Данные сайтов",
|
||||
"reportNothingCarried": "Читаемые данные не перенесены",
|
||||
"reportUnrecoverable": "Не удалось расшифровать: {{count}}",
|
||||
"closeSourceBrowserHint": "Закройте исходный браузер и повторите попытку, чтобы получить полную копию, либо импортируйте сейчас, приняв, что данные сайтов могут оказаться неполными.",
|
||||
"importAnyway": "Всё равно импортировать",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "Не удалось разблокировать файлы cookie и пароли, поэтому потребуется войти заново.",
|
||||
"appBoundEncrypted": "Chrome 127+ в Windows привязывает файлы cookie к самому браузеру, и другое приложение не может их перенести.",
|
||||
"storeTooOld": "База данных оказалась слишком старой для этого браузера и была пропущена.",
|
||||
"storeTooNew": "База данных создана более новым браузером и была пропущена.",
|
||||
"sourceBrowserRunning": "Исходный браузер был запущен, поэтому данные сайтов могут быть неполными.",
|
||||
"securePreferencesReset": "Защищённые настройки, например домашняя страница и поисковая система, сброшены до значений по умолчанию.",
|
||||
"extensionsPartial": "Некоторые расширения принадлежали исходному браузеру и не были перенесены.",
|
||||
"storeUnreadable": "База данных не читалась и была пропущена, а не скопирована повреждённой."
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "Синхронизация...",
|
||||
@@ -1928,7 +1950,10 @@
|
||||
"malformed": "VLESS URI недействителен."
|
||||
},
|
||||
"camoufoxRemoved": "Camoufox больше не поддерживается. Создайте этот профиль заново с Wayfern.",
|
||||
"noE2ePasswordSet": "Пароль сквозного шифрования не задан. Задайте его перед синхронизацией зашифрованных данных."
|
||||
"noE2ePasswordSet": "Пароль сквозного шифрования не задан. Задайте его перед синхронизацией зашифрованных данных.",
|
||||
"importSourceNotChromium": "Эта папка не является профилем браузера на Chromium",
|
||||
"importSourceNotChromiumNamed": "Профили {{family}} импортировать нельзя: поддерживаются только браузеры на Chromium",
|
||||
"importSourceBrowserRunning": "Сначала закройте {{browser}} или выберите импорт всё равно"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "Профили",
|
||||
@@ -2192,7 +2217,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot прогревает ваши профили ночью на удалённой машине, чтобы они сохраняли cookies и историю, пока ваш компьютер выключен. Требуется тариф Pro или Team."
|
||||
"hint": "Cookie Bot прогревает ваши профили ночью на удалённой машине, чтобы они сохраняли cookies и историю, пока ваш компьютер выключен. Требуется платный тариф."
|
||||
},
|
||||
"empty": {
|
||||
"title": "Нет подключённых профилей",
|
||||
@@ -2484,7 +2509,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Подключить к Cookie Bot",
|
||||
"proRequired": "Для Cookie Bot нужен тариф Pro или Team",
|
||||
"proRequired": "Для Cookie Bot нужен платный тариф",
|
||||
"noneEligible": "Ни один из выбранных профилей нельзя прогреть удалённо"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2546,15 +2571,18 @@
|
||||
"titleBlocked": "Запуск заблокирован",
|
||||
"titleWarning": "Перед запуском",
|
||||
"intro": "Проверьте эти проблемы профиля «{{name}}» перед запуском браузера.",
|
||||
"fingerprintHeading": "Выходной узел прокси не совпадает с отпечатком",
|
||||
"vpnExtensionHeading": "Обнаружено VPN-расширение",
|
||||
"fingerprintHeading": "Измеренный выходной узел не совпадает с отпечатком",
|
||||
"vpnExtensionHeading": "Обнаружено VPN- или прокси-расширение",
|
||||
"vpnExtensionIntro": "Расширения в этом профиле, способные перенаправить трафик браузера:",
|
||||
"vpnExtensionConfirmed": "Может изменить прокси",
|
||||
"vpnExtensionLikely": "Возможно, изменит прокси",
|
||||
"vpnExtensionConfirmed": "Известный VPN- или прокси-инструмент",
|
||||
"vpnExtensionLikely": "Похоже на VPN- или прокси-инструмент",
|
||||
"vpnExtensionCapability": "Имеет разрешение proxy",
|
||||
"vpnExtensionExplainer": "Если одно из них направит трафик в другое место, реальное местоположение браузера перестанет совпадать с часовым поясом, языком и геолокацией, с которыми создавался профиль, а Donut не сможет это обнаружить извне.",
|
||||
"proxyCapableHeading": "Расширения, способные изменить прокси",
|
||||
"proxyCapableIntro": "Это не похоже на VPN, но у них есть разрешение proxy в Chromium, которое нужно и менеджерам загрузок, и инструментам отладки. Donut не может определить, использует ли его кто-то из них:",
|
||||
"sourceDonut": "Управляется Donut",
|
||||
"sourceBrowser": "Установлено в профиле",
|
||||
"measurementUnreliable": "Поскольку VPN-расширение может переопределить прокси, проверка выходного узла может не отражать реальный маршрут браузера.",
|
||||
"measurementUnreliable": "Расширение в этом профиле имеет разрешение proxy, поэтому проверка выходного узла может не отражать реальный маршрут браузера.",
|
||||
"scanIncompleteEncrypted": "Профиль зашифрован, поэтому удалось проверить только расширения, управляемые Donut.",
|
||||
"scanIncompleteEphemeral": "В профиле ещё нет данных, поэтому удалось проверить только расширения, управляемые Donut.",
|
||||
"scanIncompletePartial": "Проверка расширений была прервана, поэтому некоторые могут отсутствовать в списке.",
|
||||
@@ -2564,8 +2592,8 @@
|
||||
"dontWarnExtensions": "Больше не предупреждать об этих расширениях",
|
||||
"applyToRemaining": "Применить этот выбор к остальным профилям",
|
||||
"cancelledSummary": "Отменено запусков: {{cancelled}} из {{total}}",
|
||||
"cancelled": "Запуск отменён",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}, {{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}, {{source}}",
|
||||
"scanIncompleteMissing": "Профиль ещё ни разу не запускался, поэтому удалось проверить только расширения, управляемые Donut."
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -635,6 +635,7 @@
|
||||
"connectionSuccess": "Bağlantı başarılı!",
|
||||
"serverError": "Sunucu bir hatayla yanıt verdi",
|
||||
"connectFailed": "Sunucuya bağlanılamadı",
|
||||
"storageEndpoint": "Depolama: {{endpoint}}",
|
||||
"settingsSaved": "Eşitleme ayarları kaydedildi",
|
||||
"saveFailed": "Ayarlar kaydedilemedi",
|
||||
"disconnected": "Eşitleme bağlantısı kesildi",
|
||||
@@ -1467,7 +1468,28 @@
|
||||
"vpnOptional": "VPN (isteğe bağlı)",
|
||||
"noVpn": "VPN yok",
|
||||
"advancedOptions": "Gelişmiş seçenekler",
|
||||
"configureFingerprint": "Parmak izini yapılandır (isteğe bağlı)"
|
||||
"configureFingerprint": "Parmak izini yapılandır (isteğe bağlı)",
|
||||
"reportCookies": "Çerezler",
|
||||
"reportPasswords": "Parolalar",
|
||||
"reportAutofill": "Ödeme yöntemleri",
|
||||
"reportExtensions": "Uzantılar",
|
||||
"reportHistory": "Geçmiş",
|
||||
"reportBookmarks": "Yer imleri",
|
||||
"reportLocalStorage": "Site verileri",
|
||||
"reportNothingCarried": "Okunabilir hiçbir veri aktarılmadı",
|
||||
"reportUnrecoverable": "Şifresi çözülemedi: {{count}}",
|
||||
"closeSourceBrowserHint": "Tam bir kopya için kaynak tarayıcıyı kapatıp yeniden deneyin ya da site verilerinin eksik olabileceğini kabul ederek şimdi içe aktarın.",
|
||||
"importAnyway": "Yine de içe aktar",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "Çerezlerin ve parolaların kilidi açılamadı, bu yüzden yeniden oturum açmanız gerekecek.",
|
||||
"appBoundEncrypted": "Windows'ta Chrome 127+ çerezleri tarayıcının kendisine bağlar; başka hiçbir uygulama bunları taşıyamaz.",
|
||||
"storeTooOld": "Bir veritabanı bu tarayıcının açamayacağı kadar eskiydi ve atlandı.",
|
||||
"storeTooNew": "Bir veritabanı bundan daha yeni bir tarayıcıdan geldi ve atlandı.",
|
||||
"sourceBrowserRunning": "Kaynak tarayıcı çalışıyordu, bu yüzden site verileri eksik olabilir.",
|
||||
"securePreferencesReset": "Ana sayfa ve arama motoru gibi korumalı ayarlar varsayılana döndü.",
|
||||
"extensionsPartial": "Bazı uzantılar kaynak tarayıcıya aitti ve aktarılmadı.",
|
||||
"storeUnreadable": "Bir veritabanı okunamadı ve bozuk şekilde kopyalanmak yerine atlandı."
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "Eşitleniyor...",
|
||||
@@ -1914,7 +1936,10 @@
|
||||
"malformed": "VLESS URI'si geçersiz."
|
||||
},
|
||||
"camoufoxRemoved": "Camoufox artık desteklenmiyor. Bu profili Wayfern ile yeniden oluşturun.",
|
||||
"noE2ePasswordSet": "Uçtan uca şifreleme parolası ayarlanmamış. Şifreli veriyi eşitlemeden önce bir parola belirleyin."
|
||||
"noE2ePasswordSet": "Uçtan uca şifreleme parolası ayarlanmamış. Şifreli veriyi eşitlemeden önce bir parola belirleyin.",
|
||||
"importSourceNotChromium": "Bu klasör bir Chromium tarayıcı profili değil",
|
||||
"importSourceNotChromiumNamed": "{{family}} profilleri içe aktarılamaz; yalnızca Chromium tabanlı tarayıcılar desteklenir",
|
||||
"importSourceBrowserRunning": "Önce {{browser}} uygulamasını kapatın veya yine de içe aktarmayı seçin"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "Profiller",
|
||||
@@ -2178,7 +2203,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot, profillerinizi gece boyunca uzak bir makinede ısıtır; böylece bilgisayarınız açık olmadan çerezlerini ve geçmişlerini korurlar. Pro veya Team planı gerekir."
|
||||
"hint": "Cookie Bot, profillerinizi gece boyunca uzak bir makinede ısıtır; böylece bilgisayarınız açık olmadan çerezlerini ve geçmişlerini korurlar. Ücretli bir plan gerekir."
|
||||
},
|
||||
"empty": {
|
||||
"title": "Kayıtlı profil yok",
|
||||
@@ -2428,7 +2453,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Cookie Bot'a kaydet",
|
||||
"proRequired": "Cookie Bot için Pro veya Team planı gerekir",
|
||||
"proRequired": "Cookie Bot için ücretli bir plan gerekir",
|
||||
"noneEligible": "Seçili profillerin hiçbiri uzaktan ısıtılamaz"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2488,15 +2513,18 @@
|
||||
"titleBlocked": "Başlatma engellendi",
|
||||
"titleWarning": "Başlatmadan önce",
|
||||
"intro": "Tarayıcıyı başlatmadan önce \"{{name}}\" ile ilgili şu sorunları inceleyin.",
|
||||
"fingerprintHeading": "Proxy çıkışı parmak iziyle eşleşmiyor",
|
||||
"vpnExtensionHeading": "VPN uzantısı algılandı",
|
||||
"fingerprintHeading": "Ölçülen çıkış parmak iziyle eşleşmiyor",
|
||||
"vpnExtensionHeading": "VPN veya proxy uzantısı algılandı",
|
||||
"vpnExtensionIntro": "Bu profildeki, tarayıcı trafiğini yeniden yönlendirebilecek uzantılar:",
|
||||
"vpnExtensionConfirmed": "Proxy'yi değiştirebilir",
|
||||
"vpnExtensionLikely": "Proxy'yi değiştirebilir (olası)",
|
||||
"vpnExtensionConfirmed": "Bilinen VPN veya proxy aracı",
|
||||
"vpnExtensionLikely": "VPN veya proxy aracı gibi görünüyor",
|
||||
"vpnExtensionCapability": "Proxy iznine sahip",
|
||||
"vpnExtensionExplainer": "Bunlardan biri trafiğinizi başka bir yere yönlendirirse, tarayıcının gerçek konumu artık bu profilin oluşturulduğu saat dilimi, dil ve coğrafi konumla eşleşmez ve Donut bunu dışarıdan algılayamaz.",
|
||||
"proxyCapableHeading": "Proxy'yi değiştirebilen uzantılar",
|
||||
"proxyCapableIntro": "Bunlar VPN'e benzemiyor, ancak Chromium'un proxy iznine sahipler; bu izne indirme yöneticileri ve hata ayıklama araçları da ihtiyaç duyar. Donut, herhangi birinin bunu kullanıp kullanmadığını anlayamaz:",
|
||||
"sourceDonut": "Donut tarafından yönetiliyor",
|
||||
"sourceBrowser": "Profile yüklenmiş",
|
||||
"measurementUnreliable": "Bir VPN uzantısı proxy'yi geçersiz kılabileceğinden, çıkış kontrolü tarayıcının gerçekte kullandığı rotayı yansıtmayabilir.",
|
||||
"measurementUnreliable": "Bu profildeki bir uzantı proxy iznine sahip, bu nedenle çıkış kontrolü tarayıcının gerçekte kullandığı rotayı yansıtmayabilir.",
|
||||
"scanIncompleteEncrypted": "Bu profil şifreli olduğundan yalnızca Donut tarafından yönetilen uzantılar denetlenebildi.",
|
||||
"scanIncompleteEphemeral": "Bu profilde henüz veri olmadığından yalnızca Donut tarafından yönetilen uzantılar denetlenebildi.",
|
||||
"scanIncompletePartial": "Uzantı taraması yarıda kesildi, bu nedenle bazıları listelenmemiş olabilir.",
|
||||
@@ -2506,8 +2534,8 @@
|
||||
"dontWarnExtensions": "Bu uzantılar için bir daha uyarma",
|
||||
"applyToRemaining": "Bu seçimi kalan profillere uygula",
|
||||
"cancelledSummary": "{{total}} başlatmadan {{cancelled}} tanesi iptal edildi",
|
||||
"cancelled": "Başlatma iptal edildi",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}, {{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}, {{source}}",
|
||||
"scanIncompleteMissing": "Bu profil henüz başlatılmadığından yalnızca Donut tarafından yönetilen uzantılar denetlenebildi."
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -635,6 +635,7 @@
|
||||
"connectionSuccess": "Kết nối thành công!",
|
||||
"serverError": "Máy chủ trả về lỗi",
|
||||
"connectFailed": "Kết nối máy chủ thất bại",
|
||||
"storageEndpoint": "Bộ nhớ: {{endpoint}}",
|
||||
"settingsSaved": "Đã lưu cài đặt đồng bộ",
|
||||
"saveFailed": "Lưu cài đặt thất bại",
|
||||
"disconnected": "Đã ngắt kết nối đồng bộ",
|
||||
@@ -1467,7 +1468,28 @@
|
||||
"vpnOptional": "VPN (tùy chọn)",
|
||||
"noVpn": "Không dùng VPN",
|
||||
"advancedOptions": "Tùy chọn nâng cao",
|
||||
"configureFingerprint": "Cấu hình vân tay (tùy chọn)"
|
||||
"configureFingerprint": "Cấu hình vân tay (tùy chọn)",
|
||||
"reportCookies": "Cookie",
|
||||
"reportPasswords": "Mật khẩu",
|
||||
"reportAutofill": "Phương thức thanh toán",
|
||||
"reportExtensions": "Tiện ích mở rộng",
|
||||
"reportHistory": "Lịch sử",
|
||||
"reportBookmarks": "Dấu trang",
|
||||
"reportLocalStorage": "Dữ liệu trang web",
|
||||
"reportNothingCarried": "Không có dữ liệu đọc được nào được chuyển sang",
|
||||
"reportUnrecoverable": "Không giải mã được: {{count}}",
|
||||
"closeSourceBrowserHint": "Hãy đóng trình duyệt nguồn rồi thử lại để có bản sao đầy đủ, hoặc nhập ngay và chấp nhận rằng dữ liệu trang web có thể chưa đầy đủ.",
|
||||
"importAnyway": "Vẫn nhập",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "Không mở khóa được cookie và mật khẩu, nên bạn sẽ phải đăng nhập lại.",
|
||||
"appBoundEncrypted": "Chrome 127 trở lên trên Windows gắn cookie với chính trình duyệt; không ứng dụng nào khác có thể chuyển được.",
|
||||
"storeTooOld": "Một cơ sở dữ liệu quá cũ để trình duyệt này mở nên đã bị bỏ qua.",
|
||||
"storeTooNew": "Một cơ sở dữ liệu đến từ trình duyệt mới hơn nên đã bị bỏ qua.",
|
||||
"sourceBrowserRunning": "Trình duyệt nguồn đang chạy nên dữ liệu trang web có thể chưa đầy đủ.",
|
||||
"securePreferencesReset": "Các cài đặt được bảo vệ như trang chủ và công cụ tìm kiếm đã trở về mặc định.",
|
||||
"extensionsPartial": "Một số tiện ích thuộc về trình duyệt nguồn nên không được chuyển sang.",
|
||||
"storeUnreadable": "Một cơ sở dữ liệu không đọc được nên đã bị bỏ qua thay vì sao chép hỏng."
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "Đang đồng bộ...",
|
||||
@@ -1914,7 +1936,10 @@
|
||||
"malformed": "URI VLESS không hợp lệ."
|
||||
},
|
||||
"camoufoxRemoved": "Camoufox không còn được hỗ trợ. Hãy tạo lại hồ sơ này bằng Wayfern.",
|
||||
"noE2ePasswordSet": "Chưa đặt mật khẩu mã hóa đầu cuối. Hãy đặt trước khi đồng bộ dữ liệu đã mã hóa."
|
||||
"noE2ePasswordSet": "Chưa đặt mật khẩu mã hóa đầu cuối. Hãy đặt trước khi đồng bộ dữ liệu đã mã hóa.",
|
||||
"importSourceNotChromium": "Thư mục này không phải hồ sơ trình duyệt Chromium",
|
||||
"importSourceNotChromiumNamed": "Không thể nhập hồ sơ {{family}}; chỉ hỗ trợ các trình duyệt nền Chromium",
|
||||
"importSourceBrowserRunning": "Hãy đóng {{browser}} trước, hoặc chọn vẫn nhập"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "Profile",
|
||||
@@ -2178,7 +2203,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot làm ấm hồ sơ của bạn qua đêm trên máy từ xa, giúp chúng giữ được cookie và lịch sử mà không cần bật máy tính của bạn. Cần gói Pro hoặc Team."
|
||||
"hint": "Cookie Bot làm ấm hồ sơ của bạn qua đêm trên máy từ xa, giúp chúng giữ được cookie và lịch sử mà không cần bật máy tính của bạn. Cần gói trả phí."
|
||||
},
|
||||
"empty": {
|
||||
"title": "Chưa có hồ sơ nào được đăng ký",
|
||||
@@ -2428,7 +2453,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "Đăng ký vào Cookie Bot",
|
||||
"proRequired": "Cookie Bot cần gói Pro hoặc Team",
|
||||
"proRequired": "Cookie Bot cần gói trả phí",
|
||||
"noneEligible": "Không hồ sơ nào đã chọn có thể làm ấm từ xa"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2488,15 +2513,18 @@
|
||||
"titleBlocked": "Đã chặn khởi chạy",
|
||||
"titleWarning": "Trước khi khởi chạy",
|
||||
"intro": "Hãy xem lại các vấn đề của \"{{name}}\" trước khi khởi động trình duyệt.",
|
||||
"fingerprintHeading": "Điểm ra của proxy không khớp với dấu vân tay",
|
||||
"vpnExtensionHeading": "Đã phát hiện tiện ích VPN",
|
||||
"fingerprintHeading": "Điểm ra đo được không khớp với dấu vân tay",
|
||||
"vpnExtensionHeading": "Đã phát hiện tiện ích VPN hoặc proxy",
|
||||
"vpnExtensionIntro": "Các tiện ích trong hồ sơ này có thể định tuyến lại lưu lượng của trình duyệt:",
|
||||
"vpnExtensionConfirmed": "Có thể thay đổi proxy",
|
||||
"vpnExtensionLikely": "Có khả năng thay đổi proxy",
|
||||
"vpnExtensionConfirmed": "Công cụ VPN hoặc proxy đã biết",
|
||||
"vpnExtensionLikely": "Có vẻ là công cụ VPN hoặc proxy",
|
||||
"vpnExtensionCapability": "Có quyền proxy",
|
||||
"vpnExtensionExplainer": "Nếu một trong số đó chuyển lưu lượng của bạn đi nơi khác, vị trí thực của trình duyệt sẽ không còn khớp với múi giờ, ngôn ngữ và vị trí địa lý mà hồ sơ này được tạo ra, và Donut không thể phát hiện điều đó từ bên ngoài.",
|
||||
"proxyCapableHeading": "Các tiện ích có thể thay đổi proxy",
|
||||
"proxyCapableIntro": "Chúng không giống VPN, nhưng có quyền proxy của Chromium, thứ mà trình quản lý tải xuống và công cụ gỡ lỗi cũng cần. Donut không thể biết liệu có tiện ích nào đang dùng quyền đó hay không:",
|
||||
"sourceDonut": "Do Donut quản lý",
|
||||
"sourceBrowser": "Đã cài trong hồ sơ",
|
||||
"measurementUnreliable": "Vì tiện ích VPN có thể ghi đè proxy, kết quả kiểm tra điểm ra có thể không phản ánh tuyến đường mà trình duyệt thực sự dùng.",
|
||||
"measurementUnreliable": "Một tiện ích trong hồ sơ này có quyền proxy, nên kết quả kiểm tra điểm ra có thể không phản ánh tuyến đường mà trình duyệt thực sự dùng.",
|
||||
"scanIncompleteEncrypted": "Hồ sơ này được mã hóa nên chỉ có thể kiểm tra các tiện ích do Donut quản lý.",
|
||||
"scanIncompleteEphemeral": "Hồ sơ này chưa có dữ liệu nên chỉ có thể kiểm tra các tiện ích do Donut quản lý.",
|
||||
"scanIncompletePartial": "Quá trình quét tiện ích bị ngắt giữa chừng nên có thể thiếu một số tiện ích.",
|
||||
@@ -2506,8 +2534,8 @@
|
||||
"dontWarnExtensions": "Không cảnh báo lại về các tiện ích này",
|
||||
"applyToRemaining": "Áp dụng lựa chọn này cho các hồ sơ còn lại",
|
||||
"cancelledSummary": "Đã hủy {{cancelled}} trên {{total}} lượt khởi chạy",
|
||||
"cancelled": "Đã hủy khởi chạy",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}, {{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}, {{source}}",
|
||||
"scanIncompleteMissing": "Hồ sơ này chưa từng được khởi chạy nên chỉ có thể kiểm tra các tiện ích do Donut quản lý."
|
||||
}
|
||||
}
|
||||
|
||||
+38
-10
@@ -635,6 +635,7 @@
|
||||
"connectionSuccess": "连接成功!",
|
||||
"serverError": "服务器返回了错误",
|
||||
"connectFailed": "连接服务器失败",
|
||||
"storageEndpoint": "存储: {{endpoint}}",
|
||||
"settingsSaved": "同步设置已保存",
|
||||
"saveFailed": "保存设置失败",
|
||||
"disconnected": "已断开同步",
|
||||
@@ -1467,7 +1468,28 @@
|
||||
"vpnOptional": "VPN(可选)",
|
||||
"noVpn": "不使用 VPN",
|
||||
"advancedOptions": "高级选项",
|
||||
"configureFingerprint": "配置指纹(可选)"
|
||||
"configureFingerprint": "配置指纹(可选)",
|
||||
"reportCookies": "Cookie",
|
||||
"reportPasswords": "密码",
|
||||
"reportAutofill": "付款方式",
|
||||
"reportExtensions": "扩展程序",
|
||||
"reportHistory": "历史记录",
|
||||
"reportBookmarks": "书签",
|
||||
"reportLocalStorage": "网站数据",
|
||||
"reportNothingCarried": "没有可读取的数据被迁移",
|
||||
"reportUnrecoverable": "无法解密:{{count}}",
|
||||
"closeSourceBrowserHint": "关闭源浏览器后重试可获得完整副本;也可以现在导入,但网站数据可能不完整。",
|
||||
"importAnyway": "仍要导入",
|
||||
"warnings": {
|
||||
"secretsNotMigrated": "无法解锁 Cookie 和密码,你需要重新登录。",
|
||||
"appBoundEncrypted": "Windows 上的 Chrome 127+ 会把 Cookie 绑定到浏览器本身,其他任何应用都无法迁移。",
|
||||
"storeTooOld": "某个数据库过旧,此浏览器无法打开,已跳过。",
|
||||
"storeTooNew": "某个数据库来自更新版本的浏览器,已跳过。",
|
||||
"sourceBrowserRunning": "源浏览器正在运行,网站数据可能不完整。",
|
||||
"securePreferencesReset": "主页、搜索引擎等受保护的设置已恢复为默认值。",
|
||||
"extensionsPartial": "部分扩展属于源浏览器,未被迁移。",
|
||||
"storeUnreadable": "某个数据库无法读取,已跳过而不是复制损坏的副本。"
|
||||
}
|
||||
},
|
||||
"syncTooltips": {
|
||||
"syncing": "同步中...",
|
||||
@@ -1914,7 +1936,10 @@
|
||||
"malformed": "VLESS URI 无效。"
|
||||
},
|
||||
"camoufoxRemoved": "Camoufox 已不再受支持。请使用 Wayfern 重新创建此配置文件。",
|
||||
"noE2ePasswordSet": "尚未设置端到端加密密码。请先设置后再同步加密数据。"
|
||||
"noE2ePasswordSet": "尚未设置端到端加密密码。请先设置后再同步加密数据。",
|
||||
"importSourceNotChromium": "该文件夹不是 Chromium 浏览器配置文件",
|
||||
"importSourceNotChromiumNamed": "无法导入 {{family}} 配置文件;仅支持基于 Chromium 的浏览器",
|
||||
"importSourceBrowserRunning": "请先关闭 {{browser}},或选择仍要导入"
|
||||
},
|
||||
"rail": {
|
||||
"profiles": "配置文件",
|
||||
@@ -2178,7 +2203,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"title": "Cookie Bot",
|
||||
"hint": "Cookie Bot 在远程机器上通宵养号,无需开着你的电脑也能保住 Cookie 和历史记录。需要 Pro 或 Team 套餐。"
|
||||
"hint": "Cookie Bot 在远程机器上通宵养号,无需开着你的电脑也能保住 Cookie 和历史记录。需要付费套餐。"
|
||||
},
|
||||
"empty": {
|
||||
"title": "尚未加入任何配置文件",
|
||||
@@ -2428,7 +2453,7 @@
|
||||
},
|
||||
"actionBar": {
|
||||
"enrol": "加入 Cookie Bot",
|
||||
"proRequired": "Cookie Bot 需要 Pro 或 Team 套餐",
|
||||
"proRequired": "Cookie Bot 需要付费套餐",
|
||||
"noneEligible": "所选配置文件都无法远程养号"
|
||||
},
|
||||
"actions": {
|
||||
@@ -2488,15 +2513,18 @@
|
||||
"titleBlocked": "启动已阻止",
|
||||
"titleWarning": "启动前请注意",
|
||||
"intro": "启动浏览器前,请检查“{{name}}”的以下问题。",
|
||||
"fingerprintHeading": "代理出口与指纹不匹配",
|
||||
"vpnExtensionHeading": "检测到 VPN 扩展",
|
||||
"fingerprintHeading": "测得的出口与指纹不匹配",
|
||||
"vpnExtensionHeading": "检测到 VPN 或代理扩展",
|
||||
"vpnExtensionIntro": "此配置文件中可能改变浏览器流量路径的扩展:",
|
||||
"vpnExtensionConfirmed": "可以更改代理",
|
||||
"vpnExtensionLikely": "可能会更改代理",
|
||||
"vpnExtensionConfirmed": "已知的 VPN 或代理工具",
|
||||
"vpnExtensionLikely": "疑似 VPN 或代理工具",
|
||||
"vpnExtensionCapability": "拥有代理权限",
|
||||
"vpnExtensionExplainer": "如果其中之一将流量转发到别处,浏览器的真实位置将不再与创建此配置文件时使用的时区、语言和地理位置一致,而 Donut 无法从外部察觉。",
|
||||
"proxyCapableHeading": "可以更改代理的扩展",
|
||||
"proxyCapableIntro": "它们看起来不是 VPN,但拥有 Chromium 的代理权限,下载管理器和调试工具同样需要该权限。Donut 无法判断它们是否在使用它:",
|
||||
"sourceDonut": "由 Donut 管理",
|
||||
"sourceBrowser": "已安装在配置文件中",
|
||||
"measurementUnreliable": "由于 VPN 扩展可以覆盖代理设置,出口检测结果可能并非浏览器实际使用的线路。",
|
||||
"measurementUnreliable": "此配置文件中有扩展拥有代理权限,因此出口检测结果可能并非浏览器实际使用的线路。",
|
||||
"scanIncompleteEncrypted": "此配置文件已加密,因此只能检查由 Donut 管理的扩展。",
|
||||
"scanIncompleteEphemeral": "此配置文件尚无数据,因此只能检查由 Donut 管理的扩展。",
|
||||
"scanIncompletePartial": "扩展扫描被中断,可能有部分扩展未列出。",
|
||||
@@ -2506,8 +2534,8 @@
|
||||
"dontWarnExtensions": "不再就这些扩展发出警告",
|
||||
"applyToRemaining": "将此选择应用于其余配置文件",
|
||||
"cancelledSummary": "已取消 {{total}} 次启动中的 {{cancelled}} 次",
|
||||
"cancelled": "已取消启动",
|
||||
"vpnExtensionEntry": " {{version}} — {{capability}}、{{source}}",
|
||||
"vpnExtensionEntryNoVersion": " — {{capability}}、{{source}}",
|
||||
"scanIncompleteMissing": "此配置文件尚未启动过,因此只能检查由 Donut 管理的扩展。"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,6 +43,8 @@ export type BackendErrorCode =
|
||||
| "UPDATE_PREPARATION_FAILED"
|
||||
| "PROFILE_NAME_EXISTS"
|
||||
| "IMPORT_SOURCE_NOT_FOUND"
|
||||
| "IMPORT_SOURCE_NOT_CHROMIUM"
|
||||
| "IMPORT_SOURCE_BROWSER_RUNNING"
|
||||
| "IMPORT_NO_ITEMS"
|
||||
| "BROWSER_NOT_DOWNLOADED"
|
||||
| "ARCHIVE_EXTRACTION_FAILED"
|
||||
@@ -253,6 +255,16 @@ export function translateBackendError(t: TFunction, err: unknown): string {
|
||||
});
|
||||
case "IMPORT_SOURCE_NOT_FOUND":
|
||||
return t("backendErrors.importSourceNotFound");
|
||||
case "IMPORT_SOURCE_NOT_CHROMIUM":
|
||||
return parsed.params?.family
|
||||
? t("backendErrors.importSourceNotChromiumNamed", {
|
||||
family: parsed.params.family,
|
||||
})
|
||||
: t("backendErrors.importSourceNotChromium");
|
||||
case "IMPORT_SOURCE_BROWSER_RUNNING":
|
||||
return t("backendErrors.importSourceBrowserRunning", {
|
||||
browser: parsed.params?.browser ?? "",
|
||||
});
|
||||
case "IMPORT_NO_ITEMS":
|
||||
return t("backendErrors.importNoItems");
|
||||
case "BROWSER_NOT_DOWNLOADED":
|
||||
|
||||
+29
-3
@@ -1176,11 +1176,33 @@ export function clearThemeColors(): void {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* WebKitGTK, which is the webview on Linux and nowhere else.
|
||||
*
|
||||
* Windows runs WebView2 (a Chromium user agent) and macOS runs WKWebView
|
||||
* (`Macintosh`), so an `AppleWebKit` user agent claiming X11/Linux is
|
||||
* WebKitGTK and only WebKitGTK.
|
||||
*/
|
||||
function isWebKitGtk(): boolean {
|
||||
if (typeof navigator === "undefined") {
|
||||
return false;
|
||||
}
|
||||
const ua = navigator.userAgent;
|
||||
return /\b(?:X11|Linux)\b/.test(ua) && ua.includes("AppleWebKit");
|
||||
}
|
||||
|
||||
/**
|
||||
* Run a theme mutation inside a View Transition so the whole UI cross-fades
|
||||
* (~200ms, tuned in globals.css) instead of hard-cutting between palettes.
|
||||
* Falls back to an instant switch when the API is unavailable or the user
|
||||
* prefers reduced motion.
|
||||
* Falls back to an instant switch when the API is unavailable, the user
|
||||
* prefers reduced motion, or the webview is WebKitGTK.
|
||||
*
|
||||
* A view transition asks the engine to snapshot the whole document into
|
||||
* compositor layers and hold rendering until it can cross-fade them. That is
|
||||
* the newest and least-exercised path in WebKitGTK, and it is reached from
|
||||
* exactly one screen here, which is the screen a Linux user reported the app
|
||||
* segfaulting on. The cross-fade is decoration; not taking that path on Linux
|
||||
* costs nothing anyone will miss.
|
||||
*/
|
||||
export function withThemeTransition(mutate: () => void): void {
|
||||
if (typeof document === "undefined") {
|
||||
@@ -1193,7 +1215,11 @@ export function withThemeTransition(mutate: () => void): void {
|
||||
const doc = document as Document & {
|
||||
startViewTransition?: (callback: () => void) => unknown;
|
||||
};
|
||||
if (reduced || typeof doc.startViewTransition !== "function") {
|
||||
if (
|
||||
reduced ||
|
||||
isWebKitGtk() ||
|
||||
typeof doc.startViewTransition !== "function"
|
||||
) {
|
||||
mutate();
|
||||
return;
|
||||
}
|
||||
|
||||
+55
-4
@@ -275,11 +275,44 @@ export interface DetectedProfile {
|
||||
|
||||
export interface ImportProfileItem {
|
||||
source_path: string;
|
||||
/**
|
||||
* Source browser family. Selects which OS keychain entry holds the key that
|
||||
* unlocks the source's cookies and passwords, so it decides whether secrets
|
||||
* survive the import.
|
||||
*/
|
||||
browser_type?: string;
|
||||
new_profile_name: string;
|
||||
/** Mutually exclusive with `vpn_id`; the importer rejects setting both. */
|
||||
proxy_id?: string | null;
|
||||
vpn_id?: string | null;
|
||||
/** Import even though the source browser is still running. */
|
||||
allow_running?: boolean;
|
||||
}
|
||||
|
||||
/** Stable warning codes; each maps to `importProfile.warnings.*`. */
|
||||
export type ProfileImportWarning =
|
||||
| "secretsNotMigrated"
|
||||
| "appBoundEncrypted"
|
||||
| "storeTooOld"
|
||||
| "storeTooNew"
|
||||
| "sourceBrowserRunning"
|
||||
| "securePreferencesReset"
|
||||
| "extensionsPartial"
|
||||
| "storeUnreadable";
|
||||
|
||||
export interface ProfileImportReport {
|
||||
cookies_migrated: number;
|
||||
cookies_unrecoverable: number;
|
||||
passwords_migrated: number;
|
||||
passwords_unrecoverable: number;
|
||||
payment_methods_migrated: number;
|
||||
payment_methods_unrecoverable: number;
|
||||
extensions_migrated: number;
|
||||
history_entries: number;
|
||||
bookmarks: number;
|
||||
local_storage_origins: number;
|
||||
bytes_copied: number;
|
||||
warnings: ProfileImportWarning[];
|
||||
}
|
||||
|
||||
export interface ProfileImportItemResult {
|
||||
@@ -288,6 +321,8 @@ export interface ProfileImportItemResult {
|
||||
status: "imported" | "skipped" | "failed";
|
||||
profile_id: string | null;
|
||||
error: string | null;
|
||||
/** What actually came across. Present when status is "imported". */
|
||||
report?: ProfileImportReport | null;
|
||||
}
|
||||
|
||||
export interface ProfileImportBatchResult {
|
||||
@@ -673,7 +708,22 @@ export interface ConsistencyResult {
|
||||
mismatches: string[];
|
||||
}
|
||||
|
||||
/** A VPN/proxy extension found in a profile, which can reroute browser traffic. */
|
||||
/**
|
||||
* How strongly an extension is believed to be a VPN or proxy tool.
|
||||
* "capability" is not such a claim: it means only that the extension holds
|
||||
* Chromium's `proxy` permission, which download managers do too.
|
||||
*/
|
||||
export type VpnExtensionConfidence = "confirmed" | "likely" | "capability";
|
||||
|
||||
/** How much of a profile's extension set could be read. */
|
||||
export type ExtensionScanState =
|
||||
| "scanned"
|
||||
| "partial"
|
||||
| "encrypted"
|
||||
| "ephemeral"
|
||||
| "missing";
|
||||
|
||||
/** An extension found in a profile that could change where the browser connects. */
|
||||
export interface DetectedVpnExtension {
|
||||
/** Acknowledgement identity: `donut:<uuid>` or `crx:<id>`. */
|
||||
key: string;
|
||||
@@ -681,15 +731,16 @@ export interface DetectedVpnExtension {
|
||||
version: string | null;
|
||||
/** "donut" (managed by Donut) or "browser" (installed in the profile). */
|
||||
source: string;
|
||||
/** "confirmed" (holds the proxy permission) or "likely". */
|
||||
confidence: string;
|
||||
confidence: VpnExtensionConfidence;
|
||||
/** Holds the `proxy` permission outright, so it can change the proxy today. */
|
||||
proxy_control: boolean;
|
||||
signals: string[];
|
||||
}
|
||||
|
||||
/** Local-only checks answered before a launch starts any worker. */
|
||||
export interface PreLaunchChecks {
|
||||
vpn_extensions: DetectedVpnExtension[];
|
||||
scan_state: string;
|
||||
scan_state: ExtensionScanState;
|
||||
consistency: ConsistencyResult;
|
||||
exit_probe_pending: boolean;
|
||||
exit_measurement_unreliable: boolean;
|
||||
|
||||
Reference in New Issue
Block a user