Merge pull request #43 from nhooyr/autobahn

Integrate autobahn tests

Author: nhooyr

.github/test/Dockerfile

@@ -5,7 +5,9 @@ LABEL "com.github.actions.description"="test"
 LABEL "com.github.actions.icon"="code"
 LABEL "com.github.actions.color"="purple"
 
-RUN apt update && apt install -y shellcheck
+RUN apt update && \
+	apt install -y shellcheck python-pip && \
+	pip install autobahntestsuite
 
 COPY entrypoint.sh /entrypoint.sh
 

.gitignore

@@ -1 +1,2 @@
 coverage.html
+wstest_reports

opcode.go

@@ -10,7 +10,7 @@ const (
 	opText
 	opBinary
 	// 3 - 7 are reserved for further non-control frames.
-	opClose opcode = 8 + iota
+	opClose opcode = 8 + iota - 3
 	opPing
 	opPong
 	// 11-16 are reserved for further control frames.

opcode_string.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"math/bits"
+	"unicode/utf8"
 
 	"golang.org/x/xerrors"
 )
@@ -21,7 +22,7 @@ const (
 	StatusProtocolError
 	StatusUnsupportedData
 	// 1004 is reserved.
-	StatusNoStatusRcvd StatusCode = 1005 + iota
+	StatusNoStatusRcvd StatusCode = 1005 + iota - 4
 	StatusAbnormalClosure
 	StatusInvalidFramePayloadData
 	StatusPolicyViolation
@@ -53,9 +54,38 @@ func parseClosePayload(p []byte) (code StatusCode, reason string, err error) {
 	code = StatusCode(binary.BigEndian.Uint16(p))
 	reason = string(p[2:])
 
+	if !utf8.ValidString(reason) {
+		return 0, "", xerrors.Errorf("invalid utf-8: %q", reason)
+	}
+	if !isValidReceivedCloseCode(code) {
+		return 0, "", xerrors.Errorf("invalid code %v", code)
+	}
+
 	return code, reason, nil
 }
 
+var validReceivedCloseCodes = map[StatusCode]bool{
+	// see http://www.iana.org/assignments/websocket/websocket.xhtml#close-code-number
+	StatusNormalClosure:           true,
+	StatusGoingAway:               true,
+	StatusProtocolError:           true,
+	StatusUnsupportedData:         true,
+	StatusNoStatusRcvd:            false,
+	StatusAbnormalClosure:         false,
+	StatusInvalidFramePayloadData: true,
+	StatusPolicyViolation:         true,
+	StatusMessageTooBig:           true,
+	StatusMandatoryExtension:      true,
+	StatusInternalError:           true,
+	StatusServiceRestart:          true,
+	StatusTryAgainLater:           true,
+	StatusTLSHandshake:            false,
+}
+
+func isValidReceivedCloseCode(code StatusCode) bool {
+	return validReceivedCloseCodes[code] || (code >= 3000 && code <= 4999)
+}
+
 const maxControlFramePayload = 125
 
 func closePayload(code StatusCode, reason string) ([]byte, error) {