lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-28 23:06:14 -04:00
Code Issues Releases Wiki Activity

fix socks password authentication

Browse Source
This commit is contained in:
Darien Raymond 2017-01-29 08:25:01 +01:00
parent 20e785fa80
commit 6629b6dd28
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
proxy/socks/protocol.go
View File

@ -85,7 +85,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
if version == socks5Version { if version == socks5Version {
nMethod := int(buffer.Byte(1)) nMethod := int(buffer.Byte(1))
if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, nMethod)); err != nil { if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, nMethod)); err != nil {
return nil, err return nil, errors.Base(err).Message("Socks|Server: Failed to read auth methods.")
} }
var expectedAuth byte = authNotRequired var expectedAuth byte = authNotRequired
@ -94,12 +94,12 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
} }
if !hasAuthMethod(expectedAuth, buffer.BytesRange(2, 2+nMethod)) { if !hasAuthMethod(expectedAuth, buffer.BytesRange(2, 2+nMethod)) {
writeSocks5AuthenticationResponse(writer, authNoMatchingMethod) writeSocks5AuthenticationResponse(writer, socks5Version, authNoMatchingMethod)
return nil, errors.New("Socks|Server: No matching auth method.") return nil, errors.New("Socks|Server: No matching auth method.")
} }
if err := writeSocks5AuthenticationResponse(writer, expectedAuth); err != nil { if err := writeSocks5AuthenticationResponse(writer, socks5Version, expectedAuth); err != nil {
return nil, err return nil, errors.Base(err).Message("Socks|Server: Failed to write auth response.")
} }
if expectedAuth == authPassword { if expectedAuth == authPassword {
@ -109,17 +109,17 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
} }
if !s.config.HasAccount(username, password) { if !s.config.HasAccount(username, password) {
writeSocks5AuthenticationResponse(writer, 0xFF) writeSocks5AuthenticationResponse(writer, 0x01, 0xFF)
return nil, errors.New("Socks|Server: Invalid username or password.") return nil, errors.New("Socks|Server: Invalid username or password.")
} }
if err := writeSocks5AuthenticationResponse(writer, 0x00); err != nil { if err := writeSocks5AuthenticationResponse(writer, 0x01, 0x00); err != nil {
return nil, err return nil, errors.Base(err).Message("Socks|Server: Failed to write auth response.")
} }
} }
buffer.Clear() buffer.Clear()
if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, 4)); err != nil { if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, 4)); err != nil {
return nil, err return nil, errors.Base(err).Message("Socks|Server: Failed to read request.")
} }
cmd := buffer.Byte(1) cmd := buffer.Byte(1)
@ -244,8 +244,8 @@ func hasAuthMethod(expectedAuth byte, authCandidates []byte) bool {
return false return false
} }
func writeSocks5AuthenticationResponse(writer io.Writer, auth byte) error { func writeSocks5AuthenticationResponse(writer io.Writer, version byte, auth byte) error {
_, err := writer.Write([]byte{socks5Version, auth}) _, err := writer.Write([]byte{version, auth})
return err return err
} }