Signed-off-by: arraykeys@gmail.com <arraykeys@gmail.com>

config.go

@@ -245,13 +245,8 @@ func initConfig() (err error) {
 	spsArgs.ParentKey = sps.Flag("parent-key", "the password for auto encrypt/decrypt parent connection data").Short('Z').Default("").String()
 	spsArgs.LocalCompress = sps.Flag("local-compress", "auto compress/decompress data on local connection").Short('m').Default("false").Bool()
 	spsArgs.ParentCompress = sps.Flag("parent-compress", "auto compress/decompress data on parent connection").Short('M').Default("false").Bool()
-	spsArgs.SSMethod = sps.Flag("ss-method", "").Hidden().Short('h').Default("aes-256-cfb").String()
-	spsArgs.SSKey = sps.Flag("ss-key", "").Hidden().Short('j').Default("sspassword").String()
-	spsArgs.ParentSSMethod = sps.Flag("parent-ss-method", "").Hidden().Short('H').Default("aes-256-cfb").String()
-	spsArgs.ParentSSKey = sps.Flag("parent-ss-key", "").Hidden().Short('J').Default("sspassword").String()
 	spsArgs.DisableHTTP = sps.Flag("disable-http", "disable http(s) proxy").Default("false").Bool()
 	spsArgs.DisableSocks5 = sps.Flag("disable-socks", "disable socks proxy").Default("false").Bool()
-	spsArgs.DisableSS = sps.Flag("disable-ss", "").Hidden().Default("false").Bool()
 
 	//parse args
 	serviceName := kingpin.MustParse(app.Parse(os.Args[1:]))

services/args.go

@@ -232,13 +232,8 @@ type SPSArgs struct {
 	ParentKey         *string
 	LocalCompress     *bool
 	ParentCompress    *bool
-	SSMethod          *string
-	SSKey             *string
-	ParentSSMethod    *string
-	ParentSSKey       *string
 	DisableHTTP       *bool
 	DisableSocks5     *bool
-	DisableSS         *bool
 }
 
 func (a *SPSArgs) Protocol() string {

services/sps.go

@@ -16,7 +16,6 @@ import (
 	"github.com/snail007/goproxy/utils"
 	"github.com/snail007/goproxy/utils/conncrypt"
 	"github.com/snail007/goproxy/utils/socks"
-	"github.com/snail007/goproxy/utils/ss"
 )
 
 type SPS struct {
@@ -27,8 +26,6 @@ type SPS struct {
 	serverChannels []*utils.ServerChannel
 	userConns      utils.ConcurrentMap
 	log            *logger.Logger
-	localCipher    *ss.Cipher
-	parentCipher   *ss.Cipher
 }
 
 func NewSPS() Service {
@@ -49,10 +46,6 @@ func (s *SPS) CheckArgs() (err error) {
 		err = fmt.Errorf("parent type unkown,use -T <tls|tcp|kcp>")
 		return
 	}
-	if *s.cfg.ParentType == "ss" && (*s.cfg.ParentSSKey == "" || *s.cfg.ParentSSMethod == "") {
-		err = fmt.Errorf("ss parent need a ss key, set it by : -J <sskey>")
-		return
-	}
 	if *s.cfg.ParentType == TYPE_TLS || *s.cfg.LocalType == TYPE_TLS {
 		s.cfg.CertBytes, s.cfg.KeyBytes, err = utils.TlsBytes(*s.cfg.CertFile, *s.cfg.KeyFile)
 		if err != nil {
@@ -69,28 +62,11 @@ func (s *SPS) CheckArgs() (err error) {
 	return
 }
 func (s *SPS) InitService() (err error) {
-
 	if *s.cfg.DNSAddress != "" {
 		(*s).domainResolver = utils.NewDomainResolver(*s.cfg.DNSAddress, *s.cfg.DNSTTL, s.log)
 	}
-
 	s.InitOutConnPool()
-
 	err = s.InitBasicAuth()
-	if *s.cfg.SSMethod != "" && *s.cfg.SSKey != "" {
-		s.localCipher, err = ss.NewCipher(*s.cfg.SSMethod, *s.cfg.SSKey)
-		if err != nil {
-			s.log.Printf("error generating cipher : %s", err)
-			return
-		}
-	}
-	if *s.cfg.ParentServiceType == "ss" {
-		s.parentCipher, err = ss.NewCipher(*s.cfg.ParentSSMethod, *s.cfg.ParentSSKey)
-		if err != nil {
-			s.log.Printf("error generating cipher : %s", err)
-			return
-		}
-	}
 	return
 }
 func (s *SPS) InitOutConnPool() {
@@ -281,25 +257,6 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) {
 				auth = socks.Auth{User: userpassA[0], Password: userpassA[1]}
 			}
 		}
-	} else {
-		//ss
-		if *s.cfg.DisableSS {
-			(*inConn).Close()
-			return
-		}
-		(*inConn).SetDeadline(time.Now().Add(time.Second * 5))
-		ssConn := ss.NewConn(*inConn, s.localCipher.Copy())
-		address, err = ss.GetRequest(ssConn)
-		(*inConn).SetDeadline(time.Time{})
-		if err != nil {
-			return
-		}
-		// ensure the host does not contain some illegal characters, NUL may panic on Win32
-		if strings.ContainsRune(address, 0x00) {
-			err = errors.New("invalid domain name")
-			return
-		}
-		*inConn = ssConn
 	}
 	if err != nil || address == "" {
 		s.log.Printf("unknown request from: %s,%s", (*inConn).RemoteAddr(), string(h))
@@ -325,7 +282,7 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) {
 		})
 	}
 
-	if *s.cfg.ParentAuth != "" || *s.cfg.ParentSSKey != "" || s.IsBasicAuth() {
+	if *s.cfg.ParentAuth != "" || s.IsBasicAuth() {
 		forwardBytes = utils.RemoveProxyHeaders(forwardBytes)
 	}
 
@@ -411,18 +368,6 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) {
 		if err = clientConn.Handshake(); err != nil {
 			return
 		}
-	} else if *s.cfg.ParentServiceType == "ss" {
-		ra, e := ss.RawAddr(address)
-		if e != nil {
-			err = fmt.Errorf("build ss raw addr fail, err: %s", e)
-			return
-		}
-
-		outConn, err = ss.DialWithRawAddr(&outConn, ra, "", s.parentCipher.Copy())
-		if err != nil {
-			err = fmt.Errorf("dial ss parent fail, err : %s", err)
-			return
-		}
 	}
 
 	//forward client data to target,if necessary.