Skip to content

Commit 7d13811

Browse files
authored
Merge pull request #654 to bring back Unbounded And TLS files
2 parents f44ae6a + f064fab commit 7d13811

11 files changed

Lines changed: 163 additions & 136 deletions

File tree

broflake/broflake.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ import (
88
)
99

1010
func Wrap(ll net.Listener, certPEM string, keyPEM string) (net.Listener, error) {
11-
return egress.NewListener(context.Background(), ll, certPEM, keyPEM)
11+
return egress.NewWebSocketListener(context.Background(), ll, certPEM, keyPEM)
1212
}

common/headers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ const (
4444
ThrottleSettings = "throttle_settings"
4545
TimeZone = "time_zone"
4646
SupportedDataCaps = "supported_data_caps"
47+
UnboundedTeamId = "unbounded_team_id"
4748
)

go.mod

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/getlantern/http-proxy-lantern/v2
22

3-
go 1.22.9
3+
go 1.24.2
44

55
require (
66
cloud.google.com/go/errorreporting v0.3.0
@@ -10,7 +10,7 @@ require (
1010
github.com/OperatorFoundation/Replicant-go/Replicant/v3 v3.0.23
1111
github.com/OperatorFoundation/Starbridge-go/Starbridge/v3 v3.0.17
1212
github.com/dustin/go-humanize v1.0.1
13-
github.com/getlantern/broflake v0.0.0-20231117182649-7d46643a6f87
13+
github.com/getlantern/broflake v0.0.0-20250515135912-b53a6690f363
1414
github.com/getlantern/cmux/v2 v2.0.0-20230301223233-dac79088a4c0
1515
github.com/getlantern/cmuxprivate v0.0.0-20211216020409-d29d0d38be54
1616
github.com/getlantern/enhttp v0.0.0-20210901195634-6f89d45ee033
@@ -36,7 +36,7 @@ require (
3636
github.com/getlantern/packetforward v0.0.0-20201001150407-c68a447b0360
3737
github.com/getlantern/proxy/v3 v3.0.0-20240328103708-9185589b6a99
3838
github.com/getlantern/psmux v1.5.15
39-
github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970
39+
github.com/getlantern/quicwrapper v0.0.0-20250417060014-acb01527c4c2
4040
github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7
4141
github.com/getlantern/sing-vmess v0.0.0-20241209111030-0f2c02b4eb9a
4242
github.com/getlantern/tinywss v0.0.0-20211216020538-c10008a7d461
@@ -66,7 +66,7 @@ require (
6666
go.opentelemetry.io/otel/sdk v1.28.0
6767
go.opentelemetry.io/otel/sdk/metric v1.28.0
6868
go.opentelemetry.io/otel/trace v1.28.0
69-
golang.org/x/net v0.26.0
69+
golang.org/x/net v0.35.0
7070
google.golang.org/api v0.169.0
7171
)
7272

@@ -108,6 +108,7 @@ require (
108108
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
109109
github.com/cespare/xxhash/v2 v2.2.0 // indirect
110110
github.com/cloudflare/circl v1.3.7 // indirect
111+
github.com/coder/websocket v1.8.12 // indirect
111112
github.com/davecgh/go-spew v1.1.1 // indirect
112113
github.com/dchest/siphash v1.2.3 // indirect
113114
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -172,30 +173,31 @@ require (
172173
github.com/oschwald/maxminddb-golang v1.11.0 // indirect
173174
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
174175
github.com/pierrec/lz4/v4 v4.1.14 // indirect
175-
github.com/pion/datachannel v1.5.5 // indirect
176-
github.com/pion/dtls/v2 v2.2.7 // indirect
177-
github.com/pion/ice/v2 v2.3.5 // indirect
178-
github.com/pion/interceptor v0.1.17 // indirect
176+
github.com/pion/datachannel v1.5.8 // indirect
177+
github.com/pion/dtls/v2 v2.2.12 // indirect
178+
github.com/pion/ice/v2 v2.3.36 // indirect
179+
github.com/pion/interceptor v0.1.29 // indirect
179180
github.com/pion/logging v0.2.2 // indirect
180-
github.com/pion/mdns v0.0.7 // indirect
181+
github.com/pion/mdns v0.0.12 // indirect
181182
github.com/pion/randutil v0.1.0 // indirect
182-
github.com/pion/rtcp v1.2.10 // indirect
183-
github.com/pion/rtp v1.7.13 // indirect
184-
github.com/pion/sctp v1.8.7 // indirect
185-
github.com/pion/sdp/v3 v3.0.6 // indirect
186-
github.com/pion/srtp/v2 v2.0.15 // indirect
187-
github.com/pion/stun v0.6.0 // indirect
188-
github.com/pion/transport/v2 v2.2.1 // indirect
189-
github.com/pion/turn/v2 v2.1.0 // indirect
190-
github.com/pion/webrtc/v3 v3.2.6 // indirect
183+
github.com/pion/rtcp v1.2.14 // indirect
184+
github.com/pion/rtp v1.8.7 // indirect
185+
github.com/pion/sctp v1.8.19 // indirect
186+
github.com/pion/sdp/v3 v3.0.9 // indirect
187+
github.com/pion/srtp/v2 v2.0.20 // indirect
188+
github.com/pion/stun v0.6.1 // indirect
189+
github.com/pion/transport/v2 v2.2.10 // indirect
190+
github.com/pion/turn/v2 v2.1.6 // indirect
191+
github.com/pion/webrtc/v3 v3.3.4 // indirect
191192
github.com/pkg/errors v0.9.1 // indirect
192193
github.com/pmezard/go-difflib v1.0.0 // indirect
193194
github.com/prometheus/client_golang v1.19.1 // indirect
194195
github.com/prometheus/client_model v0.5.0 // indirect
195196
github.com/prometheus/common v0.48.0 // indirect
196197
github.com/prometheus/procfs v0.12.0 // indirect
197-
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
198-
github.com/quic-go/quic-go v0.40.0 // indirect
198+
github.com/quic-go/qpack v0.5.1 // indirect
199+
github.com/quic-go/quic-go v0.50.1 // indirect
200+
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
199201
github.com/refraction-networking/water v0.7.0-alpha // indirect
200202
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
201203
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
@@ -213,6 +215,7 @@ require (
213215
github.com/tklauser/numcpus v0.3.0 // indirect
214216
github.com/ulikunitz/xz v0.5.11 // indirect
215217
github.com/vishvananda/netns v0.0.4 // indirect
218+
github.com/wlynxg/anet v0.0.3 // indirect
216219
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
217220
github.com/yusufpapurcu/wmi v1.2.2 // indirect
218221
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb // indirect
@@ -225,13 +228,13 @@ require (
225228
go.uber.org/mock v0.5.0 // indirect
226229
go.uber.org/multierr v1.8.0 // indirect
227230
go.uber.org/zap v1.21.0 // indirect
228-
golang.org/x/crypto v0.29.0 // indirect
229-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
231+
golang.org/x/crypto v0.33.0 // indirect
232+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
230233
golang.org/x/mod v0.18.0 // indirect
231234
golang.org/x/oauth2 v0.20.0 // indirect
232-
golang.org/x/sync v0.9.0 // indirect
233-
golang.org/x/sys v0.27.0 // indirect
234-
golang.org/x/text v0.20.0 // indirect
235+
golang.org/x/sync v0.11.0 // indirect
236+
golang.org/x/sys v0.30.0 // indirect
237+
golang.org/x/text v0.22.0 // indirect
235238
golang.org/x/time v0.5.0 // indirect
236239
golang.org/x/tools v0.22.0 // indirect
237240
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect

0 commit comments

Comments
 (0)