Skip to content

Commit e041e15

Browse files
willnorriswillnorris
committed
go.mod: bump package versions
caddy to v2.7.3 tailscale to v1.46.1 go to 1.20
1 parent f9a6cde commit e041e15

4 files changed

Lines changed: 209 additions & 234 deletions

File tree

‎README.md‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
The Tailscale Caddy plugin brings Tailscale integration to the Caddy web server.
66
It's really multiple plugins in one, providing:
77

8-
- the ability for a Caddy server to directly join your Tailscale network
9-
without needing a separate Tailscale client.
10-
- a Caddy authentication provider, so that you can pass a user's Tailscale
11-
identity to an applicatiton.
12-
- a Caddy subcommand to quickly setup a reverse-proxy using either or both of
13-
the network listener or authentication provider.
8+
- the ability for a Caddy server to directly join your Tailscale network
9+
without needing a separate Tailscale client.
10+
- a Caddy authentication provider, so that you can pass a user's Tailscale
11+
identity to an applicatiton.
12+
- a Caddy subcommand to quickly setup a reverse-proxy using either or both of
13+
the network listener or authentication provider.
1414

1515
This plugin is still very experimental.
1616

@@ -20,7 +20,7 @@ Use [xcaddy](https://github.com/caddyserver/xcaddy) to build Caddy with the
2020
Tailscale plugin included.
2121

2222
```
23-
xcaddy build v2.6.4 --with github.com/tailscale/caddy-tailscale
23+
xcaddy build v2.7.3 --with github.com/tailscale/caddy-tailscale
2424
```
2525

2626
## Caddy network listener
@@ -33,7 +33,7 @@ you can have multiple sites listening on different ports of a single node.
3333

3434
### Configuration
3535

36-
Configure Caddy to listen on a special "tailscale" network address. If using a
36+
Configure Caddy to listen on a special "tailscale" network address. If using a
3737
Caddyfile, use the [bind directive](https://caddyserver.com/docs/caddyfile/directives/bind):
3838

3939
```
@@ -59,9 +59,7 @@ listen address:
5959
"http": {
6060
"servers": {
6161
"srv0": {
62-
"listen": [
63-
"tailscale/myhost:80"
64-
]
62+
"listen": ["tailscale/myhost:80"]
6563
}
6664
}
6765
}
@@ -70,7 +68,7 @@ listen address:
7068
```
7169

7270
Caddy will join your Tailscale network and listen only on that network
73-
interface. Multiple addresses can be specified if you want to listen on the
71+
interface. Multiple addresses can be specified if you want to listen on the
7472
Tailscale address as well as a local address:
7573

7674
```
@@ -122,17 +120,16 @@ soon as possible.
122120
New nodes can be added to your Tailscale network by providing an [Auth
123121
key](https://tailscale.com/kb/1085/auth-keys/) or by following a special URL.
124122
Auth keys are provided to Caddy via the `TS_AUTHKEY` or `TS_AUTHKEY_<HOST>`
125-
environment variable. So if your network listener was `tailscale/myhost`, then
123+
environment variable. So if your network listener was `tailscale/myhost`, then
126124
it would look first for the `TS_AUTHKEY_MYHOST` environment variable, then
127125
`TS_AUTHKEY`.
128126

129127
If no auth key is provided, then Tailscale will generate a URL that can be used
130-
to add the new node and print it to the Caddy log. Tailscale logs can be
128+
to add the new node and print it to the Caddy log. Tailscale logs can be
131129
somewhat noisy so are turned off by default. Set `TS_VERBOSE=1` to see the URL
132-
logged. After the node had been added to your network, you can restart Caddy
130+
logged. After the node had been added to your network, you can restart Caddy
133131
without the debug flag.
134132

135-
136133
## Caddy authentication provider
137134

138135
Setup the Tailscale authentication provider with `tailscale_auth` directive.
@@ -144,7 +141,7 @@ applications, similar to [nginx-auth][].
144141

145142
Set the [`order`](https://caddyserver.com/docs/caddyfile/options#order)
146143
directive in your global options to instruct Caddy when to process
147-
`tailscale_auth`. For example, in a Caddyfile:
144+
`tailscale_auth`. For example, in a Caddyfile:
148145

149146
```
150147
{
@@ -158,12 +155,12 @@ directive in your global options to instruct Caddy when to process
158155

159156
The following fields are set on the Caddy user object:
160157

161-
- `user.id`: the Tailscale email-ish user ID
162-
- `user.tailscale_login`: the username portion of the Tailscale user ID
163-
- `user.tailscale_user`: same as `user.id`
164-
- `user.tailscale_name`: the display name of the Tailscale user
165-
- `user.tailscale_profile_picture`: the URL of the Tailscale user's profile picture
166-
- `user.tailscale_tailnet`: the name of the Tailscale network the user is a member of
158+
- `user.id`: the Tailscale email-ish user ID
159+
- `user.tailscale_login`: the username portion of the Tailscale user ID
160+
- `user.tailscale_user`: same as `user.id`
161+
- `user.tailscale_name`: the display name of the Tailscale user
162+
- `user.tailscale_profile_picture`: the URL of the Tailscale user's profile picture
163+
- `user.tailscale_tailnet`: the name of the Tailscale network the user is a member of
167164

168165
These can be mapped to HTTP headers passed to an application using something
169166
like the following in your Caddyfile:
@@ -175,7 +172,7 @@ header_up X-Webauth-Name {http.auth.user.tailscale_name}
175172
```
176173

177174
When used with a Tailscale listener (described above), that Tailscale connection
178-
is used to identify the remote user. Otherwise, the authentication provider
175+
is used to identify the remote user. Otherwise, the authentication provider
179176
will attempt to connect to the Tailscale daemon running on the local machine.
180177

181178
## tailscale-proxy subcommand

‎command.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ func cmdTailscaleProxy(fs caddycmd.Flags) (int, error) {
199199
tlsApp := caddytls.TLS{
200200
Automation: &caddytls.AutomationConfig{
201201
Policies: []*caddytls.AutomationPolicy{{
202-
Subjects: []string{fromAddr.Host},
203-
IssuersRaw: []json.RawMessage{json.RawMessage(`{"module":"internal"}`)},
202+
SubjectsRaw: []string{fromAddr.Host},
203+
IssuersRaw: []json.RawMessage{json.RawMessage(`{"module":"internal"}`)},
204204
}},
205205
},
206206
}

‎go.mod‎

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

3-
go 1.19
3+
go 1.20
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.6.4
7-
go.uber.org/zap v1.24.0
8-
tailscale.com v1.44.0
6+
github.com/caddyserver/caddy/v2 v2.7.3
7+
go.uber.org/zap v1.25.0
8+
tailscale.com v1.46.1
99
)
1010

1111
require (
@@ -17,7 +17,7 @@ require (
1717
github.com/Microsoft/go-winio v0.6.1 // indirect
1818
github.com/akutz/memconn v0.1.0 // indirect
1919
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
20-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
20+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
2121
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
2222
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
2323
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
@@ -33,10 +33,10 @@ require (
3333
github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
3434
github.com/aws/smithy-go v1.13.5 // indirect
3535
github.com/beorn7/perks v1.0.1 // indirect
36-
github.com/caddyserver/certmagic v0.17.2 // indirect
36+
github.com/caddyserver/certmagic v0.19.1 // indirect
3737
github.com/cespare/xxhash v1.1.0 // indirect
3838
github.com/cespare/xxhash/v2 v2.2.0 // indirect
39-
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
39+
github.com/chzyer/readline v1.5.1 // indirect
4040
github.com/coreos/go-iptables v0.6.0 // indirect
4141
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
4242
github.com/dgraph-io/badger v1.6.2 // indirect
@@ -48,18 +48,19 @@ require (
4848
github.com/go-kit/kit v0.10.0 // indirect
4949
github.com/go-logfmt/logfmt v0.5.1 // indirect
5050
github.com/go-ole/go-ole v1.2.6 // indirect
51-
github.com/go-sql-driver/mysql v1.6.0 // indirect
52-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
51+
github.com/go-sql-driver/mysql v1.7.0 // indirect
52+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5353
github.com/godbus/dbus/v5 v5.1.0 // indirect
54-
github.com/golang/glog v1.0.0 // indirect
54+
github.com/golang/glog v1.1.0 // indirect
5555
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5656
github.com/golang/mock v1.6.0 // indirect
5757
github.com/golang/protobuf v1.5.3 // indirect
5858
github.com/golang/snappy v0.0.4 // indirect
5959
github.com/google/btree v1.1.2 // indirect
60-
github.com/google/cel-go v0.13.0 // indirect
60+
github.com/google/cel-go v0.15.1 // indirect
6161
github.com/google/go-cmp v0.5.9 // indirect
62-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
62+
github.com/google/nftables v0.1.1-0.20230115205135-9aa6fdf5a28c // indirect
63+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
6364
github.com/google/uuid v1.3.0 // indirect
6465
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
6566
github.com/huandu/xstrings v1.4.0 // indirect
@@ -68,21 +69,22 @@ require (
6869
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6970
github.com/insomniacslk/dhcp v0.0.0-20230407062729-974c6f05fe16 // indirect
7071
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
71-
github.com/jackc/pgconn v1.13.0 // indirect
72+
github.com/jackc/pgconn v1.14.0 // indirect
7273
github.com/jackc/pgio v1.0.0 // indirect
7374
github.com/jackc/pgpassfile v1.0.0 // indirect
74-
github.com/jackc/pgproto3/v2 v2.3.1 // indirect
75-
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
76-
github.com/jackc/pgtype v1.12.0 // indirect
77-
github.com/jackc/pgx/v4 v4.17.2 // indirect
75+
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
76+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
77+
github.com/jackc/pgtype v1.14.0 // indirect
78+
github.com/jackc/pgx/v4 v4.18.0 // indirect
7879
github.com/jmespath/go-jmespath v0.4.0 // indirect
7980
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
8081
github.com/jsimonetti/rtnetlink v1.3.2 // indirect
81-
github.com/klauspost/compress v1.16.5 // indirect
82-
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
82+
github.com/klauspost/compress v1.16.7 // indirect
83+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
8384
github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a // indirect
8485
github.com/libdns/libdns v0.2.1 // indirect
8586
github.com/manifoldco/promptui v0.9.0 // indirect
87+
github.com/mastercactapus/proxyprotocol v0.0.4 // indirect
8688
github.com/mattn/go-colorable v0.1.13 // indirect
8789
github.com/mattn/go-isatty v0.0.18 // indirect
8890
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -91,71 +93,70 @@ require (
9193
github.com/mdlayher/sdnotify v1.0.0 // indirect
9294
github.com/mdlayher/socket v0.4.1 // indirect
9395
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
94-
github.com/mholt/acmez v1.1.0 // indirect
96+
github.com/mholt/acmez v1.2.0 // indirect
9597
github.com/micromdm/scep/v2 v2.1.0 // indirect
9698
github.com/miekg/dns v1.1.55 // indirect
9799
github.com/mitchellh/copystructure v1.2.0 // indirect
98100
github.com/mitchellh/go-ps v1.0.0 // indirect
99101
github.com/mitchellh/reflectwalk v1.0.2 // indirect
100-
github.com/onsi/ginkgo/v2 v2.2.0 // indirect
102+
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
101103
github.com/pierrec/lz4/v4 v4.1.17 // indirect
102104
github.com/pkg/errors v0.9.1 // indirect
103105
github.com/prometheus/client_golang v1.15.1 // indirect
104106
github.com/prometheus/client_model v0.4.0 // indirect
105107
github.com/prometheus/common v0.42.0 // indirect
106108
github.com/prometheus/procfs v0.9.0 // indirect
107109
github.com/quic-go/qpack v0.4.0 // indirect
108-
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
109-
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
110-
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
111-
github.com/quic-go/quic-go v0.32.0 // indirect
110+
github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
111+
github.com/quic-go/quic-go v0.37.3 // indirect
112112
github.com/russross/blackfriday/v2 v2.1.0 // indirect
113113
github.com/shopspring/decimal v1.2.0 // indirect
114114
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
115115
github.com/slackhq/nebula v1.6.1 // indirect
116-
github.com/smallstep/certificates v0.23.2 // indirect
117-
github.com/smallstep/nosql v0.5.0 // indirect
116+
github.com/smallstep/certificates v0.24.3-rc.5 // indirect
117+
github.com/smallstep/nosql v0.6.0 // indirect
118118
github.com/smallstep/truststore v0.12.1 // indirect
119119
github.com/spf13/cast v1.5.0 // indirect
120120
github.com/spf13/cobra v1.7.0 // indirect
121121
github.com/spf13/pflag v1.0.5 // indirect
122122
github.com/stoewer/go-strcase v1.2.0 // indirect
123123
github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d // indirect
124-
github.com/tailscale/golang-x-crypto v0.0.0-20221115211329-17a3db2c30d2 // indirect
124+
github.com/tailscale/golang-x-crypto v0.0.0-20230713185742-f0b76a10a08e // indirect
125125
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
126126
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect
127-
github.com/tailscale/tscert v0.0.0-20230124224810-c6dc1f4049b2 // indirect
128-
github.com/tailscale/wireguard-go v0.0.0-20230410165232-af172621b4dd // indirect
127+
github.com/tailscale/tscert v0.0.0-20230509043813-4e9cb4f2b4ad // indirect
128+
github.com/tailscale/wireguard-go v0.0.0-20230710185534-bb2c8f22eccf // indirect
129129
github.com/tcnksm/go-httpstat v0.2.0 // indirect
130130
github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
131-
github.com/urfave/cli v1.22.12 // indirect
131+
github.com/urfave/cli v1.22.14 // indirect
132132
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
133133
github.com/vishvananda/netns v0.0.4 // indirect
134134
github.com/x448/float16 v0.8.4 // indirect
135-
go.etcd.io/bbolt v1.3.6 // indirect
135+
github.com/zeebo/blake3 v0.2.3 // indirect
136+
go.etcd.io/bbolt v1.3.7 // indirect
136137
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
137-
go.step.sm/cli-utils v0.7.5 // indirect
138-
go.step.sm/crypto v0.23.2 // indirect
139-
go.step.sm/linkedca v0.19.0 // indirect
140-
go.uber.org/atomic v1.11.0 // indirect
138+
go.step.sm/cli-utils v0.8.0 // indirect
139+
go.step.sm/crypto v0.33.0 // indirect
140+
go.step.sm/linkedca v0.20.0 // indirect
141141
go.uber.org/multierr v1.11.0 // indirect
142142
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
143143
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 // indirect
144-
golang.org/x/crypto v0.8.0 // indirect
144+
golang.org/x/crypto v0.11.0 // indirect
145145
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect
146-
golang.org/x/mod v0.10.0 // indirect
147-
golang.org/x/net v0.10.0 // indirect
148-
golang.org/x/sync v0.2.0 // indirect
149-
golang.org/x/sys v0.8.1-0.20230609144347-5059a07aa46a // indirect
150-
golang.org/x/term v0.8.0 // indirect
151-
golang.org/x/text v0.9.0 // indirect
146+
golang.org/x/mod v0.11.0 // indirect
147+
golang.org/x/net v0.12.0 // indirect
148+
golang.org/x/sync v0.3.0 // indirect
149+
golang.org/x/sys v0.10.0 // indirect
150+
golang.org/x/term v0.10.0 // indirect
151+
golang.org/x/text v0.11.0 // indirect
152152
golang.org/x/time v0.3.0 // indirect
153-
golang.org/x/tools v0.9.1 // indirect
153+
golang.org/x/tools v0.10.0 // indirect
154154
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
155155
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
156-
google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
157-
google.golang.org/grpc v1.53.0-dev.0.20230123225046-4075ef07c5d5 // indirect
158-
google.golang.org/protobuf v1.30.0 // indirect
156+
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
157+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
158+
google.golang.org/grpc v1.56.2 // indirect
159+
google.golang.org/protobuf v1.31.0 // indirect
159160
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
160161
gopkg.in/yaml.v3 v3.0.1 // indirect
161162
gvisor.dev/gvisor v0.0.0-20230504175454-7b0a1988a28f // indirect

0 commit comments

Comments
 (0)