eliott/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop synced 2026-04-25 17:15:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

gh-9836: Register correct signing issuers for windows (gh-13304)

Browse Source
This commit is contained in:
mr. m
2026-04-18 16:25:58 +02:00
committed by GitHub
parent a164e226dc
commit 2700722a1e
10 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/linux-release-build.yml vendored
View File

@@ -104,6 +104,8 @@ jobs:
- name: Import
env:
SURFER_COMPAT: ${{ matrix.arch }}
SURFER_CERT_PATCH_ISSUER: ${{ secrets.SURFER_CERT_PATCH_ISSUER }}
SURFER_CERT_PATCH_NAME: ${{ secrets.SURFER_CERT_PATCH_NAME }}
run: |
. "$HOME/.cargo/env"
npm run import

4
.github/workflows/macos-release-build.yml vendored
View File

@@ -118,7 +118,9 @@ jobs:
- name: Import
env:
SURFER_COMPAT: ${{ matrix.arch }}
run: npm run import -- --verbose
SURFER_CERT_PATCH_ISSUER: ${{ secrets.SURFER_CERT_PATCH_ISSUER }}
SURFER_CERT_PATCH_NAME: ${{ secrets.SURFER_CERT_PATCH_NAME }}
run: npm run import
- name: Bootstrap
run: |

2
.github/workflows/windows-profile-build.yml vendored
View File

@@ -80,6 +80,8 @@ jobs:
if: ${{ matrix.arch == 'x86_64' }}
env:
SURFER_NO_BRANDING_PATCH: true
SURFER_CERT_PATCH_ISSUER: ${{ secrets.SURFER_CERT_PATCH_ISSUER }}
SURFER_CERT_PATCH_NAME: ${{ secrets.SURFER_CERT_PATCH_NAME }}
run: npm run import
- name: Generate

2
.github/workflows/windows-release-build.yml vendored
View File

@@ -165,6 +165,8 @@ jobs:
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
env:
SURFER_COMPAT: ${{ matrix.arch }}
SURFER_CERT_PATCH_ISSUER: ${{ secrets.SURFER_CERT_PATCH_ISSUER }}
SURFER_CERT_PATCH_NAME: ${{ secrets.SURFER_CERT_PATCH_NAME }}
run: |
. "$HOME/.cargo/env"
npm run import -- --verbose

4
build/windows/sign.ps1
View File

@@ -4,6 +4,7 @@
param(
[string][Parameter(Mandatory=$true)]$SignIdentity,
[string][Parameter(Mandatory=$true)]$SignIdentityIssuer,
[string][Parameter(Mandatory=$true)]$GithubRunId
)
@@ -26,6 +27,9 @@ mkdir windsign-temp -ErrorAction SilentlyContinue
$env:SURFER_MOZCONFIG_ONLY="1"
$env:SURFER_SIGNING_MODE=""
$env:SURFER_CERT_PATCH_ISSUER=$SignIdentityIssuer
$env:SURFER_CERT_PATCH_NAME=$SignIdentity
Start-Job -Name "DownloadGitl10n" -ScriptBlock {
param($PWD)
cd $PWD

8
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"devDependencies": {
"@babel/preset-typescript": "^7.27.0",
"@zen-browser/prettier": "^3.9.3",
"@zen-browser/surfer": "^1.13.4",
"@zen-browser/surfer": "^1.14.3",
"formal-git": "^1.2.9",
"globals": "^16.3.0",
"husky": "^9.1.7",
@@ -868,9 +868,9 @@
}
},
"node_modules/@zen-browser/surfer": {
"version": "1.13.4",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.13.4.tgz",
"integrity": "sha512-rpwceHYN3k1kaZP+IhAiZ5ksLgedqGv8uo8kqACFR4dDX/DO5P7XoCQtooOPrEyrxcI7uu/gI/xtuldfOBKUkQ==",
"version": "1.14.3",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.14.3.tgz",
"integrity": "sha512-AjJx7jedNSSP5WRWsG3W5fUxYSaWlY3nir/MZ2RFS+C0/rs6Uj+qpOVlMu6ZrQf9cr9r13e33nP5GGhSWbGOSA==",
"dev": true,
"license": "MPL-2.0",
"dependencies": {

2
package.json
View File

@@ -47,7 +47,7 @@
"devDependencies": {
"@babel/preset-typescript": "^7.27.0",
"@zen-browser/prettier": "^3.9.3",
"@zen-browser/surfer": "^1.13.4",
"@zen-browser/surfer": "^1.14.3",
"formal-git": "^1.2.9",
"globals": "^16.3.0",
"husky": "^9.1.7",

10
src/browser/components/sessionstore/SessionStore-sys-mjs.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
index 71921cec2b6aa0f103856c31254fd6c4affefccb..fbb44402e3201a00eb37765d60829828d40e70ea 100644
index 71921cec2b6aa0f103856c31254fd6c4affefccb..d39f2bd587e9aa320d69f94a2bd30be909c3e608 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -129,6 +129,9 @@ const TAB_EVENTS = [
@@ -350,3 +350,11 @@ index 71921cec2b6aa0f103856c31254fd6c4affefccb..fbb44402e3201a00eb37765d60829828
// Convert any open groups into saved groups.
let groupStateToSave = window.groups.find(
groupState => groupState.id == window.tabs[tIndex].groupId
@@ -8076,7 +8139,6 @@ var SessionStoreInternal = {
timer.initWithCallback(
function () {
if (beats <= 0) {
- this._log.debug(`looseTimer of ${delay} timed out`);
Glean.sessionRestore.shutdownFlushAllOutcomes.timed_out.add(1);
deferred.resolve();
}

24
src/zen/sessionstore/ZenWindowSync.sys.mjs
View File

@@ -731,7 +731,14 @@ class nsZenWindowSync {
return;
}
await this.#styleSwapedBrowsers(aOurTab, aOtherTab, () => {
this.#swapBrowserDocShellsInner(aOurTab, aOtherTab);
try {
this.#swapBrowserDocShellsInner(aOurTab, aOtherTab);
} catch (e) {
console.error(
`Error swapping browsers for tabs ${aOurTab.id} and ${aOtherTab.id}:`,
e
);
}
});
}
@@ -1066,10 +1073,17 @@ class nsZenWindowSync {
continue;
}
delete tab._zenContentsVisible;
this.#swapBrowserDocShellsInner(targetTab, tab, {
focus: targetTab.selected,
onClose: true,
});
try {
this.#swapBrowserDocShellsInner(targetTab, tab, {
focus: targetTab.selected,
onClose: true,
});
} catch (e) {
console.error(
`Error swapping browsers for tabs ${tab.id} and ${targetTab.id} during close:`,
e
);
}
this.#swapedTabsEntriesForWC.set(
tab.linkedBrowser.permanentKey,
targetTab

2
src/zen/tabs/ZenPinnedTabManager.mjs
View File

@@ -857,7 +857,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
const pinUrl = tab._zenPinnedInitialState.entry.url.split("#")[0];
const currentUrl = location.split("#")[0];
// Add an indicator that the pin has been changed
if (pinUrl === currentUrl) {
if (Services.io.newURI(currentUrl).spec === Services.io.newURI(pinUrl).spec) {
this.resetPinChangedUrl(tab);
return;
}