🐛 fixed #105

model/server.go

@@ -1,6 +1,7 @@
 package model
 
 import (
+	"encoding/json"
 	"fmt"
 	"html/template"
 	"time"
@@ -25,5 +26,10 @@ type Server struct {
 }
 
 func (s Server) Marshal() template.JS {
-	return template.JS(fmt.Sprintf(`{"ID":%d,"Name":"%s","Secret":"%s","DisplayIndex":%d,"Tag":"%s","Note":"%s"}`, s.ID, s.Name, s.Secret, s.DisplayIndex, s.Tag, s.Note))
+	name, _ := json.Marshal(s.Name)
+	tag, _ := json.Marshal(s.Tag)
+	note, _ := json.Marshal(s.Note)
+	secret, _ := json.Marshal(s.Secret)
+	return template.JS(fmt.Sprintf(`{"ID":%d,"Name":%s,"Secret":%s,"DisplayIndex":%d,"Tag":%s,"Note":%s}`,
+		s.ID, name, secret, s.DisplayIndex, tag, note))
 }

model/server_test.go

@@ -0,0 +1,27 @@
+package model
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestServerMarshal(t *testing.T) {
+	patterns := []string{
+		"asd > asd",
+		"asd \" asd",
+		"asd } asd",
+	}
+
+	for i := 0; i < len(patterns); i++ {
+		server := Server{
+			Name: patterns[i],
+			Tag:  patterns[i],
+		}
+		serverStr := string(server.Marshal())
+		var serverRestore Server
+		assert.Nil(t, json.Unmarshal([]byte(serverStr), &serverRestore))
+		assert.Equal(t, server, serverRestore)
+	}
+}