Merge pull request #177 from vania-pooh/master

Fixed issue with proxying to remote WebSocket

docs/quota-files.adoc

@@ -54,11 +54,11 @@ Two notations are supported in `vnc` attribute:
 
 . If the remote server also returns VNC traffic on a web socket (which is a case for http://aerokube.com/selenoid/latest/#_live_browser_screen[Selenoid]) - then you should specify a `ws://` URL without trailing `<session-id>` value:
 +
-    ws://my-selenoid-host.example.com/vnc
+    ws://my-selenoid-host.example.com:4444/vnc
 +
 Having this URL Ggr will append session ID and proxy VNC traffic from:
 +
-    ws://my-selenoid-host.example.com/vnc/<session-id>
+    ws://my-selenoid-host.example.com:4444/vnc/<session-id>
 
 === Working with External Selenium Services
 

proxy.go

@@ -535,7 +535,7 @@ func vnc(wsconn *websocket.Conn) {
 			port = vncInfo.Port
 			path = vncInfo.Path
 		}
-		sessionID := strings.Split(wsconn.Request().URL.Path, "/")[2]
+		sessionID := strings.Split(wsconn.Request().URL.Path, "/")[2][md5SumLength:]
 		switch scheme {
 		case vncScheme:
 			proxyVNC(id, wsconn, sessionID, host, port)

proxy_test.go

@@ -251,7 +251,7 @@ func TestProxyScreenWebSocketsProtocol(t *testing.T) {
 
 	const testData = "ws-data"
 	mux := http.NewServeMux()
-	mux.Handle("/vnc/", websocket.Handler(func(wsconn *websocket.Conn) {
+	mux.Handle("/vnc/123", websocket.Handler(func(wsconn *websocket.Conn) {
 		wsconn.Write([]byte(testData))
 	}))