[update] adjust code, release memory

pkg/common/client.go

@@ -28,7 +28,7 @@ type Client struct {
 	BaseHost   string
 	basicAuth  []string
 	cookie     map[string]string
-	http       *http.Client
+	http       http.Client
 	UrlParsers []UrlParser
 }
 
@@ -36,11 +36,12 @@ type UrlParser interface {
 	parse(url string, params ...map[string]string) string
 }
 
-func NewClient(timeout time.Duration, baseHost string) *Client {
+func NewClient(timeout time.Duration, baseHost string) Client {
 	headers := make(map[string]string, 0)
-	client := new(http.Client)
-	client.Timeout = timeout * time.Second
-	return &Client{
+	client := http.Client{
+		Timeout: timeout * time.Second,
+	}
+	return Client{
 		BaseHost: baseHost,
 		Timeout:  timeout * time.Second,
 		Headers:  headers,

pkg/common/table.go

@@ -148,14 +148,14 @@ func (t *WrapperTable) convertDataToSlice() [][]string {
 				switch t.TruncPolicy {
 				case TruncSuffix:
 					row[m] = fmt.Sprintf("%s...",
-						GetValidString(j[n],columSize-3, true))
+						GetValidString(j[n], columSize-3, true))
 				case TruncPrefix:
 					row[m] = fmt.Sprintf("...%s",
-						GetValidString(j[n],len(j[n])-columSize-3, false))
+						GetValidString(j[n], len(j[n])-columSize-3, false))
 				case TruncMiddle:
 					midValue := (columSize - 3) / 2
-					row[m] = fmt.Sprintf("%s...%s",GetValidString(j[n],midValue, true),
-						GetValidString(j[n],len(j[n])-midValue, false))
+					row[m] = fmt.Sprintf("%s...%s", GetValidString(j[n], midValue, true),
+						GetValidString(j[n], len(j[n])-midValue, false))
 				}
 			}
 
@@ -168,8 +168,8 @@ func (t *WrapperTable) convertDataToSlice() [][]string {
 func (t *WrapperTable) Display() string {
 	t.CalculateColumnsSize()
 
-	tableString := &strings.Builder{}
-	table := tablewriter.NewWriter(tableString)
+	tableString := strings.Builder{}
+	table := tablewriter.NewWriter(&tableString)
 	table.SetBorder(false)
 	table.SetHeader(t.Labels)
 	colors := make([]tablewriter.Colors, len(t.Fields))
@@ -193,23 +193,23 @@ func (t *WrapperTable) Display() string {
 	return tableString.String()
 }
 
-func GetValidString(s string, position int, positive bool) string{
+func GetValidString(s string, position int, positive bool) string {
 	step := 1
 	if positive {
 		step = -1
 	}
-	for position >=0 && position <= len(s) {
+	for position >= 0 && position <= len(s) {
 		switch positive {
 		case true:
-			if utf8.ValidString(s[:position]){
+			if utf8.ValidString(s[:position]) {
 				return s[:position]
 			}
 		case false:
-			if utf8.ValidString(s[position:]){
+			if utf8.ValidString(s[position:]) {
 				return s[position:]
 			}
 		}
 		position += step
 	}
 	return ""
-}
\ No newline at end of file
+}

pkg/common/utils.go

@@ -28,10 +28,12 @@ func GzipCompressFile(srcPath, dstPath string) error {
 	if err != nil {
 		return err
 	}
+	defer sf.Close()
 	df, err := os.Create(dstPath)
 	if err != nil {
 		return err
 	}
+	defer df.Close()
 	writer := gzip.NewWriter(df)
 	writer.Name = dstPath
 	writer.ModTime = time.Now().UTC()
@@ -60,6 +62,6 @@ func Abs(x int) int {
 	return x
 }
 
-func CurrentUTCTime()string{
+func CurrentUTCTime() string {
 	return time.Now().UTC().Format("2006-01-02 15:04:05 +0000")
-}
\ No newline at end of file
+}

pkg/handler/pagination.go

@@ -13,8 +13,8 @@ import (
 	"github.com/jumpserver/koko/pkg/utils"
 )
 
-func NewAssetPagination(term *utils.Terminal, assets []model.Asset) *AssetPagination {
-	assetPage := &AssetPagination{term: term, assets: assets}
+func NewAssetPagination(term *utils.Terminal, assets []model.Asset) AssetPagination {
+	assetPage := AssetPagination{term: term, assets: assets}
 	assetPage.Initial()
 	return assetPage
 }
@@ -181,8 +181,8 @@ func (p *AssetPagination) displayTipsInfo() {
 
 }
 
-func NewUserPagination(term *utils.Terminal, uid, search string, policy bool) *UserAssetPagination {
-	return &UserAssetPagination{
+func NewUserPagination(term *utils.Terminal, uid, search string, policy bool) UserAssetPagination {
+	return UserAssetPagination{
 		UserID:        uid,
 		offset:        0,
 		limit:         0,
@@ -269,7 +269,7 @@ func (p *UserAssetPagination) Start() []model.Asset {
 
 func (p *UserAssetPagination) displayPageAssets() {
 	if len(p.Data.Data) == 0 {
-		_, _ = p.term.Write([]byte(getI18nFromMap("NoAssets")+"\n\r"))
+		_, _ = p.term.Write([]byte(getI18nFromMap("NoAssets") + "\n\r"))
 		return
 	}
 

pkg/handler/wrappersession.go

@@ -43,6 +43,7 @@ func (w *WrapperSession) readLoop() {
 	}
 	w.mux.RLock()
 	_ = w.inWriter.Close()
+	_ = w.outReader.Close()
 	w.mux.RUnlock()
 	close(w.closed)
 	logger.Infof("Request %s: Read loop break", w.Uuid)

pkg/proxy/parser.go

@@ -31,8 +31,8 @@ const (
 	CommandOutputParserName = "Command Output parser"
 )
 
-func newParser(sid string) *Parser {
-	parser := &Parser{id: sid}
+func newParser(sid string) Parser {
+	parser := Parser{id: sid}
 	parser.initial()
 	return parser
 }
@@ -55,8 +55,8 @@ type Parser struct {
 
 	command         string
 	output          string
-	cmdInputParser  *CmdParser
-	cmdOutputParser *CmdParser
+	cmdInputParser  CmdParser
+	cmdOutputParser CmdParser
 
 	cmdFilterRules []model.SystemUserFilterRule
 	closed         chan struct{}

pkg/proxy/parsercmd.go

@@ -12,8 +12,8 @@ import (
 
 var ps1Pattern = regexp.MustCompile(`^\[?.*@.*\]?[\\$#]\s|mysql>\s`)
 
-func NewCmdParser(sid, name string) *CmdParser {
-	parser := &CmdParser{id: sid, name:name}
+func NewCmdParser(sid, name string) CmdParser {
+	parser := CmdParser{id: sid, name:name}
 	parser.initial()
 	return parser
 }

pkg/proxy/recorder.go

@@ -21,8 +21,8 @@ func NewCommandRecorder(sid string) (recorder *CommandRecorder) {
 	return recorder
 }
 
-func NewReplyRecord(sid string) (recorder *ReplyRecorder) {
-	recorder = &ReplyRecorder{SessionID: sid}
+func NewReplyRecord(sid string) (recorder ReplyRecorder) {
+	recorder = ReplyRecorder{SessionID: sid}
 	recorder.initial()
 	return recorder
 }

pkg/proxy/switch.go

@@ -117,8 +117,8 @@ func (s *SwitchSession) SetFilterRules(cmdRules []model.SystemUserFilterRule) {
 // Bridge 桥接两个链接
 func (s *SwitchSession) Bridge(userConn UserConnection, srvConn srvconn.ServerConnection) (err error) {
 	var (
-		parser         *Parser
-		replayRecorder *ReplyRecorder
+		parser         Parser
+		replayRecorder ReplyRecorder
 
 		userInChan chan []byte
 		srvInChan  chan []byte

pkg/service/init.go

@@ -35,10 +35,9 @@ func Initial(ctx context.Context) {
 	go KeepSyncConfigWithServer(ctx)
 }
 
-func newClient() *common.Client {
+func newClient() common.Client {
 	cf := config.GetConf()
-	cli := common.NewClient(30, "")
-	cli.BaseHost = cf.CoreHost
+	cli := common.NewClient(30, cf.CoreHost)
 	return cli
 }