From 5ee06543d3a226a8e4b76b49d90594b81d77489b Mon Sep 17 00:00:00 2001 From: Viacheslav Medvediev Date: Tue, 20 Dec 2016 17:10:40 +0200 Subject: [PATCH 1/2] Add User Agent cli param --- README.md | 2 ++ main.go | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index fd53472..fb25195 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,8 @@ Usage of ./wsd: origin of WebSocket client (default "http://localhost/") -protocol string WebSocket subprotocol + -userAgent string + "User-Agent" header -url string WebSocket server address to connect to (default "ws://localhost:1337/ws") -version diff --git a/main.go b/main.go index 6870b88..5b87219 100644 --- a/main.go +++ b/main.go @@ -20,6 +20,7 @@ var ( origin string url string protocol string + userAgent string displayHelp bool displayVersion bool insecureSkipVerify bool @@ -35,6 +36,7 @@ func init() { flag.StringVar(&origin, "origin", "http://localhost/", "origin of WebSocket client") flag.StringVar(&url, "url", "ws://localhost:1337/ws", "WebSocket server address to connect to") flag.StringVar(&protocol, "protocol", "", "WebSocket subprotocol") + flag.StringVar(&userAgent, "userAgent", "", "User-Agent header") flag.BoolVar(&insecureSkipVerify, "insecureSkipVerify", false, "Skip TLS certificate verification") flag.BoolVar(&displayHelp, "help", false, "Display help information about wsd") flag.BoolVar(&displayVersion, "version", false, "Display version number") @@ -92,6 +94,9 @@ func dial(url, protocol, origin string) (ws *websocket.Conn, err error) { if protocol != "" { config.Protocol = []string{protocol} } + if userAgent != "" { + config.Header.Add("User-Agent", userAgent) + } config.TlsConfig = &tls.Config{ InsecureSkipVerify: insecureSkipVerify, } From 3c7378d4836e7b9e765041e884f5bde4c3c8c567 Mon Sep 17 00:00:00 2001 From: Viacheslav Medvediev Date: Tue, 20 Dec 2016 17:48:05 +0200 Subject: [PATCH 2/2] Replace tab with spaces --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 5b87219..fa33926 100644 --- a/main.go +++ b/main.go @@ -20,7 +20,7 @@ var ( origin string url string protocol string - userAgent string + userAgent string displayHelp bool displayVersion bool insecureSkipVerify bool