fix #704

Author: Jrohy

core/server.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"github.com/tidwall/pretty"
 	"github.com/tidwall/sjson"
-	"io/ioutil"
+	"os"
 )
 
 var configPath = "/usr/local/etc/trojan/config.json"
@@ -40,7 +40,7 @@ func Load(path string) []byte {
 	if path == "" {
 		path = configPath
 	}
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		fmt.Println(err)
 		return nil
@@ -53,7 +53,7 @@ func Save(data []byte, path string) bool {
 	if path == "" {
 		path = configPath
 	}
-	if err := ioutil.WriteFile(path, pretty.Pretty(data), 0644); err != nil {
+	if err := os.WriteFile(path, pretty.Pretty(data), 0644); err != nil {
 		fmt.Println(err)
 		return false
 	}

web/controller/trojan.go

@@ -8,7 +8,6 @@ import (
 	"github.com/gin-gonic/gin"
 	ws "github.com/gorilla/websocket"
 	"io"
-	"log"
 	"strconv"
 	"strings"
 	"time"
@@ -81,6 +80,10 @@ func Log(c *gin.Context) {
 	}
 	defer wsConn.WsClose()
 	param := c.DefaultQuery("line", "300")
+	if !websocket.IsInteger(param) {
+		fmt.Println("invalid param: " + param)
+		return
+	}
 	if param == "-1" {
 		param = "--no-tail"
 	} else {
@@ -89,12 +92,11 @@ func Log(c *gin.Context) {
 	result, err := websocket.LogChan("trojan", param, wsConn.CloseChan)
 	if err != nil {
 		fmt.Println(err)
-		wsConn.WsClose()
 		return
 	}
 	for line := range result {
 		if err := wsConn.WsWrite(ws.TextMessage, []byte(line+"\n")); err != nil {
-			log.Println("can't send: ", line)
+			fmt.Println("can't send: ", line)
 			break
 		}
 	}