updating

client.go

@@ -430,7 +430,7 @@ func (d *Dialer) DialContext(ctx context.Context, urlStr string, requestHeader h
 
 func cloneTLSConfig(cfg *tls.Config) *tls.Config {
 	if cfg == nil {
-		return &tls.Config{}
+		return &tls.Config{MinVersion: tls.VersionTLS12}
 	}
 	return cfg.Clone()
 }

client_server_test.go

@@ -524,7 +524,9 @@ func TestRespOnBadHandshake(t *testing.T) {
 
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(expectedStatus)
-		io.WriteString(w, expectedBody)
+		if _, err := io.WriteString(w, expectedBody); err != nil {
+			t.Fatalf("WriteString: %v", err)
+		}
 	}))
 	defer s.Close()
 
@@ -773,7 +775,10 @@ func TestSocksProxyDial(t *testing.T) {
 		}
 		defer c1.Close()
 
-		c1.SetDeadline(time.Now().Add(30 * time.Second))
+		if err := c1.SetDeadline(time.Now().Add(30 * time.Second)); err != nil {
+			t.Errorf("set deadline failed: %v", err)
+			return
+		}
 
 		buf := make([]byte, 32)
 		if _, err := io.ReadFull(c1, buf[:3]); err != nil {
@@ -812,10 +817,15 @@ func TestSocksProxyDial(t *testing.T) {
 		defer c2.Close()
 		done := make(chan struct{})
 		go func() {
-			io.Copy(c1, c2)
+			if _, err := io.Copy(c1, c2); err != nil {
+				t.Errorf("copy failed: %v", err)
+			}
 			close(done)
 		}()
-		io.Copy(c2, c1)
+		if _, err := io.Copy(c2, c1); err != nil {
+			t.Errorf("copy failed: %v", err)
+			return
+		}
 		<-done
 	}()
 

compression.go

@@ -33,7 +33,9 @@ func decompressNoContextTakeover(r io.Reader) io.ReadCloser {
 		"\x01\x00\x00\xff\xff"
 
 	fr, _ := flateReaderPool.Get().(io.ReadCloser)
-	fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), nil)
+	if err := fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), nil); err != nil {
+		panic(err)
+	}
 	return &flateReadWrapper{fr}
 }
 

compression_test.go

@@ -22,7 +22,9 @@ func TestTruncWriter(t *testing.T) {
 			if m > n {
 				m = n
 			}
-			w.Write(p[:m])
+			if _, err := w.Write(p[:m]); err != nil {
+				t.Fatal(err)
+			}
 			p = p[m:]
 		}
 		if b.String() != data[:len(data)-len(w.p)] {
@@ -46,7 +48,9 @@ func BenchmarkWriteNoCompression(b *testing.B) {
 	messages := textMessages(100)
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		c.WriteMessage(TextMessage, messages[i%len(messages)])
+		if err := c.WriteMessage(TextMessage, messages[i%len(messages)]); err != nil {
+			b.Fatal(err)
+		}
 	}
 	b.ReportAllocs()
 }
@@ -59,7 +63,9 @@ func BenchmarkWriteWithCompression(b *testing.B) {
 	c.newCompressionWriter = compressNoContextTakeover
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		c.WriteMessage(TextMessage, messages[i%len(messages)])
+		if err := c.WriteMessage(TextMessage, messages[i%len(messages)]); err != nil {
+			b.Fatal(err)
+		}
 	}
 	b.ReportAllocs()
 }

conn.go

@@ -6,10 +6,12 @@ package websocket
 
 import (
 	"bufio"
+	"crypto/rand"
 	"encoding/binary"
 	"errors"
 	"io"
-	"math/rand"
+	"log"
+	"math/big"
 	"net"
 	"strconv"
 	"strings"
@@ -181,8 +183,15 @@ var (
 )
 
 func newMaskKey() [4]byte {
-	n := rand.Uint32()
-	return [4]byte{byte(n), byte(n >> 8), byte(n >> 16), byte(n >> 24)}
+	/*n := mr.Uint32()
+	log.Printf("math/rand: %v - %v", n, [4]byte{byte(n), byte(n >> 8), byte(n >> 16), byte(n >> 24)})*/
+	nBig, err := rand.Int(rand.Reader, big.NewInt(int64(1<<32)))
+	if err != nil {
+		log.Println(err)
+	}
+	nb := nBig.Uint64()
+	log.Printf("crypto/rand: %v - %v", nb, [4]byte{byte(nb), byte(nb >> 8), byte(nb >> 16), byte(nb >> 24)})
+	return [4]byte{byte(nb), byte(nb >> 8), byte(nb >> 16), byte(nb >> 24)}
 }
 
 func hideTempErr(err error) error {

examples/autobahn/server.go

@@ -178,7 +178,11 @@ func main() {
 	http.HandleFunc("/r", echoReadAllWriter)
 	http.HandleFunc("/m", echoReadAllWriteMessage)
 	http.HandleFunc("/p", echoReadAllWritePreparedMessage)
-	err := http.ListenAndServe(*addr, nil)
+	server := &http.Server{
+		Addr:              *addr,
+		ReadHeaderTimeout: 3 * time.Second,
+	}
+	err := server.ListenAndServe()
 	if err != nil {
 		log.Fatal("ListenAndServe: ", err)
 	}

examples/chat/main.go

@@ -8,6 +8,7 @@ import (
 	"flag"
 	"log"
 	"net/http"
+	"time"
 )
 
 var addr = flag.String("addr", ":8080", "http service address")
@@ -33,7 +34,11 @@ func main() {
 	http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
 		serveWs(hub, w, r)
 	})
-	err := http.ListenAndServe(*addr, nil)
+	server := &http.Server{
+		Addr:              *addr,
+		ReadHeaderTimeout: 3 * time.Second,
+	}
+	err := server.ListenAndServe()
 	if err != nil {
 		log.Fatal("ListenAndServe: ", err)
 	}

examples/command/main.go

@@ -189,5 +189,9 @@ func main() {
 	}
 	http.HandleFunc("/", serveHome)
 	http.HandleFunc("/ws", serveWs)
-	log.Fatal(http.ListenAndServe(*addr, nil))
+	server := &http.Server{
+		Addr:              *addr,
+		ReadHeaderTimeout: 3 * time.Second,
+	}
+	log.Fatal(server.ListenAndServe())
 }

examples/filewatch/main.go

@@ -11,6 +11,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strconv"
 	"time"
 
@@ -49,7 +50,7 @@ func readFileIfModified(lastMod time.Time) ([]byte, time.Time, error) {
 	if !fi.ModTime().After(lastMod) {
 		return nil, lastMod, nil
 	}
-	p, err := ioutil.ReadFile(filename)
+	p, err := ioutil.ReadFile(filepath.Clean(filename))
 	if err != nil {
 		return nil, fi.ModTime(), err
 	}
@@ -163,7 +164,11 @@ func main() {
 	filename = flag.Args()[0]
 	http.HandleFunc("/", serveHome)
 	http.HandleFunc("/ws", serveWs)
-	if err := http.ListenAndServe(*addr, nil); err != nil {
+	server := &http.Server{
+		Addr:              *addr,
+		ReadHeaderTimeout: 3 * time.Second,
+	}
+	if err := server.ListenAndServe(); err != nil {
 		log.Fatal(err)
 	}
 }

prepared_test.go

@@ -70,7 +70,7 @@ func TestPreparedMessage(t *testing.T) {
 		got := buf.String()
 
 		if got != want {
-			t.Errorf("write message != prepared message for %+v", tt)
+			t.Errorf("write message != prepared message, got %#v, want %#v", got, want)
 		}
 	}
 }

util.go

@@ -6,7 +6,7 @@ package websocket
 
 import (
 	"crypto/rand"
-	"crypto/sha1"
+	"crypto/sha512"
 	"encoding/base64"
 	"io"
 	"net/http"
@@ -17,7 +17,7 @@ import (
 var keyGUID = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
 
 func computeAcceptKey(challengeKey string) string {
-	h := sha1.New()
+	h := sha512.New()
 	h.Write([]byte(challengeKey))
 	h.Write(keyGUID)
 	return base64.StdEncoding.EncodeToString(h.Sum(nil))