Skip to content

Commit e181dcd

Browse files
committed
deps: upgrade Caddy to v2.11.4 and Tailscale to v1.98.9
Upgrade the two primary dependencies and allow go mod tidy to resolve the resulting transitive dependency graph via minimal version selection. The module builds cleanly, and go vet, the test suite, and govulncheck all report no issues. Signed-off-by: Evan Champion <306651197+evan314159@users.noreply.github.com>
1 parent bb080c4 commit e181dcd

2 files changed

Lines changed: 433 additions & 539 deletions

File tree

go.mod

Lines changed: 117 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,186 +1,200 @@
11
module github.com/tailscale/caddy-tailscale
22

3-
go 1.25.3
3+
go 1.26.5
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.10.2
7-
github.com/caddyserver/certmagic v0.24.0
6+
github.com/caddyserver/caddy/v2 v2.11.4
7+
github.com/caddyserver/certmagic v0.25.3
88
github.com/google/go-cmp v0.7.0
9-
github.com/tailscale/tscert v0.0.0-20240608151842-d3f834017e53
10-
go.uber.org/zap v1.27.0
11-
tailscale.com v1.90.9
9+
github.com/tailscale/tscert v0.0.0-20251216020129-aea342f6d747
10+
go.uber.org/zap v1.28.0
11+
tailscale.com v1.98.9
1212
)
1313

1414
require (
15-
cel.dev/expr v0.24.0 // indirect
16-
cloud.google.com/go/auth v0.16.2 // indirect
15+
cel.dev/expr v0.25.1 // indirect
16+
cloud.google.com/go/auth v0.20.0 // indirect
1717
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
18-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
19-
dario.cat/mergo v1.0.1 // indirect
20-
filippo.io/edwards25519 v1.1.0 // indirect
18+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
19+
dario.cat/mergo v1.0.2 // indirect
20+
filippo.io/bigmod v0.1.0 // indirect
21+
filippo.io/edwards25519 v1.2.0 // indirect
2122
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
22-
github.com/BurntSushi/toml v1.5.0 // indirect
23-
github.com/KimMachineGun/automemlimit v0.7.4 // indirect
23+
github.com/BurntSushi/toml v1.6.0 // indirect
24+
github.com/DeRuina/timberjack v1.4.2 // indirect
25+
github.com/KimMachineGun/automemlimit v0.7.5 // indirect
2426
github.com/Masterminds/goutils v1.1.1 // indirect
25-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
27+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2628
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
27-
github.com/Microsoft/go-winio v0.6.2 // indirect
2829
github.com/akutz/memconn v0.1.0 // indirect
29-
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
30+
github.com/alecthomas/chroma/v2 v2.24.1 // indirect
3031
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
31-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
32+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
3233
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
3334
github.com/beorn7/perks v1.0.1 // indirect
34-
github.com/caddyserver/zerossl v0.1.3 // indirect
35-
github.com/ccoveille/go-safecast v1.6.1 // indirect
36-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
35+
github.com/caddyserver/zerossl v0.1.5 // indirect
36+
github.com/ccoveille/go-safecast/v2 v2.0.0 // indirect
37+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3738
github.com/cespare/xxhash v1.1.0 // indirect
3839
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3940
github.com/chzyer/readline v1.5.1 // indirect
40-
github.com/cloudflare/circl v1.6.1 // indirect
41+
github.com/cloudflare/circl v1.6.3 // indirect
4142
github.com/coder/websocket v1.8.12 // indirect
42-
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
43+
github.com/coreos/go-oidc/v3 v3.17.0 // indirect
4344
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
45+
github.com/creachadair/msync v0.7.1 // indirect
4446
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
4547
github.com/dgraph-io/badger v1.6.2 // indirect
4648
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
4749
github.com/dgraph-io/ristretto v0.2.0 // indirect
4850
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
49-
github.com/dlclark/regexp2 v1.11.5 // indirect
51+
github.com/dlclark/regexp2 v1.12.0 // indirect
5052
github.com/dustin/go-humanize v1.0.1 // indirect
5153
github.com/felixge/httpsnoop v1.0.4 // indirect
52-
github.com/francoispqt/gojay v1.2.13 // indirect
53-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
54-
github.com/gaissmai/bart v0.18.0 // indirect
55-
github.com/go-chi/chi/v5 v5.2.2 // indirect
56-
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
57-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
54+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
55+
github.com/gaissmai/bart v0.26.1 // indirect
56+
github.com/go-chi/chi/v5 v5.2.5 // indirect
57+
github.com/go-jose/go-jose/v3 v3.0.5 // indirect
58+
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
5859
github.com/go-json-experiment/json v0.0.0-20250813024750-ebf49471dced // indirect
5960
github.com/go-logr/logr v1.4.3 // indirect
6061
github.com/go-logr/stdr v1.2.2 // indirect
61-
github.com/go-sql-driver/mysql v1.8.1 // indirect
62+
github.com/go-sql-driver/mysql v1.9.3 // indirect
6263
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
63-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
64+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
6465
github.com/golang/protobuf v1.5.4 // indirect
6566
github.com/golang/snappy v0.0.4 // indirect
66-
github.com/google/btree v1.1.2 // indirect
67-
github.com/google/cel-go v0.26.0 // indirect
67+
github.com/google/btree v1.1.3 // indirect
68+
github.com/google/cel-go v0.28.1 // indirect
6869
github.com/google/certificate-transparency-go v1.1.8-0.20240110162603-74a5dd331745 // indirect
69-
github.com/google/go-tpm v0.9.5 // indirect
70+
github.com/google/go-tpm v0.9.8 // indirect
7071
github.com/google/go-tspi v0.3.0 // indirect
7172
github.com/google/s2a-go v0.1.9 // indirect
7273
github.com/google/uuid v1.6.0 // indirect
73-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
74-
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
75-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
74+
github.com/googleapis/enterprise-certificate-proxy v0.3.15 // indirect
75+
github.com/googleapis/gax-go/v2 v2.22.0 // indirect
76+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
7677
github.com/hdevalence/ed25519consensus v0.2.0 // indirect
7778
github.com/huandu/xstrings v1.5.0 // indirect
79+
github.com/huin/goupnp v1.3.0 // indirect
7880
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7981
github.com/jackc/pgpassfile v1.0.0 // indirect
80-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
81-
github.com/jackc/pgx/v5 v5.6.0 // indirect
82-
github.com/jackc/puddle/v2 v2.2.1 // indirect
82+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
83+
github.com/jackc/pgx/v5 v5.9.2 // indirect
84+
github.com/jackc/puddle/v2 v2.2.2 // indirect
8385
github.com/jsimonetti/rtnetlink v1.4.0 // indirect
84-
github.com/klauspost/compress v1.18.0 // indirect
86+
github.com/klauspost/compress v1.18.6 // indirect
8587
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
86-
github.com/libdns/libdns v1.1.0 // indirect
88+
github.com/libdns/libdns v1.1.1 // indirect
8789
github.com/manifoldco/promptui v0.9.0 // indirect
88-
github.com/mattn/go-colorable v0.1.13 // indirect
90+
github.com/mattn/go-colorable v0.1.14 // indirect
8991
github.com/mattn/go-isatty v0.0.20 // indirect
9092
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 // indirect
9193
github.com/mdlayher/socket v0.5.0 // indirect
9294
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
93-
github.com/mholt/acmez/v3 v3.1.2 // indirect
94-
github.com/miekg/dns v1.1.68 // indirect
95+
github.com/mholt/acmez/v3 v3.1.6 // indirect
96+
github.com/miekg/dns v1.1.72 // indirect
9597
github.com/mitchellh/copystructure v1.2.0 // indirect
9698
github.com/mitchellh/go-ps v1.0.0 // indirect
9799
github.com/mitchellh/reflectwalk v1.0.2 // indirect
98100
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
99101
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
100-
github.com/pires/go-proxyproto v0.8.1 // indirect
102+
github.com/pires/go-proxyproto v0.12.0 // indirect
101103
github.com/pkg/errors v0.9.1 // indirect
102-
github.com/prometheus-community/pro-bing v0.4.0 // indirect
103-
github.com/prometheus/client_golang v1.23.0 // indirect
104+
github.com/prometheus/client_golang v1.23.2 // indirect
104105
github.com/prometheus/client_model v0.6.2 // indirect
105-
github.com/prometheus/common v0.65.0 // indirect
106-
github.com/prometheus/procfs v0.17.0 // indirect
107-
github.com/quic-go/qpack v0.5.1 // indirect
108-
github.com/quic-go/quic-go v0.54.0 // indirect
106+
github.com/prometheus/common v0.67.5 // indirect
107+
github.com/prometheus/otlptranslator v1.0.0 // indirect
108+
github.com/prometheus/procfs v0.20.1 // indirect
109+
github.com/quic-go/qpack v0.6.0 // indirect
110+
github.com/quic-go/quic-go v0.59.1 // indirect
109111
github.com/rs/xid v1.6.0 // indirect
110112
github.com/russross/blackfriday/v2 v2.1.0 // indirect
111113
github.com/safchain/ethtool v0.3.0 // indirect
112114
github.com/shopspring/decimal v1.4.0 // indirect
113115
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
114-
github.com/sirupsen/logrus v1.9.3 // indirect
115-
github.com/slackhq/nebula v1.9.5 // indirect
116-
github.com/smallstep/certificates v0.28.4 // indirect
117-
github.com/smallstep/cli-utils v0.12.1 // indirect
116+
github.com/sirupsen/logrus v1.9.4 // indirect
117+
github.com/slackhq/nebula v1.10.3 // indirect
118+
github.com/smallstep/certificates v0.30.2 // indirect
119+
github.com/smallstep/cli-utils v0.12.2 // indirect
118120
github.com/smallstep/go-attestation v0.4.4-0.20241119153605-2306d5b464ca // indirect
119-
github.com/smallstep/linkedca v0.23.0 // indirect
120-
github.com/smallstep/nosql v0.7.0 // indirect
121+
github.com/smallstep/linkedca v0.25.0 // indirect
122+
github.com/smallstep/nosql v0.8.0 // indirect
121123
github.com/smallstep/pkcs7 v0.2.1 // indirect
122-
github.com/smallstep/scep v0.0.0-20240926084937-8cf1ca453101 // indirect
124+
github.com/smallstep/scep v0.0.0-20250318231241-a25cabb69492 // indirect
123125
github.com/smallstep/truststore v0.13.0 // indirect
124126
github.com/spf13/cast v1.7.0 // indirect
125-
github.com/spf13/cobra v1.9.1 // indirect
126-
github.com/spf13/pflag v1.0.7 // indirect
127-
github.com/stoewer/go-strcase v1.2.0 // indirect
128-
github.com/tailscale/certstore v0.1.1-0.20231202035212-d3fa0460f47e // indirect
127+
github.com/spf13/cobra v1.10.2 // indirect
128+
github.com/spf13/pflag v1.0.10 // indirect
129+
github.com/tailscale/certstore v0.1.1-0.20260409135935-3638fb84b77d // indirect
129130
github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
130-
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
131-
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
131+
github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd // indirect
132132
github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc // indirect
133133
github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976 // indirect
134-
github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da // indirect
134+
github.com/tailscale/wireguard-go v0.0.0-20260622165914-65d8d42c9a5a // indirect
135135
github.com/urfave/cli v1.22.17 // indirect
136136
github.com/x448/float16 v0.8.4 // indirect
137-
github.com/yuin/goldmark v1.7.13 // indirect
137+
github.com/yuin/goldmark v1.8.2 // indirect
138138
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
139139
github.com/zeebo/blake3 v0.2.4 // indirect
140-
go.etcd.io/bbolt v1.3.11 // indirect
141-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
142-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
143-
go.opentelemetry.io/contrib/propagators/autoprop v0.62.0 // indirect
144-
go.opentelemetry.io/contrib/propagators/aws v1.37.0 // indirect
145-
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
146-
go.opentelemetry.io/contrib/propagators/jaeger v1.37.0 // indirect
147-
go.opentelemetry.io/contrib/propagators/ot v1.37.0 // indirect
148-
go.opentelemetry.io/otel v1.37.0 // indirect
149-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
150-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
151-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
152-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
153-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
154-
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
155-
go.step.sm/crypto v0.67.0 // indirect
140+
go.etcd.io/bbolt v1.4.3 // indirect
141+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
142+
go.opentelemetry.io/contrib/bridges/prometheus v0.68.0 // indirect
143+
go.opentelemetry.io/contrib/exporters/autoexport v0.68.0 // indirect
144+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
145+
go.opentelemetry.io/contrib/propagators/autoprop v0.68.0 // indirect
146+
go.opentelemetry.io/contrib/propagators/aws v1.43.0 // indirect
147+
go.opentelemetry.io/contrib/propagators/b3 v1.43.0 // indirect
148+
go.opentelemetry.io/contrib/propagators/jaeger v1.43.0 // indirect
149+
go.opentelemetry.io/contrib/propagators/ot v1.43.0 // indirect
150+
go.opentelemetry.io/otel v1.43.0 // indirect
151+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.19.0 // indirect
152+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0 // indirect
153+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.43.0 // indirect
154+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 // indirect
155+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
156+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirect
157+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
158+
go.opentelemetry.io/otel/exporters/prometheus v0.65.0 // indirect
159+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.19.0 // indirect
160+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.43.0 // indirect
161+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.43.0 // indirect
162+
go.opentelemetry.io/otel/log v0.19.0 // indirect
163+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
164+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
165+
go.opentelemetry.io/otel/sdk/log v0.19.0 // indirect
166+
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
167+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
168+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
169+
go.step.sm/crypto v0.81.0 // indirect
156170
go.uber.org/automaxprocs v1.6.0 // indirect
157-
go.uber.org/mock v0.6.0 // indirect
158171
go.uber.org/multierr v1.11.0 // indirect
159172
go.uber.org/zap/exp v0.3.0 // indirect
173+
go.yaml.in/yaml/v2 v2.4.4 // indirect
174+
go.yaml.in/yaml/v3 v3.0.4 // indirect
160175
go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
161176
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
162-
golang.org/x/crypto v0.45.0 // indirect
163-
golang.org/x/crypto/x509roots/fallback v0.0.0-20250305170421-49bf5b80c810 // indirect
164-
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
165-
golang.org/x/mod v0.30.0 // indirect
166-
golang.org/x/net v0.47.0 // indirect
167-
golang.org/x/oauth2 v0.30.0 // indirect
168-
golang.org/x/sync v0.18.0 // indirect
169-
golang.org/x/sys v0.38.0 // indirect
170-
golang.org/x/term v0.37.0 // indirect
171-
golang.org/x/text v0.31.0 // indirect
172-
golang.org/x/time v0.12.0 // indirect
173-
golang.org/x/tools v0.39.0 // indirect
177+
golang.org/x/crypto v0.52.0 // indirect
178+
golang.org/x/crypto/x509roots/fallback v0.0.0-20260213171211-a408498e5541 // indirect
179+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
180+
golang.org/x/mod v0.35.0 // indirect
181+
golang.org/x/net v0.55.0 // indirect
182+
golang.org/x/oauth2 v0.36.0 // indirect
183+
golang.org/x/sync v0.20.0 // indirect
184+
golang.org/x/sys v0.45.0 // indirect
185+
golang.org/x/term v0.43.0 // indirect
186+
golang.org/x/text v0.37.0 // indirect
187+
golang.org/x/time v0.15.0 // indirect
188+
golang.org/x/tools v0.44.0 // indirect
174189
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
175190
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
176-
google.golang.org/api v0.240.0 // indirect
177-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
178-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
179-
google.golang.org/grpc v1.73.0 // indirect
191+
google.golang.org/api v0.277.0 // indirect
192+
google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d // indirect
193+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
194+
google.golang.org/grpc v1.81.0 // indirect
180195
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
181-
google.golang.org/protobuf v1.36.8 // indirect
182-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
196+
google.golang.org/protobuf v1.36.11 // indirect
183197
gopkg.in/yaml.v3 v3.0.1 // indirect
184-
gvisor.dev/gvisor v0.0.0-20250205023644-9414b50a5633 // indirect
198+
gvisor.dev/gvisor v0.0.0-20260224225140-573d5e7127a8 // indirect
185199
howett.net/plist v1.0.0 // indirect
186200
)

0 commit comments

Comments
 (0)