Skip to content

feat: 支持从本地配置文件加载自定义出站规则 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ember-Moth wants to merge 1 commit into from
Closed

feat: 支持从本地配置文件加载自定义出站规则 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions api/panel/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,30 @@ type DNSItem struct {
}

type Outbound struct {
Name string `json:"name"`
Protocol string `json:"protocol"`
Address string `json:"address"`
Port int `json:"port"`
Password string `json:"password"`
Rules []string `json:"rules"`
Name string `json:"name"`
Protocol string `json:"protocol"`
Address string `json:"address"`
Port int `json:"port"`
User string `json:"user"`
Password string `json:"password"`
Method string `json:"method"` // Shadowsocks cipher method
Flow string `json:"flow"` // Trojan/VLESS flow control
Security string `json:"security"` // VMess security / TLS/Reality security
Encryption string `json:"encryption"` // VLESS encryption
SNI string `json:"sni"` // TLS/Reality Server Name Indication
Insecure bool `json:"insecure"` // TLS skip certificate verification
Fingerprint string `json:"fingerprint"` // TLS/Reality browser fingerprint
RealityPublicKey string `json:"reality_public_key"` // Reality public key
RealityShortId string `json:"reality_short_id"` // Reality short ID
RealitySpiderX string `json:"reality_spider_x"` // Reality spider X path
WgSecretKey string `json:"wg_secret_key"` // WireGuard client private key
WgPublicKey string `json:"wg_public_key"` // WireGuard server public key
WgPreSharedKey string `json:"wg_preshared_key"` // WireGuard pre-shared key (optional)
WgAddress []string `json:"wg_address"` // WireGuard client IP addresses
WgMTU int `json:"wg_mtu"` // WireGuard MTU (optional, default 1420)
WgKeepAlive int `json:"wg_keepalive"` // WireGuard keepalive interval (optional)
WgReserved []int `json:"wg_reserved"` // WireGuard reserved bytes (optional, for WARP)
Rules []string `json:"rules"`
}

type Protocol struct {
Expand Down Expand Up @@ -102,7 +120,7 @@ func GetServerConfig(c *ClientV2) (*ServerConfigResponse, error) {
if err != nil {
return nil, fmt.Errorf("访问 %s 失败: %v", client.BaseURL+path, err.Error())
}

// 检查 HTTP 状态码
if r.StatusCode() == 304 {
return nil, nil
Expand All @@ -111,7 +129,7 @@ func GetServerConfig(c *ClientV2) (*ServerConfigResponse, error) {
body := r.Body()
return nil, fmt.Errorf("访问 %s 失败: %s", client.BaseURL+path, string(body))
}

// 只有在成功响应时才检查 hash
hash := sha256.Sum256(r.Body())
newBodyHash := hex.EncodeToString(hash[:])
Expand Down
35 changes: 32 additions & 3 deletions conf/conf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import (
)

type Conf struct {
LogConfig LogConfig `mapstructure:"Log"`
ApiConfig ServerApiConfig `mapstructure:"Api"`
PprofPort int `mapstructure:"PprofPort"`
LogConfig LogConfig `mapstructure:"Log"`
ApiConfig ServerApiConfig `mapstructure:"Api"`
PprofPort int `mapstructure:"PprofPort"`
DefaultOutbound string `mapstructure:"DefaultOutbound"` // Default outbound tag, empty means "Default" (freedom)
Outbound []OutboundConfig `mapstructure:"Outbound"`
}

type LogConfig struct {
Expand All @@ -34,6 +36,33 @@ type NodeApiConfig struct {
Timeout int `mapstructure:"Timeout"`
}

type OutboundConfig struct {
Name string `mapstructure:"Name"`
Protocol string `mapstructure:"Protocol"`
Address string `mapstructure:"Address"`
Port int `mapstructure:"Port"`
User string `mapstructure:"User"`
Password string `mapstructure:"Password"`
Method string `mapstructure:"Method"` // Shadowsocks cipher method
Flow string `mapstructure:"Flow"` // Trojan/VLESS flow control
Security string `mapstructure:"Security"` // VMess security / TLS/Reality security
Encryption string `mapstructure:"Encryption"` // VLESS encryption
SNI string `mapstructure:"SNI"` // TLS/Reality Server Name Indication
Insecure bool `mapstructure:"Insecure"` // TLS skip certificate verification
Fingerprint string `mapstructure:"Fingerprint"` // TLS/Reality browser fingerprint
RealityPublicKey string `mapstructure:"RealityPublicKey"` // Reality public key
RealityShortId string `mapstructure:"RealityShortId"` // Reality short ID
RealitySpiderX string `mapstructure:"RealitySpiderX"` // Reality spider X path
WgSecretKey string `mapstructure:"WgSecretKey"` // WireGuard client private key
WgPublicKey string `mapstructure:"WgPublicKey"` // WireGuard server public key
WgPreSharedKey string `mapstructure:"WgPreSharedKey"` // WireGuard pre-shared key (optional)
WgAddress []string `mapstructure:"WgAddress"` // WireGuard client IP addresses
WgMTU int `mapstructure:"WgMTU"` // WireGuard MTU (optional, default 1420)
WgKeepAlive int `mapstructure:"WgKeepAlive"` // WireGuard keepalive interval (optional)
WgReserved []int `mapstructure:"WgReserved"` // WireGuard reserved bytes (optional, for WARP)
Rules []string `mapstructure:"Rules"`
}

func New() *Conf {
return &Conf{
LogConfig: LogConfig{
Expand Down
Loading