commit a31b9310a22ab2bdb60ed53dc2a941cb2cc07e20 Author: nic Date: Tue Jul 22 18:20:10 2025 +0300 0.1.0 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..90345d1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*cache* +.env diff --git a/cmd/client/main.go b/cmd/client/main.go new file mode 100644 index 0000000..06ab7d0 --- /dev/null +++ b/cmd/client/main.go @@ -0,0 +1 @@ +package main diff --git a/cmd/server/main.go b/cmd/server/main.go new file mode 100644 index 0000000..4f69ba0 --- /dev/null +++ b/cmd/server/main.go @@ -0,0 +1,16 @@ +package main + +import ( + "log/slog" + + "github.com/rombintu/godpn/internal/tracker" +) + +func main() { + server := tracker.NewServer() + server.Configure() + if err := server.Run(); err != nil { + slog.Info(err.Error()) + } + +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..c2df856 --- /dev/null +++ b/go.mod @@ -0,0 +1,23 @@ +module github.com/rombintu/godpn + +go 1.24.4 + +require ( + github.com/gorilla/websocket v1.5.3 + github.com/labstack/echo/v4 v4.13.4 + github.com/shadowsocks/go-shadowsocks2 v0.1.5 +) + +require ( + github.com/labstack/gommon v0.4.2 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.2 // indirect + golang.org/x/crypto v0.38.0 // indirect + golang.org/x/net v0.40.0 // indirect + golang.org/x/sys v0.33.0 // indirect + golang.org/x/text v0.25.0 // indirect + golang.org/x/time v0.11.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..ed9c6b7 --- /dev/null +++ b/go.sum @@ -0,0 +1,44 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA= +github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ= +github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= +github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg= +github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s= +github.com/shadowsocks/go-shadowsocks2 v0.1.5 h1:PDSQv9y2S85Fl7VBeOMF9StzeXZyK1HakRm86CUbr28= +github.com/shadowsocks/go-shadowsocks2 v0.1.5/go.mod h1:AGGpIoek4HRno4xzyFiAtLHkOpcoznZEkAccaI/rplM= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= +golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= +golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= +golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/models/peer.go b/internal/models/peer.go new file mode 100644 index 0000000..7e2a8f9 --- /dev/null +++ b/internal/models/peer.go @@ -0,0 +1,6 @@ +package models + +type PeerManifest struct { + IP string `json:"ip" form:"ip" query:"ip"` + PubKey string `json:"pubkey" form:"pubkey" query:"pubkey" validate:"required"` +} diff --git a/internal/peer/handlers.go b/internal/peer/handlers.go new file mode 100644 index 0000000..d949744 --- /dev/null +++ b/internal/peer/handlers.go @@ -0,0 +1,28 @@ +package peer + +import ( + "github.com/labstack/echo/v4" + "github.com/rombintu/godpn/internal/models" +) + +func (s *Server) connectHandler(c echo.Context) error { + var peerManifest models.PeerManifest + + if err := c.Bind(peerManifest); err != nil { + return err + } + + peer := NewPeer(peerManifest.PubKey) + if err := peer.Connect(peerManifest.IP, "8080"); err != nil { + return err + } + defer peer.Disconnect() + + // TODO + + return c.JSON(200, "OK") +} + +func (s *Server) peerInfo(c echo.Context) error { + return nil +} diff --git a/internal/peer/peer.go b/internal/peer/peer.go new file mode 100644 index 0000000..79c6398 --- /dev/null +++ b/internal/peer/peer.go @@ -0,0 +1,102 @@ +package peer + +import ( + "errors" + "io" + "log/slog" + "net" + "sync" + + "github.com/shadowsocks/go-shadowsocks2/core" +) + +const ( + tcpNetwork = "tcp" + bufferSize = 32 * 1024 // 32KB +) + +// Ошибки подключения +var ( + ErrNotConnected = errors.New("peer is not connected") +) + +type Peer struct { + pubKey string + connEncrypted net.Conn + mu sync.Mutex + active bool +} + +func NewPeer(pubKey string) *Peer { + return &Peer{ + pubKey: pubKey, + active: false, + } +} + +func (p *Peer) Connect(ip, port string) error { + p.mu.Lock() + defer p.mu.Unlock() + + if p.active { + return nil // Уже подключен + } + + conn, err := net.Dial(tcpNetwork, net.JoinHostPort(ip, port)) + if err != nil { + return err + } + + cipher, err := core.PickCipher("AEAD_CHACHA20_POLY1305", []byte(p.pubKey), "") + if err != nil { + conn.Close() + return err + } + + p.connEncrypted = cipher.StreamConn(conn) + p.active = true + return nil +} + +func (p *Peer) Disconnect() error { + p.mu.Lock() + defer p.mu.Unlock() + + if !p.active { + return nil + } + + err := p.connEncrypted.Close() + p.active = false + return err +} + +func (p *Peer) Start(localClient net.Conn) error { + if !p.active { + return ErrNotConnected + } + + var wg sync.WaitGroup + wg.Add(2) + + // Логика проксирования в обе стороны + go p.pipeData(localClient, p.connEncrypted, &wg) + go p.pipeData(p.connEncrypted, localClient, &wg) + + wg.Wait() + return nil +} + +func (p *Peer) pipeData(src, dst net.Conn, wg *sync.WaitGroup) { + defer wg.Done() + + buf := make([]byte, bufferSize) + _, err := io.CopyBuffer(dst, src, buf) + if err != nil { + slog.Warn("pipe data error", slog.String("message", err.Error())) + } + + // Закрываем соединения при завершении + src.Close() + dst.Close() +} diff --git a/internal/peer/server.go b/internal/peer/server.go new file mode 100644 index 0000000..e37d387 --- /dev/null +++ b/internal/peer/server.go @@ -0,0 +1,31 @@ +package peer + +import ( + "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" +) + +type Server struct { + router *echo.Echo +} + +func NewServer() *Server { + return &Server{ + router: echo.New(), + } +} + +func (s *Server) Configure() { + // Middleware + s.router.Use(middleware.Logger()) + s.router.Use(middleware.Recover()) + s.router.Use(middleware.CORS()) + + // Роуты + s.router.POST("/connect", s.connectHandler) + s.router.GET("/info", s.peerInfo) +} + +func (s *Server) Run() error { + return s.router.Start(":8081") +} diff --git a/internal/tracker/handlers.go b/internal/tracker/handlers.go new file mode 100644 index 0000000..3eef7ea --- /dev/null +++ b/internal/tracker/handlers.go @@ -0,0 +1,72 @@ +package tracker + +import ( + "net/http" + + "github.com/gorilla/websocket" + "github.com/labstack/echo/v4" + "github.com/rombintu/godpn/internal/models" +) + +func (s *Server) registerHandler(c echo.Context) error { + var peer models.PeerManifest + if err := c.Bind(peer); err != nil { + return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid request"}) + } + + if peer.PubKey == "" { + return c.JSON(http.StatusBadRequest, map[string]string{"error": "pubkey is required"}) + } + + ip := c.RealIP() + if peer.IP != "" { + ip = peer.IP + } + + s.mu.Lock() + s.tracker.peers[ip] = peer.PubKey + s.mu.Unlock() + + return c.JSON(http.StatusOK, map[string]string{ + "status": "registered", + "ip": ip, + }) +} + +// Обработчик списка peers (HTTP) +func (s *Server) listPeers(c echo.Context) error { + s.mu.RLock() + defer s.mu.RUnlock() + return c.JSON(http.StatusOK, s.tracker.peers) +} + +// WebSocket handler для реального времени +func (s *Server) websocketHandler(c echo.Context) error { + upgrader := websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { return true }, + } + + ws, err := upgrader.Upgrade(c.Response(), c.Request(), nil) + if err != nil { + return err + } + defer ws.Close() + + // Отправляем текущий список peers при подключении + s.mu.RLock() + if err := ws.WriteJSON(s.tracker.peers); err != nil { + s.mu.RUnlock() + return err + } + s.mu.RUnlock() + + // Ожидаем новые сообщения (можно добавить heartbeat) + for { + _, _, err := ws.ReadMessage() + if err != nil { + break + } + } + + return nil +} diff --git a/internal/tracker/server.go b/internal/tracker/server.go new file mode 100644 index 0000000..b441156 --- /dev/null +++ b/internal/tracker/server.go @@ -0,0 +1,37 @@ +package tracker + +import ( + "sync" + + "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" +) + +type Server struct { + router *echo.Echo + mu sync.RWMutex + tracker *Tracker +} + +func NewServer() *Server { + return &Server{ + router: echo.New(), + tracker: NewTracker(), + } +} + +func (s *Server) Configure() { + // Middleware + s.router.Use(middleware.Logger()) + s.router.Use(middleware.Recover()) + s.router.Use(middleware.CORS()) + + // Роуты + s.router.POST("/register", s.registerHandler) + s.router.GET("/peers", s.listPeers) + s.router.GET("/ws", s.websocketHandler) +} + +func (s *Server) Run() error { + return s.router.Start(":8080") +} diff --git a/internal/tracker/tracker.go b/internal/tracker/tracker.go new file mode 100644 index 0000000..937a0ca --- /dev/null +++ b/internal/tracker/tracker.go @@ -0,0 +1,11 @@ +package tracker + +type Tracker struct { + peers map[string]string +} + +func NewTracker() *Tracker { + return &Tracker{ + peers: make(map[string]string), + } +}