JetSprow/J-Board-Lite
1
0
Fork 0
mirror of https://github.com/JetSprow/J-Board-Lite.git synced 2026-05-01 01:14:10 +05:30
Code Issues Packages Projects Releases Wiki Activity

fix: support xray access log from format

Browse Source
This commit is contained in:
JetSprow
2026-04-29 19:21:42 +10:00
parent 0319212b84
commit 843753bed6
4 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent/jboard-agent/Makefile
View File

@@ -1,5 +1,5 @@
BINARY := jboard-agent BINARY := jboard-agent
VERSION := 3.0.1 VERSION := 3.0.2
LDFLAGS := -s -w LDFLAGS := -s -w
.PHONY: build build-linux clean .PHONY: build build-linux clean

2
agent/jboard-agent/cmd/agent/main.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/jboard/jboard-agent/internal/probe" "github.com/jboard/jboard-agent/internal/probe"
) )
const version = "3.0.1" const version = "3.0.2"
func main() { func main() {
debug.SetGCPercent(50) debug.SetGCPercent(50)

2
agent/jboard-agent/internal/probe/xraylog.go
View File

@@ -20,7 +20,7 @@ import (
const maxXrayReadBytes int64 = 2 * 1024 * 1024 const maxXrayReadBytes int64 = 2 * 1024 * 1024
const maxXrayEventsPerPush = 300 const maxXrayEventsPerPush = 300
var xrayAccessLinePattern = regexp.MustCompile(`^(\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2})\s+(\S+)\s+(accepted|rejected)\s+(?:(tcp|udp):)?(\S+)\s+\[([^\]]+)\](?:.*?\bemail:\s*([^\s]+))?`) var xrayAccessLinePattern = regexp.MustCompile(`^(\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}(?:\.\d+)?)\s+(?:from\s+)?(\S+)\s+(accepted|rejected)\s+(?:(tcp|udp):)?(\S+)\s+\[([^\]]+)\](?:.*?\bemail:\s*([^\s]+))?`)
type xrayLogState struct { type xrayLogState struct {
Path string `json:"path"` Path string `json:"path"`

31
agent/jboard-agent/internal/probe/xraylog_test.go
View File

@@ -44,6 +44,37 @@ func TestParseXrayAccessLineWithIPv6Source(t *testing.T) {
} }
} }
func TestParseXrayAccessLineWithFromAndFractionalTimestamp(t *testing.T) {
line := "2026/04/29 09:20:06.006542 from tcp:220.240.111.193:59433 accepted udp:71.18.167.208:443 [inbound-17583 >> direct] email: user@test.com-cmojtnp3"
got, ok := parseXrayAccessLine(line)
if !ok {
t.Fatal("parseXrayAccessLine() failed")
}
if got.SourceIP != "220.240.111.193" {
t.Fatalf("SourceIP = %q", got.SourceIP)
}
if got.ClientEmail != "user@test.com-cmojtnp3" {
t.Fatalf("ClientEmail = %q", got.ClientEmail)
}
if got.InboundTag != "inbound-17583" {
t.Fatalf("InboundTag = %q", got.InboundTag)
}
if got.Network != "udp" || got.TargetHost != "71.18.167.208" || got.TargetPort != 443 {
t.Fatalf("target = %s %s:%d", got.Network, got.TargetHost, got.TargetPort)
}
}
func TestParseXrayAccessLineWithFromPlainSource(t *testing.T) {
line := "2026/04/29 09:20:05.982584 from 220.240.111.193:59425 accepted tcp:webcast3-core-c-lf.amemv.com:443 [inbound-17583 >> direct] email: user@test.com-cmojtnp3"
got, ok := parseXrayAccessLine(line)
if !ok {
t.Fatal("parseXrayAccessLine() failed")
}
if got.SourceIP != "220.240.111.193" || got.Network != "tcp" || got.TargetHost != "webcast3-core-c-lf.amemv.com" {
t.Fatalf("parsed = %+v", got)
}
}
func TestAggregateXrayAccessLines(t *testing.T) { func TestAggregateXrayAccessLines(t *testing.T) {
lines := []string{ lines := []string{
"2026/04/29 10:11:12 203.0.113.9:51820 accepted tcp:example.com:443 [proxy] email: user@example.com-cabc1234", "2026/04/29 10:11:12 203.0.113.9:51820 accepted tcp:example.com:443 [proxy] email: user@example.com-cabc1234",