Merge pull request #174 from jumpserver/v54_bugfix

[Bugfix] fix regex or no system user panic err

pkg/httpd/sftpvolume.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/LeeEirc/elfinder"
 	"github.com/pkg/sftp"
@@ -300,17 +301,24 @@ func (u *UserVolume) Paste(dir, filename, suffix string, reader io.ReadCloser) (
 
 func (u *UserVolume) RootFileDir() elfinder.FileDir {
 	logger.Debug("Root File Dir")
-	fInfo, _ := u.UserSftp.Stat(u.basePath)
+	var (
+		size int64
+	)
+	tz := time.Now().UnixNano()
+	if fInfo, err := u.UserSftp.Stat(u.basePath); err == nil {
+		size = fInfo.Size()
+		tz = fInfo.ModTime().Unix()
+	}
 	var rest elfinder.FileDir
 	rest.Name = u.Homename
 	rest.Hash = hashPath(u.Uuid, "/")
-	rest.Size = fInfo.Size()
+	rest.Size = size
 	rest.Volumeid = u.Uuid
 	rest.Mime = "directory"
 	rest.Dirs = 1
 	rest.Read, rest.Write = 1, 1
 	rest.Locked = 1
-	rest.Ts = fInfo.ModTime().Unix()
+	rest.Ts = tz
 	return rest
 }
 

pkg/proxy/proxy.go

@@ -116,7 +116,10 @@ func (p *ProxyServer) getSSHConn() (srvConn *srvconn.ServerSSHConnection, err er
 func (p *ProxyServer) getTelnetConn() (srvConn *srvconn.ServerTelnetConnection, err error) {
 	conf := config.GetConf()
 	cusString := conf.TelnetRegex
-	pattern, _ := regexp.Compile(cusString)
+	pattern, err := regexp.Compile(cusString)
+	if err != nil {
+		logger.Errorf("compile telnet Regex %s err %s", cusString, err)
+	}
 	srvConn = &srvconn.ServerTelnetConnection{
 		User:                 p.User,
 		Asset:                p.Asset,

pkg/srvconn/telnetconn.go

@@ -132,7 +132,7 @@ func (tc *ServerTelnetConnection) login(data []byte) AuthStatus {
 		return AuthSuccess
 	}
 	if tc.CustomString != "" {
-		if tc.CustomSuccessPattern.Match(data) {
+		if tc.CustomSuccessPattern != nil && tc.CustomSuccessPattern.Match(data) {
 			return AuthSuccess
 		}
 	}