add public funcs to work with auth: ReadMethods ServeConnNoAuth

Author: pymq

auth.go

@@ -166,7 +166,7 @@ func (a UserPassAuthenticator) Authenticate(reader io.Reader, writer io.Writer)
 // authenticate is used to handle connection authentication
 func (s *Server) authenticate(conn io.Writer, bufConn io.Reader) (*AuthContext, error) {
 	// Get the methods
-	methods, err := readMethods(bufConn)
+	methods, err := ReadMethods(bufConn)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get auth methods: %v", err)
 	}
@@ -190,9 +190,9 @@ func noAcceptableAuth(conn io.Writer) error {
 	return ErrNoSupportedAuth
 }
 
-// readMethods is used to read the number of methods
+// ReadMethods is used to read the number of methods
 // and proceeding auth methods
-func readMethods(r io.Reader) ([]byte, error) {
+func ReadMethods(r io.Reader) ([]byte, error) {
 	header := []byte{0}
 	if _, err := r.Read(header); err != nil {
 		return nil, err

socks5.go

@@ -188,3 +188,32 @@ func (s *Server) ServeConn(conn net.Conn) error {
 
 	return nil
 }
+
+// ServeConnNoAuth is used to serve a single connection where the auth
+// negotiation has already been handled by the caller (e.g. locally on the client side).
+// It skips the version byte read and authentication, going directly to request handling.
+func (s *Server) ServeConnNoAuth(conn net.Conn) error {
+	defer conn.Close()
+
+	request, err := NewRequest(conn)
+	if err != nil {
+		if err == errUnrecognizedAddrType {
+			if err := sendReply(conn, ReplyAddrTypeNotSupported, nil); err != nil {
+				return fmt.Errorf("failed to send reply: %v", err)
+			}
+		}
+		return fmt.Errorf("failed to read destination address: %v", err)
+	}
+	request.AuthContext = &AuthContext{Method: AuthMethodNoAuth}
+	if client, ok := conn.RemoteAddr().(*net.TCPAddr); ok {
+		request.RemoteAddr = &AddrSpec{IP: client.IP, Port: client.Port}
+	}
+
+	if err := s.handleRequest(request, conn); err != nil {
+		err = fmt.Errorf("failed to handle request: %v", err)
+		s.config.Logger.Printf("socks: %v", err)
+		return err
+	}
+
+	return nil
+}