mirror of
https://github.com/v2fly/v2ray-core.git
synced 2024-12-21 09:36:34 -05:00
sample socks proxy
This commit is contained in:
parent
0a96b8fb1d
commit
262eb4f985
@ -5,6 +5,7 @@ import (
|
|||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
_ "log"
|
||||||
|
|
||||||
v2net "github.com/v2ray/v2ray-core/net"
|
v2net "github.com/v2ray/v2ray-core/net"
|
||||||
)
|
)
|
||||||
@ -25,7 +26,7 @@ type Socks5AuthenticationRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (request *Socks5AuthenticationRequest) HasAuthMethod(method byte) bool {
|
func (request *Socks5AuthenticationRequest) HasAuthMethod(method byte) bool {
|
||||||
for i := byte(0); i < request.nMethods; i++ {
|
for i := 0; i < int(request.nMethods); i++ {
|
||||||
if request.authMethods[i] == method {
|
if request.authMethods[i] == method {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@ -140,17 +141,22 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
case AddrTypeDomain:
|
case AddrTypeDomain:
|
||||||
buffer = make([]byte, 257)
|
buffer = make([]byte, 256)
|
||||||
nBytes, err = reader.Read(buffer)
|
nBytes, err = reader.Read(buffer[0:1])
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
domainLength := buffer[0]
|
||||||
|
nBytes, err = reader.Read(buffer[:domainLength])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
domainLength := buffer[0]
|
|
||||||
if nBytes != int(domainLength)+1 {
|
if nBytes != int(domainLength) {
|
||||||
err = fmt.Errorf("Unable to read domain")
|
err = fmt.Errorf("Unable to read domain with %d bytes, expecting %d bytes", nBytes, domainLength)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
request.Domain = string(buffer[1 : domainLength+1])
|
request.Domain = string(buffer[:domainLength])
|
||||||
case AddrTypeIPv6:
|
case AddrTypeIPv6:
|
||||||
nBytes, err = reader.Read(request.IPv6[:])
|
nBytes, err = reader.Read(request.IPv6[:])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
package tcp
|
package freedom
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
|
"log"
|
||||||
|
|
||||||
"github.com/v2ray/v2ray-core"
|
"github.com/v2ray/v2ray-core"
|
||||||
v2net "github.com/v2ray/v2ray-core/net"
|
v2net "github.com/v2ray/v2ray-core/net"
|
||||||
@ -25,8 +26,10 @@ func (vconn *VFreeConnection) Start(vRay core.OutboundVRay) error {
|
|||||||
output := vRay.OutboundOutput()
|
output := vRay.OutboundOutput()
|
||||||
conn, err := net.Dial("tcp", vconn.dest.String())
|
conn, err := net.Dial("tcp", vconn.dest.String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Print(err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
log.Print("Working on tcp:" + vconn.dest.String())
|
||||||
|
|
||||||
finish := make(chan bool, 2)
|
finish := make(chan bool, 2)
|
||||||
go vconn.DumpInput(conn, input, finish)
|
go vconn.DumpInput(conn, input, finish)
|
||||||
@ -51,9 +54,11 @@ func (vconn *VFreeConnection) DumpOutput(conn net.Conn, output chan<- []byte, fi
|
|||||||
buffer := make([]byte, 128)
|
buffer := make([]byte, 128)
|
||||||
nBytes, err := conn.Read(buffer)
|
nBytes, err := conn.Read(buffer)
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
|
close(output)
|
||||||
finish <- true
|
finish <- true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
log.Print(buffer[:nBytes])
|
||||||
output <- buffer[:nBytes]
|
output <- buffer[:nBytes]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
13
net/freedom/freedomfactory.go
Normal file
13
net/freedom/freedomfactory.go
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
package freedom
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/v2ray/v2ray-core"
|
||||||
|
v2net "github.com/v2ray/v2ray-core/net"
|
||||||
|
)
|
||||||
|
|
||||||
|
type FreedomFactory struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (factory FreedomFactory) Create(vp *core.VPoint, dest v2net.VAddress) (core.OutboundConnectionHandler, error) {
|
||||||
|
return NewVFreeConnection(vp, dest), nil
|
||||||
|
}
|
@ -3,7 +3,9 @@ package socks
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
|
"log"
|
||||||
"net"
|
"net"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
"github.com/v2ray/v2ray-core"
|
"github.com/v2ray/v2ray-core"
|
||||||
socksio "github.com/v2ray/v2ray-core/io/socks"
|
socksio "github.com/v2ray/v2ray-core/io/socks"
|
||||||
@ -26,8 +28,8 @@ func NewSocksServer(vp *core.VPoint) *SocksServer {
|
|||||||
return server
|
return server
|
||||||
}
|
}
|
||||||
|
|
||||||
func (server *SocksServer) Listen(port uint8) error {
|
func (server *SocksServer) Listen(port uint16) error {
|
||||||
listener, err := net.Listen("tcp", ":"+string(port))
|
listener, err := net.Listen("tcp", ":"+strconv.Itoa(int(port)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -40,6 +42,7 @@ func (server *SocksServer) AcceptConnections(listener net.Listener) error {
|
|||||||
for server.accepting {
|
for server.accepting {
|
||||||
connection, err := listener.Accept()
|
connection, err := listener.Accept()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Print(err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
go server.HandleConnection(connection)
|
go server.HandleConnection(connection)
|
||||||
@ -52,10 +55,14 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
|
|||||||
|
|
||||||
auth, err := socksio.ReadAuthentication(connection)
|
auth, err := socksio.ReadAuthentication(connection)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Print(err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
log.Print(auth)
|
||||||
|
|
||||||
if auth.HasAuthMethod(socksio.AuthNotRequired) {
|
if !auth.HasAuthMethod(socksio.AuthNotRequired) {
|
||||||
|
// TODO send response with FF
|
||||||
|
log.Print(ErrorAuthenticationFailed)
|
||||||
return ErrorAuthenticationFailed
|
return ErrorAuthenticationFailed
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -64,15 +71,33 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
|
|||||||
|
|
||||||
request, err := socksio.ReadRequest(connection)
|
request, err := socksio.ReadRequest(connection)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Print(err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
response := socksio.NewSocks5Response()
|
||||||
|
|
||||||
if request.Command == socksio.CmdBind || request.Command == socksio.CmdUdpAssociate {
|
if request.Command == socksio.CmdBind || request.Command == socksio.CmdUdpAssociate {
|
||||||
response := socksio.NewSocks5Response()
|
response := socksio.NewSocks5Response()
|
||||||
response.Error = socksio.ErrorCommandNotSupported
|
response.Error = socksio.ErrorCommandNotSupported
|
||||||
socksio.WriteResponse(connection, response)
|
socksio.WriteResponse(connection, response)
|
||||||
|
log.Print(ErrorCommandNotSupported)
|
||||||
return ErrorCommandNotSupported
|
return ErrorCommandNotSupported
|
||||||
}
|
}
|
||||||
|
|
||||||
|
response.Error = socksio.ErrorSuccess
|
||||||
|
response.Port = request.Port
|
||||||
|
response.AddrType = request.AddrType
|
||||||
|
switch response.AddrType {
|
||||||
|
case socksio.AddrTypeIPv4:
|
||||||
|
copy(response.IPv4[:], request.IPv4[:])
|
||||||
|
case socksio.AddrTypeIPv6:
|
||||||
|
copy(response.IPv6[:], request.IPv6[:])
|
||||||
|
case socksio.AddrTypeDomain:
|
||||||
|
response.Domain = request.Domain
|
||||||
|
}
|
||||||
|
socksio.WriteResponse(connection, response)
|
||||||
|
|
||||||
|
|
||||||
ray := server.vPoint.NewInboundConnectionAccepted(request.Destination())
|
ray := server.vPoint.NewInboundConnectionAccepted(request.Destination())
|
||||||
input := ray.InboundInput()
|
input := ray.InboundInput()
|
||||||
@ -90,7 +115,9 @@ func (server *SocksServer) dumpInput(conn net.Conn, input chan<- []byte, finish
|
|||||||
for {
|
for {
|
||||||
buffer := make([]byte, 256)
|
buffer := make([]byte, 256)
|
||||||
nBytes, err := conn.Read(buffer)
|
nBytes, err := conn.Read(buffer)
|
||||||
|
log.Printf("Reading %d bytes, with error %v", nBytes, err)
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
|
close(input)
|
||||||
finish <- true
|
finish <- true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@ -105,7 +132,8 @@ func (server *SocksServer) dumpOutput(conn net.Conn, output <-chan []byte, finis
|
|||||||
finish <- true
|
finish <- true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
conn.Write(buffer)
|
nBytes, _ := conn.Write(buffer)
|
||||||
|
log.Printf("Writing %d bytes", nBytes)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
39
net/socks/socks_test.go
Normal file
39
net/socks/socks_test.go
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
package socks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/v2ray/v2ray-core"
|
||||||
|
"github.com/v2ray/v2ray-core/testing/mocks"
|
||||||
|
"github.com/v2ray/v2ray-core/testing/unit"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestSocksTcpConnect(t *testing.T) {
|
||||||
|
t.Skip("Not ready yet.")
|
||||||
|
|
||||||
|
assert := unit.Assert(t)
|
||||||
|
|
||||||
|
port := 12384
|
||||||
|
|
||||||
|
uuid := "2418d087-648d-4990-86e8-19dca1d006d3"
|
||||||
|
vid, err := core.UUIDToVID(uuid)
|
||||||
|
assert.Error(err).IsNil()
|
||||||
|
|
||||||
|
config := VConfig{
|
||||||
|
port,
|
||||||
|
[]core.VUser{VUser{vid}},
|
||||||
|
"",
|
||||||
|
[]core.VNext{}}
|
||||||
|
|
||||||
|
och := new(FakeOutboundConnectionHandler)
|
||||||
|
och.Data2Send = bytes.NewBuffer(make([]byte, 1024))
|
||||||
|
och.Data2Return = []byte("The data to be returned to socks server.")
|
||||||
|
|
||||||
|
vpoint, err := NewVPoint(&config, SocksServerFactory{}, och)
|
||||||
|
assert.Error(err).IsNil()
|
||||||
|
|
||||||
|
err = vpoint.Start()
|
||||||
|
assert.Error(err).IsNil()
|
||||||
|
|
||||||
|
}
|
@ -7,6 +7,6 @@ import (
|
|||||||
type SocksServerFactory struct {
|
type SocksServerFactory struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (factory *SocksServerFactory) Create(vp *core.VPoint) *SocksServer {
|
func (factory SocksServerFactory) Create(vp *core.VPoint) (core.InboundConnectionHandler, error) {
|
||||||
return NewSocksServer(vp)
|
return NewSocksServer(vp), nil
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,11 @@ func (addr VAddress) String() string {
|
|||||||
var host string
|
var host string
|
||||||
switch addr.Type {
|
switch addr.Type {
|
||||||
case AddrTypeIP:
|
case AddrTypeIP:
|
||||||
host = addr.IP.String()
|
host = addr.IP.String()
|
||||||
|
if len(addr.IP) == net.IPv6len {
|
||||||
|
host = "[" + host + "]"
|
||||||
|
}
|
||||||
|
|
||||||
case AddrTypeDomain:
|
case AddrTypeDomain:
|
||||||
host = addr.Domain
|
host = addr.Domain
|
||||||
default:
|
default:
|
||||||
|
37
release/server/socks/main.go
Normal file
37
release/server/socks/main.go
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/v2ray/v2ray-core"
|
||||||
|
"github.com/v2ray/v2ray-core/net/freedom"
|
||||||
|
"github.com/v2ray/v2ray-core/net/socks"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
port := uint16(8888)
|
||||||
|
|
||||||
|
uuid := "2418d087-648d-4990-86e8-19dca1d006d3"
|
||||||
|
vid, err := core.UUIDToVID(uuid)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
config := core.VConfig{
|
||||||
|
port,
|
||||||
|
[]core.VUser{core.VUser{vid}},
|
||||||
|
"",
|
||||||
|
[]core.VNext{}}
|
||||||
|
|
||||||
|
vpoint, err := core.NewVPoint(&config, socks.SocksServerFactory{}, freedom.FreedomFactory{})
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
err = vpoint.Start()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
finish := make(chan bool)
|
||||||
|
<-finish
|
||||||
|
}
|
33
testing/mocks/fakeoutboundhandler.go
Normal file
33
testing/mocks/fakeoutboundhandler.go
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
package mocks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
|
||||||
|
"github.com/v2ray/v2ray-core"
|
||||||
|
v2net "github.com/v2ray/v2ray-core/net"
|
||||||
|
)
|
||||||
|
|
||||||
|
type FakeOutboundConnectionHandler struct {
|
||||||
|
Data2Send bytes.Buffer
|
||||||
|
Data2Return []byte
|
||||||
|
Destination v2net.VAddress
|
||||||
|
}
|
||||||
|
|
||||||
|
func (handler *FakeOutboundConnectionHandler) Start(ray core.OutboundVRay) error {
|
||||||
|
input := ray.OutboundInput()
|
||||||
|
output := ray.OutboundOutput()
|
||||||
|
|
||||||
|
output <- handler.Data2Return
|
||||||
|
for {
|
||||||
|
data, open := <-input
|
||||||
|
if !open {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
handler.Data2Send.Write(data)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (handler *FakeOutboundConnectionHandler) Create(vPoint *core.VPoint, dest v2net.VAddress) (core.OutboundConnectionHandler, error) {
|
||||||
|
return handler, nil
|
||||||
|
}
|
20
vpoint.go
20
vpoint.go
@ -16,7 +16,7 @@ type VPoint struct {
|
|||||||
|
|
||||||
// NewVPoint returns a new VPoint server based on given configuration.
|
// NewVPoint returns a new VPoint server based on given configuration.
|
||||||
// The server is not started at this point.
|
// The server is not started at this point.
|
||||||
func NewVPoint(config *VConfig) (*VPoint, error) {
|
func NewVPoint(config *VConfig, ichFactory InboundConnectionHandlerFactory, ochFactory OutboundConnectionHandlerFactory) (*VPoint, error) {
|
||||||
var vpoint = new(VPoint)
|
var vpoint = new(VPoint)
|
||||||
vpoint.Config = *config
|
vpoint.Config = *config
|
||||||
vpoint.UserSet = NewVUserSet()
|
vpoint.UserSet = NewVUserSet()
|
||||||
@ -24,6 +24,9 @@ func NewVPoint(config *VConfig) (*VPoint, error) {
|
|||||||
for _, user := range vpoint.Config.AllowedClients {
|
for _, user := range vpoint.Config.AllowedClients {
|
||||||
vpoint.UserSet.AddUser(user)
|
vpoint.UserSet.AddUser(user)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vpoint.ichFactory = ichFactory
|
||||||
|
vpoint.ochFactory = ochFactory
|
||||||
|
|
||||||
return vpoint, nil
|
return vpoint, nil
|
||||||
}
|
}
|
||||||
@ -59,21 +62,6 @@ func (vp *VPoint) Start() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (vp *VPoint) NewInboundConnectionAccepted(destination v2net.VAddress) InboundVRay {
|
func (vp *VPoint) NewInboundConnectionAccepted(destination v2net.VAddress) InboundVRay {
|
||||||
/*
|
|
||||||
vNextLen := len(vp.Config.VNextList)
|
|
||||||
if vNextLen > 0 {
|
|
||||||
vNextIndex := rand.Intn(vNextLen)
|
|
||||||
vNext := vp.Config.VNextList[vNextIndex]
|
|
||||||
vNextUser := dest.User
|
|
||||||
vNextUserLen := len(vNext.Users)
|
|
||||||
if vNextUserLen > 0 {
|
|
||||||
vNextUserIndex = rand.Intn(vNextUserLen)
|
|
||||||
vNextUser = vNext.Users[vNextUserIndex]
|
|
||||||
}
|
|
||||||
newDest := VDestination{"tcp", vNext.ServerAddress, vNextUser}
|
|
||||||
dest = newDest
|
|
||||||
}*/
|
|
||||||
|
|
||||||
ray := NewVRay()
|
ray := NewVRay()
|
||||||
// TODO: handle error
|
// TODO: handle error
|
||||||
och, _ := vp.ochFactory.Create(vp, destination)
|
och, _ := vp.ochFactory.Create(vp, destination)
|
||||||
|
Loading…
Reference in New Issue
Block a user