Allow for incorrect and missing schemes.

Fixes hashrocket#12 Also picked up a few unrelated gofmt changes. Signed-off-by: Brian Brazil <[email protected]>
brian-brazil · Dec 22, 2019 · 51992ac · 51992ac
1 parent bc51635
commit 51992ac
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/connection.go b/connection.go
@@ -24,7 +24,7 @@ func connect(url, origin string, rlConf *readline.Config, allowInsecure bool) er
 
 	dialer := websocket.Dialer{
 		Proxy: http.ProxyFromEnvironment,
-		TLSClientConfig:&tls.Config{
+		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: allowInsecure,
 		},
 	}

diff --git a/main.go b/main.go
@@ -17,7 +17,7 @@ const Version = "0.2.1"
 var options struct {
 	origin       string
 	printVersion bool
-	insecure bool
+	insecure     bool
 }
 
 func main() {
@@ -50,6 +50,22 @@ func root(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
+	// Correct and add missing schemes.
+	switch dest.Scheme {
+	case "ws", "wss":
+	case "http":
+		dest.Scheme = "ws"
+	case "https":
+		dest.Scheme = "wss"
+	default:
+		// Likely no scheme at all, e.g. "localhost:8000".
+		dest, err = url.Parse("ws://" + args[0])
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(1)
+		}
+	}
+
 	var origin string
 	if options.origin != "" {
 		origin = options.origin

diff --git a/vendor/github.com/mattn/go-colorable/colorable_windows.go b/vendor/github.com/mattn/go-colorable/colorable_windows.go