captcha2 — C++20 验证码服务(FreeType + stb_image_write): - 完整实现: 图片生成、CaptchaStore、RateLimiter、pymsg RPC 路由 - 协议完全兼容 Python 原版,gateway 零改动 审计修复 (captcha2_SECURITY_AUDIT_20260809.md): - P0-1: 存储答案小写化 (对齐 Python 版语义) - P1-1: gateway 按 IP 限流 10/min + captcha2 全局限流 600/min 兜底 - P2-1: generate_text mt19937 → std::random_device - P2-2: ::tolower UB → unsigned char lambda - P3-1: parse_int 辅助函数, stoi 异常可诊断 - P3-2: 显式 #include <iomanip> - P3-3: 补齐 CAPTCHA_LEN/TTL/RATE_LIMIT 环境变量 - P3-4: LogC 日志超时 5.0→1.0s - P3-5: 限流/满容抛异常, gateway 映射 429/503 - P3-6: 清理死代码 集成: - core/init.txt: captcha → captcha2 - confs configs/captcha.ini: 新增 max_store/rate_limit_per_min - docs: 开发方案、安全审计报告、交叉引用更新
112 lines
3.0 KiB
C++
112 lines
3.0 KiB
C++
/*
|
||
* LogC.hpp — captcha2 异步日志客户端(简化版)
|
||
*
|
||
* 基于 libmsg AsyncQueue,异步批量推送日志到 db:8005 的 Logs 表。
|
||
* - 内存队列 + 后台线程攒批(满 50 条或 2 秒 flush)
|
||
* - fail-safe:db 不可用时静默丢弃
|
||
* - API: info() / warning() / error()
|
||
*/
|
||
#pragma once
|
||
|
||
#include <us/Msg.hpp>
|
||
#include <us/AsyncQueue.hpp>
|
||
#include <boost/json.hpp>
|
||
#include <iostream>
|
||
#include <string>
|
||
#include <vector>
|
||
#include <chrono>
|
||
#include <cstdlib>
|
||
|
||
namespace captcha2 {
|
||
|
||
struct LogEntry {
|
||
std::string ts;
|
||
std::string service;
|
||
std::string level;
|
||
std::string message;
|
||
std::string trace_id;
|
||
std::string extra;
|
||
};
|
||
|
||
class LogC {
|
||
public:
|
||
static LogC& instance() {
|
||
static LogC inst;
|
||
return inst;
|
||
}
|
||
|
||
void info(const std::string& svc, const std::string& msg) {
|
||
push(svc, "INFO", msg);
|
||
}
|
||
void warning(const std::string& svc, const std::string& msg) {
|
||
push(svc, "WARNING", msg);
|
||
}
|
||
void error(const std::string& svc, const std::string& msg) {
|
||
push(svc, "ERROR", msg);
|
||
}
|
||
|
||
private:
|
||
LogC() {
|
||
const char* host = std::getenv("DB_HOST");
|
||
const char* port = std::getenv("DB_PORT");
|
||
db_host_ = host ? host : "127.0.0.1";
|
||
db_port_ = port ? std::atoi(port) : 8005;
|
||
|
||
queue_ = std::make_unique<pmc::net::AsyncQueue<LogEntry>>(
|
||
[this](std::vector<LogEntry>&& batch) { send_batch(std::move(batch)); },
|
||
pmc::net::AsyncQueueConfig{.batch_size = 50, .flush_interval = 2.0, .max_queue_size = 10000},
|
||
[](const std::exception& e, std::vector<LogEntry>&&) {
|
||
std::cerr << "[captcha2/log] send failed: " << e.what() << std::endl;
|
||
});
|
||
queue_->start();
|
||
}
|
||
|
||
~LogC() { if (queue_) queue_->shutdown(); }
|
||
|
||
void push(const std::string& svc, const std::string& level, const std::string& msg) {
|
||
auto now = std::chrono::system_clock::now();
|
||
auto t = std::chrono::system_clock::to_time_t(now);
|
||
char buf[32];
|
||
std::strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", std::gmtime(&t));
|
||
|
||
LogEntry e;
|
||
e.ts = buf;
|
||
e.service = svc;
|
||
e.level = level;
|
||
e.message = msg;
|
||
queue_->push(std::move(e));
|
||
}
|
||
|
||
void send_batch(std::vector<LogEntry>&& batch) {
|
||
try {
|
||
// P3-4: 复用单连接发送整批日志,超时 1.0s(日志非关键路径,db2 慢时不阻塞 flush 线程过久)
|
||
pmc::net::MsgClient client(db_host_, db_port_, "captcha2-log");
|
||
for (auto& e : batch) {
|
||
boost::json::object vals;
|
||
vals["ts"] = e.ts;
|
||
vals["service"] = e.service;
|
||
vals["level"] = e.level;
|
||
vals["message"] = e.message;
|
||
vals["trace_id"] = e.trace_id.empty() ? nullptr : boost::json::value(e.trace_id);
|
||
vals["extra"] = e.extra.empty() ? nullptr : boost::json::value(e.extra);
|
||
|
||
boost::json::object req;
|
||
req["_route"] = "execute";
|
||
req["action"] = "insert";
|
||
req["table"] = "Logs";
|
||
req["values"] = vals;
|
||
|
||
client.call(boost::json::serialize(req), 1.0);
|
||
}
|
||
} catch (const std::exception& e) {
|
||
std::cerr << "[captcha2/log] batch drop: " << e.what() << std::endl;
|
||
}
|
||
}
|
||
|
||
std::string db_host_;
|
||
int db_port_;
|
||
std::unique_ptr<pmc::net::AsyncQueue<LogEntry>> queue_;
|
||
};
|
||
|
||
} // namespace captcha2
|