From 8e1dbdb0a3bfd342661f7df1d36b69961945f793 Mon Sep 17 00:00:00 2001 From: garmr Date: Fri, 6 Jun 2025 12:15:12 -0700 Subject: [PATCH 1/3] update quicwrapper --- go.mod | 10 ++++++---- go.sum | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 26cc2b65..91ad3ef5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/getlantern/http-proxy-lantern/v2 -go 1.22.9 +go 1.24.2 + +toolchain go1.24.4 require ( cloud.google.com/go/errorreporting v0.3.0 @@ -36,7 +38,7 @@ require ( github.com/getlantern/packetforward v0.0.0-20201001150407-c68a447b0360 github.com/getlantern/proxy/v3 v3.0.0-20240328103708-9185589b6a99 github.com/getlantern/psmux v1.5.15 - github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970 + github.com/getlantern/quicwrapper v0.0.0-20250606185317-bfdf6ce90356 github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7 github.com/getlantern/sing-vmess v0.0.0-20241209111030-0f2c02b4eb9a github.com/getlantern/tinywss v0.0.0-20211216020538-c10008a7d461 @@ -66,7 +68,7 @@ require ( go.opentelemetry.io/otel/sdk v1.28.0 go.opentelemetry.io/otel/sdk/metric v1.28.0 go.opentelemetry.io/otel/trace v1.28.0 - golang.org/x/net v0.26.0 + golang.org/x/net v0.28.0 google.golang.org/api v0.169.0 ) @@ -195,7 +197,7 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/quic-go/qtls-go1-20 v0.4.1 // indirect - github.com/quic-go/quic-go v0.40.0 // indirect + github.com/quic-go/quic-go v0.52.0 // indirect github.com/refraction-networking/water v0.7.0-alpha // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect diff --git a/go.sum b/go.sum index f123a986..e8527135 100644 --- a/go.sum +++ b/go.sum @@ -305,6 +305,8 @@ github.com/getlantern/psmux v1.5.15 h1:VUCEk8MIsvAj90wNYRyY2fE9ZL4LIRhi1W5V9aycA github.com/getlantern/psmux v1.5.15/go.mod h1:nyp/sr4uTbWpUh7Q2WovRb07LeLNUxDg8kAdS726FIw= github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970 h1:ekTCi+m1TvUceBCT/6qz3/7fnljyytGW8waUW7dGQD4= github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970/go.mod h1:PEDykM1SIU8PTVRrShJ9/WVb/uBpGyl4XBgT+LKw+X4= +github.com/getlantern/quicwrapper v0.0.0-20250606185317-bfdf6ce90356 h1:MtlG2ZdDXDgPLKeBhc/SfVH2MF43E8bDxblLB4nqqKM= +github.com/getlantern/quicwrapper v0.0.0-20250606185317-bfdf6ce90356/go.mod h1:GGvihiSjHgzXT5s6DvJgz87oDJdvKcPE2IWqXHUiY24= github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7 h1:47FJ5kTeXc3I1VPpi2hWW9I16/Y3K0cpUq/B7oWJGF8= github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7/go.mod h1:OOqKCIkspqXtIWEex4uhH1H9l7NGekT9i3Hs591ZDk4= github.com/getlantern/sing-vmess v0.0.0-20241209111030-0f2c02b4eb9a h1:EaWmH5vANbKEXCdfgTChyEpWWwLsSrLPKqO6j0h+IB8= @@ -622,6 +624,8 @@ github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5 github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= github.com/quic-go/quic-go v0.40.0 h1:GYd1iznlKm7dpHD7pOVpUvItgMPo/jrMgDWZhMCecqw= github.com/quic-go/quic-go v0.40.0/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c= +github.com/quic-go/quic-go v0.52.0 h1:/SlHrCRElyaU6MaEPKqKr9z83sBg2v4FLLvWM+Z47pA= +github.com/quic-go/quic-go v0.52.0/go.mod h1:MFlGGpcpJqRAfmYi6NC2cptDPSxRWTOGNuP4wqrWmzQ= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM= github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= @@ -839,6 +843,8 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= From 49d176a607c8d26cba7aa2153873f470fee5be79 Mon Sep 17 00:00:00 2001 From: garmr Date: Fri, 6 Jun 2025 12:37:38 -0700 Subject: [PATCH 2/3] update golang image in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 98942af4..cc45d379 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM --platform=$BUILDPLATFORM golang:1.24-alpine as builder +FROM --platform=$BUILDPLATFORM golang:1.24.2-alpine as builder ARG TARGETOS TARGETARCH WORKDIR $GOPATH/src/getlantern/http-proxy-lantern/ From 934802ffb8ead31ab89e884d41df006bc0d9c432 Mon Sep 17 00:00:00 2001 From: garmr Date: Fri, 6 Jun 2025 12:58:42 -0700 Subject: [PATCH 3/3] remove toolchain directive from go.mod --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 91ad3ef5..428b4443 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/getlantern/http-proxy-lantern/v2 go 1.24.2 -toolchain go1.24.4 - require ( cloud.google.com/go/errorreporting v0.3.0 git.torproject.org/pluggable-transports/goptlib.git v1.2.0