Skip to content

Commit 72039f6

Browse files
neilalexanderneilalexander
authored
Update dependencies (#3449)
Signed-off-by: Neil Alexander <[email protected]> --------- Co-authored-by: Neil Alexander <[email protected]>
1 parent 7acf32f commit 72039f6

File tree

12 files changed

+145
-140
lines changed

12 files changed

+145
-140
lines changed

‎.github/workflows/dendrite.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
with:
7575
go-version-file: "go.mod"
7676
- name: golangci-lint
77-
uses: golangci/golangci-lint-action@v3
77+
uses: golangci/golangci-lint-action@v6
7878

7979
# run go test with different go versions
8080
test:

‎clientapi/routing/sendevent.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,14 @@ func generateSendEvent(
414414
for i := range queryRes.StateEvents {
415415
stateEvents[i] = queryRes.StateEvents[i].PDU
416416
}
417-
provider := gomatrixserverlib.NewAuthEvents(gomatrixserverlib.ToPDUs(stateEvents))
418-
if err = gomatrixserverlib.Allowed(e.PDU, &provider, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
417+
provider, err := gomatrixserverlib.NewAuthEvents(gomatrixserverlib.ToPDUs(stateEvents))
418+
if err != nil {
419+
return nil, &util.JSONResponse{
420+
Code: http.StatusForbidden,
421+
JSON: spec.Forbidden(err.Error()),
422+
}
423+
}
424+
if err = gomatrixserverlib.Allowed(e.PDU, provider, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
419425
return rsAPI.QueryUserIDForSender(ctx, *validRoomID, senderID)
420426
}); err != nil {
421427
return nil, &util.JSONResponse{

‎federationapi/routing/threepid.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ func buildMembershipEvent(
344344
protoEvent.Depth = queryRes.Depth
345345
protoEvent.PrevEvents = queryRes.LatestEvents
346346

347-
authEvents := gomatrixserverlib.NewAuthEvents(nil)
347+
authEvents, _ := gomatrixserverlib.NewAuthEvents(nil)
348348

349349
for i := range queryRes.StateEvents {
350350
err = authEvents.AddEvent(queryRes.StateEvents[i].PDU)
@@ -357,7 +357,7 @@ func buildMembershipEvent(
357357
return nil, err
358358
}
359359

360-
refs, err := eventsNeeded.AuthEventReferences(&authEvents)
360+
refs, err := eventsNeeded.AuthEventReferences(authEvents)
361361
if err != nil {
362362
return nil, err
363363
}
@@ -421,7 +421,7 @@ func sendToRemoteServer(
421421
// found. Returning an error isn't necessary in this case as the event will be
422422
// rejected by gomatrixserverlib.
423423
func fillDisplayName(
424-
builder *gomatrixserverlib.ProtoEvent, authEvents gomatrixserverlib.AuthEvents,
424+
builder *gomatrixserverlib.ProtoEvent, authEvents *gomatrixserverlib.AuthEvents,
425425
) error {
426426
var content gomatrixserverlib.MemberContent
427427
if err := json.Unmarshal(builder.Content, &content); err != nil {

‎go.mod‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ require (
2424
github.com/matrix-org/dugong v0.0.0-20210921133753-66e6b1c67e2e
2525
github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91
2626
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530
27-
github.com/matrix-org/gomatrixserverlib v0.0.0-20240910190622-2c764912ce93
27+
github.com/matrix-org/gomatrixserverlib v0.0.0-20241215094829-e86ab16eabe8
2828
github.com/matrix-org/pinecone v0.11.1-0.20230810010612-ea4c33717fd7
2929
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
30-
github.com/mattn/go-sqlite3 v1.14.22
31-
github.com/nats-io/nats-server/v2 v2.10.20
32-
github.com/nats-io/nats.go v1.36.0
30+
github.com/mattn/go-sqlite3 v1.14.24
31+
github.com/nats-io/nats-server/v2 v2.10.23
32+
github.com/nats-io/nats.go v1.37.0
3333
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
3434
github.com/opentracing/opentracing-go v1.2.0
3535
github.com/patrickmn/go-cache v2.1.0+incompatible
@@ -41,25 +41,25 @@ require (
4141
github.com/tidwall/sjson v1.2.5
4242
github.com/uber/jaeger-client-go v2.30.0+incompatible
4343
github.com/uber/jaeger-lib v2.4.1+incompatible
44-
github.com/yggdrasil-network/yggdrasil-go v0.5.6
45-
github.com/yggdrasil-network/yggquic v0.0.0-20240802104827-b4e97a928967
44+
github.com/yggdrasil-network/yggdrasil-go v0.5.11
45+
github.com/yggdrasil-network/yggquic v0.0.0-20241212194307-0d495106021f
4646
go.uber.org/atomic v1.11.0
47-
golang.org/x/crypto v0.28.0
48-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
47+
golang.org/x/crypto v0.31.0
48+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
4949
golang.org/x/image v0.18.0
5050
golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b
51-
golang.org/x/sync v0.9.0
52-
golang.org/x/term v0.25.0
51+
golang.org/x/sync v0.10.0
52+
golang.org/x/term v0.27.0
5353
gopkg.in/h2non/bimg.v1 v1.1.9
5454
gopkg.in/yaml.v2 v2.4.0
5555
gotest.tools/v3 v3.4.0
5656
maunium.net/go/mautrix v0.15.1
57-
modernc.org/sqlite v1.29.5
57+
modernc.org/sqlite v1.34.2
5858
nhooyr.io/websocket v1.8.7
5959
)
6060

6161
require (
62-
github.com/Arceliar/ironwood v0.0.0-20240529054413-b8e59574e2b2 // indirect
62+
github.com/Arceliar/ironwood v0.0.0-20241210120540-9deb08d9f8f9 // indirect
6363
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
6464
github.com/Microsoft/go-winio v0.5.2 // indirect
6565
github.com/RoaringBitmap/roaring v1.2.3 // indirect
@@ -84,6 +84,7 @@ require (
8484
github.com/blevesearch/zapx/v15 v15.3.13 // indirect
8585
github.com/blevesearch/zapx/v16 v16.0.12 // indirect
8686
github.com/cespare/xxhash/v2 v2.2.0 // indirect
87+
github.com/coder/websocket v1.8.12 // indirect
8788
github.com/containerd/log v0.1.0 // indirect
8889
github.com/davecgh/go-spew v1.1.1 // indirect
8990
github.com/distribution/reference v0.6.0 // indirect
@@ -100,23 +101,23 @@ require (
100101
github.com/golang/glog v1.0.0 // indirect
101102
github.com/golang/protobuf v1.5.3 // indirect
102103
github.com/golang/snappy v0.0.4 // indirect
103-
github.com/google/pprof v0.0.0-20230808223545-4887780b67fb // indirect
104+
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect
104105
github.com/h2non/filetype v1.1.3 // indirect
105106
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
106107
github.com/hjson/hjson-go/v4 v4.4.0 // indirect
107108
github.com/json-iterator/go v1.1.12 // indirect
108109
github.com/juju/errors v1.0.0 // indirect
109-
github.com/klauspost/compress v1.17.9 // indirect
110+
github.com/klauspost/compress v1.17.11 // indirect
110111
github.com/mattn/go-colorable v0.1.13 // indirect
111-
github.com/mattn/go-isatty v0.0.19 // indirect
112+
github.com/mattn/go-isatty v0.0.20 // indirect
112113
github.com/minio/highwayhash v1.0.3 // indirect
113114
github.com/moby/term v0.5.0 // indirect
114115
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
115116
github.com/modern-go/reflect2 v1.0.2 // indirect
116117
github.com/morikuni/aec v1.0.0 // indirect
117118
github.com/mschoch/smat v0.2.0 // indirect
118119
github.com/nats-io/jwt/v2 v2.5.8 // indirect
119-
github.com/nats-io/nkeys v0.4.7 // indirect
120+
github.com/nats-io/nkeys v0.4.8 // indirect
120121
github.com/nats-io/nuid v1.0.1 // indirect
121122
github.com/ncruces/go-strftime v0.1.9 // indirect
122123
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
@@ -126,12 +127,13 @@ require (
126127
github.com/prometheus/client_model v0.5.0 // indirect
127128
github.com/prometheus/common v0.48.0 // indirect
128129
github.com/prometheus/procfs v0.12.0 // indirect
129-
github.com/quic-go/quic-go v0.45.2 // indirect
130+
github.com/quic-go/quic-go v0.46.0 // indirect
130131
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
131132
github.com/rogpeppe/go-internal v1.13.1 // indirect
132133
github.com/rs/zerolog v1.29.1 // indirect
133134
github.com/tidwall/match v1.1.1 // indirect
134135
github.com/tidwall/pretty v1.2.1 // indirect
136+
github.com/wlynxg/anet v0.0.5 // indirect
135137
go.etcd.io/bbolt v1.3.7 // indirect
136138
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
137139
go.opentelemetry.io/otel v1.32.0 // indirect
@@ -140,20 +142,20 @@ require (
140142
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
141143
go.opentelemetry.io/otel/trace v1.32.0 // indirect
142144
go.uber.org/mock v0.4.0 // indirect
143-
golang.org/x/mod v0.18.0 // indirect
144-
golang.org/x/net v0.30.0 // indirect
145-
golang.org/x/sys v0.27.0 // indirect
146-
golang.org/x/text v0.20.0 // indirect
147-
golang.org/x/time v0.6.0 // indirect
148-
golang.org/x/tools v0.22.0 // indirect
145+
golang.org/x/mod v0.19.0 // indirect
146+
golang.org/x/net v0.32.0 // indirect
147+
golang.org/x/sys v0.28.0 // indirect
148+
golang.org/x/text v0.21.0 // indirect
149+
golang.org/x/time v0.8.0 // indirect
150+
golang.org/x/tools v0.23.0 // indirect
149151
google.golang.org/protobuf v1.35.1 // indirect
150152
gopkg.in/macaroon.v2 v2.1.0 // indirect
151153
gopkg.in/yaml.v3 v3.0.1 // indirect
152154
maunium.net/go/maulogger/v2 v2.4.1 // indirect
153155
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
154-
modernc.org/libc v1.41.0 // indirect
156+
modernc.org/libc v1.55.3 // indirect
155157
modernc.org/mathutil v1.6.0 // indirect
156-
modernc.org/memory v1.7.2 // indirect
158+
modernc.org/memory v1.8.0 // indirect
157159
modernc.org/strutil v1.2.0 // indirect
158160
modernc.org/token v1.1.0 // indirect
159161
)

0 commit comments

Comments
 (0)