Add SSH inbound, log level. Update MTPROXY. Fixes

option/manager.go

@@ -6,6 +6,6 @@ type ManagerServiceDatabase struct {
 }
 
 type ManagerServiceOptions struct {
-	Inbounds []string              `json:"inbounds"`
+	Inbounds []string               `json:"inbounds"`
 	Database ManagerServiceDatabase `json:"database"`
 }

option/masque.go

@@ -1,18 +1,23 @@
 package option
 
 import (
+	"net/netip"
+
 	"github.com/sagernet/sing/common/json/badoption"
 )
 
 type MASQUEOutboundOptions struct {
 	DialerOptions
-	UseHTTP2             bool               `json:"use_http2,omitempty"`
-	UseIPv6              bool               `json:"use_ipv6,omitempty"`
-	Profile              CloudflareProfile  `json:"profile,omitempty"`
-	UDPTimeout           badoption.Duration `json:"udp_timeout,omitempty"`
-	UDPKeepalivePeriod   badoption.Duration `json:"udp_keepalive_period,omitempty"`
-	UDPInitialPacketSize uint16             `json:"udp_initial_packet_size,omitempty"`
-	ReconnectDelay       badoption.Duration `json:"reconnect_delay,omitempty"`
+	System               bool                             `json:"system,omitempty"`
+	Name                 string                           `json:"name,omitempty"`
+	AllowedIPs           badoption.Listable[netip.Prefix] `json:"allowed_ips,omitempty"`
+	UseHTTP2             bool                             `json:"use_http2,omitempty"`
+	UseIPv6              bool                             `json:"use_ipv6,omitempty"`
+	Profile              CloudflareProfile                `json:"profile,omitempty"`
+	UDPTimeout           badoption.Duration               `json:"udp_timeout,omitempty"`
+	UDPKeepalivePeriod   badoption.Duration               `json:"udp_keepalive_period,omitempty"`
+	UDPInitialPacketSize uint16                           `json:"udp_initial_packet_size,omitempty"`
+	ReconnectDelay       badoption.Duration               `json:"reconnect_delay,omitempty"`
 	MASQUEOutboundTLSOptionsContainer
 }
 

option/mieru.go

@@ -15,10 +15,11 @@ type MieruOutboundOptions struct {
 
 type MieruInboundOptions struct {
 	ListenOptions
-	Users               []MieruUser `json:"users,omitempty"`
-	Transport           string      `json:"transport,omitempty"`
-	TrafficPattern      string      `json:"traffic_pattern,omitempty"`
-	UserHintIsMandatory bool        `json:"user_hint_is_mandatory,omitempty"`
+	ListenPorts         badoption.Listable[string] `json:"listen_ports,omitempty"`
+	Users               []MieruUser                `json:"users,omitempty"`
+	Transport           string                     `json:"transport,omitempty"`
+	TrafficPattern      string                     `json:"traffic_pattern,omitempty"`
+	UserHintIsMandatory bool                       `json:"user_hint_is_mandatory,omitempty"`
 }
 
 type MieruUser struct {

option/mtproxy.go

@@ -11,7 +11,7 @@ type MTProxyInboundOptions struct {
 	Users                       []MTProxyUser      `json:"users,omitempty"`
 	Concurrency                 uint               `json:"concurrency,omitempty"`
 	DomainFrontingPort          uint               `json:"domain_fronting_port,omitempty"`
-	DomainFrontingIP            string             `json:"domain_fronting_ip,omitempty"`
+	DomainFrontingHost          string             `json:"domain_fronting_host,omitempty"`
 	DomainFrontingProxyProtocol bool               `json:"domain_fronting_proxy_protocol,omitempty"`
 	PreferIP                    string             `json:"prefer_ip,omitempty"`
 	AutoUpdate                  bool               `json:"auto_update,omitempty"`

option/node.go

@@ -1,11 +1,11 @@
 package option
 
 type NodeServiceOptions struct {
-	UUID               string             `json:"uuid"`
-	Inbounds           []string           `json:"inbounds"`
-	ConnectionLimiters []string           `json:"connection_limiters"`
-	BandwidthLimiters  []string           `json:"bandwidth_limiters"`
-	TrafficLimiters    []string           `json:"traffic_limiters"`
-	RateLimiters       []string           `json:"rate_limiters"`
-	Manager            string             `json:"manager"`
+	UUID               string   `json:"uuid"`
+	Inbounds           []string `json:"inbounds"`
+	ConnectionLimiters []string `json:"connection_limiters"`
+	BandwidthLimiters  []string `json:"bandwidth_limiters"`
+	TrafficLimiters    []string `json:"traffic_limiters"`
+	RateLimiters       []string `json:"rate_limiters"`
+	Manager            string   `json:"manager"`
 }

option/openvpn.go

@@ -1,38 +1,45 @@
 package option
 
-import "github.com/sagernet/sing/common/json/badoption"
+import (
+	"net/netip"
+
+	"github.com/sagernet/sing/common/json/badoption"
+)
 
 type OpenVPNOutboundOptions struct {
 	DialerOptions
-	Servers        []ServerOptions    `json:"servers"`
-	Proto          string             `json:"proto,omitempty"`
-	Cipher         string             `json:"cipher,omitempty"`
-	Auth           string             `json:"auth,omitempty"`
-	Username       string             `json:"username,omitempty"`
-	Password       string             `json:"password,omitempty"`
-	TLSCrypt       string             `json:"tls_crypt,omitempty"`
-	TLSCryptPath   string             `json:"tls_crypt_path,omitempty"`
-	TLSCryptV2     bool               `json:"tls_crypt_v2,omitempty"`
-	TLSAuth        string             `json:"tls_auth,omitempty"`
-	TLSAuthPath    string             `json:"tls_auth_path,omitempty"`
-	KeyDirection   int                `json:"key_direction,omitempty"`
-	ReconnectDelay badoption.Duration `json:"reconnect_delay,omitempty"`
-	PingInterval   badoption.Duration `json:"ping_interval,omitempty"`
+	System         bool                             `json:"system,omitempty"`
+	Name           string                           `json:"name,omitempty"`
+	AllowedIPs     badoption.Listable[netip.Prefix] `json:"allowed_ips,omitempty"`
+	Servers        []ServerOptions                  `json:"servers"`
+	Proto          string                           `json:"proto,omitempty"`
+	Cipher         string                           `json:"cipher,omitempty"`
+	Auth           string                           `json:"auth,omitempty"`
+	Username       string                           `json:"username,omitempty"`
+	Password       string                           `json:"password,omitempty"`
+	TLSCrypt       string                           `json:"tls_crypt,omitempty"`
+	TLSCryptPath   string                           `json:"tls_crypt_path,omitempty"`
+	TLSCryptV2     bool                             `json:"tls_crypt_v2,omitempty"`
+	TLSAuth        string                           `json:"tls_auth,omitempty"`
+	TLSAuthPath    string                           `json:"tls_auth_path,omitempty"`
+	KeyDirection   int                              `json:"key_direction,omitempty"`
+	ReconnectDelay badoption.Duration               `json:"reconnect_delay,omitempty"`
+	PingInterval   badoption.Duration               `json:"ping_interval,omitempty"`
 	OpenVPNOutboundTLSOptionsContainer
 }
 
 type OpenVPNTLSOptions struct {
-	Certificate           string                     `json:"certificate,omitempty"`
-	CertificatePath       string                     `json:"certificate_path,omitempty"`
-	Key                   string                     `json:"key,omitempty"`
-	KeyPath               string                     `json:"key_path,omitempty"`
-	CA                    string                     `json:"ca,omitempty"`
-	CAPath                string                     `json:"ca_path,omitempty"`
-	CipherSuites          badoption.Listable[string] `json:"cipher_suites,omitempty"`
-	VerifyX509Name        string                     `json:"verify_x509_name,omitempty"`
-	VerifyX509NameMode    string                     `json:"verify_x509_name_mode,omitempty"`
-	KernelTx              bool                       `json:"kernel_tx,omitempty"`
-	KernelRx              bool                       `json:"kernel_rx,omitempty"`
+	Certificate        string                     `json:"certificate,omitempty"`
+	CertificatePath    string                     `json:"certificate_path,omitempty"`
+	Key                string                     `json:"key,omitempty"`
+	KeyPath            string                     `json:"key_path,omitempty"`
+	CA                 string                     `json:"ca,omitempty"`
+	CAPath             string                     `json:"ca_path,omitempty"`
+	CipherSuites       badoption.Listable[string] `json:"cipher_suites,omitempty"`
+	VerifyX509Name     string                     `json:"verify_x509_name,omitempty"`
+	VerifyX509NameMode string                     `json:"verify_x509_name_mode,omitempty"`
+	KernelTx           bool                       `json:"kernel_tx,omitempty"`
+	KernelRx           bool                       `json:"kernel_rx,omitempty"`
 }
 
 type OpenVPNOutboundTLSOptionsContainer struct {

option/ssh.go

@@ -2,6 +2,39 @@ package option
 
 import "github.com/sagernet/sing/common/json/badoption"
 
+type SSHInboundOptions struct {
+	ListenOptions
+	Users         []SSHUser                  `json:"users,omitempty"`
+	HostKey       badoption.Listable[string] `json:"host_key,omitempty"`
+	HostKeyPath   badoption.Listable[string] `json:"host_key_path,omitempty"`
+	ServerVersion string                     `json:"server_version,omitempty"`
+	MaxAuthTries  int                        `json:"max_auth_tries,omitempty"`
+	Fallback      *SSHFallbackServerOptions  `json:"fallback,omitempty"`
+}
+
+type SSHFallbackServerOptions struct {
+	DialerOptions
+	ServerOptions
+	CA                     *SSHCAOptions              `json:"ca,omitempty"`
+	IssueCA                *SSHCAOptions              `json:"issue_ca,omitempty"`
+	HostKey                badoption.Listable[string] `json:"host_key,omitempty"`
+	HostKeyPath            badoption.Listable[string] `json:"host_key_path,omitempty"`
+	HostKeyAlgorithms      badoption.Listable[string] `json:"host_key_algorithms,omitempty"`
+	ClientVersion          string                     `json:"client_version,omitempty"`
+}
+
+type SSHCAOptions struct {
+	PrivateKey           badoption.Listable[string] `json:"private_key,omitempty"`
+	PrivateKeyPath       string                     `json:"private_key_path,omitempty"`
+	PrivateKeyPassphrase string                     `json:"private_key_passphrase,omitempty"`
+}
+
+type SSHUser struct {
+	Name           string                     `json:"name,omitempty"`
+	Password       string                     `json:"password,omitempty"`
+	AuthorizedKeys badoption.Listable[string] `json:"authorized_keys,omitempty"`
+}
+
 type SSHOutboundOptions struct {
 	DialerOptions
 	ServerOptions