xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: hysteria parse auth

Browse source
This commit is contained in:
gVisor bot 2022-06-07 15:24:46 +08:00
parent 15154fba73
commit a03df5233f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
adapter/outbound/hysteria.go
View file

@ -4,6 +4,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"encoding/base64"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
@ -71,7 +72,7 @@ type HysteriaOption struct {
UpMbps int `proxy:"up_mbps,omitempty"` UpMbps int `proxy:"up_mbps,omitempty"`
Down string `proxy:"down,omitempty"` Down string `proxy:"down,omitempty"`
DownMbps int `proxy:"down_mbps,omitempty"` DownMbps int `proxy:"down_mbps,omitempty"`
Auth []byte `proxy:"auth,omitempty"` Auth string `proxy:"auth,omitempty"`
AuthString string `proxy:"auth_str,omitempty"` AuthString string `proxy:"auth_str,omitempty"`
Obfs string `proxy:"obfs,omitempty"` Obfs string `proxy:"obfs,omitempty"`
SNI string `proxy:"sni,omitempty"` SNI string `proxy:"sni,omitempty"`
@ -163,8 +164,12 @@ func NewHysteria(option HysteriaOption) (*Hysteria, error) {
log.Infoln("hysteria: Path MTU Discovery is not yet supported on this platform") log.Infoln("hysteria: Path MTU Discovery is not yet supported on this platform")
} }
var auth []byte var auth []byte
if len(option.Auth) > 0 { if option.Auth != "" {
auth = option.Auth authBytes, err := base64.StdEncoding.DecodeString(option.Auth)
if err != nil {
return nil, fmt.Errorf("hysteria %s parse auth error: %w", addr, err)
}
auth = authBytes
} else { } else {
auth = []byte(option.AuthString) auth = []byte(option.AuthString)
} }