client.go

@@ -38,6 +38,8 @@ type Client struct {
 // addr is server address
 //
 // conf is the client configure
+//
+//
 func NewClient(c net.Conn, config *ssh.ClientConfig, addr string, conf *Conf) (*Client, error) {
 	//obfsConn := &TimedOutConn{c, conf.Timeout}
 	sshConn, newch, reqs, err := ssh.NewClientConn(c, addr, config)
@@ -71,8 +73,9 @@ func (cc *Client) Run() error {
 
 	go cc.registerSignal()
 
-	time.Sleep(1 * time.Second)
+	select {
-
+	case <-time.After(1 * time.Second):
+	}
 	// wait port forward to finish
 	if cc.listeners != nil {
 		log.Debugf("wait all channel to be done")
@@ -417,7 +420,6 @@ func (cc *Client) registerSignal() {
 }
 
 // AddDynamicHTTPForward add a http dynamic forward through
-//
 //  secure channel
 func (cc *Client) AddDynamicHTTPForward(addr string) error {
 	log.Debugf("add dynamic http listen: %s", addr)

console.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package obfssh

console_unix.go

@@ -1,4 +1,3 @@
-//go:build darwin || freebsd || linux || openbsd || solaris
 // +build darwin freebsd linux openbsd solaris
 
 package obfssh

go.mod

@@ -3,6 +3,7 @@ module github.com/fangdingjun/obfssh
 go 1.13
 
 require (
+	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/containerd/console v1.0.0
 	github.com/fangdingjun/go-log/v5 v5.0.0
 	github.com/fangdingjun/protolistener v0.0.0-20200701071613-b79ebce338af

go.sum

@@ -1,29 +1,23 @@
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/containerd/console v1.0.0 h1:fU3UuQapBs+zLJu82NhR11Rif1ny2zfMMAyPJzSN5tQ=
 github.com/containerd/console v1.0.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fangdingjun/go-log v5.0.1+incompatible h1:c5dNQfcb1T1We3TULF3ppVVmafG6aZSZBYi2qjCXnO4=
 github.com/fangdingjun/go-log/v5 v5.0.0 h1:vdh9Bk9C4ZFL6KoO6rII73zQIyaLf7hFdBvucO/ckiE=
 github.com/fangdingjun/go-log/v5 v5.0.0/go.mod h1:V012Oxo0/pSbccX4OFSp9MJglXwNsZo2ByBBorr7zzM=
 github.com/fangdingjun/protolistener v0.0.0-20200701071613-b79ebce338af h1:ktdWTFpcRv7TNea7+OE8gNDz2mCbFNXwxLJe7GfruQ4=
 github.com/fangdingjun/protolistener v0.0.0-20200701071613-b79ebce338af/go.mod h1:WYiFoA3d+VfM47p+FHCbDdnKR7eedUmUdwd8c07XT/0=
-github.com/fangdingjun/socks-go v0.0.0-20180926100003-fc6f0a9ee1f4 h1:c3Iw/znf2xe2uut9zUTueO6XHyTTLugrbN9fAE4NAkg=
 github.com/fangdingjun/socks-go v0.0.0-20180926100003-fc6f0a9ee1f4/go.mod h1:0P4kTlyyh76uY1Li3cyw4pOIKGL9RmXXWTQYFLS1ZaM=
-github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
 github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc h1:lNOt1SMsgHXTdpuGw+RpnJtzUcCb/oRKZP65pBy9pr8=
 github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc/go.mod h1:6/gX3+E/IYGa0wMORlSMla999awQFdbaeQCHjSMKIzY=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.11.0 h1:4Zv0OGbpkg4yNuUtH0s8rvoYxRCNyT29NVUo6pgPmxI=
 github.com/pkg/sftp v1.11.0/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
-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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
@@ -37,7 +31,5 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e h1:N7DeIrjYszNmSW409R3frPPwglRwMkXSBzwVbkOjLLA=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

obfssh/ssh.go

@@ -233,11 +233,13 @@ func main() {
 
 	timeout := time.Duration(cfg.KeepaliveInterval*2) * time.Second
 
-	var _conn net.Conn = &obfssh.TimedOutConn{Conn: c, Timeout: timeout}
+	var _conn = c
+
+	conn := &obfssh.TimedOutConn{Conn: c, Timeout: timeout}
 
 	if cfg.TLS {
 		log.Debugf("begin tls handshake")
-		_conn = tls.Client(_conn, &tls.Config{
+		_conn = tls.Client(conn, &tls.Config{
 			ServerName:         host,
 			InsecureSkipVerify: cfg.TLSInsecure,
 		})
@@ -308,7 +310,7 @@ func main() {
 	}
 	for _, p := range cfg.DynamicForwards {
 
-		if !strings.Contains(p, ":") {
+		if strings.Index(p, ":") == -1 {
 			local = fmt.Sprintf(":%s", p)
 		} else {
 			local = p
@@ -320,7 +322,7 @@ func main() {
 	}
 
 	for _, p := range cfg.DynamicHTTP {
-		if !strings.Contains(p, ":") {
+		if strings.Index(p, ":") == -1 {
 			local = fmt.Sprintf(":%s", p)
 		} else {
 			local = p
@@ -361,7 +363,10 @@ func main() {
 
 func parseForwardAddr(s string) []string {
 	ss := strings.FieldsFunc(s, func(c rune) bool {
-		return c == ':'
+		if c == ':' {
+			return true
+		}
+		return false
 	})
 	return ss
 }

obfsshd/server.go

@@ -74,7 +74,7 @@ func main() {
 					if u, err := conf.getUser(c.User()); err == nil {
 						for _, pk := range u.publicKeys {
 							if k.Type() == pk.Type() &&
-								bytes.Equal(k.Marshal(), pk.Marshal()) {
+								bytes.Compare(k.Marshal(), pk.Marshal()) == 0 {
 								return true
 							}
 						}

redir.go

@@ -1,4 +1,3 @@
-//go:build !linux
 // +build !linux
 
 package obfssh

redir_iptables.go

@@ -1,4 +1,3 @@
-//go:build linux && !cgo
 // +build linux,!cgo
 
 package obfssh

redir_iptables_2.go

@@ -1,4 +1,3 @@
-//go:build linux && cgo
 // +build linux,cgo
 
 package obfssh

server.go

@@ -34,6 +34,8 @@ type Server struct {
 // config is &ssh.ServerConfig
 //
 // conf is the server configure
+//
+//
 func NewServer(c net.Conn, config *ssh.ServerConfig, conf *Conf) (*Server, error) {
 	sshConn, ch, req, err := ssh.NewServerConn(&TimedOutConn{c, 15 * 60 * time.Second}, config)
 	if err != nil {
@@ -209,10 +211,10 @@ func (s *session) handleSubsystem(payload []byte) bool {
 func (s *session) handleShell() bool {
 	var cmd *exec.Cmd
 	if runtime.GOOS == "windows" {
-		s.env = append(s.env, "SHELL=powershell")
+		s.env = append(s.env, fmt.Sprintf("SHELL=powershell"))
 		cmd = exec.Command("powershell")
 	} else {
-		s.env = append(s.env, "SHELL=/bin/bash")
+		s.env = append(s.env, fmt.Sprintf("SHELL=/bin/bash"))
 		cmd = exec.Command("/bin/bash", "-l")
 	}
 	s.cmd = cmd
@@ -230,10 +232,10 @@ func (s *session) handleExec(payload []byte) bool {
 	}
 	log.Infoln("execute command", _cmd.Arg)
 	if runtime.GOOS == "windows" {
-		s.env = append(s.env, "SHELL=powershell")
+		s.env = append(s.env, fmt.Sprintf("SHELL=powershell"))
 		cmd = exec.Command("powershell", "-Command", _cmd.Arg)
 	} else {
-		s.env = append(s.env, "SHELL=/bin/bash")
+		s.env = append(s.env, fmt.Sprintf("SHELL=/bin/bash"))
 		cmd = exec.Command("/bin/bash", "-c", _cmd.Arg)
 	}
 	s.cmd = cmd
@@ -271,7 +273,7 @@ func (s *session) handlePtyReq(payload []byte) bool {
 	s.env = append(s.env, fmt.Sprintf("SSH_TTY=%s", s.ptsname))
 	s.env = append(s.env, fmt.Sprintf("TERM=%s", _ptyReq.Term))
 
-	ws, _ := s._console.Size()
+	ws, err := s._console.Size()
 	log.Debugf("current console %+v", ws)
 	ws.Height = uint16(_ptyReq.Rows)
 	ws.Width = uint16(_ptyReq.Columns)
@@ -564,7 +566,7 @@ func (sc *Server) handleTcpipForward(req *ssh.Request) {
 		return
 	}
 
-	if addr.Port > 65535 {
+	if addr.Port > 65535 || addr.Port < 0 {
 		log.Errorf("invalid port %d", addr.Port)
 		if req.WantReply {
 			req.Reply(false, nil)