diff --git a/go.mod b/go.mod index 136278e..4030273 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/coder/wgtunnel go 1.20 -replace golang.zx2c4.com/wireguard => github.com/coder/wireguard-go v0.0.0-20230920225835-b7d43c468619 +replace github.com/tailscale/wireguard-go => github.com/coder/wireguard-go v0.0.0-20240502122727-a4cb23ac736d require ( cdr.dev/slog v1.6.2-0.20230901043036-3e17d6de9749 @@ -11,6 +11,7 @@ require ( github.com/go-chi/httprate v0.7.4 github.com/riandyrn/otelchi v0.5.1 github.com/stretchr/testify v1.8.4 + github.com/tailscale/wireguard-go v0.0.0-20231121184858-cc193a0b3272 github.com/urfave/cli/v2 v2.25.7 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 go.opentelemetry.io/otel v1.18.0 @@ -21,7 +22,6 @@ require ( golang.org/x/mod v0.12.0 golang.org/x/sync v0.3.0 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 - golang.zx2c4.com/wireguard v0.0.0-20230704135630-469159ecf7d1 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 google.golang.org/grpc v1.58.3 ) @@ -62,5 +62,5 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 // indirect + gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 // indirect ) diff --git a/go.sum b/go.sum index a9cda4c..6d384e6 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E= github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c= -github.com/coder/wireguard-go v0.0.0-20230920225835-b7d43c468619 h1:Ug4+d7ooZNjQPVHL+zrHF2hLCr0FOpxHdB2Urr77VmY= -github.com/coder/wireguard-go v0.0.0-20230920225835-b7d43c468619/go.mod h1:tqur9LnfstdR9ep2LaJT4lFUl0EjlHtge+gAjmsHUG4= +github.com/coder/wireguard-go v0.0.0-20240502122727-a4cb23ac736d h1:9bX/NUIgbQN2wDDTIIt/Gn60D1Ff7QjH3VhDAH5dgv0= +github.com/coder/wireguard-go v0.0.0-20240502122727-a4cb23ac736d/go.mod h1:BOm5fXUBFM+m9woLNBoxI9TaBXXhGNP50LX/TGIvGb4= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -145,5 +145,5 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 h1:Wobr37noukisGxpKo5jAsLREcpj61RxrWYzD8uwveOY= -gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0/go.mod h1:Dn5idtptoW1dIos9U6A2rpebLs/MtTwFacjKb8jLdQA= +gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 h1:TbRPT0HtzFP3Cno1zZo7yPzEEnfu8EjLfl6IU9VfqkQ= +gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259/go.mod h1:AVgIgHMwK63XvmAzWG9vLQ41YnVHN0du0tEC46fI7yY= diff --git a/tunneld/api.go b/tunneld/api.go index 99a6ae7..dd1e49c 100644 --- a/tunneld/api.go +++ b/tunneld/api.go @@ -15,10 +15,10 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/hostrouter" "github.com/riandyrn/otelchi" + "github.com/tailscale/wireguard-go/device" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "golang.org/x/xerrors" - "golang.zx2c4.com/wireguard/device" "github.com/coder/wgtunnel/tunneld/httpapi" "github.com/coder/wgtunnel/tunneld/httpmw" diff --git a/tunneld/options.go b/tunneld/options.go index 7e29637..4d1a2a2 100644 --- a/tunneld/options.go +++ b/tunneld/options.go @@ -11,8 +11,8 @@ import ( "strings" "time" + "github.com/tailscale/wireguard-go/device" "golang.org/x/xerrors" - "golang.zx2c4.com/wireguard/device" "cdr.dev/slog" "github.com/coder/wgtunnel/tunnelsdk" diff --git a/tunneld/options_test.go b/tunneld/options_test.go index 3201234..81032b0 100644 --- a/tunneld/options_test.go +++ b/tunneld/options_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "golang.zx2c4.com/wireguard/device" + "github.com/tailscale/wireguard-go/device" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "github.com/coder/wgtunnel/tunneld" diff --git a/tunneld/tunneld.go b/tunneld/tunneld.go index e67d177..7a4e2cb 100644 --- a/tunneld/tunneld.go +++ b/tunneld/tunneld.go @@ -9,13 +9,13 @@ import ( "sync" "time" + "github.com/tailscale/wireguard-go/conn" + "github.com/tailscale/wireguard-go/device" + "github.com/tailscale/wireguard-go/tun/netstack" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "golang.org/x/xerrors" - "golang.zx2c4.com/wireguard/conn" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/tun/netstack" ) // TODO: add logging to API diff --git a/tunnelsdk/api.go b/tunnelsdk/api.go index 1b71a47..ba143b6 100644 --- a/tunnelsdk/api.go +++ b/tunnelsdk/api.go @@ -7,7 +7,7 @@ import ( "net/netip" "time" - "golang.zx2c4.com/wireguard/device" + "github.com/tailscale/wireguard-go/device" ) type Response struct { diff --git a/tunnelsdk/tunnel.go b/tunnelsdk/tunnel.go index cd30cc9..c0ce3e5 100644 --- a/tunnelsdk/tunnel.go +++ b/tunnelsdk/tunnel.go @@ -13,10 +13,10 @@ import ( "net/url" "time" + "github.com/tailscale/wireguard-go/conn" + "github.com/tailscale/wireguard-go/device" + "github.com/tailscale/wireguard-go/tun/netstack" "golang.org/x/xerrors" - "golang.zx2c4.com/wireguard/conn" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/tun/netstack" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "cdr.dev/slog"