lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-29 12:47:26 -05:00
Code Issues Releases Wiki Activity

fix lint errors in socks

Browse Source
This commit is contained in:
Darien Raymond 2018-05-26 02:01:48 +02:00
parent dd52e82c2d
commit b453190e58
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/socks/client.go
View File

@ -118,7 +118,7 @@ func (c *Client) Process(ctx context.Context, link *core.Link, dialer proxy.Dial
if err != nil { if err != nil {
return newError("failed to create UDP connection").Base(err) return newError("failed to create UDP connection").Base(err)
} }
defer udpConn.Close() defer udpConn.Close() // nolint: errcheck
requestFunc = func() error { requestFunc = func() error {
defer timer.SetTimeout(p.Timeouts.DownlinkOnly) defer timer.SetTimeout(p.Timeouts.DownlinkOnly)
return buf.Copy(link.Reader, buf.NewSequentialWriter(NewUDPWriter(request, udpConn)), buf.UpdateActivity(timer)) return buf.Copy(link.Reader, buf.NewSequentialWriter(NewUDPWriter(request, udpConn)), buf.UpdateActivity(timer))

39
proxy/socks/protocol.go
View File

@ -54,7 +54,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
version := buffer.Byte(0) version := buffer.Byte(0)
if version == socks4Version { if version == socks4Version {
if s.config.AuthType == AuthType_PASSWORD { if s.config.AuthType == AuthType_PASSWORD {
writeSocks4Response(writer, socks4RequestRejected, net.AnyIP, net.Port(0)) writeSocks4Response(writer, socks4RequestRejected, net.AnyIP, net.Port(0)) // nolint: errcheck
return nil, newError("socks 4 is not allowed when auth is required.") return nil, newError("socks 4 is not allowed when auth is required.")
} }
@ -63,8 +63,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
} }
port := net.PortFromBytes(buffer.BytesRange(2, 4)) port := net.PortFromBytes(buffer.BytesRange(2, 4))
address := net.IPAddress(buffer.BytesRange(4, 8)) address := net.IPAddress(buffer.BytesRange(4, 8))
_, err := readUntilNull(reader) // user id if _, err := readUntilNull(reader); /* user id */ err != nil {
if err != nil {
return nil, err return nil, err
} }
if address.IP()[0] == 0x00 { if address.IP()[0] == 0x00 {
@ -86,7 +85,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
} }
return request, nil return request, nil
default: default:
writeSocks4Response(writer, socks4RequestRejected, net.AnyIP, net.Port(0)) writeSocks4Response(writer, socks4RequestRejected, net.AnyIP, net.Port(0)) // nolint: errcheck
return nil, newError("unsupported command: ", buffer.Byte(1)) return nil, newError("unsupported command: ", buffer.Byte(1))
} }
} }
@ -103,7 +102,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
} }
if !hasAuthMethod(expectedAuth, buffer.BytesRange(2, 2+nMethod)) { if !hasAuthMethod(expectedAuth, buffer.BytesRange(2, 2+nMethod)) {
writeSocks5AuthenticationResponse(writer, socks5Version, authNoMatchingMethod) writeSocks5AuthenticationResponse(writer, socks5Version, authNoMatchingMethod) // nolint: errcheck
return nil, newError("no matching auth method") return nil, newError("no matching auth method")
} }
@ -118,7 +117,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
} }
if !s.config.HasAccount(username, password) { if !s.config.HasAccount(username, password) {
writeSocks5AuthenticationResponse(writer, 0x01, 0xFF) writeSocks5AuthenticationResponse(writer, 0x01, 0xFF) // nolint: errcheck
return nil, newError("invalid username or password") return nil, newError("invalid username or password")
} }
@ -136,15 +135,15 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
request.Command = protocol.RequestCommandTCP request.Command = protocol.RequestCommandTCP
case cmdUDPPort: case cmdUDPPort:
if !s.config.UdpEnabled { if !s.config.UdpEnabled {
writeSocks5Response(writer, statusCmdNotSupport, net.AnyIP, net.Port(0)) writeSocks5Response(writer, statusCmdNotSupport, net.AnyIP, net.Port(0)) // nolint: errcheck
return nil, newError("UDP is not enabled.") return nil, newError("UDP is not enabled.")
} }
request.Command = protocol.RequestCommandUDP request.Command = protocol.RequestCommandUDP
case cmdTCPBind: case cmdTCPBind:
writeSocks5Response(writer, statusCmdNotSupport, net.AnyIP, net.Port(0)) writeSocks5Response(writer, statusCmdNotSupport, net.AnyIP, net.Port(0)) // nolint: errcheck
return nil, newError("TCP bind is not supported.") return nil, newError("TCP bind is not supported.")
default: default:
writeSocks5Response(writer, statusCmdNotSupport, net.AnyIP, net.Port(0)) writeSocks5Response(writer, statusCmdNotSupport, net.AnyIP, net.Port(0)) // nolint: errcheck
return nil, newError("unknown command ", cmd) return nil, newError("unknown command ", cmd)
} }
@ -240,7 +239,7 @@ func writeSocks5Response(writer io.Writer, errCode byte, address net.Address, po
buffer := buf.New() buffer := buf.New()
defer buffer.Release() defer buffer.Release()
buffer.AppendBytes(socks5Version, errCode, 0x00 /* reserved */) common.Must2(buffer.AppendBytes(socks5Version, errCode, 0x00 /* reserved */))
if err := addrParser.WriteAddressPort(buffer, address, port); err != nil { if err := addrParser.WriteAddressPort(buffer, address, port); err != nil {
return err return err
} }
@ -253,9 +252,9 @@ func writeSocks4Response(writer io.Writer, errCode byte, address net.Address, po
buffer := buf.New() buffer := buf.New()
defer buffer.Release() defer buffer.Release()
buffer.AppendBytes(0x00, errCode) common.Must2(buffer.AppendBytes(0x00, errCode))
common.Must(buffer.AppendSupplier(serial.WriteUint16(port.Value()))) common.Must(buffer.AppendSupplier(serial.WriteUint16(port.Value())))
buffer.Write(address.IP()) common.Must2(buffer.Write(address.IP()))
_, err := writer.Write(buffer.Bytes()) _, err := writer.Write(buffer.Bytes())
return err return err
} }
@ -287,12 +286,12 @@ func DecodeUDPPacket(packet *buf.Buffer) (*protocol.RequestHeader, error) {
func EncodeUDPPacket(request *protocol.RequestHeader, data []byte) (*buf.Buffer, error) { func EncodeUDPPacket(request *protocol.RequestHeader, data []byte) (*buf.Buffer, error) {
b := buf.New() b := buf.New()
b.AppendBytes(0, 0, 0 /* Fragment */) common.Must2(b.AppendBytes(0, 0, 0 /* Fragment */))
if err := addrParser.WriteAddressPort(b, request.Address, request.Port); err != nil { if err := addrParser.WriteAddressPort(b, request.Address, request.Port); err != nil {
b.Release() b.Release()
return nil, err return nil, err
} }
b.Write(data) common.Must2(b.Write(data))
return b, nil return b, nil
} }
@ -349,7 +348,7 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
b := buf.New() b := buf.New()
defer b.Release() defer b.Release()
b.AppendBytes(socks5Version, 0x01, authByte) common.Must2(b.AppendBytes(socks5Version, 0x01, authByte))
if authByte == authPassword { if authByte == authPassword {
rawAccount, err := request.User.GetTypedAccount() rawAccount, err := request.User.GetTypedAccount()
if err != nil { if err != nil {
@ -357,10 +356,10 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
} }
account := rawAccount.(*Account) account := rawAccount.(*Account)
b.AppendBytes(0x01, byte(len(account.Username))) common.Must2(b.AppendBytes(0x01, byte(len(account.Username))))
b.Write([]byte(account.Username)) common.Must2(b.Write([]byte(account.Username)))
b.AppendBytes(byte(len(account.Password))) common.Must2(b.AppendBytes(byte(len(account.Password))))
b.Write([]byte(account.Password)) common.Must2(b.Write([]byte(account.Password)))
} }
if _, err := writer.Write(b.Bytes()); err != nil { if _, err := writer.Write(b.Bytes()); err != nil {
@ -393,7 +392,7 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
if request.Command == protocol.RequestCommandUDP { if request.Command == protocol.RequestCommandUDP {
command = byte(cmdUDPPort) command = byte(cmdUDPPort)
} }
b.AppendBytes(socks5Version, command, 0x00 /* reserved */) common.Must2(b.AppendBytes(socks5Version, command, 0x00 /* reserved */))
if err := addrParser.WriteAddressPort(b, request.Address, request.Port); err != nil { if err := addrParser.WriteAddressPort(b, request.Address, request.Port); err != nil {
return nil, err return nil, err
} }

4
proxy/socks/server.go
View File

@ -139,7 +139,7 @@ func (s *Server) transport(ctx context.Context, reader io.Reader, writer io.Writ
requestDone := func() error { requestDone := func() error {
defer timer.SetTimeout(plcy.Timeouts.DownlinkOnly) defer timer.SetTimeout(plcy.Timeouts.DownlinkOnly)
defer common.Close(link.Writer) defer common.Close(link.Writer) // nolint: errcheck
v2reader := buf.NewReader(reader) v2reader := buf.NewReader(reader)
if err := buf.Copy(v2reader, link.Writer, buf.UpdateActivity(timer)); err != nil { if err := buf.Copy(v2reader, link.Writer, buf.UpdateActivity(timer)); err != nil {
@ -218,7 +218,7 @@ func (s *Server) handleUDPPayload(ctx context.Context, conn internet.Connection,
newError("failed to write UDP response").AtWarning().Base(err).WithContext(ctx).WriteToLog() newError("failed to write UDP response").AtWarning().Base(err).WithContext(ctx).WriteToLog()
} }
conn.Write(udpMessage.Bytes()) conn.Write(udpMessage.Bytes()) // nolint: errcheck
}) })
} }
} }