diff options
| author | Christophe Besson <cbesson@gmail.com> | 2026-09-04 16:08:06 +0200 |
|---|---|---|
| committer | Christophe Besson <cbesson@gmail.com> | 2026-09-04 16:08:06 +0200 |
| commit | a4aabd1d33770d6199a8cb7bc87f639668617bc9 (patch) | |
| tree | f1c280790ae4791b587c879b2922567a44290a54 /packages/meshbay-client | |
| parent | 7ff675fdc0866ca40bdb703bc95c0cc60e3edd87 (diff) | |
| download | meshbay-a4aabd1d33770d6199a8cb7bc87f639668617bc9.tar.gz | |
fix(packaging): re-running setup no longer re-prompts for firewall access
Every run of customInstall showed the "Allow MeshBay through Windows
Firewall?" question and, on Yes, a fresh UAC prompt -- an upgrade or repair
install would ask again even with all four rules already in place.
customInstall now checks first: firewall.ps1 check, unelevated
(Get-NetFirewallRule needs no admin, only New/Remove do), exits 0 if every
rule already exists. Only a nonzero result reaches the MessageBox and the
elevated add. A second run of setup on an already-configured machine now
asks nothing.
Verified unelevated: check exits 1 and logs which rules are missing on a
machine with none of them (the fresh-install case); electron-builder
compiles the nsExec::Exec / Pop $0 / ${If} wiring. Node suite 837 pass /
25 skip.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Diffstat (limited to 'packages/meshbay-client')
| -rw-r--r-- | packages/meshbay-client/build/installer.nsh | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/packages/meshbay-client/build/installer.nsh b/packages/meshbay-client/build/installer.nsh index 67d103d..d2307c8 100644 --- a/packages/meshbay-client/build/installer.nsh +++ b/packages/meshbay-client/build/installer.nsh @@ -40,19 +40,27 @@ WriteRegExpandStr HKCU "Environment" "Path" "$1" SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - ; Firewall. MeshBay.exe and meshbay-node.exe each bind UDP sockets for WebRTC, - ; and Windows prompts "Allow access" the first time each does. A per-user - ; installer cannot pre-create a firewall rule (that needs admin), so offer to - ; run one elevated helper now: one UAC prompt instead of two dialogs mid-use. - ; firewall.ps1 is idempotent and does nothing if the exes are missing. - ${IfNot} ${Silent} - MessageBox MB_YESNO|MB_ICONQUESTION \ - "Allow MeshBay through Windows Firewall now?$\n$\nMeshBay connects to other devices on your local network. Choosing Yes adds the rules in one step (Windows will ask for administrator confirmation). Choosing No is fine too -- Windows will ask you to allow access the first time MeshBay connects." \ - /SD IDYES IDNO mb_skip_fw - ExecShellWait "runas" "${MB_PWSH}" \ - '-NoProfile -ExecutionPolicy Bypass -File "$INSTDIR\resources\firewall.ps1" add' \ - SW_HIDE - mb_skip_fw: + ; Firewall. MeshBay.exe / meshbay-node.exe (WebRTC) and MeshBay.exe again + ; (LAN cast) each need an inbound allow, and Windows prompts "Allow access" + ; the first time each does. A per-user installer cannot pre-create a + ; firewall rule (that needs admin), so offer one elevated helper: one UAC + ; prompt instead of up to four dialogs spread across first use. + ; + ; Checked first, UNELEVATED (Get-NetFirewallRule needs no admin, only + ; New/Remove do) -- so re-running setup with the rules already in place + ; asks nothing and never pops UAC again. + nsExec::Exec '"${MB_PWSH}" -NoProfile -ExecutionPolicy Bypass -File "$INSTDIR\resources\firewall.ps1" check' + Pop $0 + ${If} $0 != 0 + ${IfNot} ${Silent} + MessageBox MB_YESNO|MB_ICONQUESTION \ + "Allow MeshBay through Windows Firewall now?$\n$\nMeshBay connects to other devices on your local network. Choosing Yes adds the rules in one step (Windows will ask for administrator confirmation). Choosing No is fine too -- Windows will ask you to allow access the first time MeshBay connects." \ + /SD IDYES IDNO mb_skip_fw + ExecShellWait "runas" "${MB_PWSH}" \ + '-NoProfile -ExecutionPolicy Bypass -File "$INSTDIR\resources\firewall.ps1" add' \ + SW_HIDE + mb_skip_fw: + ${EndIf} ${EndIf} !macroend |