websocket: allow "https" scheme on Client's Endpoint

Previously, we only check for "wss" scheme to initialize the TLS
configuration.  At some point, user may have one single address to
connect to HTTP and WebSocket server on the same domain, which require
two addresses on their side.

This commit relaxing the Endpoint rule when parsing WebSocket URI.
Scheme "https" will be considered as "wss" or secure connection with
TLS.

1 files changed, 51 insertions, 0 deletions

diff --git a/lib/websocket/client_test.go b/lib/websocket/client_test.go
index 9aae9cfc..466e0932 100644
--- a/lib/websocket/client_test.go
+++ b/lib/websocket/client_test.go
@@ -5,6 +5,7 @@
 package websocket
 
 import (
+	"crypto/tls"
 	"net/http"
 	"sync"
 	"testing"
@@ -60,6 +61,56 @@ func TestConnect(t *testing.T) {
 	}
 }
 
+func TestClient_parseURI(t *testing.T) {
+	cl := &Client{}
+
+	cases := []struct {
+		endpoint         string
+		expRemoteAddress string
+		expTLSConfig     *tls.Config
+		expError         string
+	}{{
+		endpoint:         "ws://127.0.0.1:8080",
+		expRemoteAddress: "127.0.0.1:8080",
+	}, {
+		endpoint:         "wss://127.0.0.1",
+		expRemoteAddress: "127.0.0.1:443",
+		expTLSConfig:     new(tls.Config),
+	}, {
+		endpoint:         "wss://127.0.0.1:8000",
+		expRemoteAddress: "127.0.0.1:8000",
+		expTLSConfig:     new(tls.Config),
+	}, {
+		endpoint:         "http://127.0.0.1",
+		expRemoteAddress: "127.0.0.1:80",
+	}, {
+		endpoint:         "https://127.0.0.1",
+		expRemoteAddress: "127.0.0.1:443",
+		expTLSConfig:     new(tls.Config),
+	}, {
+		endpoint:         "https://127.0.0.1:8443",
+		expRemoteAddress: "127.0.0.1:8443",
+		expTLSConfig:     new(tls.Config),
+	}}
+
+	for _, c := range cases {
+		t.Log("parseURI", c.endpoint)
+
+		cl.remoteAddr = ""
+		cl.TLSConfig = nil
+		cl.Endpoint = c.endpoint
+
+		err := cl.parseURI()
+		if err != nil {
+			test.Assert(t, "error", c.expError, err.Error(), true)
+			continue
+		}
+
+		test.Assert(t, "remote address", c.expRemoteAddress, cl.remoteAddr, true)
+		test.Assert(t, "TLS config", c.expTLSConfig, cl.TLSConfig, true)
+	}
+}
+
 func TestClientPing(t *testing.T) {
 	if _testServer == nil {
 		runTestServer()