github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix socks client for super long domain

pull/587/head
Darien Raymond 2017-09-19 01:39:33 +02:00
parent d19eccc957
commit 190adf1872
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
proxy/socks/protocol.go
View File

@ -244,7 +244,7 @@ func writeSocks5AuthenticationResponse(writer io.Writer, version byte, auth byte
return err return err
} }
func appendAddress(buffer *buf.Buffer, address net.Address, port net.Port) { func appendAddress(buffer *buf.Buffer, address net.Address, port net.Port) error {
switch address.Family() { switch address.Family() {
case net.AddressFamilyIPv4: case net.AddressFamilyIPv4:
buffer.AppendBytes(0x01) buffer.AppendBytes(0x01)
@ -253,16 +253,23 @@ func appendAddress(buffer *buf.Buffer, address net.Address, port net.Port) {
buffer.AppendBytes(0x04) buffer.AppendBytes(0x04)
buffer.Append(address.IP()) buffer.Append(address.IP())
case net.AddressFamilyDomain: case net.AddressFamilyDomain:
n := byte(len(address.Domain()))
if int(n) != len(address.Domain()) {
return newError("Super long domain is not supported in Socks protocol. ", address.Domain())
}
buffer.AppendBytes(0x03, byte(len(address.Domain()))) buffer.AppendBytes(0x03, byte(len(address.Domain())))
buffer.AppendSupplier(serial.WriteString(address.Domain())) buffer.AppendSupplier(serial.WriteString(address.Domain()))
} }
buffer.AppendSupplier(serial.WriteUint16(port.Value())) buffer.AppendSupplier(serial.WriteUint16(port.Value()))
return nil
} }
func writeSocks5Response(writer io.Writer, errCode byte, address net.Address, port net.Port) error { func writeSocks5Response(writer io.Writer, errCode byte, address net.Address, port net.Port) error {
buffer := buf.NewLocal(64) buffer := buf.NewLocal(64)
buffer.AppendBytes(socks5Version, errCode, 0x00 /* reserved */) buffer.AppendBytes(socks5Version, errCode, 0x00 /* reserved */)
appendAddress(buffer, address, port) if err := appendAddress(buffer, address, port); err != nil {
return err
}
_, err := writer.Write(buffer.Bytes()) _, err := writer.Write(buffer.Bytes())
return err return err
@ -327,12 +334,14 @@ func DecodeUDPPacket(packet []byte) (*protocol.RequestHeader, []byte, error) {
return request, packet[dataBegin:], nil return request, packet[dataBegin:], nil
} }
func EncodeUDPPacket(request *protocol.RequestHeader, data []byte) *buf.Buffer { func EncodeUDPPacket(request *protocol.RequestHeader, data []byte) (*buf.Buffer, error) {
b := buf.New() b := buf.New()
b.AppendBytes(0, 0, 0 /* Fragment */) b.AppendBytes(0, 0, 0 /* Fragment */)
appendAddress(b, request.Address, request.Port) if err := appendAddress(b, request.Address, request.Port); err != nil {
return nil, err
}
b.Append(data) b.Append(data)
return b return b, nil
} }
type UDPReader struct { type UDPReader struct {
@ -371,7 +380,10 @@ func NewUDPWriter(request *protocol.RequestHeader, writer io.Writer) *UDPWriter
// Write implements io.Writer. // Write implements io.Writer.
func (w *UDPWriter) Write(b []byte) (int, error) { func (w *UDPWriter) Write(b []byte) (int, error) {
eb := EncodeUDPPacket(w.request, b) eb, err := EncodeUDPPacket(w.request, b)
if err != nil {
return 0, err
}
defer eb.Release() defer eb.Release()
if _, err := w.writer.Write(eb.Bytes()); err != nil { if _, err := w.writer.Write(eb.Bytes()); err != nil {
return 0, err return 0, err

5
proxy/socks/server.go
View File

@ -187,8 +187,11 @@ func (v *Server) handleUDPPayload(ctx context.Context, conn internet.Connection,
log.Trace(newError("writing back UDP response with ", payload.Len(), " bytes").AtDebug()) log.Trace(newError("writing back UDP response with ", payload.Len(), " bytes").AtDebug())
udpMessage := EncodeUDPPacket(request, payload.Bytes()) udpMessage, err := EncodeUDPPacket(request, payload.Bytes())
defer udpMessage.Release() defer udpMessage.Release()
if err != nil {
log.Trace(newError("failed to write UDP response").AtWarning().Base(err))
}
conn.Write(udpMessage.Bytes()) conn.Write(udpMessage.Bytes())
}) })