Feature: Tunnel the device protocol through a reverse proxy over WebSocket
This commit is contained in:
1 parent
de621aa555
commit
d4f312c9d8
20 files changed
+1994
-63
No files matched your search
+87
-28
@@ -12,14 +12,18 @@
|
||||
#include <fstream> // std::ifstream
|
||||
#include <iterator> // std::istreambuf_iterator
|
||||
#include <string>
|
||||
#include <mutex> // std::call_once
|
||||
#include <mutex> // std::mutex
|
||||
|
||||
#pragma comment(lib, "secur32.lib")
|
||||
#pragma comment(lib, "crypt32.lib")
|
||||
|
||||
namespace {
|
||||
|
||||
std::once_flag g_tlsOnce;
|
||||
// 进程级 TLS 状态:首连时加载一次,服务端下发/撤销信任锚后可重建(TlsReload)。
|
||||
// 所有读写都在 g_tlsMtx 下;证书校验(VerifyServerCert)在校验期间持同一把锁,因此
|
||||
// 重建时可以安全地释放旧的 store/engine——不会再有线程正拿着它们用。
|
||||
std::mutex g_tlsMtx;
|
||||
bool g_tlsLoaded = false; // 已加载过至少一次(决定首次失败是否 fail-closed)
|
||||
bool g_tlsEnabled = false; // TLS 会话可用:send/recv 走加密
|
||||
bool g_tlsError = false; // 证书存在但加载失败:拒绝连接(fail-closed)
|
||||
HCERTSTORE g_tlsStore = NULL;
|
||||
@@ -160,26 +164,23 @@ bool LoadTrustAnchor(const std::string& pem, const std::string& source, HCERTSTO
|
||||
return true;
|
||||
}
|
||||
|
||||
void InitTls()
|
||||
enum TlsAnchor { TLS_ANCHOR_OK, TLS_ANCHOR_NONE, TLS_ANCHOR_INVALID };
|
||||
|
||||
// 读取当前信任锚并建好 store + 链引擎(成功时经 outStore/outEngine 交出,调用方负责
|
||||
// 释放)。不触碰全局状态。source 描述锚的来源,仅用于日志。
|
||||
TlsAnchor BuildTlsAnchor(HCERTSTORE* outStore, HCERTCHAINENGINE* outEngine,
|
||||
std::string& source, std::string& err)
|
||||
{
|
||||
std::string pem, source;
|
||||
std::string pem;
|
||||
if (!ReadTrustAnchor(pem, source)) {
|
||||
// 无证书 → 明文(默认,与老客户端一致)
|
||||
g_tlsEnabled = false;
|
||||
g_tlsError = false;
|
||||
Mprintf("[TLS] disabled: no trust anchor configured, plaintext mode\n");
|
||||
return;
|
||||
err = "no trust anchor configured";
|
||||
return TLS_ANCHOR_NONE;
|
||||
}
|
||||
|
||||
// 证书已配置:管理员已「颁发」,必须走 TLS;加载失败即拒绝连接(fail-closed),
|
||||
// 不能静默回退明文。
|
||||
HCERTSTORE store = NULL;
|
||||
if (!LoadTrustAnchor(pem, source, &store)) {
|
||||
g_tlsEnabled = false;
|
||||
g_tlsError = true;
|
||||
Mprintf("[TLS] FATAL: trust anchor (%s) present but failed to load; refusing connections (fail-closed)\n",
|
||||
source.c_str());
|
||||
return;
|
||||
err = "trust anchor (" + source + ") present but failed to load";
|
||||
return TLS_ANCHOR_INVALID;
|
||||
}
|
||||
|
||||
// 严格钉扎:链引擎只信任该 store 里的根证书,排除系统根库。否则攻击者拿一张任意
|
||||
@@ -190,33 +191,87 @@ void InitTls()
|
||||
HCERTCHAINENGINE engine = NULL;
|
||||
if (!CertCreateCertificateChainEngine(&ec, &engine)) {
|
||||
CertCloseStore(store, 0);
|
||||
g_tlsEnabled = false;
|
||||
g_tlsError = true;
|
||||
Mprintf("[TLS] FATAL: CertCreateCertificateChainEngine failed; refusing connections (fail-closed)\n");
|
||||
return;
|
||||
err = "CertCreateCertificateChainEngine failed";
|
||||
return TLS_ANCHOR_INVALID;
|
||||
}
|
||||
|
||||
*outStore = store;
|
||||
*outEngine = engine;
|
||||
return TLS_ANCHOR_OK;
|
||||
}
|
||||
|
||||
// 按当前信任锚重建 TLS 状态(调用方持 g_tlsMtx)。
|
||||
// 首次加载失败 → fail-closed(管理员已「颁发」证书,不能静默回退明文);运行期热重载
|
||||
// 失败 → 保持现有状态不变,返回 false(一次坏下发不该打死正在工作的客户端;下次启动
|
||||
// 仍会 fail-closed)。
|
||||
bool ApplyTlsStateLocked(bool initial, std::string& err)
|
||||
{
|
||||
HCERTSTORE store = NULL;
|
||||
HCERTCHAINENGINE engine = NULL;
|
||||
std::string source;
|
||||
const TlsAnchor anchor = BuildTlsAnchor(&store, &engine, source, err);
|
||||
|
||||
if (anchor == TLS_ANCHOR_INVALID) {
|
||||
if (initial) {
|
||||
g_tlsEnabled = false;
|
||||
g_tlsError = true;
|
||||
g_tlsLoaded = true;
|
||||
Mprintf("[TLS] FATAL: %s; refusing connections (fail-closed)\n", err.c_str());
|
||||
} else {
|
||||
Mprintf("[TLS] reload failed: %s (keeping current transport)\n", err.c_str());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// 互换。旧 store/engine 可以直接释放:校验路径持同一把锁,此刻没有线程在用它们。
|
||||
HCERTSTORE oldStore = g_tlsStore;
|
||||
HCERTCHAINENGINE oldEngine = g_tlsEngine;
|
||||
g_tlsStore = store;
|
||||
g_tlsEngine = engine;
|
||||
g_tlsEnabled = true;
|
||||
g_tlsEnabled = (anchor == TLS_ANCHOR_OK);
|
||||
g_tlsError = false;
|
||||
Mprintf("[TLS] enabled: trust anchor loaded (%s), all connections use TLS\n", source.c_str());
|
||||
g_tlsLoaded = true;
|
||||
if (oldEngine) CertFreeCertificateChainEngine(oldEngine);
|
||||
if (oldStore) CertCloseStore(oldStore, 0);
|
||||
|
||||
if (g_tlsEnabled)
|
||||
Mprintf("[TLS] enabled: trust anchor loaded (%s), all connections use TLS\n", source.c_str());
|
||||
else
|
||||
Mprintf("[TLS] disabled: no trust anchor configured, plaintext mode\n");
|
||||
return true;
|
||||
}
|
||||
|
||||
// 首次调用时才真正加载;之后一律用缓存的状态(热重载由 TlsReload 负责)。
|
||||
inline void EnsureTlsLoadedLocked()
|
||||
{
|
||||
if (!g_tlsLoaded) {
|
||||
std::string err;
|
||||
ApplyTlsStateLocked(true, err);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
bool TlsEnabled()
|
||||
{
|
||||
std::call_once(g_tlsOnce, InitTls);
|
||||
std::lock_guard<std::mutex> lk(g_tlsMtx);
|
||||
EnsureTlsLoadedLocked();
|
||||
return g_tlsEnabled;
|
||||
}
|
||||
|
||||
bool TlsLoadError()
|
||||
{
|
||||
std::call_once(g_tlsOnce, InitTls);
|
||||
std::lock_guard<std::mutex> lk(g_tlsMtx);
|
||||
EnsureTlsLoadedLocked();
|
||||
return g_tlsError;
|
||||
}
|
||||
|
||||
bool TlsReload(std::string& err)
|
||||
{
|
||||
std::lock_guard<std::mutex> lk(g_tlsMtx);
|
||||
return ApplyTlsStateLocked(!g_tlsLoaded, err);
|
||||
}
|
||||
|
||||
// ---- TlsChannel ----
|
||||
|
||||
void TlsChannel::CloseHandles()
|
||||
@@ -249,6 +304,8 @@ bool TlsChannel::VerifyServerCert()
|
||||
if (sc != SEC_E_OK || !remote)
|
||||
return false;
|
||||
|
||||
// 与 TlsReload 互斥:校验期间持有 g_tlsMtx,重建时释放的旧 store/engine 不会正被使用。
|
||||
std::lock_guard<std::mutex> lk(g_tlsMtx);
|
||||
if (!g_tlsStore || !g_tlsEngine) {
|
||||
CertFreeCertificateContext(remote);
|
||||
return false;
|
||||
@@ -273,7 +330,7 @@ bool TlsChannel::VerifyServerCert()
|
||||
return trusted;
|
||||
}
|
||||
|
||||
bool TlsChannel::Handshake(SOCKET sock)
|
||||
bool TlsChannel::Handshake(SOCKET sock, const char* sni)
|
||||
{
|
||||
std::lock_guard<std::recursive_mutex> lk(m_ctxMtx);
|
||||
CloseHandles(); // 重连时清理上一次会话(recursive 锁,此处可重入)
|
||||
@@ -300,8 +357,10 @@ bool TlsChannel::Handshake(SOCKET sock)
|
||||
SecBufferDesc outDesc = { SECBUFFER_VERSION, 1, &outBuf };
|
||||
ULONG attrs = 0;
|
||||
|
||||
// 首次调用产生 ClientHello
|
||||
sc = InitializeSecurityContextA(&m_cred, NULL, NULL, flags, 0, SECURITY_NATIVE_DREP,
|
||||
// 首次调用产生 ClientHello。pszTargetName 非空时 Schannel 会把它作为 SNI 发送,
|
||||
// 供反代按域名分流;证书校验仍是手动钉信任锚(SCH_CRED_MANUAL_CRED_VALIDATION),
|
||||
// 不因传了名字而启用主机名校验。
|
||||
sc = InitializeSecurityContextA(&m_cred, NULL, (SEC_CHAR*)sni, flags, 0, SECURITY_NATIVE_DREP,
|
||||
NULL, 0, &m_ctx, &outDesc, &attrs, &tsExpiry);
|
||||
m_ctxValid = true; // 上下文已分配,之后必须 DeleteSecurityContext
|
||||
if (sc != SEC_I_CONTINUE_NEEDED && sc != SEC_E_OK) {
|
||||
@@ -340,7 +399,7 @@ bool TlsChannel::Handshake(SOCKET sock)
|
||||
outBuf = { 0, SECBUFFER_TOKEN, NULL };
|
||||
outDesc = { SECBUFFER_VERSION, 1, &outBuf };
|
||||
|
||||
sc = InitializeSecurityContextA(&m_cred, &m_ctx, NULL, flags, 0, SECURITY_NATIVE_DREP,
|
||||
sc = InitializeSecurityContextA(&m_cred, &m_ctx, (SEC_CHAR*)sni, flags, 0, SECURITY_NATIVE_DREP,
|
||||
&inDesc, 0, NULL, &outDesc, &attrs, &tsExpiry);
|
||||
|
||||
// 裁剪已消费的输入,仅保留 SECBUFFER_EXTRA 指向的未消费尾部
|
||||
|
||||
Reference in new issue
Block a user