diff --git a/pkg/proxy/parsercmd.go b/pkg/proxy/parsercmd.go
index a7be4d52cdc62221556d488f3b5eab478f2acc63..6b51641573d409fe871877e0df675b84c6b5387f 100644
--- a/pkg/proxy/parsercmd.go
+++ b/pkg/proxy/parsercmd.go
@@ -1,13 +1,12 @@
package proxy
import (
- "io"
+ "bytes"
+ "github.com/jumpserver/koko/pkg/logger"
+ "github.com/jumpserver/koko/pkg/utils"
"regexp"
"strings"
"sync"
-
- "github.com/jumpserver/koko/pkg/logger"
- "github.com/jumpserver/koko/pkg/utils"
)
var ps1Pattern = regexp.MustCompile(`^\[?.*@.*\]?[\\$#]\s|mysql>\s`)
@@ -21,91 +20,29 @@ func NewCmdParser(sid, name string) *CmdParser {
type CmdParser struct {
id string
name string
+ buf bytes.Buffer
- term *utils.Terminal
- reader io.ReadCloser
- writer io.WriteCloser
- currentLines []string
lock *sync.Mutex
maxLength int
currentLength int
- closed chan struct{}
}
func (cp *CmdParser) WriteData(p []byte) (int, error) {
- select {
- case <-cp.closed:
- return 0, io.EOF
- default:
- }
- return cp.writer.Write(p)
-}
-
-func (cp *CmdParser) Write(p []byte) (int, error) {
- select {
- case <-cp.closed:
- return 0, io.EOF
- default:
- }
- return len(p), nil
-}
-
-func (cp *CmdParser) Read(p []byte) (int, error) {
- select {
- case <-cp.closed:
- return 0, io.EOF
- default:
+ cp.lock.Lock()
+ defer cp.lock.Unlock()
+ if cp.buf.Len() >= 1024 {
+ return 0, nil
}
- return cp.reader.Read(p)
+ return cp.buf.Write(p)
}
func (cp *CmdParser) Close() error {
- select {
- case <-cp.closed:
- return nil
- default:
- close(cp.closed)
- }
- _ = cp.reader.Close()
- return cp.writer.Close()
+ logger.Infof("session ID: %s, parser name: %s", cp.id, cp.name)
+ return nil
}
func (cp *CmdParser) initial() {
- cp.reader, cp.writer = io.Pipe()
- cp.currentLines = make([]string, 0)
cp.lock = new(sync.Mutex)
- cp.maxLength = 1024
- cp.currentLength = 0
- cp.closed = make(chan struct{})
-
- cp.term = utils.NewTerminal(cp, "")
- cp.term.SetEcho(false)
- go func() {
- logger.Infof("Session %s: %s start", cp.id, cp.name)
- defer logger.Infof("Session %s: %s close", cp.id, cp.name)
- loop:
- 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)
- if cp.currentLength < cp.maxLength {
- cp.currentLines = append(cp.currentLines, line)
- }
- cp.lock.Unlock()
- }
- }()
}
func (cp *CmdParser) parsePS1(s string) string {
@@ -114,16 +51,11 @@ func (cp *CmdParser) parsePS1(s string) string {
// Parse 解æžå‘½ä»¤æˆ–输出
func (cp *CmdParser) Parse() string {
- select {
- case <-cp.closed:
- default:
- cp.writer.Write([]byte("\r"))
- }
cp.lock.Lock()
defer cp.lock.Unlock()
- output := strings.TrimSpace(strings.Join(cp.currentLines, "\r\n"))
+ lines := utils.ParseTerminalData(cp.buf.Bytes())
+ output := strings.TrimSpace(strings.Join(lines, "\r\n"))
output = cp.parsePS1(output)
- cp.currentLines = make([]string, 0)
- cp.currentLength = 0
+ cp.buf.Reset()
return output
}
diff --git a/pkg/utils/parser.go b/pkg/utils/parser.go
index a0286a3e746f48ef43181217a68556cdd64eb6c3..be16a221e8799ac29f410b3fc71a079e01cf4849 100644
--- a/pkg/utils/parser.go
+++ b/pkg/utils/parser.go
@@ -6,12 +6,12 @@ package utils
import (
"bytes"
- "io"
- "strconv"
"unicode/utf8"
+
+ "github.com/jumpserver/koko/pkg/logger"
)
-type TerminalParser struct {
+type terminalParser struct {
// line is the current line being entered.
line []rune
@@ -41,62 +41,12 @@ type TerminalParser struct {
historyPending string
}
-// NewTerminal runs a VT100 terminal on the given ReadWriter. If the ReadWriter is
-// a local terminal, that terminal must first have been put into raw mode.
-// prompt is a string that is written at the start of each input line (i.e.
-// "> ").
-func NewTerminalParser(prompt string) *TerminalParser {
- return &TerminalParser{
- historyIndex: -1,
- }
-}
-
-func (t *TerminalParser) move(up, down, left, right int) {
- m := []rune{}
-
- // 1 unit up can be expressed as ^[[A or ^[A
- // 5 units up can be expressed as ^[[5A
-
- if up == 1 {
- m = append(m, keyEscape, '[', 'A')
- } else if up > 1 {
- m = append(m, keyEscape, '[')
- m = append(m, []rune(strconv.Itoa(up))...)
- m = append(m, 'A')
- }
-
- if down == 1 {
- m = append(m, keyEscape, '[', 'B')
- } else if down > 1 {
- m = append(m, keyEscape, '[')
- m = append(m, []rune(strconv.Itoa(down))...)
- m = append(m, 'B')
- }
-
- if right == 1 {
- m = append(m, keyEscape, '[', 'C')
- } else if right > 1 {
- m = append(m, keyEscape, '[')
- m = append(m, []rune(strconv.Itoa(right))...)
- m = append(m, 'C')
- }
-
- if left == 1 {
- m = append(m, keyEscape, '[', 'D')
- } else if left > 1 {
- m = append(m, keyEscape, '[')
- m = append(m, []rune(strconv.Itoa(left))...)
- m = append(m, 'D')
- }
-
-}
-
-func (t *TerminalParser) setLine(newLine []rune, newPos int) {
+func (t *terminalParser) setLine(newLine []rune, newPos int) {
t.line = newLine
t.pos = newPos
}
-func (t *TerminalParser) eraseNPreviousChars(n int) {
+func (t *terminalParser) eraseNPreviousChars(n int) {
if n == 0 {
return
}
@@ -112,7 +62,7 @@ func (t *TerminalParser) eraseNPreviousChars(n int) {
// countToLeftWord returns then number of characters from the cursor to the
// start of the previous word.
-func (t *TerminalParser) countToLeftWord() int {
+func (t *terminalParser) countToLeftWord() int {
if t.pos == 0 {
return 0
}
@@ -137,7 +87,7 @@ func (t *TerminalParser) countToLeftWord() int {
// countToRightWord returns then number of characters from the cursor to the
// start of the next word.
-func (t *TerminalParser) countToRightWord() int {
+func (t *terminalParser) countToRightWord() int {
pos := t.pos
for pos < len(t.line) {
if t.line[pos] == ' ' {
@@ -156,7 +106,7 @@ func (t *TerminalParser) countToRightWord() int {
// handleKey processes the given key and, optionally, returns a line of text
// that the user has entered.
-func (t *TerminalParser) handleKey(key rune) (line string, ok bool) {
+func (t *terminalParser) handleKey(key rune) (line string, ok bool) {
if t.pasteActive && key != keyEnter {
t.addKeyToLine(key)
return
@@ -259,7 +209,7 @@ func (t *TerminalParser) handleKey(key rune) (line string, ok bool) {
// addKeyToLine inserts the given key at the current position in the current
// line.
-func (t *TerminalParser) addKeyToLine(key rune) {
+func (t *terminalParser) addKeyToLine(key rune) {
if len(t.line) == cap(t.line) {
newLine := make([]rune, len(t.line), 2*(1+len(t.line)))
copy(newLine, t.line)
@@ -271,7 +221,9 @@ func (t *TerminalParser) addKeyToLine(key rune) {
t.pos++
}
-func (t *TerminalParser) ParseLines(p []byte) (lines []string, err error) {
+func (t *terminalParser) parseLines(p []byte) (lines []string) {
+ var err error
+
lines = make([]string, 0, 3)
lineIsPasted := t.pasteActive
reader := bytes.NewBuffer(p)
@@ -290,7 +242,7 @@ func (t *TerminalParser) ParseLines(p []byte) (lines []string, err error) {
if len(t.line) == 0 {
// as key has already handled, we need update remainder data,
t.remainder = rest
- return "", io.EOF
+ return lines
}
}
if key == keyPasteStart {
@@ -319,7 +271,7 @@ func (t *TerminalParser) ParseLines(p []byte) (lines []string, err error) {
if lineIsPasted {
err = ErrPasteIndicator
}
- return
+ lines = append(lines, line)
}
// t.remainder is a slice at the beginning of t.inBuf
@@ -328,10 +280,29 @@ func (t *TerminalParser) ParseLines(p []byte) (lines []string, err error) {
var n int
n, err = reader.Read(readBuf)
- if err != nil {
+ if err != nil && n == 0 {
+ if len(t.line) > 0 {
+ lines = append(lines, string(t.line))
+ }
+ if len(t.remainder) > 0{
+ continue
+ }
return
+ } else if err == nil && n == 0 {
+ if len(t.remainder) == len(t.inBuf) {
+ logger.Errorf("～～ å‘生å¡é¡¿é—®é¢˜ ～～")
+ t.remainder = t.remainder[1:]
+ continue
+ }
}
t.remainder = t.inBuf[:n+len(t.remainder)]
}
}
+
+func ParseTerminalData(p []byte) (lines []string) {
+ t := terminalParser{
+ historyIndex: -1,
+ }
+ return t.parseLines(p)
+}