mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-02 11:15:03 +03:00
MHSanaei
93d1e63554
decodeCappedValues is documented to count JSON values, but it also counted object keys and closing brackets, so a node's GUID-keyed online and IP trees reached the cap at roughly half the stated number of values, and the master then refused the whole report rather than the excess. Keys and closing brackets no longer count; every value, nested ones included, still does.
72 lines
2.0 KiB
Go
72 lines
2.0 KiB
Go
package runtime
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"unicode/utf8"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/util/json_util"
|
|
)
|
|
|
|
// Per-endpoint caps on node-reported lists: each "{}" decodes into a whole struct, so the
|
|
// byte cap alone still lets a node's answer expand into gigabytes.
|
|
const (
|
|
maxNodeDescendants = 1024
|
|
maxNodeInbounds = 65536
|
|
maxNodeHostGroups = 65536
|
|
maxNodeClientIPs = 1 << 20
|
|
// maxNodeMapValues bounds every value of the GUID-keyed trees and maps a node reports.
|
|
maxNodeMapValues = 1 << 20
|
|
)
|
|
|
|
var errRemoteListTooLong = json_util.ErrListTooLong
|
|
|
|
// decodeCappedValues unmarshals raw into v after checking it holds at most maxValues
|
|
// JSON values in all, nested ones included; object keys and closing brackets are not values.
|
|
func decodeCappedValues(raw json.RawMessage, v any, maxValues int) error {
|
|
dec := json.NewDecoder(bytes.NewReader(raw))
|
|
// One frame per open container; an object's strings alternate between key and value.
|
|
type frame struct{ object, wantKey bool }
|
|
var open []frame
|
|
count := 0
|
|
for {
|
|
tok, err := dec.Token()
|
|
if err != nil {
|
|
break
|
|
}
|
|
delim, isDelim := tok.(json.Delim)
|
|
if isDelim && (delim == ']' || delim == '}') {
|
|
open = open[:len(open)-1]
|
|
continue
|
|
}
|
|
if top := len(open) - 1; top >= 0 && open[top].object {
|
|
if open[top].wantKey {
|
|
open[top].wantKey = false
|
|
continue
|
|
}
|
|
open[top].wantKey = true
|
|
}
|
|
if count++; count > maxValues {
|
|
return fmt.Errorf("%w (%d values)", errRemoteListTooLong, maxValues)
|
|
}
|
|
if isDelim {
|
|
open = append(open, frame{object: delim == '{', wantKey: delim == '{'})
|
|
}
|
|
}
|
|
return json.Unmarshal(raw, v)
|
|
}
|
|
|
|
// truncateNodeMessage bounds a node-supplied message the master turns into an error,
|
|
// which is logged and stored as the node's lastError.
|
|
func truncateNodeMessage(msg string) string {
|
|
if len(msg) <= errBodyDiagBytes {
|
|
return msg
|
|
}
|
|
cut := errBodyDiagBytes
|
|
for cut > 0 && !utf8.RuneStart(msg[cut]) {
|
|
cut--
|
|
}
|
|
return msg[:cut] + "... (truncated)"
|
|
}
|