Skip to content

Avoid math/rand usage for ws client masking #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2025
Merged

Avoid math/rand usage for ws client masking #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a05202d
avoid math/rand usage for ws client masking
FZambia Jul 11, 2025
cc8de1a
rm bench
FZambia Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions internal/websocket/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package websocket

import (
"bufio"
"crypto/rand"
"encoding/binary"
"errors"
"io"
"math/rand"
"net"
"strconv"
"strings"
Expand Down Expand Up @@ -180,8 +180,11 @@ var (
)

func newMaskKey() [4]byte {
n := rand.Uint32()
return [4]byte{byte(n), byte(n >> 8), byte(n >> 16), byte(n >> 24)}
var key [4]byte
if _, err := io.ReadFull(rand.Reader, key[:]); err != nil {
panic("failed to generate mask key: " + err.Error())
}
return key
}

func hideTempErr(err error) error {
Expand Down
14 changes: 1 addition & 13 deletions internal/websocket/prepared_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package websocket
import (
"bytes"
"compress/flate"
"math/rand"
"testing"
)

Expand All @@ -24,12 +23,7 @@ var preparedMessageTests = []struct {
{PingMessage, true, false, flate.BestSpeed},
{PingMessage, true, true, flate.BestSpeed},

// Client
{TextMessage, false, false, flate.BestSpeed},
{TextMessage, false, true, flate.BestSpeed},
{TextMessage, false, true, flate.BestCompression},
{PingMessage, false, false, flate.BestSpeed},
{PingMessage, false, true, flate.BestSpeed},
// Client tests will fail due to random masking, skipping them.
}

func TestPreparedMessage(t *testing.T) {
Expand All @@ -42,9 +36,6 @@ func TestPreparedMessage(t *testing.T) {
}
_ = c.SetCompressionLevel(tt.compressionLevel)

// Seed random number generator for consistent frame mask.
rand.Seed(1234) //nolint:staticcheck

if err := c.WriteMessage(tt.messageType, data); err != nil {
t.Fatal(err)
}
Expand All @@ -58,9 +49,6 @@ func TestPreparedMessage(t *testing.T) {
// Scribble on data to ensure that NewPreparedMessage takes a snapshot.
copy(data, "hello world")

// Seed random number generator for consistent frame mask.
rand.Seed(1234) //nolint:staticcheck

buf.Reset()
if err := c.WritePreparedMessage(pm); err != nil {
t.Fatal(err)
Expand Down
Loading