mirror of
https://github.com/XTLS/Xray-core.git
synced 2025-05-09 05:38:41 +00:00
Feat: sniffer exclude domain & ip
This commit is contained in:
JimhHan
parent
14189eba07
commit
06fc82bad1
31 changed files with 653 additions and 411 deletions
243
infra/conf/common/common.go
Normal file
243
infra/conf/common/common.go
Normal file
|
|
@ -0,0 +1,243 @@
|
|||
package common
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/xtls/xray-core/common/net"
|
||||
"github.com/xtls/xray-core/common/protocol"
|
||||
)
|
||||
|
||||
//go:generate go run github.com/xtls/xray-core/common/errors/errorgen
|
||||
|
||||
type StringList []string
|
||||
|
||||
func NewStringList(raw []string) *StringList {
|
||||
list := StringList(raw)
|
||||
return &list
|
||||
}
|
||||
|
||||
func (v StringList) Len() int {
|
||||
return len(v)
|
||||
}
|
||||
|
||||
func (v *StringList) UnmarshalJSON(data []byte) error {
|
||||
var strarray []string
|
||||
if err := json.Unmarshal(data, &strarray); err == nil {
|
||||
*v = *NewStringList(strarray)
|
||||
return nil
|
||||
}
|
||||
|
||||
var rawstr string
|
||||
if err := json.Unmarshal(data, &rawstr); err == nil {
|
||||
strlist := strings.Split(rawstr, ",")
|
||||
*v = *NewStringList(strlist)
|
||||
return nil
|
||||
}
|
||||
return newError("unknown format of a string list: " + string(data))
|
||||
}
|
||||
|
||||
type Address struct {
|
||||
net.Address
|
||||
}
|
||||
|
||||
func (v *Address) UnmarshalJSON(data []byte) error {
|
||||
var rawStr string
|
||||
if err := json.Unmarshal(data, &rawStr); err != nil {
|
||||
return newError("invalid address: ", string(data)).Base(err)
|
||||
}
|
||||
v.Address = net.ParseAddress(rawStr)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (v *Address) Build() *net.IPOrDomain {
|
||||
return net.NewIPOrDomain(v.Address)
|
||||
}
|
||||
|
||||
type Network string
|
||||
|
||||
func (v Network) Build() net.Network {
|
||||
switch strings.ToLower(string(v)) {
|
||||
case "tcp":
|
||||
return net.Network_TCP
|
||||
case "udp":
|
||||
return net.Network_UDP
|
||||
case "unix":
|
||||
return net.Network_UNIX
|
||||
default:
|
||||
return net.Network_Unknown
|
||||
}
|
||||
}
|
||||
|
||||
type NetworkList []Network
|
||||
|
||||
func (v *NetworkList) UnmarshalJSON(data []byte) error {
|
||||
var strarray []Network
|
||||
if err := json.Unmarshal(data, &strarray); err == nil {
|
||||
nl := NetworkList(strarray)
|
||||
*v = nl
|
||||
return nil
|
||||
}
|
||||
|
||||
var rawstr Network
|
||||
if err := json.Unmarshal(data, &rawstr); err == nil {
|
||||
strlist := strings.Split(string(rawstr), ",")
|
||||
nl := make([]Network, len(strlist))
|
||||
for idx, network := range strlist {
|
||||
nl[idx] = Network(network)
|
||||
}
|
||||
*v = nl
|
||||
return nil
|
||||
}
|
||||
return newError("unknown format of a string list: " + string(data))
|
||||
}
|
||||
|
||||
func (v *NetworkList) Build() []net.Network {
|
||||
if v == nil {
|
||||
return []net.Network{net.Network_TCP}
|
||||
}
|
||||
|
||||
list := make([]net.Network, 0, len(*v))
|
||||
for _, network := range *v {
|
||||
list = append(list, network.Build())
|
||||
}
|
||||
return list
|
||||
}
|
||||
|
||||
func parseIntPort(data []byte) (net.Port, error) {
|
||||
var intPort uint32
|
||||
err := json.Unmarshal(data, &intPort)
|
||||
if err != nil {
|
||||
return net.Port(0), err
|
||||
}
|
||||
return net.PortFromInt(intPort)
|
||||
}
|
||||
|
||||
func parseStringPort(s string) (net.Port, net.Port, error) {
|
||||
if strings.HasPrefix(s, "env:") {
|
||||
s = s[4:]
|
||||
s = os.Getenv(s)
|
||||
}
|
||||
|
||||
pair := strings.SplitN(s, "-", 2)
|
||||
if len(pair) == 0 {
|
||||
return net.Port(0), net.Port(0), newError("invalid port range: ", s)
|
||||
}
|
||||
if len(pair) == 1 {
|
||||
port, err := net.PortFromString(pair[0])
|
||||
return port, port, err
|
||||
}
|
||||
|
||||
fromPort, err := net.PortFromString(pair[0])
|
||||
if err != nil {
|
||||
return net.Port(0), net.Port(0), err
|
||||
}
|
||||
toPort, err := net.PortFromString(pair[1])
|
||||
if err != nil {
|
||||
return net.Port(0), net.Port(0), err
|
||||
}
|
||||
return fromPort, toPort, nil
|
||||
}
|
||||
|
||||
func parseJSONStringPort(data []byte) (net.Port, net.Port, error) {
|
||||
var s string
|
||||
err := json.Unmarshal(data, &s)
|
||||
if err != nil {
|
||||
return net.Port(0), net.Port(0), err
|
||||
}
|
||||
return parseStringPort(s)
|
||||
}
|
||||
|
||||
type PortRange struct {
|
||||
From uint32
|
||||
To uint32
|
||||
}
|
||||
|
||||
func (v *PortRange) Build() *net.PortRange {
|
||||
return &net.PortRange{
|
||||
From: v.From,
|
||||
To: v.To,
|
||||
}
|
||||
}
|
||||
|
||||
// UnmarshalJSON implements encoding/json.Unmarshaler.UnmarshalJSON
|
||||
func (v *PortRange) UnmarshalJSON(data []byte) error {
|
||||
port, err := parseIntPort(data)
|
||||
if err == nil {
|
||||
v.From = uint32(port)
|
||||
v.To = uint32(port)
|
||||
return nil
|
||||
}
|
||||
|
||||
from, to, err := parseJSONStringPort(data)
|
||||
if err == nil {
|
||||
v.From = uint32(from)
|
||||
v.To = uint32(to)
|
||||
if v.From > v.To {
|
||||
return newError("invalid port range ", v.From, " -> ", v.To)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
return newError("invalid port range: ", string(data))
|
||||
}
|
||||
|
||||
type PortList struct {
|
||||
Range []PortRange
|
||||
}
|
||||
|
||||
func (list *PortList) Build() *net.PortList {
|
||||
portList := new(net.PortList)
|
||||
for _, r := range list.Range {
|
||||
portList.Range = append(portList.Range, r.Build())
|
||||
}
|
||||
return portList
|
||||
}
|
||||
|
||||
// UnmarshalJSON implements encoding/json.Unmarshaler.UnmarshalJSON
|
||||
func (list *PortList) UnmarshalJSON(data []byte) error {
|
||||
var listStr string
|
||||
var number uint32
|
||||
if err := json.Unmarshal(data, &listStr); err != nil {
|
||||
if err2 := json.Unmarshal(data, &number); err2 != nil {
|
||||
return newError("invalid port: ", string(data)).Base(err2)
|
||||
}
|
||||
}
|
||||
rangelist := strings.Split(listStr, ",")
|
||||
for _, rangeStr := range rangelist {
|
||||
trimmed := strings.TrimSpace(rangeStr)
|
||||
if len(trimmed) > 0 {
|
||||
if strings.Contains(trimmed, "-") {
|
||||
from, to, err := parseStringPort(trimmed)
|
||||
if err != nil {
|
||||
return newError("invalid port range: ", trimmed).Base(err)
|
||||
}
|
||||
list.Range = append(list.Range, PortRange{From: uint32(from), To: uint32(to)})
|
||||
} else {
|
||||
port, err := parseIntPort([]byte(trimmed))
|
||||
if err != nil {
|
||||
return newError("invalid port: ", trimmed).Base(err)
|
||||
}
|
||||
list.Range = append(list.Range, PortRange{From: uint32(port), To: uint32(port)})
|
||||
}
|
||||
}
|
||||
}
|
||||
if number != 0 {
|
||||
list.Range = append(list.Range, PortRange{From: number, To: number})
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type User struct {
|
||||
EmailString string `json:"email"`
|
||||
LevelByte byte `json:"level"`
|
||||
}
|
||||
|
||||
func (v *User) Build() *protocol.User {
|
||||
return &protocol.User{
|
||||
Email: v.EmailString,
|
||||
Level: uint32(v.LevelByte),
|
||||
}
|
||||
}
|
||||
231
infra/conf/common/common_test.go
Normal file
231
infra/conf/common/common_test.go
Normal file
|
|
@ -0,0 +1,231 @@
|
|||
package common_test
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
"github.com/google/go-cmp/cmp/cmpopts"
|
||||
|
||||
"github.com/xtls/xray-core/common"
|
||||
"github.com/xtls/xray-core/common/net"
|
||||
"github.com/xtls/xray-core/common/protocol"
|
||||
. "github.com/xtls/xray-core/infra/conf/common"
|
||||
)
|
||||
|
||||
func TestStringListUnmarshalError(t *testing.T) {
|
||||
rawJSON := `1234`
|
||||
list := new(StringList)
|
||||
err := json.Unmarshal([]byte(rawJSON), list)
|
||||
if err == nil {
|
||||
t.Error("expected error, but got nil")
|
||||
}
|
||||
}
|
||||
|
||||
func TestStringListLen(t *testing.T) {
|
||||
rawJSON := `"a, b, c, d"`
|
||||
var list StringList
|
||||
err := json.Unmarshal([]byte(rawJSON), &list)
|
||||
common.Must(err)
|
||||
if r := cmp.Diff([]string(list), []string{"a", " b", " c", " d"}); r != "" {
|
||||
t.Error(r)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIPParsing(t *testing.T) {
|
||||
rawJSON := "\"8.8.8.8\""
|
||||
var address Address
|
||||
err := json.Unmarshal([]byte(rawJSON), &address)
|
||||
common.Must(err)
|
||||
if r := cmp.Diff(address.IP(), net.IP{8, 8, 8, 8}); r != "" {
|
||||
t.Error(r)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDomainParsing(t *testing.T) {
|
||||
rawJSON := "\"example.com\""
|
||||
var address Address
|
||||
common.Must(json.Unmarshal([]byte(rawJSON), &address))
|
||||
if address.Domain() != "example.com" {
|
||||
t.Error("domain: ", address.Domain())
|
||||
}
|
||||
}
|
||||
|
||||
func TestURLParsing(t *testing.T) {
|
||||
{
|
||||
rawJSON := "\"https://dns.google/dns-query\""
|
||||
var address Address
|
||||
common.Must(json.Unmarshal([]byte(rawJSON), &address))
|
||||
if address.Domain() != "https://dns.google/dns-query" {
|
||||
t.Error("URL: ", address.Domain())
|
||||
}
|
||||
}
|
||||
{
|
||||
rawJSON := "\"https+local://dns.google/dns-query\""
|
||||
var address Address
|
||||
common.Must(json.Unmarshal([]byte(rawJSON), &address))
|
||||
if address.Domain() != "https+local://dns.google/dns-query" {
|
||||
t.Error("URL: ", address.Domain())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestInvalidAddressJson(t *testing.T) {
|
||||
rawJSON := "1234"
|
||||
var address Address
|
||||
err := json.Unmarshal([]byte(rawJSON), &address)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
}
|
||||
|
||||
func TestStringNetwork(t *testing.T) {
|
||||
var network Network
|
||||
common.Must(json.Unmarshal([]byte(`"tcp"`), &network))
|
||||
if v := network.Build(); v != net.Network_TCP {
|
||||
t.Error("network: ", v)
|
||||
}
|
||||
}
|
||||
|
||||
func TestArrayNetworkList(t *testing.T) {
|
||||
var list NetworkList
|
||||
common.Must(json.Unmarshal([]byte("[\"Tcp\"]"), &list))
|
||||
|
||||
nlist := list.Build()
|
||||
if !net.HasNetwork(nlist, net.Network_TCP) {
|
||||
t.Error("no tcp network")
|
||||
}
|
||||
if net.HasNetwork(nlist, net.Network_UDP) {
|
||||
t.Error("has udp network")
|
||||
}
|
||||
}
|
||||
|
||||
func TestStringNetworkList(t *testing.T) {
|
||||
var list NetworkList
|
||||
common.Must(json.Unmarshal([]byte("\"TCP, ip\""), &list))
|
||||
|
||||
nlist := list.Build()
|
||||
if !net.HasNetwork(nlist, net.Network_TCP) {
|
||||
t.Error("no tcp network")
|
||||
}
|
||||
if net.HasNetwork(nlist, net.Network_UDP) {
|
||||
t.Error("has udp network")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInvalidNetworkJson(t *testing.T) {
|
||||
var list NetworkList
|
||||
err := json.Unmarshal([]byte("0"), &list)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
}
|
||||
|
||||
func TestIntPort(t *testing.T) {
|
||||
var portRange PortRange
|
||||
common.Must(json.Unmarshal([]byte("1234"), &portRange))
|
||||
|
||||
if r := cmp.Diff(portRange, PortRange{
|
||||
From: 1234, To: 1234,
|
||||
}); r != "" {
|
||||
t.Error(r)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOverRangeIntPort(t *testing.T) {
|
||||
var portRange PortRange
|
||||
err := json.Unmarshal([]byte("70000"), &portRange)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
|
||||
err = json.Unmarshal([]byte("-1"), &portRange)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnvPort(t *testing.T) {
|
||||
common.Must(os.Setenv("PORT", "1234"))
|
||||
|
||||
var portRange PortRange
|
||||
common.Must(json.Unmarshal([]byte("\"env:PORT\""), &portRange))
|
||||
|
||||
if r := cmp.Diff(portRange, PortRange{
|
||||
From: 1234, To: 1234,
|
||||
}); r != "" {
|
||||
t.Error(r)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSingleStringPort(t *testing.T) {
|
||||
var portRange PortRange
|
||||
common.Must(json.Unmarshal([]byte("\"1234\""), &portRange))
|
||||
|
||||
if r := cmp.Diff(portRange, PortRange{
|
||||
From: 1234, To: 1234,
|
||||
}); r != "" {
|
||||
t.Error(r)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStringPairPort(t *testing.T) {
|
||||
var portRange PortRange
|
||||
common.Must(json.Unmarshal([]byte("\"1234-5678\""), &portRange))
|
||||
|
||||
if r := cmp.Diff(portRange, PortRange{
|
||||
From: 1234, To: 5678,
|
||||
}); r != "" {
|
||||
t.Error(r)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOverRangeStringPort(t *testing.T) {
|
||||
var portRange PortRange
|
||||
err := json.Unmarshal([]byte("\"65536\""), &portRange)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
|
||||
err = json.Unmarshal([]byte("\"70000-80000\""), &portRange)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
|
||||
err = json.Unmarshal([]byte("\"1-90000\""), &portRange)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
|
||||
err = json.Unmarshal([]byte("\"700-600\""), &portRange)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
}
|
||||
|
||||
func TestUserParsing(t *testing.T) {
|
||||
user := new(User)
|
||||
common.Must(json.Unmarshal([]byte(`{
|
||||
"id": "96edb838-6d68-42ef-a933-25f7ac3a9d09",
|
||||
"email": "love@example.com",
|
||||
"level": 1,
|
||||
"alterId": 100
|
||||
}`), user))
|
||||
|
||||
nUser := user.Build()
|
||||
if r := cmp.Diff(nUser, &protocol.User{
|
||||
Level: 1,
|
||||
Email: "love@example.com",
|
||||
}, cmpopts.IgnoreUnexported(protocol.User{})); r != "" {
|
||||
t.Error(r)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInvalidUserJson(t *testing.T) {
|
||||
user := new(User)
|
||||
err := json.Unmarshal([]byte(`{"email": 1234}`), user)
|
||||
if err == nil {
|
||||
t.Error("nil error")
|
||||
}
|
||||
}
|
||||
9
infra/conf/common/errors.generated.go
Normal file
9
infra/conf/common/errors.generated.go
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
package common
|
||||
|
||||
import "github.com/xtls/xray-core/common/errors"
|
||||
|
||||
type errPathObjHolder struct{}
|
||||
|
||||
func newError(values ...interface{}) *errors.Error {
|
||||
return errors.New(values...).WithPathObj(errPathObjHolder{})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue