瀏覽代碼

remove duplicated methods

Darien Raymond 8 年之前
父節點
當前提交
b9fb670ca6
共有 1 個文件被更改,包括 1 次插入6 次删除
  1. 1 6
      proxy/socks/protocol.go

+ 1 - 6
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()