Skip to content

socks: Preserve buffered payload after handshake #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Snowy117 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

socks: Preserve buffered payload after handshake #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions protocol/socks/handshake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,20 @@ func ClientHandshake5(conn io.ReadWriter, command byte, destination M.Socksaddr,
return response, err
}

func newBufferedConn(conn net.Conn, reader *std_bufio.Reader) (net.Conn, error) {
buffered := reader.Buffered()
if buffered == 0 {
return conn, nil
}
buffer := buf.NewSize(buffered)
_, err := buffer.ReadFullFrom(reader, buffered)
if err != nil {
buffer.Release()
return nil, err
}
return bufio.NewCachedConn(conn, buffer), nil
}

func HandleConnectionEx(
ctx context.Context, conn net.Conn, reader *std_bufio.Reader,
authenticator *auth.Authenticator,
Expand Down Expand Up @@ -155,7 +169,11 @@ func HandleConnectionEx(
}
return E.New("socks4: authentication failed, username=", request.Username)
}
handler.NewConnectionEx(auth.ContextWithUser(ctx, request.Username), NewLazyConn(conn, version), source, request.Destination, onClose)
requestConn, connErr := newBufferedConn(conn, reader)
if connErr != nil {
return E.Cause(connErr, "socks4: read buffered data")
}
handler.NewConnectionEx(auth.ContextWithUser(ctx, request.Username), NewLazyConn(requestConn, version), source, request.Destination, onClose)
return nil
/*case CommandTorResolve, CommandTorResolvePTR:
if resolver == nil {
Expand Down Expand Up @@ -225,7 +243,11 @@ func HandleConnectionEx(
}
switch request.Command {
case socks5.CommandConnect:
handler.NewConnectionEx(ctx, NewLazyConn(conn, version), source, request.Destination, onClose)
requestConn, connErr := newBufferedConn(conn, reader)
if connErr != nil {
return E.Cause(connErr, "socks5: read buffered data")
}
handler.NewConnectionEx(ctx, NewLazyConn(requestConn, version), source, request.Destination, onClose)
return nil
case socks5.CommandUDPAssociate:
var (
Expand Down