Repository navigation
feat(online): Share proxy settings between HTTP and websocket and ask for the proxy login - #646
Open
tintinhamans wants to merge 16 commits into
Conversation
tintinhamans
force-pushed
the
arctic/go/feat/service-proxy-settings
branch
from
October 24, 2026 10:07
0be2203 to
e1c3e2b
Compare
tintinhamans
marked this pull request as draft
October 24, 2026 12:07
tintinhamans
force-pushed
the
arctic/go/feat/service-proxy-settings
branch
4 times, most recently
from
October 24, 2026 20:42
3ef3d03 to
6d44cf3
Compare
tintinhamans
marked this pull request as ready for review
October 24, 2026 20:48
…m::openArchiveFile() (TheSuperHackers#3376) (cherry picked from commit 86f2cab)
(cherry picked from commit 5db4f75)
…leSystem, Win32LocalFileSystem (TheSuperHackers#3374) (cherry picked from commit 3f3ed9f)
…ile::getFileInfo(), StdBIGFile::getFileInfo() (TheSuperHackers#3415) (cherry picked from commit b805c12)
…File (TheSuperHackers#3505) Both classes are identical apart from their name and contain no platform specific code. Nothing in them depends on the BIG format either: they open a file from an offset and a size inside the archive file. ArchiveFile takes over their functions and is no longer an abstract class. (cherry picked from commit 52a777a)
…ystem into BIGFileSystem (TheSuperHackers#3505) Both classes are identical apart from their name and go through the local file system for all file access. The one class that remains sits next to ArchiveFileSystem in Core/GameEngine. (cherry picked from commit e4b4d1e)
…e loadBigFilesFromDirectory (TheSuperHackers#3505) loadMods refers to BIG files, which nothing else in ArchiveFileSystem does. It becomes a virtual function that BIGFileSystem implements. loadBigFilesFromDirectory is renamed to loadArchiveFilesFromDirectory, because the base class is not tied to one archive format. (cherry picked from commit f299561)
tintinhamans
force-pushed
the
arctic/go/feat/service-proxy-settings
branch
4 times, most recently
from
October 24, 2026 23:48
ea182b0 to
9324c04
Compare
tintinhamans
force-pushed
the
arctic/go/feat/service-proxy-settings
branch
from
October 25, 2026 05:20
7df4244 to
ebf4438
Compare
…e Zero Hour archives (cherry picked from commit aaea4c1)
…only with verbose logging
tintinhamans
force-pushed
the
arctic/go/feat/service-proxy-settings
branch
from
October 25, 2026 11:15
ebf4438 to
7f3a4d2
Compare
tintinhamans
changed the title
tintinhamans
force-pushed
the
arctic/go/feat/service-proxy-settings
branch
from
October 25, 2026 12:53
7f3a4d2 to
c98444b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge after #645.
HTTP and websocket now share one proxy policy, set in
settings.jsonasnetwork.proxy:mode(automaticfollows the Windows settings with static proxy, PAC and WPAD,disabledconnects directly,customusesaddress) andwindows_login(default true). Routes are tried in order when a connection fails. Direct connections use HTTP/3 where available, otherwise HTTP/2, and the websocket uses HTTP/1.1. The scheme of PAC and WPAD results is read with the WinHTTP values, and without a WPAD or PAC file the lookup falls back to the static proxy or direct. Proxies get Basic, Digest or Negotiate (Kerberos with the current Windows account), no NTLM.When the proxy answers
407a login dialog opens above the update check box. It reuses the retailGameSpyLoginProfile.wndlayout as a stopgap and the game's own strings where they exist (OK, CANCEL, Password, Remember My Password, Connecting, Connection has failed, the wrong password message), so those are translated. The Windows login is tried silently first. The dialog has a "Use Windows login" checkbox, and when the Windows login is rejected it says "The Windows login was not accepted." Proxy and GO login credentials share the DPAPI protectedcredentials.json, one entry per server or proxy.network.servercan now becustomwith anaddress(host[:port], https only), with its own login and no fallback. Invalid network values insettings.jsonare reset to defaults on load and written back. The options menu for all of this is #655.Build:
vcpkg.jsonadds the curl featureshttp2,http3andsspi, with an overlay triplet incmake/triplets.Tested:
z_generalsbuilds. Through local Basic and Digest proxies, set as custom and (Basic) through a Windows PAC script, the update check gets407, the login dialog opens, the right password connects and a wrong one brings the dialog back with an error. The Windows login checkbox was rig tested against a Basic proxy: it is rejected and the dialog shows "The Windows login was not accepted." Not tested: WPAD, Negotiate against a real Kerberos proxy.