mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 23:00:45 -04:00
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)
267 lines
7.4 KiB
C
Vendored
Generated
267 lines
7.4 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#if !defined(CURL_DISABLE_HTTP) && defined(USE_SPNEGO)
|
|
|
|
#include "urldata.h"
|
|
#include "cfilters.h"
|
|
#include "curl_trc.h"
|
|
#include "http_negotiate.h"
|
|
#include "vauth/vauth.h"
|
|
#include "vtls/vtls.h"
|
|
#include "curlx/strparse.h"
|
|
|
|
|
|
static void http_auth_nego_reset(struct connectdata *conn,
|
|
struct negotiatedata *neg_ctx,
|
|
bool proxy)
|
|
{
|
|
if(proxy)
|
|
conn->proxy_negotiate_state = GSS_AUTHNONE;
|
|
else {
|
|
conn->http_negotiate_state = GSS_AUTHNONE;
|
|
Curl_peer_unlink(&conn->creds_origin);
|
|
Curl_creds_unlink(&conn->creds);
|
|
}
|
|
if(neg_ctx)
|
|
Curl_auth_cleanup_spnego(neg_ctx);
|
|
}
|
|
|
|
CURLcode Curl_input_negotiate(struct Curl_easy *data, struct connectdata *conn,
|
|
bool proxy, const char *header)
|
|
{
|
|
CURLcode result;
|
|
size_t len;
|
|
|
|
/* Point to credentials and host */
|
|
struct Curl_creds *creds = NULL;
|
|
const char *host;
|
|
|
|
/* Point to the correct struct with this */
|
|
struct negotiatedata *neg_ctx;
|
|
curlnegotiate state;
|
|
|
|
if(proxy) {
|
|
#ifndef CURL_DISABLE_PROXY
|
|
creds = conn->http_proxy.creds;
|
|
host = conn->http_proxy.peer->hostname;
|
|
state = conn->proxy_negotiate_state;
|
|
#else
|
|
return CURLE_NOT_BUILT_IN;
|
|
#endif
|
|
}
|
|
else {
|
|
creds = data->state.creds;
|
|
host = data->state.origin->hostname;
|
|
state = conn->http_negotiate_state;
|
|
}
|
|
|
|
neg_ctx = Curl_auth_nego_get(conn, proxy);
|
|
if(!neg_ctx)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
/* Obtain the input token, if any */
|
|
header += strlen("Negotiate");
|
|
curlx_str_passblanks(&header);
|
|
|
|
len = strlen(header);
|
|
neg_ctx->havenegdata = len != 0;
|
|
if(!len) {
|
|
if(state == GSS_AUTHSUCC) {
|
|
infof(data, "Negotiate auth restarted");
|
|
http_auth_nego_reset(conn, neg_ctx, proxy);
|
|
}
|
|
else if(state != GSS_AUTHNONE) {
|
|
/* The server rejected our authentication and has not supplied any more
|
|
negotiation mechanisms */
|
|
http_auth_nego_reset(conn, neg_ctx, proxy);
|
|
return CURLE_LOGIN_DENIED;
|
|
}
|
|
}
|
|
|
|
/* Supports SSL channel binding for Windows ISS extended protection */
|
|
#if defined(USE_WINDOWS_SSPI) && defined(SECPKG_ATTR_ENDPOINT_BINDINGS)
|
|
neg_ctx->sslContext = conn->sslContext;
|
|
#endif
|
|
/* Check if the connection is using SSL and get the channel binding data */
|
|
#ifdef GSS_C_CHANNEL_BOUND_FLAG
|
|
#ifdef USE_SSL
|
|
curlx_dyn_init(&neg_ctx->channel_binding_data, SSL_CB_MAX_SIZE + 1);
|
|
if(Curl_conn_is_ssl(conn, FIRSTSOCKET)) {
|
|
result = Curl_ssl_get_channel_binding(data, FIRSTSOCKET,
|
|
&neg_ctx->channel_binding_data);
|
|
if(result) {
|
|
http_auth_nego_reset(conn, neg_ctx, proxy);
|
|
return result;
|
|
}
|
|
}
|
|
#else
|
|
curlx_dyn_init(&neg_ctx->channel_binding_data, 1);
|
|
#endif /* USE_SSL */
|
|
#endif /* GSS_C_CHANNEL_BOUND_FLAG */
|
|
|
|
/* Initialize the security context and decode our challenge */
|
|
result = Curl_auth_decode_spnego_message(data, creds, "HTTP",
|
|
host, header, neg_ctx);
|
|
|
|
#ifdef GSS_C_CHANNEL_BOUND_FLAG
|
|
curlx_dyn_free(&neg_ctx->channel_binding_data);
|
|
#endif
|
|
|
|
if(result)
|
|
http_auth_nego_reset(conn, neg_ctx, proxy);
|
|
|
|
if(!result && !proxy) {
|
|
/* Start it up. From this time onwards, the connection is tied
|
|
* tp the credentials used. */
|
|
if(conn->creds_origin &&
|
|
!Curl_peer_equal(conn->creds_origin, data->state.origin)) {
|
|
DEBUGASSERT(0); /* should not happen. */
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
if(conn->creds && !Curl_creds_same(creds, conn->creds)) {
|
|
DEBUGASSERT(0); /* should not happen. */
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
Curl_peer_link(&conn->creds_origin, data->state.origin);
|
|
Curl_creds_link(&conn->creds, creds);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
CURLcode Curl_output_negotiate(struct Curl_easy *data,
|
|
struct connectdata *conn, bool proxy)
|
|
{
|
|
struct negotiatedata *neg_ctx;
|
|
struct auth *authp;
|
|
curlnegotiate *state;
|
|
char *base64 = NULL;
|
|
size_t len = 0;
|
|
char *userp;
|
|
CURLcode result;
|
|
|
|
if(proxy) {
|
|
#ifndef CURL_DISABLE_PROXY
|
|
authp = &data->state.authproxy;
|
|
state = &conn->proxy_negotiate_state;
|
|
#else
|
|
return CURLE_NOT_BUILT_IN;
|
|
#endif
|
|
}
|
|
else {
|
|
authp = &data->state.authhost;
|
|
state = &conn->http_negotiate_state;
|
|
}
|
|
neg_ctx = Curl_auth_nego_get(conn, proxy);
|
|
if(!neg_ctx)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
authp->done = FALSE;
|
|
|
|
if(*state == GSS_AUTHRECV) {
|
|
if(neg_ctx->havenegdata) {
|
|
neg_ctx->havemultiplerequests = TRUE;
|
|
}
|
|
}
|
|
else if(*state == GSS_AUTHSUCC) {
|
|
if(!neg_ctx->havenoauthpersist) {
|
|
neg_ctx->noauthpersist = !neg_ctx->havemultiplerequests;
|
|
}
|
|
}
|
|
|
|
if(neg_ctx->noauthpersist ||
|
|
(*state != GSS_AUTHDONE && *state != GSS_AUTHSUCC)) {
|
|
|
|
if(neg_ctx->noauthpersist && *state == GSS_AUTHSUCC) {
|
|
infof(data, "Curl_output_negotiate, "
|
|
"no persistent authentication: cleanup existing context");
|
|
http_auth_nego_reset(conn, neg_ctx, proxy);
|
|
}
|
|
if(!neg_ctx->context) {
|
|
result = Curl_input_negotiate(data, conn, proxy, "Negotiate");
|
|
if(result == CURLE_AUTH_ERROR) {
|
|
/* negotiate auth failed, let's continue unauthenticated to stay
|
|
* compatible with the behavior before curl-7_64_0-158-g6c6035532 */
|
|
authp->done = TRUE;
|
|
return CURLE_OK;
|
|
}
|
|
else if(result)
|
|
return result;
|
|
}
|
|
|
|
result = Curl_auth_create_spnego_message(neg_ctx, &base64, &len);
|
|
if(result)
|
|
return result;
|
|
|
|
userp = curl_maprintf("%sAuthorization: Negotiate %s\r\n",
|
|
proxy ? "Proxy-" : "", base64);
|
|
|
|
if(proxy) {
|
|
#ifndef CURL_DISABLE_PROXY
|
|
curlx_free(data->req.hd_proxy_auth);
|
|
data->req.hd_proxy_auth = userp;
|
|
#endif
|
|
}
|
|
else {
|
|
curlx_free(data->req.hd_auth);
|
|
data->req.hd_auth = userp;
|
|
}
|
|
|
|
curlx_free(base64);
|
|
|
|
if(!userp) {
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
|
|
*state = GSS_AUTHSENT;
|
|
#ifdef HAVE_GSSAPI
|
|
if(neg_ctx->status == GSS_S_COMPLETE ||
|
|
neg_ctx->status == GSS_S_CONTINUE_NEEDED) {
|
|
*state = GSS_AUTHDONE;
|
|
}
|
|
#else
|
|
#ifdef USE_WINDOWS_SSPI
|
|
if(neg_ctx->status == SEC_E_OK ||
|
|
neg_ctx->status == SEC_I_CONTINUE_NEEDED) {
|
|
*state = GSS_AUTHDONE;
|
|
}
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
if(*state == GSS_AUTHDONE || *state == GSS_AUTHSUCC) {
|
|
/* connection is already authenticated,
|
|
* do not send a header in future requests */
|
|
authp->done = TRUE;
|
|
}
|
|
|
|
neg_ctx->havenegdata = FALSE;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#endif /* !CURL_DISABLE_HTTP && USE_SPNEGO */
|