feat(ss): support none/dummy cipher via no-op AEAD implementation
The go-gost fork of go-shadowsocks2 dropped built-in support for the none/dummy cipher that was present in the original go-shadowsocks2. Combined with the SS components' hard requirement for auth (and therefore a valid cipher), this made gost fail to start with method=none or method=dummy. Add a no-op cipher in x/internal/util/ss/none/ that implements the core.ShadowCipher interface using the standard go-shadowsocks2 AEAD framing (salt + length-prefixed chunks, target address embedding) without actual encryption. SaltSize=16 ensures random salts on every connection to avoid bloom-ring replay detection. Update SS TCP connector/handler and SS UDP connector/handler to detect method=none/dummy (case-insensitive) and use the no-op cipher instead of utils.NewClientConfig/NewServerConfig. Fixes go-gost/x#105
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
// Package none provides a no-op cipher for Shadowsocks that passes data
|
||||
// through without encryption. It implements the go-shadowsocks2 core.ShadowCipher
|
||||
// interface. This cipher is intended for debugging, testing, and compatibility
|
||||
// purposes and MUST NOT be used in production.
|
||||
package none
|
||||
|
||||
// noopAEAD is a cipher.AEAD that performs no encryption or authentication.
|
||||
// All data passes through unchanged.
|
||||
type noopAEAD struct{}
|
||||
|
||||
// NonceSize returns 0 since no nonce is needed.
|
||||
func (noopAEAD) NonceSize() int { return 0 }
|
||||
|
||||
// Overhead returns 0 since no authentication tag is added.
|
||||
func (noopAEAD) Overhead() int { return 0 }
|
||||
|
||||
// Seal appends plaintext to dst without encryption.
|
||||
func (noopAEAD) Seal(dst, nonce, plaintext, additionalData []byte) []byte {
|
||||
return append(dst, plaintext...)
|
||||
}
|
||||
|
||||
// Open appends ciphertext to dst without decryption.
|
||||
func (noopAEAD) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
|
||||
return append(dst, ciphertext...), nil
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package none
|
||||
|
||||
import (
|
||||
"crypto/cipher"
|
||||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/go-gost/go-shadowsocks2/core"
|
||||
"github.com/go-gost/go-shadowsocks2/shadowaead"
|
||||
)
|
||||
|
||||
// Cipher is a no-op Shadowsocks cipher that passes data through without
|
||||
// encryption. It supports both TCP and UDP via the standard go-shadowsocks2
|
||||
// ShadowCipher interface. The SS protocol framing (length-prefixed chunks)
|
||||
// is preserved, but no encryption or authentication is applied.
|
||||
var Cipher core.ShadowCipher = &noneCipher{}
|
||||
|
||||
type noneCipher struct{}
|
||||
|
||||
// SaltSize returns a non-zero value so the go-shadowsocks2 bloom ring
|
||||
// does not reject every connection as a repeated salt. The 16-byte salt
|
||||
// is generated randomly and is not used for any actual key derivation.
|
||||
func (noneCipher) SaltSize() int { return 16 }
|
||||
|
||||
// KeySize returns 0 since no encryption key is used.
|
||||
func (noneCipher) KeySize() int { return 0 }
|
||||
|
||||
// NonceSize returns 0 since no nonce is used.
|
||||
func (noneCipher) NonceSize() int { return 0 }
|
||||
|
||||
// TagSize returns 0 since no authentication tag is used.
|
||||
func (noneCipher) TagSize() int { return 0 }
|
||||
|
||||
// Key returns nil.
|
||||
func (noneCipher) Key() []byte { return nil }
|
||||
|
||||
// Keys returns nil.
|
||||
func (noneCipher) Keys() [][]byte { return nil }
|
||||
|
||||
// FirstKey returns nil.
|
||||
func (noneCipher) FirstKey() []byte { return nil }
|
||||
|
||||
// Encrypter returns a no-op AEAD.
|
||||
func (noneCipher) Encrypter(key, salt []byte) (cipher.AEAD, error) {
|
||||
return noopAEAD{}, nil
|
||||
}
|
||||
|
||||
// Decrypter returns a no-op AEAD.
|
||||
func (noneCipher) Decrypter(key, salt []byte) (cipher.AEAD, error) {
|
||||
return noopAEAD{}, nil
|
||||
}
|
||||
|
||||
// TCPConn wraps a net.Conn with the no-op cipher using the standard
|
||||
// go-shadowsocks2 AEAD stream connection. The SS protocol framing
|
||||
// (salt + length-prefixed chunks) is preserved but unencrypted.
|
||||
func (c noneCipher) TCPConn(conn net.Conn, users []core.UserConfig, role int) core.TCPConn {
|
||||
return shadowaead.NewConn(conn, c)
|
||||
}
|
||||
|
||||
// NewUDPSessionManager creates a UDP session manager using the standard
|
||||
// go-shadowsocks2 AEAD UDP implementation. Packets are framed but
|
||||
// unencrypted.
|
||||
func (c noneCipher) NewUDPSessionManager(timeout time.Duration, users []core.UserConfig, windowSize, role int) core.UDPSessionManager {
|
||||
return shadowaead.NewAEADSessionManager(c, timeout, role)
|
||||
}
|
||||
Reference in New Issue
Block a user