github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

send username/password together with initial handshake data in socks client. Fix #785

pull/861/head
Darien Raymond 2017-12-26 23:33:25 +01:00
parent 1777540e3d
commit 664b840812
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
proxy/socks/protocol.go
View File

@ -397,13 +397,27 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
if request.User != nil { if request.User != nil {
authByte = byte(authPassword) authByte = byte(authPassword)
} }
authRequest := []byte{socks5Version, 0x01, authByte}
if _, err := writer.Write(authRequest); err != nil { b := buf.NewLocal(512)
b.AppendBytes(socks5Version, 0x01, authByte)
if authByte == authPassword {
rawAccount, err := request.User.GetTypedAccount()
if err != nil {
return nil, err
}
account := rawAccount.(*Account)
b.AppendBytes(0x01, byte(len(account.Username)))
b.Append([]byte(account.Username))
b.AppendBytes(byte(len(account.Password)))
b.Append([]byte(account.Password))
}
if _, err := writer.Write(b.Bytes()); err != nil {
return nil, err return nil, err
} }
b := buf.NewLocal(512) if err := b.Reset(buf.ReadFullFrom(reader, 2)); err != nil {
if err := b.AppendSupplier(buf.ReadFullFrom(reader, 2)); err != nil {
return nil, err return nil, err
} }
@ -415,22 +429,7 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
} }
if authByte == authPassword { if authByte == authPassword {
rawAccount, err := request.User.GetTypedAccount() if err := b.Reset(buf.ReadFullFrom(reader, 2)); err != nil {
if err != nil {
return nil, err
}
account := rawAccount.(*Account)
b.Clear()
b.AppendBytes(socks5Version, byte(len(account.Username)))
b.Append([]byte(account.Username))
b.AppendBytes(byte(len(account.Password)))
b.Append([]byte(account.Password))
if _, err := writer.Write(b.Bytes()); err != nil {
return nil, err
}
b.Clear()
if err := b.AppendSupplier(buf.ReadFullFrom(reader, 2)); err != nil {
return nil, err return nil, err
} }
if b.Byte(1) != 0x00 { if b.Byte(1) != 0x00 {