diff --git a/dns/dnsmessage/message.go b/dns/dnsmessage/message.go
index 42987ab7c..a656efc12 100644
--- a/dns/dnsmessage/message.go
+++ b/dns/dnsmessage/message.go
@@ -273,7 +273,6 @@ var (
errTooManyAdditionals = errors.New("too many Additionals to pack (>65535)")
errNonCanonicalName = errors.New("name is not in canonical format (it must end with a .)")
errStringTooLong = errors.New("character string exceeds maximum length (255)")
- errCompressedSRV = errors.New("compressed name in SRV resource data")
)
// Internal constants.
@@ -2028,10 +2027,6 @@ func (n *Name) pack(msg []byte, compression map[string]uint16, compressionOff in
// unpack unpacks a domain name.
func (n *Name) unpack(msg []byte, off int) (int, error) {
- return n.unpackCompressed(msg, off, true /* allowCompression */)
-}
-
-func (n *Name) unpackCompressed(msg []byte, off int, allowCompression bool) (int, error) {
// currOff is the current working offset.
currOff := off
@@ -2076,9 +2071,6 @@ Loop:
name = append(name, '.')
currOff = endOff
case 0xC0: // Pointer
- if !allowCompression {
- return off, errCompressedSRV
- }
if currOff >= len(msg) {
return off, errInvalidPtr
}
@@ -2549,7 +2541,7 @@ func unpackSRVResource(msg []byte, off int) (SRVResource, error) {
return SRVResource{}, &nestedError{"Port", err}
}
var target Name
- if _, err := target.unpackCompressed(msg, off, false /* allowCompression */); err != nil {
+ if _, err := target.unpack(msg, off); err != nil {
return SRVResource{}, &nestedError{"Target", err}
}
return SRVResource{priority, weight, port, target}, nil
diff --git a/dns/dnsmessage/message_test.go b/dns/dnsmessage/message_test.go
index c84d5a3aa..e60ec42d9 100644
--- a/dns/dnsmessage/message_test.go
+++ b/dns/dnsmessage/message_test.go
@@ -303,28 +303,6 @@ func TestNameUnpackTooLongName(t *testing.T) {
}
}
-func TestIncompressibleName(t *testing.T) {
- name := MustNewName("example.com.")
- compression := map[string]uint16{}
- buf, err := name.pack(make([]byte, 0, 100), compression, 0)
- if err != nil {
- t.Fatal("first Name.pack() =", err)
- }
- buf, err = name.pack(buf, compression, 0)
- if err != nil {
- t.Fatal("second Name.pack() =", err)
- }
- var n1 Name
- off, err := n1.unpackCompressed(buf, 0, false /* allowCompression */)
- if err != nil {
- t.Fatal("unpacking incompressible name without pointers failed:", err)
- }
- var n2 Name
- if _, err := n2.unpackCompressed(buf, off, false /* allowCompression */); err != errCompressedSRV {
- t.Errorf("unpacking compressed incompressible name with pointers: got %v, want = %v", err, errCompressedSRV)
- }
-}
-
func checkErrorPrefix(err error, prefix string) bool {
e, ok := err.(*nestedError)
return ok && e.s == prefix
diff --git a/go.mod b/go.mod
index 3bd487f5a..7f512d703 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module golang.org/x/net
go 1.18
require (
- golang.org/x/crypto v0.18.0
- golang.org/x/sys v0.16.0
- golang.org/x/term v0.16.0
+ golang.org/x/crypto v0.19.0
+ golang.org/x/sys v0.17.0
+ golang.org/x/term v0.17.0
golang.org/x/text v0.14.0
)
diff --git a/go.sum b/go.sum
index 8eeaf16c6..683b469d6 100644
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,8 @@
-golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
diff --git a/html/token.go b/html/token.go
index de67f938a..3c57880d6 100644
--- a/html/token.go
+++ b/html/token.go
@@ -910,9 +910,6 @@ func (z *Tokenizer) readTagAttrKey() {
return
}
switch c {
- case ' ', '\n', '\r', '\t', '\f', '/':
- z.pendingAttr[0].end = z.raw.end - 1
- return
case '=':
if z.pendingAttr[0].start+1 == z.raw.end {
// WHATWG 13.2.5.32, if we see an equals sign before the attribute name
@@ -920,7 +917,9 @@ func (z *Tokenizer) readTagAttrKey() {
continue
}
fallthrough
- case '>':
+ case ' ', '\n', '\r', '\t', '\f', '/', '>':
+ // WHATWG 13.2.5.33 Attribute name state
+ // We need to reconsume the char in the after attribute name state to support the / character
z.raw.end--
z.pendingAttr[0].end = z.raw.end
return
@@ -939,6 +938,11 @@ func (z *Tokenizer) readTagAttrVal() {
if z.err != nil {
return
}
+ if c == '/' {
+ // WHATWG 13.2.5.34 After attribute name state
+ // U+002F SOLIDUS (/) - Switch to the self-closing start tag state.
+ return
+ }
if c != '=' {
z.raw.end--
return
diff --git a/html/token_test.go b/html/token_test.go
index b2383a951..8b0d5aab6 100644
--- a/html/token_test.go
+++ b/html/token_test.go
@@ -601,6 +601,21 @@ var tokenTests = []tokenTest{
``,
`
`,
},
+ {
+ "forward slash before attribute name",
+ `
`,
+ `
`,
+ },
+ {
+ "forward slash before attribute name with spaces around",
+ `
`,
+ `
`,
+ },
+ {
+ "forward slash after attribute name followed by a character",
+ `
`,
+ `
`,
+ },
}
func TestTokenizer(t *testing.T) {
diff --git a/http2/frame.go b/http2/frame.go
index c1f6b90dc..e2b298d85 100644
--- a/http2/frame.go
+++ b/http2/frame.go
@@ -1510,13 +1510,12 @@ func (mh *MetaHeadersFrame) checkPseudos() error {
}
func (fr *Framer) maxHeaderStringLen() int {
- v := fr.maxHeaderListSize()
- if uint32(int(v)) == v {
- return int(v)
+ v := int(fr.maxHeaderListSize())
+ if v < 0 {
+ // If maxHeaderListSize overflows an int, use no limit (0).
+ return 0
}
- // They had a crazy big number for MaxHeaderBytes anyway,
- // so give them unlimited header lengths:
- return 0
+ return v
}
// readMetaFrame returns 0 or more CONTINUATION frames from fr and
diff --git a/http2/server_push_test.go b/http2/server_push_test.go
index 9882d9ef7..cda8f4336 100644
--- a/http2/server_push_test.go
+++ b/http2/server_push_test.go
@@ -11,6 +11,7 @@ import (
"io/ioutil"
"net/http"
"reflect"
+ "runtime"
"strconv"
"sync"
"testing"
@@ -483,11 +484,7 @@ func TestServer_Push_RejectAfterGoAway(t *testing.T) {
ready := make(chan struct{})
errc := make(chan error, 2)
st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
- select {
- case <-ready:
- case <-time.After(5 * time.Second):
- errc <- fmt.Errorf("timeout waiting for GOAWAY to be processed")
- }
+ <-ready
if got, want := w.(http.Pusher).Push("https://"+r.Host+"/pushed", nil), http.ErrNotSupported; got != want {
errc <- fmt.Errorf("Push()=%v, want %v", got, want)
}
@@ -505,6 +502,10 @@ func TestServer_Push_RejectAfterGoAway(t *testing.T) {
case <-ready:
return
default:
+ if runtime.GOARCH == "wasm" {
+ // Work around https://go.dev/issue/65178 to avoid goroutine starvation.
+ runtime.Gosched()
+ }
}
st.sc.serveMsgCh <- func(loopNum int) {
if !st.sc.pushEnabled {
diff --git a/internal/quic/endpoint.go b/internal/quic/endpoint.go
index 82a08a18c..8ed67de54 100644
--- a/internal/quic/endpoint.go
+++ b/internal/quic/endpoint.go
@@ -103,25 +103,31 @@ func (e *Endpoint) LocalAddr() netip.AddrPort {
// It waits for the peers of any open connection to acknowledge the connection has been closed.
func (e *Endpoint) Close(ctx context.Context) error {
e.acceptQueue.close(errors.New("endpoint closed"))
+
+ // It isn't safe to call Conn.Abort or conn.exit with connsMu held,
+ // so copy the list of conns.
+ var conns []*Conn
e.connsMu.Lock()
if !e.closing {
- e.closing = true
+ e.closing = true // setting e.closing prevents new conns from being created
for c := range e.conns {
- c.Abort(localTransportError{code: errNo})
+ conns = append(conns, c)
}
if len(e.conns) == 0 {
e.udpConn.Close()
}
}
e.connsMu.Unlock()
+
+ for _, c := range conns {
+ c.Abort(localTransportError{code: errNo})
+ }
select {
case <-e.closec:
case <-ctx.Done():
- e.connsMu.Lock()
- for c := range e.conns {
+ for _, c := range conns {
c.exit()
}
- e.connsMu.Unlock()
return ctx.Err()
}
return nil
diff --git a/internal/quic/endpoint_test.go b/internal/quic/endpoint_test.go
index ab6cd1cf5..16c3e0bce 100644
--- a/internal/quic/endpoint_test.go
+++ b/internal/quic/endpoint_test.go
@@ -97,7 +97,7 @@ func newLocalEndpoint(t *testing.T, side connSide, conf *Config) *Endpoint {
t.Fatal(err)
}
t.Cleanup(func() {
- e.Close(context.Background())
+ e.Close(canceledContext())
})
return e
}
diff --git a/internal/quic/qlog/qlog.go b/internal/quic/qlog/qlog.go
index e54c839f0..f33c6b0fd 100644
--- a/internal/quic/qlog/qlog.go
+++ b/internal/quic/qlog/qlog.go
@@ -29,7 +29,7 @@ const (
// VantageClient traces follow a connection from the client's perspective.
VantageClient = Vantage("client")
- // VantageClient traces follow a connection from the server's perspective.
+ // VantageServer traces follow a connection from the server's perspective.
VantageServer = Vantage("server")
)