Handle basic auth for dialing btcd websocket connections.

config.go

@@ -43,6 +43,8 @@ type config struct {
 	ConfigFile  string `short:"C" long:"configfile" description:"Path to configuration file"`
 	SvrPort     int    `short:"p" long:"serverport" description:"Port to serve frontend websocket connections on"`
 	DataDir     string `short:"D" long:"datadir" description:"Directory to store wallets and transactions"`
+	Username    string `short:"u" long:"username" description:"Username for btcd authorization"`
+	Password    string `short:"P" long:"password" description:"Password for btcd authorization"`
 }
 
 // btcwalletHomeDir returns an OS appropriate home directory for btcwallet.

sockets.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"code.google.com/p/go.net/websocket"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -412,11 +413,20 @@ func FrontendListenAndServe() error {
 // for sending and receiving chain-related messages, failing if the
 // connection cannot be established or is lost.
 func BtcdConnect(reply chan error) {
+	// btcd requires basic authorization, so we use a custom config with
+	// the Authorization header set.
+	server := fmt.Sprintf("ws://localhost:%d/wallet", cfg.BtcdPort)
+	login := cfg.Username + ":" + cfg.Password
+	auth := "Basic" + base64.StdEncoding.EncodeToString([]byte(login))
+	config, err := websocket.NewConfig(server, "http://localhost/")
+	if err != nil {
+		reply <- ErrConnRefused
+		return
+	}
+	config.Header.Add("Authorization", auth)
+
 	// Attempt to connect to running btcd instance. Bail if it fails.
-	btcdws, err := websocket.Dial(
+	btcdws, err := websocket.DialConfig(config)
-		fmt.Sprintf("ws://localhost:%d/wallet", cfg.BtcdPort),
-		"",
-		"http://localhost/")
 	if err != nil {
 		reply <- ErrConnRefused
 		return