sysown · renecannao · Jun 10, 2026 · Jun 10, 2026 · Jun 10, 2026 · Jun 10, 2026
diff --git a/common_mk/openssl_flags.mk b/common_mk/openssl_flags.mk
@@ -37,11 +37,20 @@ ifeq ($(UNAME_S),Darwin)
             LIB_CRYPTO_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libcrypto.a" 2>/dev/null | head -n 1)
         endif
 else
-        LIB_SSL_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libssl.so*" 2>/dev/null | head -n 1)
+        # Prefer OpenSSL 3.x when multiple versions coexist in SSL_LDIR
+        # (a bare libssl.so* first-match can pick a stale 1.1 library);
+        # fall back to any shared lib, then static.
+        LIB_SSL_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libssl.so*3*" 2>/dev/null | head -n 1)
+        ifeq ($(LIB_SSL_PATH),)
+            LIB_SSL_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libssl.so*" 2>/dev/null | head -n 1)
+        endif
         ifeq ($(LIB_SSL_PATH),)
             LIB_SSL_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libssl.a" 2>/dev/null | head -n 1)
         endif
-        LIB_CRYPTO_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libcrypto.so*" 2>/dev/null | head -n 1)
+        LIB_CRYPTO_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libcrypto.so*3*" 2>/dev/null | head -n 1)
+        ifeq ($(LIB_CRYPTO_PATH),)
+            LIB_CRYPTO_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libcrypto.so*" 2>/dev/null | head -n 1)
+        endif
         ifeq ($(LIB_CRYPTO_PATH),)
             LIB_CRYPTO_PATH := $(shell find $(SSL_LDIR) -maxdepth 1 -name "libcrypto.a" 2>/dev/null | head -n 1)
         endif

diff --git a/deps/libscram/include/scram.h b/deps/libscram/include/scram.h
@@ -42,6 +42,12 @@ struct ScramState {
 	uint8_t ClientKey[32];	/* SHA256_DIGEST_LENGTH */
 	uint8_t StoredKey[32];
 	uint8_t ServerKey[32];
+	/* Channel-binding input (SCRAM-SHA-256-PLUS). NULL = plain SCRAM; non-NULL
+	 * means the client-final's c= field is base64(cbind_input) and the gs2
+	 * header in the client-first is "p=tls-server-end-point,,". The state
+	 * takes ownership of a copy allocated in scram_state_set_cbind_input. */
+	char* client_cbind_input;
+	int client_cbind_input_len;
 };
 
 struct PgCredentials {
@@ -99,6 +105,16 @@ extern "C" {
 
 	bool verify_server_signature(ScramState *scram_state, const PgCredentials *credentials, const char *ServerSignature);
 
+	/*
+	 * Sets the channel-binding input that will be used by build_client_first_message
+	 * (gs2 header) and build_client_final_message (c= field). cbind_input must be
+	 * the full "gs2-header || cbind-data" (e.g. "p=tls-server-end-point,," || digest).
+	 * Passing NULL/0 reverts to plain SCRAM (cbind_flag='n', cbind_input freed).
+	 * The state takes ownership of a copy of the input.
+	 */
+	void scram_state_set_cbind_input(ScramState* state,
+					 const char* cbind_input, int cbind_input_len);
+
 
 	/*
 	 * Functions for communicating as a server to the client

diff --git a/deps/libscram/src/scram.c b/deps/libscram/src/scram.c
@@ -215,13 +215,15 @@ ScramState* scram_state_init() {
         scram_state->server_nonce = NULL;
         scram_state->server_first_message = NULL;
         scram_state->SaltedPassword = NULL;
-        scram_state->cbind_flag = '\0';
+        scram_state->cbind_flag = 'n';
         scram_state->adhoc = false;
         scram_state->iterations = 0;
         scram_state->salt = NULL;
         memset(scram_state->ClientKey, 0, sizeof(scram_state->ClientKey));
         memset(scram_state->StoredKey, 0, sizeof(scram_state->StoredKey));
         memset(scram_state->ServerKey, 0, sizeof(scram_state->ServerKey));
+        scram_state->client_cbind_input = NULL;
+        scram_state->client_cbind_input_len = 0;
     }
     return scram_state;
 }
@@ -237,6 +239,7 @@ void free_scram_state(ScramState *scram_state)
 		free(scram_state->client_final_message_without_proof);
 		free(scram_state->server_nonce);
 		free(scram_state->server_first_message);
+		free(scram_state->client_cbind_input);
 		free(scram_state->SaltedPassword);
 		free(scram_state->salt);
 		memset(scram_state, 0, sizeof(*scram_state));
@@ -503,7 +506,15 @@ char *build_client_first_message(ScramState *scram_state)
 	result = malloc(len);
 	if (result == NULL)
 		goto failed;
-	snprintf(result, len, "n,,n=,r=%s", scram_state->client_nonce);
+	if (scram_state->client_cbind_input != NULL) {
+		/* Channel-bound client: gs2 cbind flag 'p' with tls-server-end-point
+		 * type. The PostgreSQL convention is an empty SCRAM username (the
+		 * real username travels in the StartupMessage), so the header is
+		 * "p=tls-server-end-point,,". */
+		snprintf(result, len, "p=tls-server-end-point,,n=,r=%s", scram_state->client_nonce);
+	} else {
+		snprintf(result, len, "n,,n=,r=%s", scram_state->client_nonce);
+	}
 
 	scram_state->client_first_message_bare = strdup(result + 3);
 	if (scram_state->client_first_message_bare == NULL)
@@ -532,7 +543,22 @@ char *build_client_final_message(ScramState *scram_state,
 	uint8_t client_proof[SCRAM_KEY_LEN];
 	int enclen;
 
-	snprintf(buf, sizeof(buf), "c=biws,r=%s", server_nonce);
+	if (scram_state->client_cbind_input != NULL) {
+		/* Channel-bound client: c=base64(gs2-header || cbind-data).
+		 * 86 bytes buffer = 22 (header) + 64 (max digest we accept) = 86;
+		 * base64-encoded = 116 chars max. The full prefix
+		 * "c=<b64>,r=<server_nonce>" easily fits in 512. */
+		char b64[128];
+		int blen = pg_b64_encode(scram_state->client_cbind_input,
+					 scram_state->client_cbind_input_len,
+					 b64, sizeof(b64));
+		if (blen < 0)
+			goto failed;
+		b64[blen] = '\0';
+		snprintf(buf, sizeof(buf), "c=%s,r=%s", b64, server_nonce);
+	} else {
+		snprintf(buf, sizeof(buf), "c=biws,r=%s", server_nonce);
+	}
 
 	scram_state->client_final_message_without_proof = strdup(buf);
 	if (scram_state->client_final_message_without_proof == NULL)
@@ -1418,3 +1444,29 @@ bool scram_verify_plain_password(const char *username, const char *password,
 	free(prep_password);
 	return false;
 }
+
+/*
+ * Set the channel-binding input that will be used by build_client_first_message
+ * (gs2 header selection) and build_client_final_message (c= field composition).
+ * cbind_input must be the full "gs2-header || cbind-data" blob, e.g.
+ * "p=tls-server-end-point,," || digest. Passing NULL/0 reverts to plain SCRAM
+ * (the existing gs2 header "n,," / c="biws" path) and frees any prior input.
+ * The state owns a private copy allocated with malloc; the caller may free its
+ * own buffer after the call returns.
+ */
+void scram_state_set_cbind_input(ScramState *state,
+				 const char *cbind_input, int cbind_input_len)
+{
+	if (state == NULL) return;
+	free(state->client_cbind_input);
+	state->client_cbind_input = NULL;
+	state->client_cbind_input_len = 0;
+	state->cbind_flag = 'n';
+	if (cbind_input == NULL || cbind_input_len <= 0) return;
+	state->client_cbind_input = (char *)malloc((size_t)cbind_input_len + 1);
+	if (state->client_cbind_input == NULL) return;
+	memcpy(state->client_cbind_input, cbind_input, (size_t)cbind_input_len);
+	state->client_cbind_input[cbind_input_len] = '\0';
+	state->client_cbind_input_len = cbind_input_len;
+	state->cbind_flag = 'p';
+}
diff --git a/doc/agents/common-mistakes.md b/doc/agents/common-mistakes.md
@@ -272,3 +272,35 @@ gh pr view <PR> --json commits --jq '.commits[].messageHeadline' | grep -i merge
 # Unrelated files changed?
 gh pr diff <PR> | grep "^+++ b/" | grep -v "<expected_files_pattern>"
 ```
+
+---
+
+## 16. TAP-Infra Build/Deploy Hazards (debug-only, bind-mounted binary, shared object dir)
+
+**Symptoms** (each observed live, 2026-07): every TAP test fails at `LOAD DEBUG FROM DISK`; the proxysql binary fails to link with `undefined reference to ...run_tests()`; a mid-run test suite aborts with the admin connection dropping for no visible reason; a test run silently exercises last week's code.
+
+**Root causes — four independent traps that compound:**
+
+1. **The TAP harness requires a DEBUG build.** `admin-debug`, `debug_levels`, and `LOAD DEBUG` are `#ifdef DEBUG`-gated; a release binary fails every test at harness init. Build with `make debug -j$(nproc)` (the lib/src sub-makes do NOT inherit parallelism from plain `make debug`).
+2. **`lib/obj/*.oo` is shared between release and debug flavors.** Switching flavors without `make clean` produces a mixed archive that fails at link (missing DEBUG-only symbols) or worse. One flavor per checkout; `make clean` when switching — and note `make clean` also deletes every TAP test binary (`make build_tap_test_debug` to restore).
+3. **The proxysql container FILE-bind-mounts `$WORKSPACE/src/proxysql`.** Two consequences: (a) after any rebuild you must `docker restart proxysql.<INFRA_ID>` or tests exercise the stale in-memory binary; (b) NEVER rebuild while a test run is live — the linker truncates the mapped inode in place and corrupts the running server's text pages (manifests as inexplicable mid-run connection loss).
+4. **Header-touching rebuilds have no dependency tracking.** After editing a widely-included header (enum/struct changes), stale objects can misbehave at runtime rather than fail to build (e.g. a renumbered enum crashing via a stale lookup table). If symptoms look impossible, `make clean` and rebuild before debugging further.
+
+**Prevention:** one build flavor per checkout (use a separate worktree for the other flavor); rebuild → `docker restart` → then test, never overlapping; treat "impossible" runtime behavior after header edits as a stale-object signal first.
+
+---
+
+## 17. Shared/Misprovisioned Test Infra (INFRA_ID collisions, INFRA type-vs-id, stale containers)
+
+**Symptoms:** tests fail with `Unknown global variable` for a variable your branch definitely has; `FATAL: User not found` on every pgsql connection; backend hostname `pgsql1.<something>` unresolvable; another session's binary appears in your container.
+
+**Root causes:**
+
+1. **`INFRA_ID` is a shared namespace.** The conventional `INFRA_ID=dev-$USER` collides across worktrees/sessions of the same user: `ensure-infras.bash` reuses a running `proxysql.<INFRA_ID>` container even if it is bind-mounted from a *different worktree*. Use a per-effort id (e.g. `dev-$USER-<feature>`).
+2. **`INFRA` is the infra TYPE, not the infra id.** Scripts like `docker-pgsql16-single/bin/docker-proxy-post.bash` build the backend hostname as `pgsql1.${INFRA}` — the resolvable compose alias is `pgsql1.docker-pgsql16-single`. Hand-exporting `INFRA=<your INFRA_ID>` writes an unresolvable hostname into the persisted admin DB, which then survives container recreation.
+3. **`docker start` on an exited proxysql container skips provisioning.** The users/servers config is applied by the post scripts, not baked into the container; recreate via `ensure-infras.bash` / `start-proxysql-isolated.bash`, never bare `docker start`.
+4. Hand-running post scripts needs the full env: `COMPOSE_PROJECT`, `INFRA` (type), `ROOT_PASSWORD=$(echo -n "$INFRA_ID" | sha256sum | head -c 10)`, run from the infra directory (they source `./constants`).
+
+**Detection:** `docker inspect proxysql.<INFRA_ID> --format '{{range .Mounts}}{{.Source}}{{"\n"}}{{end}}'` shows whose worktree the binary comes from; `SELECT hostname FROM pgsql_servers` via admin shows a poisoned backend hostname.
+
+**Useful:** `TEST_PY_TAP_INCL=<regex>` runs a subset through `run-tests-isolated.bash` without the full group.