Merge pull request #194 from jumpserver/dev

Dev

pkg/httpd/sftpvolume.go

@@ -28,7 +28,11 @@ func NewUserVolume(user *model.User, addr, hostId string) *UserVolume {
 	default:
 		assets := service.GetUserAssetByID(user.ID, hostId)
 		if len(assets) == 1 {
-			homename = assets[0].Hostname
+			folderName := assets[0].Hostname
+			if strings.Contains(folderName, "/") {
+				folderName = strings.ReplaceAll(folderName, "/", "_")
+			}
+			homename = folderName
 			basePath = filepath.Join("/", homename)
 		}
 		userSftp = srvconn.NewUserSftpConnWithAssets(user, addr, assets...)

pkg/proxy/dbparser.go

@@ -65,8 +65,6 @@ func (p *DBParser) ParseStream(userInChan, srvInChan <-chan []byte) (userOut, sr
 			close(p.cmdRecordChan)
 			close(p.userOutputChan)
 			close(p.srvOutputChan)
-			_ = p.cmdOutputParser.Close()
-			_ = p.cmdInputParser.Close()
 			logger.Infof("DB Session %s: Parser routine done", p.id)
 		}()
 		for {
@@ -169,6 +167,9 @@ func (p *DBParser) Close() {
 	default:
 		close(p.closed)
 	}
+	_ = p.cmdOutputParser.Close()
+	_ = p.cmdInputParser.Close()
+	logger.Infof("DB Session %s: Parser close", p.id)
 }
 
 func (p *DBParser) sendCommandRecord() {

pkg/proxy/parser.go

@@ -86,8 +86,6 @@ func (p *Parser) ParseStream(userInChan, srvInChan <-chan []byte) (userOut, srvO
 			close(p.cmdRecordChan)
 			close(p.userOutputChan)
 			close(p.srvOutputChan)
-			_ = p.cmdOutputParser.Close()
-			_ = p.cmdInputParser.Close()
 			logger.Infof("Session %s: Parser routine done", p.id)
 		}()
 		for {
@@ -271,6 +269,9 @@ func (p *Parser) Close() {
 		close(p.closed)
 
 	}
+	_ = p.cmdOutputParser.Close()
+	_ = p.cmdInputParser.Close()
+	logger.Infof("Session %s: Parser close", p.id)
 }
 
 func (p *Parser) sendCommandRecord() {

pkg/proxy/parsercmd.go

@@ -87,12 +87,16 @@ func (cp *CmdParser) initial() {
 		for {
 			line, err := cp.term.ReadLine()
 			if err != nil {
+
 				select {
 				case <-cp.closed:
+					logger.Debugf("Session %s %s term err: %s break loop", cp.id, cp.name, err)
 					break loop
 				default:
 				}
+				logger.Debugf("Session %s %s term err: %s,loop continue", cp.id, cp.name, err)
 				goto loop
+
 			}
 			cp.lock.Lock()
 			cp.currentLength += len(line)