fixed url escaping issue

neel-bp · Apr 6, 2023 · d9b9e54 · d9b9e54
1 parent faa5b0b
commit d9b9e54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/httpinterface/api.go b/httpinterface/api.go
@@ -36,10 +36,10 @@ var upgrader = websocket.Upgrader{
 
 type StatusResponse struct {
 	core.JobState
-	ProjectName    string  `json:"projectName"`
-	DateTimeString string  `json:"dateTimeString"`
-	Coverage       float64 `json:"coverage"`
-	WebSocketRoute string  `json:"websocketRoute"`
+	ProjectName    string       `json:"projectName"`
+	DateTimeString string       `json:"dateTimeString"`
+	Coverage       float64      `json:"coverage"`
+	WebSocketRoute template.URL `json:"websocketRoute"`
 }
 
 type WebsocketResponse struct {
@@ -194,7 +194,7 @@ func BuildStatus(w http.ResponseWriter, r *http.Request) {
 		ProjectName:    projectID,
 		DateTimeString: result.LastBuildStart.Format(time.RFC3339),
 		Coverage:       coverage,
-		WebSocketRoute: fmt.Sprintf(`ws://%s/%s/livestatus`, r.Host, projectID),
+		WebSocketRoute: template.URL(fmt.Sprintf("ws://%s/%s/livestatus", r.Host, projectID)),
 	}
 
 	tmpl := template.Must(template.ParseFiles("statuspage.html"))

diff --git a/statuspage.html b/statuspage.html
@@ -79,7 +79,7 @@ <h3 class="subtitle is-5" id="lastBuildStart">{{.DateTimeString}}</h3>
 
   lastBuildStart.innerHTML = time;
 
-  var socket = new WebSocket("{{.WebSocketRoute}}")
+  var socket = new WebSocket({{.WebSocketRoute}});
 
   socket.onmessage = function (message) {
     if (message.data != null) {