mirror of
https://github.com/open-goal/jak-project
synced 2026-08-18 21:57:54 -04:00
Alexander J. Semenuk
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
190 lines
9.5 KiB
Python
Vendored
Generated
190 lines
9.5 KiB
Python
Vendored
Generated
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
#
|
|
import logging
|
|
import os
|
|
import re
|
|
|
|
import pytest
|
|
from testenv import CurlClient, Env, ExecResult
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
@pytest.mark.skipif(condition=Env.setup_incomplete(),
|
|
reason=f"missing: {Env.incomplete_reason()}")
|
|
class TestProxyAuth:
|
|
|
|
def httpd_configure(self, env, httpd):
|
|
httpd.set_proxy_auth(True)
|
|
httpd.reload_if_config_changed()
|
|
|
|
def get_tunnel_proto_used(self, r: ExecResult):
|
|
for line in r.trace_lines:
|
|
m = re.match(r'.* CONNECT: \'(\S+)\' negotiated$', line)
|
|
if m:
|
|
return m.group(1)
|
|
assert False, f'tunnel protocol not found in:\n{"".join(r.trace_lines)}'
|
|
|
|
# download via http: proxy (no tunnel), no auth
|
|
def test_13_01_proxy_no_auth(self, env: Env, httpd, configures_httpd):
|
|
self.httpd_configure(env, httpd)
|
|
curl = CurlClient(env=env)
|
|
url = f'http://localhost:{env.http_port}/data.json'
|
|
r = curl.http_download(urls=[url], alpn_proto='http/1.1', with_stats=True,
|
|
extra_args=curl.get_proxy_args(proxys=False))
|
|
r.check_response(count=1, http_status=407)
|
|
|
|
# download via http: proxy (no tunnel), auth
|
|
def test_13_02_proxy_auth(self, env: Env, httpd, configures_httpd):
|
|
self.httpd_configure(env, httpd)
|
|
curl = CurlClient(env=env)
|
|
url = f'http://localhost:{env.http_port}/data.json'
|
|
xargs = curl.get_proxy_args(proxys=False)
|
|
xargs.extend(['--proxy-user', 'proxy:proxy'])
|
|
r = curl.http_download(urls=[url], alpn_proto='http/1.1', with_stats=True,
|
|
extra_args=xargs)
|
|
r.check_response(count=1, http_status=200)
|
|
|
|
@pytest.mark.skipif(condition=not Env.curl_has_feature('HTTPS-proxy'),
|
|
reason='curl lacks HTTPS-proxy support')
|
|
@pytest.mark.skipif(condition=not Env.have_nghttpx(), reason="no nghttpx available")
|
|
def test_13_03_proxys_no_auth(self, env: Env, httpd, configures_httpd, nghttpx_fwd):
|
|
self.httpd_configure(env, httpd)
|
|
curl = CurlClient(env=env)
|
|
url = f'http://localhost:{env.http_port}/data.json'
|
|
xargs = curl.get_proxy_args(proxys=True)
|
|
r = curl.http_download(urls=[url], alpn_proto='http/1.1', with_stats=True,
|
|
extra_args=xargs)
|
|
r.check_response(count=1, http_status=407)
|
|
|
|
@pytest.mark.skipif(condition=not Env.curl_has_feature('HTTPS-proxy'),
|
|
reason='curl lacks HTTPS-proxy support')
|
|
@pytest.mark.skipif(condition=not Env.have_nghttpx(), reason="no nghttpx available")
|
|
def test_13_04_proxys_auth(self, env: Env, httpd, configures_httpd, nghttpx_fwd):
|
|
self.httpd_configure(env, httpd)
|
|
curl = CurlClient(env=env)
|
|
url = f'http://localhost:{env.http_port}/data.json'
|
|
xargs = curl.get_proxy_args(proxys=True)
|
|
xargs.extend(['--proxy-user', 'proxy:proxy'])
|
|
r = curl.http_download(urls=[url], alpn_proto='http/1.1', with_stats=True,
|
|
extra_args=xargs)
|
|
r.check_response(count=1, http_status=200)
|
|
|
|
def test_13_05_tunnel_http_no_auth(self, env: Env, httpd, configures_httpd, nghttpx_fwd):
|
|
self.httpd_configure(env, httpd)
|
|
curl = CurlClient(env=env)
|
|
url = f'http://localhost:{env.http_port}/data.json'
|
|
xargs = curl.get_proxy_args(proxys=False, tunnel=True)
|
|
r = curl.http_download(urls=[url], alpn_proto='http/1.1', with_stats=True,
|
|
extra_args=xargs)
|
|
# expect "COULD_NOT_CONNECT"
|
|
r.check_response(exitcode=7, http_status=None)
|
|
|
|
def test_13_06_tunnel_http_auth(self, env: Env, httpd, configures_httpd):
|
|
self.httpd_configure(env, httpd)
|
|
curl = CurlClient(env=env)
|
|
url = f'http://localhost:{env.http_port}/data.json'
|
|
xargs = curl.get_proxy_args(proxys=False, tunnel=True)
|
|
xargs.extend(['--proxy-user', 'proxy:proxy'])
|
|
r = curl.http_download(urls=[url], alpn_proto='http/1.1', with_stats=True,
|
|
extra_args=xargs)
|
|
r.check_response(count=1, http_status=200)
|
|
|
|
@pytest.mark.skipif(condition=not Env.have_nghttpx(), reason="no nghttpx available")
|
|
@pytest.mark.skipif(condition=not Env.curl_has_feature('HTTPS-proxy'),
|
|
reason='curl lacks HTTPS-proxy support')
|
|
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
|
|
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
|
|
@pytest.mark.parametrize("proto", Env.http_h1_h2_protos())
|
|
@pytest.mark.parametrize("tunnel", Env.http_h1_h2_protos())
|
|
def test_13_07_tunnels_no_auth(self, env: Env, httpd, configures_httpd, nghttpx_fwd, proto, tunnel):
|
|
self.httpd_configure(env, httpd)
|
|
if tunnel == 'h2' and not env.curl_uses_lib('nghttp2'):
|
|
pytest.skip('only supported with nghttp2')
|
|
curl = CurlClient(env=env)
|
|
url = f'https://localhost:{env.https_port}/data.json'
|
|
xargs = curl.get_proxy_args(proxys=True, tunnel=True, proto=tunnel)
|
|
r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True,
|
|
extra_args=xargs)
|
|
# expect "COULD_NOT_CONNECT"
|
|
r.check_response(exitcode=7, http_status=None)
|
|
assert self.get_tunnel_proto_used(r) == tunnel
|
|
|
|
@pytest.mark.skipif(condition=not Env.have_nghttpx(), reason="no nghttpx available")
|
|
@pytest.mark.skipif(condition=not Env.curl_has_feature('HTTPS-proxy'),
|
|
reason='curl lacks HTTPS-proxy support')
|
|
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
|
|
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
|
|
@pytest.mark.parametrize("proto", Env.http_h1_h2_protos())
|
|
@pytest.mark.parametrize("tunnel", Env.http_h1_h2_protos())
|
|
def test_13_08_tunnels_auth(self, env: Env, httpd, configures_httpd, nghttpx_fwd, proto, tunnel):
|
|
self.httpd_configure(env, httpd)
|
|
if tunnel == 'h2' and not env.curl_uses_lib('nghttp2'):
|
|
pytest.skip('only supported with nghttp2')
|
|
curl = CurlClient(env=env)
|
|
url = f'https://localhost:{env.https_port}/data.json'
|
|
xargs = curl.get_proxy_args(proxys=True, tunnel=True, proto=tunnel)
|
|
xargs.extend(['--proxy-user', 'proxy:proxy'])
|
|
r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True,
|
|
extra_args=xargs)
|
|
r.check_response(count=1, http_status=200,
|
|
protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1')
|
|
assert self.get_tunnel_proto_used(r) == tunnel
|
|
|
|
@pytest.mark.skipif(condition=not Env.curl_has_feature('SPNEGO'),
|
|
reason='curl lacks SPNEGO support')
|
|
def test_13_09_negotiate_http(self, env: Env, httpd, configures_httpd):
|
|
self.httpd_configure(env, httpd)
|
|
run_env = os.environ.copy()
|
|
run_env['https_proxy'] = f'http://127.0.0.1:{env.proxy_port}'
|
|
curl = CurlClient(env=env, run_env=run_env)
|
|
url = f'https://localhost:{env.https_port}/data.json'
|
|
r1 = curl.http_download(urls=[url], alpn_proto='http/1.1', with_stats=True, extra_args=[
|
|
'--negotiate', '--proxy-user', 'proxy:proxy'
|
|
])
|
|
r1.check_response(count=1, http_status=200)
|
|
|
|
def test_13_10_tunnels_mixed_auth(self, env: Env, httpd, configures_httpd):
|
|
self.httpd_configure(env, httpd)
|
|
curl = CurlClient(env=env)
|
|
url1 = f'http://localhost:{env.http_port}/data.json?1'
|
|
url2 = f'http://localhost:{env.http_port}/data.json?2'
|
|
url3 = f'http://localhost:{env.http_port}/data.json?3'
|
|
xargs1 = curl.get_proxy_args(proxys=False, tunnel=True)
|
|
xargs1.extend(['--proxy-user', 'proxy:proxy']) # good auth
|
|
xargs2 = curl.get_proxy_args(proxys=False, tunnel=True)
|
|
xargs2.extend(['--proxy-user', 'ungood:ungood']) # bad auth
|
|
xargs3 = curl.get_proxy_args(proxys=False, tunnel=True)
|
|
# no auth
|
|
r = curl.http_download(urls=[url1, url2, url3], alpn_proto='http/1.1', with_stats=True,
|
|
url_options={url1: xargs1, url2: xargs2, url3: xargs3})
|
|
# only url1 succeeds, others fail, no connection reuse
|
|
assert r.stats[0]['http_code'] == 200, f'{r.dump_logs()}'
|
|
assert r.stats[1]['http_code'] == 0, f'{r.dump_logs()}'
|
|
assert r.stats[2]['http_code'] == 0, f'{r.dump_logs()}'
|
|
assert r.total_connects == 3, f'{r.dump_logs()}'
|