From b9fb670ca63b637eba949e302d772b2b77a1e2fe Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Thu, 5 Jan 2017 16:07:34 +0100 Subject: [PATCH] remove duplicated methods --- proxy/socks/protocol.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/proxy/socks/protocol.go b/proxy/socks/protocol.go index 0b334a67..e9526561 100644 --- a/proxy/socks/protocol.go +++ b/proxy/socks/protocol.go @@ -104,7 +104,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol if err != nil { return nil, errors.Base(err).Message("Socks|Server: Failed to read username or password.") } - if !s.validate(username, password) { + if !s.config.HasAccount(username, password) { writeSocks5AuthenticationResponse(writer, 0xFF) return nil, errors.Base(err).Message("Socks|Server: Invalid username or password.") } @@ -186,11 +186,6 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol return nil, errors.New("Socks|Server: Unknown Socks version: ", version) } -func (s *ServerSession) validate(username, password string) bool { - p, found := s.config.Accounts[username] - return found && p == password -} - func readUsernamePassword(reader io.Reader) (string, string, error) { buffer := buf.NewLocal(512) defer buffer.Release()