From 9cd014c3d6872582854e36a4df6c0a4633f3eb57 Mon Sep 17 00:00:00 2001
From: Mikhail Osipov <mike.osipov@gmail.com>
Date: Wed, 2 Sep 2020 22:20:13 +0300
Subject: fix data steal by proxy

---
 pkg/server/socket/proxy.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pkg/server/socket/proxy.go')

diff --git a/pkg/server/socket/proxy.go b/pkg/server/socket/proxy.go
index ef14f48..47f86c9 100644
--- a/pkg/server/socket/proxy.go
+++ b/pkg/server/socket/proxy.go
@@ -1,6 +1,7 @@
 package socket
 
 import (
+	"bufio"
 	"bytes"
 	"errors"
 	"fmt"
@@ -94,12 +95,16 @@ func (s *proxyServer) initConn(addr string) error {
 }
 
 func (s *proxyServer) Recv(rq queue.Q) error {
-	req, err := http.ParseRequest(rq.Reader())
+	r := bufio.NewReader(rq.Reader())
+
+	req, err := http.ParseRequest(r)
 	if err != nil {
 		s.wait <- status{400, "Bad Request"}
 		return err
 	}
 
+	// TODO check if extra data is available in reader
+
 	if req.Method != "CONNECT" {
 		s.wait <- status{400, "Bad Request"}
 		return errors.New("bad method")
@@ -122,7 +127,7 @@ func (s *proxyServer) Recv(rq queue.Q) error {
 
 	s.wait <- status{200, "Connection established"}
 
-	return s.conn.Recv(rq)
+	return queue.IoCopy(r, s.conn.(*conn))
 }
 
 func (s *proxyServer) Close() (err error) {
-- 
cgit v1.2.3-70-g09d2