root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix HTTP2 auth bug #122

Browse Source
This commit is contained in:
rui.zheng 2017-08-06 15:38:39 +08:00
parent 012932fab1
commit 55622a5f43
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/gost/main.go
View File

@ -79,7 +79,13 @@ func initChain() (*gost.Chain, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
users, err := parseUsers(node.Values.Get("secrets"))
if err != nil {
return nil, err
}
if node.User == nil && len(users) > 0 {
node.User = users[0]
}
serverName, _, _ := net.SplitHostPort(node.Addr) serverName, _, _ := net.SplitHostPort(node.Addr)
if serverName == "" { if serverName == "" {
serverName = "localhost" // default server name serverName = "localhost" // default server name

6
cmd/gost/secrets.txt
View File

@ -1,6 +1,8 @@
# username password # username password
test\admin 123456 $test.admin$ $123456$
$test 123456 @test.admin@ @123456@
test.admin# #123456#
test.admin\admin 123456
test001 123456 test001 123456
test002 12345678 test002 12345678

8
http.go
View File

@ -36,12 +36,10 @@ func (c *httpConnector) Connect(conn net.Conn, addr string) (net.Conn, error) {
req.Header.Set("Proxy-Connection", "keep-alive") req.Header.Set("Proxy-Connection", "keep-alive")
if c.User != nil { if c.User != nil {
s := c.User.String() u := c.User.Username()
if _, set := c.User.Password(); !set { p, _ := c.User.Password()
s += ":"
}
req.Header.Set("Proxy-Authorization", req.Header.Set("Proxy-Authorization",
"Basic "+base64.StdEncoding.EncodeToString([]byte(s))) "Basic "+base64.StdEncoding.EncodeToString([]byte(u+":"+p)))
} }
if err := req.Write(conn); err != nil { if err := req.Write(conn); err != nil {

4
http2.go
View File

@ -48,8 +48,10 @@ func (c *http2Connector) Connect(conn net.Conn, addr string) (net.Conn, error) {
} }
req.Header.Set("Gost-Target", addr) req.Header.Set("Gost-Target", addr)
if c.User != nil { if c.User != nil {
u := c.User.Username()
p, _ := c.User.Password()
req.Header.Set("Proxy-Authorization", req.Header.Set("Proxy-Authorization",
"Basic "+base64.StdEncoding.EncodeToString([]byte(c.User.String()))) "Basic "+base64.StdEncoding.EncodeToString([]byte(u+":"+p)))
} }
if Debug { if Debug {
dump, _ := httputil.DumpRequest(req, false) dump, _ := httputil.DumpRequest(req, false)