fix: reshaping buffer maybe too long in vision
Some checks failed
Test / test (1.20, macos-13) (push) Has been cancelled
Test / test (1.20, macos-latest) (push) Has been cancelled
Test / test (1.20, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.20, ubuntu-latest) (push) Has been cancelled
Test / test (1.20, windows-latest) (push) Has been cancelled
Test / test (1.21, macos-13) (push) Has been cancelled
Test / test (1.21, macos-latest) (push) Has been cancelled
Test / test (1.21, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.21, ubuntu-latest) (push) Has been cancelled
Test / test (1.21, windows-latest) (push) Has been cancelled
Test / test (1.22, macos-13) (push) Has been cancelled
Test / test (1.22, macos-latest) (push) Has been cancelled
Test / test (1.22, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.22, ubuntu-latest) (push) Has been cancelled
Test / test (1.22, windows-latest) (push) Has been cancelled
Test / test (1.23, macos-13) (push) Has been cancelled
Test / test (1.23, macos-latest) (push) Has been cancelled
Test / test (1.23, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.23, ubuntu-latest) (push) Has been cancelled
Test / test (1.23, windows-latest) (push) Has been cancelled
Test / test (1.24, macos-13) (push) Has been cancelled
Test / test (1.24, macos-latest) (push) Has been cancelled
Test / test (1.24, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.24, ubuntu-latest) (push) Has been cancelled
Test / test (1.24, windows-latest) (push) Has been cancelled
Test / test (1.25, macos-13) (push) Has been cancelled
Test / test (1.25, macos-latest) (push) Has been cancelled
Test / test (1.25, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.25, ubuntu-latest) (push) Has been cancelled
Test / test (1.25, windows-latest) (push) Has been cancelled
Trigger CMFA Update / trigger-CMFA-update (push) Has been cancelled

This commit is contained in:
wwqgtxx 2025-09-14 12:17:50 +08:00
parent cea29e2615
commit f02766a765
2 changed files with 17 additions and 9 deletions

View File

@ -47,15 +47,21 @@ func ApplyPadding(buffer *buf.Buffer, command byte, userUUID *[]byte, paddingTLS
const xrayBufSize = 8192 const xrayBufSize = 8192
func (vc *Conn) ReshapeBuffer(buffer *buf.Buffer) []*buf.Buffer { func (vc *Conn) ReshapeBuffer(buffer *buf.Buffer) []*buf.Buffer {
if buffer.Len() <= xrayBufSize-PaddingHeaderLen { const bufferLimit = xrayBufSize - PaddingHeaderLen
if buffer.Len() < bufferLimit {
return []*buf.Buffer{buffer} return []*buf.Buffer{buffer}
} }
cutAt := bytes.LastIndex(buffer.Bytes(), tlsApplicationDataStart) options := N.NewReadWaitOptions(nil, vc)
if cutAt == -1 { var buffers []*buf.Buffer
cutAt = xrayBufSize / 2 for buffer.Len() >= bufferLimit {
cutAt := bytes.LastIndex(buffer.Bytes(), tlsApplicationDataStart)
if cutAt < 21 || cutAt > bufferLimit {
cutAt = xrayBufSize / 2
}
buffer2 := options.NewBuffer() // ensure the new buffer can send used in vc.WriteBuffer
buf.Must(buf.Error(buffer2.ReadFullFrom(buffer, cutAt)))
buffers = append(buffers, buffer2)
} }
buffer2 := N.NewReadWaitOptions(nil, vc).NewBuffer() // ensure the new buffer can send used in vc.WriteBuffer buffers = append(buffers, buffer)
buffer2.Write(buffer.From(cutAt)) return buffers
buffer.Truncate(cutAt)
return []*buf.Buffer{buffer, buffer2}
} }

View File

@ -1,4 +1,6 @@
// Package vision implements VLESS flow `xtls-rprx-vision` introduced by Xray-core. // Package vision implements VLESS flow `xtls-rprx-vision` introduced by Xray-core.
//
// same logic as https://github.com/XTLS/Xray-core/blob/v25.9.11/proxy/proxy.go
package vision package vision
import ( import (
@ -27,7 +29,7 @@ func NewConn(conn net.Conn, tlsConn net.Conn, userUUID uuid.UUID) (*Conn, error)
ExtendedWriter: N.NewExtendedWriter(conn), ExtendedWriter: N.NewExtendedWriter(conn),
Conn: conn, Conn: conn,
userUUID: userUUID, userUUID: userUUID,
packetsToFilter: 6, packetsToFilter: 8,
readProcess: true, readProcess: true,
readFilterUUID: true, readFilterUUID: true,
writeFilterApplicationData: true, writeFilterApplicationData: true,