mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-19 07:01:09 +00:00
format code
This commit is contained in:
1 parent
4c963a51ed
commit
54fe1ed8b1
10 files changed
+119
-119
No files matched your search
+22
-22
@@ -1,9 +1,9 @@
|
||||
package socks
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bufio"
|
||||
"errors"
|
||||
"io"
|
||||
"io"
|
||||
"net"
|
||||
"strconv"
|
||||
|
||||
@@ -16,7 +16,7 @@ import (
|
||||
var (
|
||||
ErrorAuthenticationFailed = errors.New("None of the authentication methods is allowed.")
|
||||
ErrorCommandNotSupported = errors.New("Client requested an unsupported command.")
|
||||
ErrorInvalidUser = errors.New("Invalid username or password.")
|
||||
ErrorInvalidUser = errors.New("Invalid username or password.")
|
||||
)
|
||||
|
||||
// SocksServer is a SOCKS 5 proxy server
|
||||
@@ -63,8 +63,8 @@ func (server *SocksServer) AcceptConnections(listener net.Listener) error {
|
||||
|
||||
func (server *SocksServer) HandleConnection(connection net.Conn) error {
|
||||
defer connection.Close()
|
||||
|
||||
reader := bufio.NewReader(connection)
|
||||
|
||||
reader := bufio.NewReader(connection)
|
||||
|
||||
auth, err := socksio.ReadAuthentication(reader)
|
||||
if err != nil {
|
||||
@@ -87,23 +87,23 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
|
||||
|
||||
authResponse := socksio.NewAuthenticationResponse(expectedAuthMethod)
|
||||
socksio.WriteAuthentication(connection, authResponse)
|
||||
|
||||
if server.config.AuthMethod == JsonAuthMethodUserPass {
|
||||
upRequest, err := socksio.ReadUserPassRequest(reader)
|
||||
if err != nil {
|
||||
log.Error("Failed to read username and password: %v", err)
|
||||
return err
|
||||
}
|
||||
status := byte(0)
|
||||
if ! upRequest.IsValid(server.config.Username, server.config.Password) {
|
||||
status = byte(0xFF)
|
||||
}
|
||||
upResponse := socksio.NewSocks5UserPassResponse(status)
|
||||
socksio.WriteUserPassResponse(connection, upResponse)
|
||||
if status != byte(0) {
|
||||
return ErrorInvalidUser
|
||||
}
|
||||
}
|
||||
|
||||
if server.config.AuthMethod == JsonAuthMethodUserPass {
|
||||
upRequest, err := socksio.ReadUserPassRequest(reader)
|
||||
if err != nil {
|
||||
log.Error("Failed to read username and password: %v", err)
|
||||
return err
|
||||
}
|
||||
status := byte(0)
|
||||
if !upRequest.IsValid(server.config.Username, server.config.Password) {
|
||||
status = byte(0xFF)
|
||||
}
|
||||
upResponse := socksio.NewSocks5UserPassResponse(status)
|
||||
socksio.WriteUserPassResponse(connection, upResponse)
|
||||
if status != byte(0) {
|
||||
return ErrorInvalidUser
|
||||
}
|
||||
}
|
||||
|
||||
request, err := socksio.ReadRequest(reader)
|
||||
if err != nil {
|
||||
|
||||
+5
-5
@@ -2,7 +2,7 @@ package vmess
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net"
|
||||
"net"
|
||||
|
||||
"github.com/v2ray/v2ray-core"
|
||||
"github.com/v2ray/v2ray-core/log"
|
||||
@@ -44,10 +44,10 @@ func (config VNextConfig) ToVNextServer() VNextServer {
|
||||
}
|
||||
users = append(users, vuser)
|
||||
}
|
||||
ip := net.ParseIP(config.Address)
|
||||
if ip == nil {
|
||||
panic(log.Error("Unable to parse VNext IP: %s", config.Address))
|
||||
}
|
||||
ip := net.ParseIP(config.Address)
|
||||
if ip == nil {
|
||||
panic(log.Error("Unable to parse VNext IP: %s", config.Address))
|
||||
}
|
||||
return VNextServer{
|
||||
v2net.IPAddress(ip, config.Port),
|
||||
users}
|
||||
|
||||
@@ -55,7 +55,7 @@ func (handler *VMessInboundHandler) HandleConnection(connection net.Conn) error
|
||||
|
||||
request, err := reader.Read(connection)
|
||||
if err != nil {
|
||||
log.Debug("Failed to parse VMess request: %v", err)
|
||||
log.Debug("Failed to parse VMess request: %v", err)
|
||||
return err
|
||||
}
|
||||
log.Debug("Received request for %s", request.Address.String())
|
||||
|
||||
+21
-21
@@ -66,24 +66,24 @@ func (handler *VMessOutboundHandler) Start(ray core.OutboundRay) error {
|
||||
}
|
||||
|
||||
func startCommunicate(request *vmessio.VMessRequest, dest v2net.Address, ray core.OutboundRay) error {
|
||||
input := ray.OutboundInput()
|
||||
input := ray.OutboundInput()
|
||||
output := ray.OutboundOutput()
|
||||
|
||||
|
||||
conn, err := net.DialTCP("tcp", nil, &net.TCPAddr{dest.IP, int(dest.Port), ""})
|
||||
log.Debug("VMessOutbound dialing tcp: %s", dest.String())
|
||||
if err != nil {
|
||||
log.Error("Failed to open tcp (%s): %v", dest.String(), err)
|
||||
close(output)
|
||||
close(output)
|
||||
return err
|
||||
}
|
||||
defer conn.Close()
|
||||
defer close(output)
|
||||
|
||||
requestFinish := make(chan bool)
|
||||
responseFinish := make(chan bool)
|
||||
|
||||
go handleRequest(conn, request, input, requestFinish)
|
||||
go handleResponse(conn, request, output, responseFinish)
|
||||
defer close(output)
|
||||
|
||||
requestFinish := make(chan bool)
|
||||
responseFinish := make(chan bool)
|
||||
|
||||
go handleRequest(conn, request, input, requestFinish)
|
||||
go handleResponse(conn, request, output, responseFinish)
|
||||
|
||||
<-requestFinish
|
||||
conn.CloseWrite()
|
||||
@@ -92,27 +92,27 @@ func startCommunicate(request *vmessio.VMessRequest, dest v2net.Address, ray cor
|
||||
}
|
||||
|
||||
func handleRequest(conn *net.TCPConn, request *vmessio.VMessRequest, input <-chan []byte, finish chan<- bool) error {
|
||||
defer close(finish)
|
||||
requestWriter := vmessio.NewVMessRequestWriter()
|
||||
defer close(finish)
|
||||
requestWriter := vmessio.NewVMessRequestWriter()
|
||||
err := requestWriter.Write(conn, request)
|
||||
if err != nil {
|
||||
log.Error("Failed to write VMess request: %v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
encryptRequestWriter, err := v2io.NewAesEncryptWriter(request.RequestKey[:], request.RequestIV[:], conn)
|
||||
|
||||
encryptRequestWriter, err := v2io.NewAesEncryptWriter(request.RequestKey[:], request.RequestIV[:], conn)
|
||||
if err != nil {
|
||||
log.Error("Failed to create encrypt writer: %v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
v2net.ChanToWriter(encryptRequestWriter, input)
|
||||
return nil
|
||||
|
||||
v2net.ChanToWriter(encryptRequestWriter, input)
|
||||
return nil
|
||||
}
|
||||
|
||||
func handleResponse(conn *net.TCPConn, request *vmessio.VMessRequest, output chan<- []byte, finish chan<- bool) error {
|
||||
defer close(finish)
|
||||
responseKey := md5.Sum(request.RequestKey[:])
|
||||
defer close(finish)
|
||||
responseKey := md5.Sum(request.RequestKey[:])
|
||||
responseIV := md5.Sum(request.RequestIV[:])
|
||||
|
||||
response := vmessio.VMessResponse{}
|
||||
@@ -129,9 +129,9 @@ func handleResponse(conn *net.TCPConn, request *vmessio.VMessRequest, output cha
|
||||
log.Error("Failed to create decrypt reader: %v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
v2net.ReaderToChan(output, decryptResponseReader)
|
||||
return nil
|
||||
return nil
|
||||
}
|
||||
|
||||
type VMessOutboundHandlerFactory struct {
|
||||
|
||||
Reference in new issue
Block a user