ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-08-31 21:44:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix cipherrwc

Browse Source
This commit is contained in:
9seconds
2018-05-31 09:54:20 +03:00
parent 11810253ff
commit 7072a7a6b6
2 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/cipherrwc.go
+14 -15
View File
@@ -23,27 +23,26 @@ func (c *CipherReadWriteCloser) Read(p []byte) (n int, err error) {
}
func (c *CipherReadWriteCloser) Write(p []byte) (n int, err error) {
c.rest.Write(c.crypt.Encrypt(p))
newP := c.rest.Bytes()[:len(p)]
n, err = c.conn.Write(newP)
c.rest = bytes.NewBuffer(c.rest.Bytes()[n:])
encrypted := c.crypt.Encrypt(p)
curN := 0
for len(encrypted) > 0 {
curN, err = c.conn.Write(encrypted)
n += curN
if err != nil {
return
}
encrypted = encrypted[n:]
}
return
}
func (c *CipherReadWriteCloser) Close() error {
var err1 error
if c.rest.Len() > 0 {
_, err1 = c.conn.Write(c.rest.Bytes())
}
err2 := c.conn.Close()
if err2 != nil {
return err2
}
return err1
return c.conn.Close()
}
func newCipherReadWriteCloser(conn io.ReadWriteCloser, crypt Cipher) io.ReadWriteCloser {
func newCipherReadWriteCloser(conn io.ReadWriteCloser, crypt Cipher) *CipherReadWriteCloser {
return &CipherReadWriteCloser{
conn: conn,
crypt: crypt,
server/server.go
+50 -50
View File
@@ -3,7 +3,6 @@ package server
import (
"context"
"fmt"
"io"
"net"
"strconv"
"sync"
@@ -56,65 +55,66 @@ func (s *Server) accept(conn net.Conn) {
"socketid", socketID,
)
clientCipher, dc := s.getClientStream(conn, ctx, cancel, socketID)
// if err != nil {
// s.logger.Warnw("Cannot initialize client connection",
// "secret", s.secret,
// "addr", conn.RemoteAddr().String(),
// "socketid", socketID,
// "error", err,
// )
// return
// }
clientConn, dc, err := s.getClientStream(conn, ctx, cancel, socketID)
if err != nil {
s.logger.Warnw("Cannot initialize client connection",
"secret", s.secret,
"addr", conn.RemoteAddr().String(),
"socketid", socketID,
"error", err,
)
return
}
defer clientConn.Close()
tgConn, tgCipher := s.getTelegramStream(dc, ctx, cancel, socketID)
// if err != nil {
// s.logger.Warnw("Cannot initialize Telegram connection",
// "socketid", socketID,
// "error", err,
// )
// return
// }
tgConn, err := s.getTelegramStream(dc, ctx, cancel, socketID)
if err != nil {
s.logger.Warnw("Cannot initialize Telegram connection",
"socketid", socketID,
"error", err,
)
return
}
defer tgConn.Close()
wait := &sync.WaitGroup{}
wait.Add(2)
go func() {
defer wait.Done()
buf := make([]byte, 128)
for {
n, err := conn.Read(buf)
fmt.Println("client loop")
n, err := clientConn.Read(buf)
if err != nil {
fmt.Println("client read error", err)
return
}
_, err = tgConn.Write(buf[:n])
if err != nil {
fmt.Println("tgConn write error", err)
return
}
decrypted := clientCipher.Decrypt(buf[:n])
encrypted := tgCipher.Encrypt(decrypted)
tgConn.Write(encrypted)
}
}()
go func() {
defer wait.Done()
buf := make([]byte, 128)
for {
fmt.Println("tg loop")
n, err := tgConn.Read(buf)
if err != nil {
fmt.Println("tgConn read error", err)
return
}
_, err = clientConn.Write(buf[:n])
if err != nil {
fmt.Println("client write error", err)
return
}
decrypted := tgCipher.Decrypt(buf[:n])
encrypted := clientCipher.Encrypt(decrypted)
conn.Write(encrypted)
}
}()
// go func() {
// buf := make([]byte, 128)
// for {
// n, err := conn.
// }
// defer wait.Done()
// io.Copy(tgConn, clientConn)
// }()
// go func() {
// defer wait.Done()
// io.Copy(clientConn, tgConn)
// }()
<-ctx.Done()
wait.Wait()
@@ -129,20 +129,20 @@ func (s *Server) makeSocketID() string {
return uuid.NewV4().String()
}
func (s *Server) getClientStream(conn net.Conn, ctx context.Context, cancel context.CancelFunc, socketID string) (Cipher, int16) {
func (s *Server) getClientStream(conn net.Conn, ctx context.Context, cancel context.CancelFunc, socketID string) (*CipherReadWriteCloser, int16, error) {
frame, err := obfuscated2.ExtractFrame(conn)
if err != nil {
fmt.Println(err)
// return nil, 0, errors.Annotate(err, "Cannot create client stream")
return nil, 0, errors.Annotate(err, "Cannot create client stream")
}
obfs2, dc, err := obfuscated2.ParseObfuscated2ClientFrame(s.secret, frame)
if err != nil {
fmt.Println(err)
// return nil, 0, errors.Annotate(err, "Cannot create client stream")
return nil, 0, errors.Annotate(err, "Cannot create client stream")
}
return obfs2, dc
wConn := newCipherReadWriteCloser(conn, obfs2)
return wConn, dc, nil
// cipherConn := newCipherReadWriteCloser(conn, obfs2)
// ctxConn := newCtxReadWriteCloser(cipherConn, ctx, cancel)
@@ -151,20 +151,20 @@ func (s *Server) getClientStream(conn net.Conn, ctx context.Context, cancel cont
// return ctxConn, dc, nil
}
func (s *Server) getTelegramStream(dc int16, ctx context.Context, cancel context.CancelFunc, socketID string) (io.ReadWriteCloser, Cipher) {
func (s *Server) getTelegramStream(dc int16, ctx context.Context, cancel context.CancelFunc, socketID string) (*CipherReadWriteCloser, error) {
socket, err := dialToTelegram(dc)
if err != nil {
fmt.Println(err)
// return nil, errors.Annotate(err, "Cannot dial")
return nil, errors.Annotate(err, "Cannot dial")
}
obfs2, frame := obfuscated2.MakeTelegramObfuscated2Frame()
if n, err := socket.Write(frame); err != nil || n != len(frame) {
fmt.Println(err)
// return nil, errors.Annotate(err, "Cannot write hadnshake frame")
return nil, errors.Annotate(err, "Cannot write hadnshake frame")
}
return socket, obfs2
wConn := newCipherReadWriteCloser(socket, obfs2)
return wConn, nil
// cipherConn := newCipherReadWriteCloser(socket, obfs2)
// ctxConn := newCtxReadWriteCloser(cipherConn, ctx, cancel)