mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-23 19:37:13 +00:00
37c5e0bfd2
* fix(api-docs): document clientIpsByGuid route
Restores a green `go test ./...` baseline: TestAPIRoutesDocumented
flagged POST /panel/api/clients/clientIpsByGuid (added in 9385b6c6)
as undocumented in endpoints.ts.
* test(node): characterize current node TLS + API auth behavior
Phase 0 regression net for the mTLS work. These pass on unchanged
production code and lock the pre-mTLS contracts so later phases can be
proven additive:
- tlsConfigForNode: skip -> InsecureSkipVerify (no VerifyConnection);
pin -> VerifyConnection installed.
- checkAPIAuth: bearer match -> Next + api_authed; unauthenticated ->
401 (XHR) / 404; valid session -> Next.
- panel HTTPS listener with no ClientAuth accepts a client that presents
no client certificate (the browsers-keep-working invariant).
* feat(crypto): node-auth CA + client-cert minting (TDD)
Stdlib-only ECDSA P-256 helpers for the node mTLS work:
- GenerateNodeCA: self-signed CA (IsCA, CertSign, path len 0)
- IssueClientCert: client-auth leaf (ExtKeyUsageClientAuth) signed by CA
- LoadCAFromPEM: parse a CA cert+key for issuing / trust-pool building
Tests assert the contract (leaf verifies against the issuing CA with
ExtKeyUsageClientAuth), seen failing on the assertion before impl.
* feat(node): lazy node mTLS CA + client cert in settings (TDD)
SettingService gains opt-in mTLS material, all stored as Setting rows
with empty defaults and kept out of entity.AllSetting (so private keys
never reach the settings UI/export):
- EnsureNodeMtlsCA: mint+persist the node-auth CA once, reuse thereafter
- EnsureMasterClientCert: issue the master client cert from the CA, idempotent
- NodeMtlsClientCAPool: ClientCAs trust pool for the listener; nil when
unconfigured so the no-mTLS path is unchanged
Tests assert idempotency and that the client cert verifies against the CA
for client auth; seen failing on the assertion before impl.
* feat(node): mtls client TLS config + master-cert provider (TDD)
tlsConfigForNode gains an 'mtls' branch that presents the master client
certificate and verifies the node server against system roots (no
InsecureSkipVerify, no custom RootCAs). The cert is supplied via an
injected MasterClientCertProvider so runtime need not import service;
it fails closed when unconfigured. skip/pin contracts unchanged.
* feat(node): allow tokenless mtls nodes in remote do() (TDD)
mtls nodes authenticate with a client certificate, so the bearer token
becomes optional for them: do() no longer rejects an empty ApiToken when
TlsVerifyMode is mtls, and the Authorization header is omitted when no
token is set. Every other mode still requires a token (regression kept).
* feat(node): authenticate verified client certs in checkAPIAuth (TDD)
A completed mTLS handshake (non-empty r.TLS.VerifiedChains) now
authenticates an API request, equivalent to a valid bearer token, and
sets api_authed so the CSRF middleware lets cert-authed mutations
through. Bearer/session/reject paths unchanged. The accept-path assert
was mutation-checked (guard flipped -> test red -> reverted).
* feat(node): opt-in mTLS on the panel listener (TDD; mutation-checked)
web.go now applies VerifyClientCertIfGiven + ClientCAs to the HTTPS
listener when a node trust CA is configured, and wires the master client
cert provider for outbound mtls calls. With no CA the listener is
byte-identical to before (browsers unaffected).
applyNodeMtls is covered end-to-end: no-cert client handshakes (browsers
keep working), a CA-signed client cert verifies, a foreign-CA cert is
rejected at the handshake. Mutation-checked:
- RequireAndVerifyClientCert -> no-cert client rejected (red) -> reverted
- drop ClientCAs -> master cert no longer trusted (red) -> reverted
* feat(node): accept mtls verify-mode + CA reveal endpoint (TDD)
- model.Node.TlsVerifyMode validator now accepts 'mtls'
- normalize() preserves mtls and requires the node scheme to be https
(fail closed), instead of clamping mtls back to verify
- NodeService.NodeMtlsCaCert + POST /panel/api/nodes/mtls/ca return this
panel's node-auth CA cert (public) to paste into a node, minting the CA
+ master client cert on first call
- endpoints.ts documents the new route (doc-sync test)
No model column added (enum is a string), so no migration/codegen.
* feat(node): node mTLS UI + trust-CA setter (TDD)
Backend:
- NodeService.SetNodeMtlsTrustCA + POST /panel/api/nodes/mtls/trustCA
store the CA this panel trusts for incoming node-API client certs
(validates PEM, empty clears); applied on next restart
- endpoints.ts + regenerated openapi.json document both mtls routes
Frontend:
- node form: 'mtls' TLS-verify option + setup hint (zod enum updated)
- Nodes page 'Node mTLS' card: copy this panel's CA, and paste/save the
trusted parent CA
- en-US i18n keys (other locales fall back to en-US)
Gates green: go build (native+windows), vet, go test ./...; frontend
typecheck, lint, vitest (541).
* style(node): gofmt web_mtls_test doc comment
* feat(node): hashed+zstd reconcile transport (TDD, negotiated, mixed-version safe)
Adds an integrity + compression envelope to node config pushes:
- internal/util/wirecodec: shared zstd codec (bomb-capped decode) +
SHA-256 hashing + the header/capability constants
- Remote.do(): always attaches X-Config-Sha256 of the uncompressed body;
zstd-compresses only when the node advertised support (learned from its
X-3x-Node-Caps response header) and the body is >=1KiB
- ConfigEnvelopeMiddleware on /panel/api: advertises the cap, decompresses
and verifies the hash (handler not invoked on mismatch) before binding
Mixed-version safe: old nodes never advertise the cap -> plain bodies;
the hash header is verify-if-present so any panel/node mix interoperates
(existing reconcile tests stay green). klauspost/compress promoted to a
direct dep. Hash-mismatch reject was mutation-checked (compare defeated
-> test red -> reverted).
* feat(node): per-node network throughput metrics (TDD)
The node status response already carries gopsutil netIO.up/down (summed
non-virtual interfaces), so no node-side change is needed:
- probe() parses netIO.up/down into HeartbeatPatch.NetUp/NetDown
- Node gains net_up/net_down columns (AutoMigrate); UpdateHeartbeat
persists them and appends netUp/netDown to the per-node metric history
- NodeMetricKeys whitelists netUp/netDown so the history endpoint serves them
- NodeHistoryPanel renders Net Up/Down sparklines (KB/s, no 0-100 clamp)
- regenerated frontend types + openapi.json for the new Node fields
* feat(node): move node mTLS controls into a toolbar button + modal
The Node mTLS panel was an always-visible card cluttering the nodes
page. Replace it with a 'Node mTLS' button beside 'Add node' that opens
a modal with the same copy-CA + trusted-parent-CA controls; the modal
closes on a successful save. No backend/i18n changes.
* i18n(node): translate mTLS + net-metrics keys for all locales
Adds the node mTLS strings (tlsMtls, mtlsFormHint, mtls.* dialog + the
saveMtls toast) and the netUp/netDown chart labels to all 12 non-English
catalogs (ar, es, fa, id, ja, pt, ru, tr, uk, vi, zh-CN, zh-TW), matching
each catalog's existing terminology. Technical tokens (mTLS/TLS/CA/API/
KB/s) kept verbatim.
* fix(node): address Copilot review on node-hardening PR
- setting_mtls: fail closed on a half-present CA/master-cert pair instead of
silently regenerating (which would rotate the CA and break fleet trust).
- config_envelope: reject non-zstd Content-Encoding on the envelope path
rather than hashing/forwarding a still-encoded body to the handler.
- node mTLS: support tokenless mTLS end-to-end — apiToken is now
required_unless tlsVerifyMode=mtls (model) with matching conditional
validation in NodeFormSchema, so the runtime allowance is actually reachable.
- NodesPage: add a catch block to onSaveTrustCa so save failures surface.
238 lines
7.0 KiB
Go
238 lines
7.0 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/gob"
|
|
"os"
|
|
"path/filepath"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/config"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
|
)
|
|
|
|
// MetricSample is one point of any time-series we keep in memory.
|
|
// The frontend deserializes both keys, so they must stay short.
|
|
type MetricSample struct {
|
|
T int64 `json:"t"`
|
|
V float64 `json:"v"`
|
|
}
|
|
|
|
// metricCapacityDefault caps each ring buffer at ~5h worth of @2s samples
|
|
// or ~25h worth of @10s samples. Plenty for the bucketed aggregation
|
|
// view and small enough that the working set per metric stays under
|
|
// ~150 KiB.
|
|
const metricCapacityDefault = 9000
|
|
|
|
// metricHistory is a thread-safe, in-memory ring buffer keyed by
|
|
// arbitrary strings. Two singletons live below: one for system-wide
|
|
// host metrics, one for per-node metrics. Keeping them in this file
|
|
// (rather than scattered across services) makes the storage model
|
|
// easy to reason about and avoids double-locking.
|
|
type metricHistory struct {
|
|
mu sync.Mutex
|
|
metrics map[string][]MetricSample
|
|
}
|
|
|
|
func newMetricHistory() *metricHistory {
|
|
return &metricHistory{metrics: map[string][]MetricSample{}}
|
|
}
|
|
|
|
// append stores a single sample for the given metric, deduping when
|
|
// two appends happen within the same wall-clock second (which can
|
|
// happen if the cron tick is faster than the metric's natural rate).
|
|
func (h *metricHistory) append(metric string, t time.Time, v float64) {
|
|
h.mu.Lock()
|
|
defer h.mu.Unlock()
|
|
buf := h.metrics[metric]
|
|
p := MetricSample{T: t.Unix(), V: v}
|
|
if n := len(buf); n > 0 && buf[n-1].T == p.T {
|
|
buf[n-1] = p
|
|
} else {
|
|
buf = append(buf, p)
|
|
}
|
|
if len(buf) > metricCapacityDefault {
|
|
buf = buf[len(buf)-metricCapacityDefault:]
|
|
}
|
|
h.metrics[metric] = buf
|
|
}
|
|
|
|
// drop removes the entire history for one metric. Used when a node is
|
|
// deleted so its old samples don't linger forever in the singleton.
|
|
func (h *metricHistory) drop(metric string) {
|
|
h.mu.Lock()
|
|
delete(h.metrics, metric)
|
|
h.mu.Unlock()
|
|
}
|
|
|
|
// snapshot returns a deep copy of every series, safe to serialize without
|
|
// holding the lock during disk I/O.
|
|
func (h *metricHistory) snapshot() map[string][]MetricSample {
|
|
h.mu.Lock()
|
|
defer h.mu.Unlock()
|
|
out := make(map[string][]MetricSample, len(h.metrics))
|
|
for k, v := range h.metrics {
|
|
cp := make([]MetricSample, len(v))
|
|
copy(cp, v)
|
|
out[k] = cp
|
|
}
|
|
return out
|
|
}
|
|
|
|
// restore replaces the in-memory series with a previously persisted set,
|
|
// re-applying the per-series capacity cap so a tampered or oversized file
|
|
// can't grow the working set unbounded.
|
|
func (h *metricHistory) restore(data map[string][]MetricSample) {
|
|
h.mu.Lock()
|
|
defer h.mu.Unlock()
|
|
for k, v := range data {
|
|
if len(v) > metricCapacityDefault {
|
|
v = v[len(v)-metricCapacityDefault:]
|
|
}
|
|
h.metrics[k] = v
|
|
}
|
|
}
|
|
|
|
// aggregate returns up to maxPoints buckets of size bucketSeconds,
|
|
// each bucket carrying the arithmetic mean of the underlying samples.
|
|
// Bucket alignment is to absolute Unix-second boundaries so two
|
|
// concurrent calls (e.g. two browser tabs) see identical x-axes.
|
|
func (h *metricHistory) aggregate(metric string, bucketSeconds int, maxPoints int) []map[string]any {
|
|
if bucketSeconds <= 0 || maxPoints <= 0 {
|
|
return []map[string]any{}
|
|
}
|
|
cutoff := time.Now().Add(-time.Duration(bucketSeconds*maxPoints) * time.Second).Unix()
|
|
|
|
h.mu.Lock()
|
|
hist := h.metrics[metric]
|
|
startIdx := 0
|
|
for i := len(hist) - 1; i >= 0; i-- {
|
|
if hist[i].T < cutoff {
|
|
startIdx = i + 1
|
|
break
|
|
}
|
|
}
|
|
if startIdx >= len(hist) {
|
|
h.mu.Unlock()
|
|
return []map[string]any{}
|
|
}
|
|
tmp := make([]MetricSample, len(hist)-startIdx)
|
|
copy(tmp, hist[startIdx:])
|
|
h.mu.Unlock()
|
|
|
|
if len(tmp) == 0 {
|
|
return []map[string]any{}
|
|
}
|
|
|
|
bSize := int64(bucketSeconds)
|
|
curBucket := (tmp[0].T / bSize) * bSize
|
|
var out []map[string]any
|
|
var acc []float64
|
|
flush := func(ts int64) {
|
|
if len(acc) == 0 {
|
|
return
|
|
}
|
|
sum := 0.0
|
|
for _, v := range acc {
|
|
sum += v
|
|
}
|
|
out = append(out, map[string]any{"t": ts, "v": sum / float64(len(acc))})
|
|
acc = acc[:0]
|
|
}
|
|
for _, p := range tmp {
|
|
b := (p.T / bSize) * bSize
|
|
if b != curBucket {
|
|
flush(curBucket)
|
|
curBucket = b
|
|
}
|
|
acc = append(acc, p.V)
|
|
}
|
|
flush(curBucket)
|
|
if len(out) > maxPoints {
|
|
out = out[len(out)-maxPoints:]
|
|
}
|
|
if out == nil {
|
|
return []map[string]any{}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// systemMetrics holds whole-host time series (cpu, mem, netUp, etc.)
|
|
// fed by ServerService.RefreshStatus every 2s. nodeMetrics holds
|
|
// per-node CPU/Mem fed by NodeHeartbeatJob every 10s. Both are
|
|
// process-local — survival across panel restart is not required.
|
|
var (
|
|
systemMetrics = newMetricHistory()
|
|
nodeMetrics = newMetricHistory()
|
|
xrayMetrics = newMetricHistory()
|
|
)
|
|
|
|
// SystemMetricKeys lists the metric names ServerService writes on every
|
|
// status sample. Exposed for documentation/test purposes; the
|
|
// controller validates incoming names against an allow-list.
|
|
var SystemMetricKeys = []string{
|
|
"cpu", "mem", "swap", "netUp", "netDown", "pktUp", "pktDown", "diskRead", "diskWrite", "diskUsage", "tcpCount", "udpCount", "online", "load1", "load5", "load15",
|
|
}
|
|
|
|
// NodeMetricKeys lists the per-node metric names NodeHeartbeatJob writes.
|
|
var NodeMetricKeys = []string{"cpu", "mem", "netUp", "netDown"}
|
|
|
|
// XrayMetricKeys lists series sourced from xray's /debug/vars expvar
|
|
// endpoint. Populated by XrayMetricsService.Sample on the same 2s cadence
|
|
// as the system metrics, but only when the xray config has a `metrics`
|
|
// block configured.
|
|
var XrayMetricKeys = []string{
|
|
"xrAlloc", "xrSys", "xrHeapObjects", "xrNumGC", "xrPauseNs",
|
|
}
|
|
|
|
// systemMetricsStorePath is where the host time-series is persisted between
|
|
// restarts. It lives next to the database so a single volume mount carries
|
|
// both. Only systemMetrics is persisted — node and xray series are cheap to
|
|
// rebuild and tied to live connections.
|
|
func systemMetricsStorePath() string {
|
|
return filepath.Join(config.GetDBFolderPath(), "system_metrics.gob")
|
|
}
|
|
|
|
// PersistSystemMetrics writes the host time-series to disk via a temp file +
|
|
// rename so a crash mid-write can't corrupt the previous snapshot. Called on a
|
|
// timer and at shutdown.
|
|
func PersistSystemMetrics() error {
|
|
path := systemMetricsStorePath()
|
|
tmp := path + ".tmp"
|
|
f, err := os.Create(tmp)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := gob.NewEncoder(f).Encode(systemMetrics.snapshot()); err != nil {
|
|
f.Close()
|
|
os.Remove(tmp)
|
|
return err
|
|
}
|
|
if err := f.Close(); err != nil {
|
|
os.Remove(tmp)
|
|
return err
|
|
}
|
|
return os.Rename(tmp, path)
|
|
}
|
|
|
|
// RestoreSystemMetrics loads a previously persisted host time-series on startup.
|
|
// A missing file is not an error (first boot). Aggregation already windows by
|
|
// time, so any gap from downtime is handled by the readers.
|
|
func RestoreSystemMetrics() {
|
|
path := systemMetricsStorePath()
|
|
f, err := os.Open(path)
|
|
if err != nil {
|
|
if !os.IsNotExist(err) {
|
|
logger.Warning("restore system metrics failed:", err)
|
|
}
|
|
return
|
|
}
|
|
defer f.Close()
|
|
var data map[string][]MetricSample
|
|
if err := gob.NewDecoder(f).Decode(&data); err != nil {
|
|
logger.Warning("decode system metrics failed:", err)
|
|
return
|
|
}
|
|
systemMetrics.restore(data)
|
|
}
|