mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

增强: HTTP/SOCKS5混合端口

Browse source
This commit is contained in:
xmapst 2024-03-25 10:15:11 +08:00
parent 2d4dd66c0e
commit 02fa2cde0a
2 changed files with 195 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

54
app/cmd/client.go
View file

@ -21,6 +21,7 @@ import (
"github.com/apernet/hysteria/app/internal/forwarding"
"github.com/apernet/hysteria/app/internal/http"
"github.com/apernet/hysteria/app/internal/proxymux"
"github.com/apernet/hysteria/app/internal/redirect"
"github.com/apernet/hysteria/app/internal/socks5"
"github.com/apernet/hysteria/app/internal/tproxy"
@ -63,6 +64,7 @@ type clientConfig struct {
Bandwidth clientConfigBandwidth `mapstructure:"bandwidth"`
FastOpen bool `mapstructure:"fastOpen"`
Lazy bool `mapstructure:"lazy"`
Mixed *mixedConfig `mapstructure:"mixed"`
SOCKS5 *socks5Config `mapstructure:"socks5"`
HTTP *httpConfig `mapstructure:"http"`
TCPForwarding []tcpForwardingEntry `mapstructure:"tcpForwarding"`
@ -113,6 +115,14 @@ type clientConfigBandwidth struct {
Down string `mapstructure:"down"`
}
type mixedConfig struct {
Listen string `mapstructure:"listen"`
Username string `mapstructure:"username"`
Password string `mapstructure:"password"`
DisableUDP bool `mapstructure:"disableUDP"`
Realm string `mapstructure:"realm"`
}
type socks5Config struct {
Listen string `mapstructure:"listen"`
Username string `mapstructure:"username"`
@ -447,6 +457,11 @@ func runClient(cmd *cobra.Command, args []string) {
// Register modes
var runner clientModeRunner
if config.Mixed != nil {
runner.Add("Mixed server", func() error {
return clientMixed(*config.Mixed, c)
})
}
if config.SOCKS5 != nil {
runner.Add("SOCKS5 server", func() error {
return clientSOCKS5(*config.SOCKS5, c)
@ -527,6 +542,45 @@ func (r *clientModeRunner) Run() {
}
}
func clientMixed(config mixedConfig, c client.Client) error {
if config.Listen == "" {
return configError{Field: "listen", Err: errors.New("listen address is empty")}
}
l, err := correctnet.Listen("tcp", config.Listen)
if err != nil {
return configError{Field: "listen", Err: err}
}
var authFunc func(username, password string) bool
username, password := config.Username, config.Password
if username != "" && password != "" {
authFunc = func(u, p string) bool {
return u == username && p == password
}
}
s := socks5.Server{
HyClient: c,
AuthFunc: authFunc,
DisableUDP: config.DisableUDP,
EventLogger: &socks5Logger{},
}
logger.Info("SOCKS5 server listening", zap.String("addr", config.Listen))
h := http.Server{
HyClient: c,
AuthFunc: authFunc,
AuthRealm: config.Realm,
EventLogger: &httpLogger{},
}
logger.Info("HTTP proxy server listening", zap.String("addr", config.Listen))
socks5Ln, httpLn := proxymux.SplitSOCKSAndHTTP(l)
go func() {
if err = h.Serve(httpLn); err != nil {
logger.Fatal(err.Error())
}
}()
return s.Serve(socks5Ln)
}
func clientSOCKS5(config socks5Config, c client.Client) error {
if config.Listen == "" {
return configError{Field: "listen", Err: errors.New("listen address is empty")}