other_mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-12-22 19:33:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add config check

Browse source
This commit is contained in:
世界 2023-02-21 19:48:09 +08:00
parent d6c2a9aab7
commit 6fb673aee4
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 46 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
infra/conf/shadowtls.go
View file

@ -21,37 +21,55 @@ type ShadowTLSUser struct {
Password string `json:"password,omitempty"`
}
func (c ShadowTLSUser) Build() *shadowtls.User {
return &shadowtls.User{
Email: c.Email,
Password: c.Password,
}
}
type ShadowTLSHandshakeConfig struct {
Address *Address `json:"address"`
Port uint16 `json:"port"`
}
func (c ShadowTLSHandshakeConfig) Build() *shadowtls.HandshakeConfig {
return &shadowtls.HandshakeConfig{
Address: c.Address.Build(),
Port: uint32(c.Port),
}
}
func (c *ShadowTLSServerConfig) Build() (proto.Message, error) {
if c.Version == 0 {
return nil, newError("shadow-tls version is not set.")
}
if c.Version == 3 && len(c.Users) == 0 {
return nil, newError("shadow-tls users is not set.")
}
if c.Handshake == nil {
return nil, newError("shadow-tls handshake config is not set.")
}
var handshakeForServerName map[string]*shadowtls.HandshakeConfig
if c.HandshakeForServerName != nil {
for serverName, serverConfig := range c.HandshakeForServerName {
handshakeForServerName[serverName] = serverConfig.Build()
if serverConfig.Address == nil {
return nil, newError("shadow-tls handshake server address is not set.")
}
if serverConfig.Port == 0 {
return nil, newError("shadow-tls handshake server port is not set.")
}
handshakeForServerName[serverName] = &shadowtls.HandshakeConfig{
Address: serverConfig.Address.Build(),
Port: uint32(serverConfig.Port),
}
}
}
if c.Handshake.Address == nil {
return nil, newError("shadow-tls handshake server address is not set.")
}
if c.Handshake.Port == 0 {
return nil, newError("shadow-tls handshake server port is not set.")
}
return &shadowtls.ServerConfig{
Version: uint32(c.Version),
Password: c.Password,
Users: common.Map(c.Users, ShadowTLSUser.Build),
Handshake: c.Handshake.Build(),
Version: uint32(c.Version),
Password: c.Password,
Users: common.Map(c.Users, func(it ShadowTLSUser) *shadowtls.User {
return &shadowtls.User{
Email: it.Email,
Password: it.Password,
}
}),
Handshake: &shadowtls.HandshakeConfig{
Address: c.Handshake.Address.Build(),
Port: uint32(c.Handshake.Port),
},
HandshakeForServerName: handshakeForServerName,
StrictMode: c.StrictMode,
Detour: c.Detour,
@ -66,6 +84,15 @@ type ShadowTLSClientConfig struct {
}
func (c *ShadowTLSClientConfig) Build() (proto.Message, error) {
if c.Version == 0 {
return nil, newError("shadow-tls version is not set.")
}
if c.Address == nil {
return nil, newError("shadow-tls server address is not set.")
}
if c.Port == 0 {
return nil, newError("shadow-tls server port is not set.")
}
return &shadowtls.ClientConfig{
Address: c.Address.Build(),
Port: uint32(c.Port),