mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 09:54:10 -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)
263 lines
8.7 KiB
C
Vendored
Generated
263 lines
8.7 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_VSSH_SSH_H
|
|
#define HEADER_CURL_VSSH_SSH_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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"
|
|
#include "urldata.h"
|
|
|
|
extern const struct Curl_protocol Curl_protocol_sftp;
|
|
extern const struct Curl_protocol Curl_protocol_scp;
|
|
|
|
#ifdef USE_SSH
|
|
|
|
#ifdef USE_LIBSSH2
|
|
#include <libssh2.h>
|
|
#include <libssh2_sftp.h>
|
|
#elif defined(USE_LIBSSH)
|
|
/* in 0.10.0 or later, ignore deprecated warnings */
|
|
#define SSH_SUPPRESS_DEPRECATED
|
|
#include <libssh/libssh.h>
|
|
#include <libssh/sftp.h>
|
|
#endif
|
|
|
|
/* meta key for storing protocol meta at easy handle */
|
|
#define CURL_META_SSH_EASY "meta:proto:ssh:easy"
|
|
/* meta key for storing protocol meta at connection */
|
|
#define CURL_META_SSH_CONN "meta:proto:ssh:conn"
|
|
|
|
/****************************************************************************
|
|
* SSH unique setup
|
|
***************************************************************************/
|
|
typedef enum {
|
|
SSH_NO_STATE = -1, /* Used for "nextState" so say there is none */
|
|
SSH_STOP = 0, /* do nothing state, stops the state machine */
|
|
|
|
SSH_INIT, /* First state in SSH-CONNECT */
|
|
SSH_S_STARTUP, /* Session startup */
|
|
SSH_HOSTKEY, /* verify hostkey */
|
|
SSH_AUTHLIST,
|
|
SSH_AUTH_PKEY_INIT,
|
|
SSH_AUTH_PKEY,
|
|
SSH_AUTH_PASS_INIT,
|
|
SSH_AUTH_PASS,
|
|
SSH_AUTH_AGENT_INIT, /* initialize then wait for connection to agent */
|
|
SSH_AUTH_AGENT_LIST, /* ask for list then wait for entire list to come */
|
|
SSH_AUTH_AGENT, /* attempt one key at a time */
|
|
SSH_AUTH_HOST_INIT,
|
|
SSH_AUTH_HOST,
|
|
SSH_AUTH_KEY_INIT,
|
|
SSH_AUTH_KEY,
|
|
SSH_AUTH_GSSAPI,
|
|
SSH_AUTH_DONE,
|
|
SSH_SFTP_INIT,
|
|
SSH_SFTP_REALPATH, /* Last state in SSH-CONNECT */
|
|
|
|
SSH_SFTP_QUOTE_INIT, /* First state in SFTP-DO */
|
|
SSH_SFTP_POSTQUOTE_INIT, /* (Possibly) First state in SFTP-DONE */
|
|
SSH_SFTP_QUOTE,
|
|
SSH_SFTP_NEXT_QUOTE,
|
|
SSH_SFTP_QUOTE_STAT,
|
|
SSH_SFTP_QUOTE_SETSTAT,
|
|
SSH_SFTP_QUOTE_SYMLINK,
|
|
SSH_SFTP_QUOTE_MKDIR,
|
|
SSH_SFTP_QUOTE_RENAME,
|
|
SSH_SFTP_QUOTE_RMDIR,
|
|
SSH_SFTP_QUOTE_UNLINK,
|
|
SSH_SFTP_QUOTE_STATVFS,
|
|
SSH_SFTP_GETINFO,
|
|
SSH_SFTP_FILETIME,
|
|
SSH_SFTP_TRANS_INIT,
|
|
SSH_SFTP_UPLOAD_INIT,
|
|
SSH_SFTP_CREATE_DIRS_INIT,
|
|
SSH_SFTP_CREATE_DIRS,
|
|
SSH_SFTP_CREATE_DIRS_MKDIR,
|
|
SSH_SFTP_READDIR_INIT,
|
|
SSH_SFTP_READDIR,
|
|
SSH_SFTP_READDIR_LINK,
|
|
SSH_SFTP_READDIR_BOTTOM,
|
|
SSH_SFTP_READDIR_DONE,
|
|
SSH_SFTP_DOWNLOAD_INIT,
|
|
SSH_SFTP_DOWNLOAD_STAT, /* Last state in SFTP-DO */
|
|
SSH_SFTP_CLOSE, /* Last state in SFTP-DONE */
|
|
SSH_SFTP_SHUTDOWN, /* First state in SFTP-DISCONNECT */
|
|
SSH_SCP_TRANS_INIT, /* First state in SCP-DO */
|
|
SSH_SCP_UPLOAD_INIT,
|
|
SSH_SCP_DOWNLOAD_INIT,
|
|
SSH_SCP_DOWNLOAD,
|
|
SSH_SCP_DONE,
|
|
SSH_SCP_SEND_EOF,
|
|
SSH_SCP_WAIT_EOF,
|
|
SSH_SCP_WAIT_CLOSE,
|
|
SSH_SCP_CHANNEL_FREE, /* Last state in SCP-DONE */
|
|
SSH_SESSION_DISCONNECT, /* First state in SCP-DISCONNECT */
|
|
SSH_SESSION_FREE, /* Last state in SCP/SFTP-DISCONNECT */
|
|
SSH_QUIT,
|
|
SSH_LAST /* never used */
|
|
} sshstate;
|
|
|
|
#define CURL_PATH_MAX 1024
|
|
|
|
/* this struct is used in the HandleData struct which is part of the
|
|
Curl_easy, which means this is used on a per-easy handle basis.
|
|
Everything that is strictly related to a connection is banned from this
|
|
struct. */
|
|
struct SSHPROTO {
|
|
char *path; /* the path we operate on, at least one byte long */
|
|
#ifdef USE_LIBSSH2
|
|
struct dynbuf readdir_link;
|
|
struct dynbuf readdir;
|
|
char readdir_filename[CURL_PATH_MAX + 1];
|
|
char readdir_longentry[CURL_PATH_MAX + 1];
|
|
|
|
LIBSSH2_SFTP_ATTRIBUTES quote_attrs; /* used by the SFTP_QUOTE state */
|
|
|
|
/* Here's a set of struct members used by the SFTP_READDIR state */
|
|
LIBSSH2_SFTP_ATTRIBUTES readdir_attrs;
|
|
#endif
|
|
};
|
|
|
|
/* ssh_conn is used for struct connection-oriented data in the connectdata
|
|
struct */
|
|
struct ssh_conn {
|
|
const char *authlist; /* List of auth. methods, managed by libssh2 */
|
|
|
|
/* common */
|
|
const char *passphrase; /* pass-phrase to use */
|
|
char *rsa_pub; /* strdup'ed public key file */
|
|
char *rsa; /* strdup'ed private key file */
|
|
sshstate state; /* always use ssh.c:state() to change state! */
|
|
sshstate nextstate; /* the state to goto after stopping */
|
|
struct curl_slist *quote_item; /* for the quote option */
|
|
char *quote_path1; /* two generic pointers for the QUOTE stuff */
|
|
char *quote_path2;
|
|
|
|
char *homedir; /* when doing SFTP we figure out home directory
|
|
in the connect phase */
|
|
/* end of READDIR stuff */
|
|
|
|
int secondCreateDirs; /* counter use by the code to see if the
|
|
second attempt has been made to change
|
|
to/create a directory */
|
|
int waitfor; /* REQ_IO_RECV/REQ_IO_SEND bits overriding
|
|
pollset given flags */
|
|
char *slash_pos; /* used by the SFTP_CREATE_DIRS state */
|
|
|
|
#ifdef USE_LIBSSH
|
|
CURLcode actualcode; /* the actual error code */
|
|
char *readdir_linkPath;
|
|
size_t readdir_len;
|
|
struct dynbuf readdir_buf;
|
|
/* our variables */
|
|
unsigned kbd_state; /* 0 or 1 */
|
|
ssh_key privkey;
|
|
ssh_key pubkey;
|
|
unsigned int auth_methods;
|
|
ssh_session ssh_session;
|
|
ssh_scp scp_session;
|
|
sftp_session sftp_session;
|
|
sftp_file sftp_file;
|
|
sftp_dir sftp_dir;
|
|
|
|
unsigned sftp_recv_state; /* 0 or 1 */
|
|
#if LIBSSH_VERSION_INT > SSH_VERSION_INT(0, 11, 0)
|
|
sftp_aio sftp_recv_aio;
|
|
|
|
sftp_aio sftp_send_aio;
|
|
unsigned sftp_send_state; /* 0 or 1 */
|
|
#else
|
|
int sftp_file_index; /* for async read */
|
|
#endif
|
|
sftp_attributes readdir_attrs; /* used by the SFTP readdir actions */
|
|
sftp_attributes readdir_link_attrs; /* used by the SFTP readdir actions */
|
|
sftp_attributes quote_attrs; /* used by the SFTP_QUOTE state */
|
|
|
|
const char *readdir_filename; /* points within readdir_attrs */
|
|
const char *readdir_longentry;
|
|
char *readdir_tmp;
|
|
BIT(initialized);
|
|
#elif defined(USE_LIBSSH2)
|
|
LIBSSH2_SESSION *ssh_session; /* Secure Shell session */
|
|
LIBSSH2_CHANNEL *ssh_channel; /* Secure Shell channel handle */
|
|
LIBSSH2_SFTP *sftp_session; /* SFTP handle */
|
|
LIBSSH2_SFTP_HANDLE *sftp_handle;
|
|
|
|
#ifndef CURL_DISABLE_PROXY
|
|
/* for HTTPS proxy storage */
|
|
Curl_recv *tls_recv;
|
|
Curl_send *tls_send;
|
|
#endif
|
|
|
|
LIBSSH2_AGENT *ssh_agent; /* proxy to ssh-agent/pageant */
|
|
struct libssh2_agent_publickey *sshagent_identity;
|
|
struct libssh2_agent_publickey *sshagent_prev_identity;
|
|
LIBSSH2_KNOWNHOSTS *kh;
|
|
#endif /* USE_LIBSSH */
|
|
BIT(authed); /* the connection has been authenticated fine */
|
|
BIT(acceptfail); /* used by the SFTP_QUOTE (continue if
|
|
quote command fails) */
|
|
};
|
|
|
|
#ifdef USE_LIBSSH
|
|
#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 9, 0)
|
|
#error "SCP/SFTP protocols require libssh 0.9.0 or later"
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef USE_LIBSSH2
|
|
|
|
/* Feature detection based on version numbers to better work with
|
|
non-configure platforms */
|
|
|
|
#if !defined(LIBSSH2_VERSION_NUM) || (LIBSSH2_VERSION_NUM < 0x010900)
|
|
#error "SCP/SFTP protocols require libssh2 1.9.0 or greater"
|
|
/* 1.9.0 was released on June 20 2019 */
|
|
#endif
|
|
|
|
#endif /* USE_LIBSSH2 */
|
|
|
|
#ifdef CURLVERBOSE
|
|
const char *Curl_ssh_statename(sshstate state);
|
|
#else
|
|
#define Curl_ssh_statename(x) ""
|
|
#endif
|
|
void Curl_ssh_set_state(struct Curl_easy *data,
|
|
struct ssh_conn *sshc,
|
|
sshstate nowstate);
|
|
|
|
#define myssh_to(x, y, z) Curl_ssh_set_state(x, y, z)
|
|
|
|
/* generic SSH backend functions */
|
|
CURLcode Curl_ssh_init(void);
|
|
void Curl_ssh_cleanup(void);
|
|
void Curl_ssh_version(char *buffer, size_t buflen);
|
|
void Curl_ssh_attach(struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
#else /* !USE_SSH */
|
|
#define Curl_ssh_cleanup()
|
|
#define Curl_ssh_attach(x, y)
|
|
#define Curl_ssh_init() 0
|
|
#endif /* USE_SSH */
|
|
|
|
#endif /* HEADER_CURL_SSH_H */
|