Merge branch 'master' into feature/upload

ndt-server.go

@@ -10,6 +10,8 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/gorilla/websocket"
+
 	"github.com/m-lab/go/prometheusx"
 
 	"github.com/m-lab/go/flagx"
@@ -167,6 +169,11 @@ func main() {
 		ndt7Mux.Handle("/static/", http.StripPrefix("/static", http.FileServer(http.Dir("html"))))
 		ndt7Handler := &handler.Handler{
 			DataDir: *dataDir,
+			Upgrader: websocket.Upgrader{
+				CheckOrigin: func(r *http.Request) bool {
+					return true // Allow cross origin resource sharing
+				},
+			},
 		}
 		ndt7Mux.Handle(
 			spec.DownloadURLPath,

ndt7/handler/handler.go

@@ -3,6 +3,7 @@ package handler
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 
 	"github.com/gorilla/websocket"
@@ -53,7 +54,9 @@ func (h Handler) downloadOrUpload(writer http.ResponseWriter, request *http.Requ
 	headers.Add("Sec-WebSocket-Protocol", spec.SecWebSocketProtocol)
 	conn, err := h.Upgrader.Upgrade(writer, request, headers)
 	if err != nil {
-		warnAndClose(writer, "downloadOrUpload: cannnot UPGRADE to WebSocket")
+		warnAndClose(writer, fmt.Sprintf(
+			"downloadOrUpload: cannnot UPGRADE to WebSocket: %s", err,
+		))
 		return
 	}
 	// TODO(bassosimone): an error before this point means that the *os.File