Skip to content

Commit 62ddc2d

Browse files
committed
bump lantern box
1 parent 80b2fca commit 62ddc2d

3 files changed

Lines changed: 869 additions & 183 deletions

File tree

common/singbox.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package common
22

33
import (
4-
"context"
54
"encoding/base64"
65
"fmt"
76
"math/rand/v2"
@@ -11,8 +10,7 @@ import (
1110
"path"
1211

1312
"github.com/charmbracelet/log"
14-
box "github.com/sagernet/sing-box"
15-
"github.com/sagernet/sing-box/include"
13+
box "github.com/getlantern/lantern-box"
1614
"github.com/sagernet/sing-box/option"
1715
"github.com/sagernet/sing/common"
1816
singJson "github.com/sagernet/sing/common/json"
@@ -29,7 +27,7 @@ func ReadSingBoxServerConfig(dataDir string) (*option.Options, error) {
2927
if err != nil {
3028
return nil, err
3129
}
32-
globalCtx := box.Context(context.Background(), include.InboundRegistry(), include.OutboundRegistry(), include.EndpointRegistry())
30+
globalCtx := box.BaseContext()
3331

3432
opt, err := singJson.UnmarshalExtendedContext[option.Options](globalCtx, data)
3533
if err != nil {
@@ -252,7 +250,7 @@ func ValidateSingBoxConfig(dataDir string) error {
252250
// Otherwise, it assumes systemd is available and uses `systemctl restart sing-box`.
253251
var noSystemd = os.Getenv("NO_SYSTEMD") != ""
254252

255-
const SingBoxExe = "sing-box-extensions"
253+
const SingBoxExe = "lantern-box"
256254

257255
// RestartSingBox restarts the sing-box service.
258256
// It either uses `systemctl restart sing-box` or, if noSystemd is true,

go.mod

Lines changed: 175 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,231 @@
11
module github.com/getlantern/lantern-server-manager
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
github.com/alexflint/go-arg v1.5.1
77
github.com/charmbracelet/log v0.4.1
8+
github.com/getlantern/lantern-box v0.0.51
89
github.com/go-acme/lego/v4 v4.31.0
910
github.com/golang-jwt/jwt/v5 v5.3.0
1011
github.com/mdp/qrterminal/v3 v3.2.1
1112
github.com/mroth/jitter v0.1.1
12-
github.com/sagernet/sing v0.6.9
13-
github.com/sagernet/sing-box v1.11.5
13+
github.com/sagernet/sing v0.7.18
14+
github.com/sagernet/sing-box v1.12.22
1415
github.com/sethvargo/go-password v0.3.1
1516
)
1617

1718
require (
19+
filippo.io/edwards25519 v1.1.0 // indirect
20+
github.com/RoaringBitmap/roaring v1.2.3 // indirect
1821
github.com/ajg/form v1.5.1 // indirect
22+
github.com/akutz/memconn v0.1.0 // indirect
23+
github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
24+
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
1925
github.com/alexflint/go-scalar v1.2.0 // indirect
20-
github.com/andybalholm/brotli v1.0.6 // indirect
26+
github.com/anacrolix/btree v0.0.0-20251201064447-d86c3fa41bd8 // indirect
27+
github.com/anacrolix/chansync v0.7.0 // indirect
28+
github.com/anacrolix/dht/v2 v2.23.0 // indirect
29+
github.com/anacrolix/envpprof v1.4.0 // indirect
30+
github.com/anacrolix/generics v0.1.1-0.20251125230353-15d98d46693b // indirect
31+
github.com/anacrolix/go-libutp v1.3.2 // indirect
32+
github.com/anacrolix/log v0.17.1-0.20251118025802-918f1157b7bb // indirect
33+
github.com/anacrolix/missinggo v1.3.0 // indirect
34+
github.com/anacrolix/missinggo/perf v1.0.0 // indirect
35+
github.com/anacrolix/missinggo/v2 v2.10.0 // indirect
36+
github.com/anacrolix/mmsg v1.0.1 // indirect
37+
github.com/anacrolix/multiless v0.4.0 // indirect
38+
github.com/anacrolix/stm v0.5.0 // indirect
39+
github.com/anacrolix/sync v0.5.5-0.20251119100342-d78dd1f686f1 // indirect
40+
github.com/anacrolix/torrent v1.61.0 // indirect
41+
github.com/anacrolix/upnp v0.1.4 // indirect
42+
github.com/anacrolix/utp v0.1.0 // indirect
43+
github.com/andybalholm/brotli v1.2.0 // indirect
44+
github.com/anytls/sing-anytls v0.0.11 // indirect
2145
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
22-
github.com/caddyserver/certmagic v0.20.0 // indirect
46+
github.com/bahlo/generic-list-go v0.2.0 // indirect
47+
github.com/benbjohnson/immutable v0.4.1-0.20221220213129-8932b999621d // indirect
48+
github.com/bits-and-blooms/bitset v1.13.0 // indirect
49+
github.com/blang/vfs v1.0.0 // indirect
50+
github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
51+
github.com/caddyserver/certmagic v0.23.0 // indirect
52+
github.com/caddyserver/zerossl v0.1.3 // indirect
2353
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
54+
github.com/cespare/xxhash v1.1.0 // indirect
55+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2456
github.com/charmbracelet/lipgloss v1.0.0 // indirect
2557
github.com/charmbracelet/x/ansi v0.4.2 // indirect
26-
github.com/cloudflare/circl v1.6.2 // indirect
58+
github.com/coder/websocket v1.8.13 // indirect
59+
github.com/coreos/go-iptables v0.7.1-0.20240112124308-65c67c9f46e6 // indirect
2760
github.com/cretz/bine v0.2.0 // indirect
61+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
62+
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
63+
github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect
64+
github.com/dustin/go-humanize v1.0.0 // indirect
65+
github.com/edsrzf/mmap-go v1.1.0 // indirect
2866
github.com/fsnotify/fsnotify v1.9.0 // indirect
67+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
68+
github.com/gaissmai/bart v0.11.1 // indirect
69+
github.com/gaukas/wazerofs v0.1.0 // indirect
70+
github.com/getlantern/algeneva v0.0.0-20250307163401-1824e7b54f52 // indirect
71+
github.com/getlantern/lantern-water v0.0.0-20260317143726-e0ee64a11d90 // indirect
72+
github.com/getlantern/samizdat v0.0.3-0.20260310125445-325cf1bd1b60 // indirect
2973
github.com/go-chi/chi/v5 v5.2.2 // indirect
3074
github.com/go-chi/render v1.0.3 // indirect
3175
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
76+
github.com/go-json-experiment/json v0.0.0-20250103232110-6a9a0fde9288 // indirect
77+
github.com/go-llsqlite/adapter v0.0.0-20230927005056-7f5ce7f0c916 // indirect
78+
github.com/go-llsqlite/crawshaw v0.5.6-0.20250312230104-194977a03421 // indirect
3279
github.com/go-logfmt/logfmt v0.6.0 // indirect
80+
github.com/go-logr/logr v1.4.3 // indirect
81+
github.com/go-logr/stdr v1.2.2 // indirect
3382
github.com/go-ole/go-ole v1.3.0 // indirect
34-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3583
github.com/gobwas/httphead v0.1.0 // indirect
3684
github.com/gobwas/pool v0.2.1 // indirect
85+
github.com/gobwas/ws v1.4.0 // indirect
86+
github.com/goccy/go-yaml v1.19.0 // indirect
87+
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
3788
github.com/gofrs/uuid/v5 v5.3.2 // indirect
89+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3890
github.com/google/btree v1.1.3 // indirect
3991
github.com/google/go-cmp v0.7.0 // indirect
40-
github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
92+
github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806 // indirect
93+
github.com/google/uuid v1.6.0 // indirect
94+
github.com/gorilla/csrf v1.7.3-0.20250123201450-9dd6af1f6d30 // indirect
95+
github.com/gorilla/securecookie v1.1.2 // indirect
96+
github.com/gorilla/websocket v1.5.3 // indirect
4197
github.com/hashicorp/yamux v0.1.2 // indirect
42-
github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 // indirect
43-
github.com/josharian/native v1.1.0 // indirect
44-
github.com/klauspost/compress v1.17.4 // indirect
45-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
46-
github.com/libdns/alidns v1.0.3 // indirect
47-
github.com/libdns/cloudflare v0.1.1 // indirect
48-
github.com/libdns/libdns v0.2.2 // indirect
98+
github.com/hdevalence/ed25519consensus v0.2.0 // indirect
99+
github.com/huandu/xstrings v1.3.2 // indirect
100+
github.com/illarion/gonotify/v2 v2.0.3 // indirect
101+
github.com/insomniacslk/dhcp v0.0.0-20250417080101-5f8cf70e8c5f // indirect
102+
github.com/jsimonetti/rtnetlink v1.4.0 // indirect
103+
github.com/klauspost/compress v1.18.2 // indirect
104+
github.com/klauspost/cpuid/v2 v2.2.11 // indirect
105+
github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a // indirect
106+
github.com/libdns/alidns v1.0.5-libdns.v1.beta1 // indirect
107+
github.com/libdns/cloudflare v0.2.2-0.20250708034226-c574dccb31a6 // indirect
108+
github.com/libdns/libdns v1.1.0 // indirect
49109
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
50110
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
51111
github.com/mattn/go-isatty v0.0.20 // indirect
52-
github.com/mdlayher/netlink v1.7.2 // indirect
53-
github.com/mdlayher/socket v0.4.1 // indirect
54-
github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 // indirect
55-
github.com/mholt/acmez v1.2.0 // indirect
112+
github.com/mdlayher/genetlink v1.3.2 // indirect
113+
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 // indirect
114+
github.com/mdlayher/sdnotify v1.0.0 // indirect
115+
github.com/mdlayher/socket v0.5.1 // indirect
116+
github.com/metacubex/tfo-go v0.0.0-20250921095601-b102db4216c0 // indirect
117+
github.com/metacubex/utls v1.8.4 // indirect
118+
github.com/mholt/acmez/v3 v3.1.2 // indirect
56119
github.com/miekg/dns v1.1.69 // indirect
120+
github.com/minio/sha256-simd v1.0.0 // indirect
121+
github.com/mitchellh/go-ps v1.0.0 // indirect
122+
github.com/mr-tron/base58 v1.2.0 // indirect
123+
github.com/mschoch/smat v0.2.0 // indirect
57124
github.com/muesli/termenv v0.16.0 // indirect
58-
github.com/onsi/ginkgo/v2 v2.9.7 // indirect
59-
github.com/oschwald/maxminddb-golang v1.12.0 // indirect
60-
github.com/pierrec/lz4/v4 v4.1.14 // indirect
61-
github.com/quic-go/qpack v0.4.0 // indirect
62-
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
125+
github.com/multiformats/go-multihash v0.2.3 // indirect
126+
github.com/multiformats/go-varint v0.0.6 // indirect
127+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
128+
github.com/pion/datachannel v1.5.10 // indirect
129+
github.com/pion/dtls/v3 v3.0.4 // indirect
130+
github.com/pion/ice/v4 v4.0.7 // indirect
131+
github.com/pion/interceptor v0.1.40 // indirect
132+
github.com/pion/logging v0.2.3 // indirect
133+
github.com/pion/mdns/v2 v2.0.7 // indirect
134+
github.com/pion/randutil v0.1.0 // indirect
135+
github.com/pion/rtcp v1.2.15 // indirect
136+
github.com/pion/rtp v1.8.18 // indirect
137+
github.com/pion/sctp v1.8.37 // indirect
138+
github.com/pion/sdp/v3 v3.0.11 // indirect
139+
github.com/pion/srtp/v3 v3.0.4 // indirect
140+
github.com/pion/stun/v3 v3.0.0 // indirect
141+
github.com/pion/transport/v3 v3.0.7 // indirect
142+
github.com/pion/turn/v4 v4.0.0 // indirect
143+
github.com/pion/webrtc/v4 v4.0.13 // indirect
144+
github.com/pkg/errors v0.9.1 // indirect
145+
github.com/prometheus-community/pro-bing v0.4.0 // indirect
146+
github.com/protolambda/ctxlock v0.1.0 // indirect
147+
github.com/quic-go/qpack v0.5.1 // indirect
148+
github.com/refraction-networking/utls v1.8.2 // indirect
149+
github.com/refraction-networking/water v0.7.1-alpha // indirect
150+
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
63151
github.com/rivo/uniseg v0.4.7 // indirect
152+
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
153+
github.com/safchain/ethtool v0.3.0 // indirect
64154
github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
65-
github.com/sagernet/cloudflare-tls v0.0.0-20231208171750-a4483c1b7cd1 // indirect
66155
github.com/sagernet/cors v1.2.1 // indirect
67156
github.com/sagernet/fswatch v0.1.1 // indirect
68-
github.com/sagernet/gvisor v0.0.0-20241123041152-536d05261cff // indirect
157+
github.com/sagernet/gvisor v0.0.0-20250325023245-7a9c0f5725fb // indirect
69158
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
70159
github.com/sagernet/nftables v0.3.0-beta.4 // indirect
71-
github.com/sagernet/quic-go v0.49.0-beta.1 // indirect
72-
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 // indirect
73-
github.com/sagernet/sing-dns v0.4.1 // indirect
74-
github.com/sagernet/sing-mux v0.3.1 // indirect
75-
github.com/sagernet/sing-quic v0.4.1 // indirect
76-
github.com/sagernet/sing-shadowsocks v0.2.7 // indirect
77-
github.com/sagernet/sing-shadowsocks2 v0.2.0 // indirect
78-
github.com/sagernet/sing-shadowtls v0.2.0 // indirect
79-
github.com/sagernet/sing-tun v0.6.1 // indirect
80-
github.com/sagernet/sing-vmess v0.2.0 // indirect
81-
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
82-
github.com/sagernet/utls v1.6.7 // indirect
83-
github.com/sagernet/wireguard-go v0.0.1-beta.5 // indirect
160+
github.com/sagernet/quic-go v0.52.0-sing-box-mod.3 // indirect
161+
github.com/sagernet/sing-mux v0.3.4 // indirect
162+
github.com/sagernet/sing-quic v0.5.3 // indirect
163+
github.com/sagernet/sing-shadowsocks v0.2.8 // indirect
164+
github.com/sagernet/sing-shadowsocks2 v0.2.1 // indirect
165+
github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11 // indirect
166+
github.com/sagernet/sing-tun v0.7.11 // indirect
167+
github.com/sagernet/sing-vmess v0.2.7 // indirect
168+
github.com/sagernet/smux v1.5.50-sing-box-mod.1 // indirect
169+
github.com/sagernet/tailscale v1.80.3-sing-box-1.12-mod.2 // indirect
170+
github.com/sagernet/wireguard-go v0.0.1-beta.7 // indirect
84171
github.com/sagernet/ws v0.0.0-20231204124109-acfe8907c854 // indirect
85-
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
86-
github.com/vishvananda/netns v0.0.4 // indirect
87-
github.com/zeebo/blake3 v0.2.3 // indirect
172+
github.com/shadowsocks/go-shadowsocks2 v0.1.5 // indirect
173+
github.com/spaolacci/murmur3 v1.1.0 // indirect
174+
github.com/tailscale/certstore v0.1.1-0.20231202035212-d3fa0460f47e // indirect
175+
github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
176+
github.com/tailscale/golang-x-crypto v0.0.0-20240604161659-3fde5e568aa4 // indirect
177+
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
178+
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
179+
github.com/tailscale/netlink v1.1.1-0.20240822203006-4d49adab4de7 // indirect
180+
github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc // indirect
181+
github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976 // indirect
182+
github.com/tetratelabs/wazero v1.11.0 // indirect
183+
github.com/tidwall/btree v1.8.1 // indirect
184+
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
185+
github.com/vishvananda/netns v0.0.5 // indirect
186+
github.com/wlynxg/anet v0.0.5 // indirect
187+
github.com/x448/float16 v0.8.4 // indirect
188+
github.com/zeebo/blake3 v0.2.4 // indirect
189+
go.etcd.io/bbolt v1.3.6 // indirect
190+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
191+
go.opentelemetry.io/otel v1.41.0 // indirect
192+
go.opentelemetry.io/otel/metric v1.41.0 // indirect
193+
go.opentelemetry.io/otel/trace v1.41.0 // indirect
194+
go.uber.org/mock v0.5.0 // indirect
88195
go.uber.org/multierr v1.11.0 // indirect
89196
go.uber.org/zap v1.27.0 // indirect
197+
go.uber.org/zap/exp v0.3.0 // indirect
198+
go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
90199
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
91-
golang.org/x/crypto v0.46.0 // indirect
92-
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
93-
golang.org/x/mod v0.30.0 // indirect
94-
golang.org/x/net v0.48.0 // indirect
200+
golang.getoutline.org/sdk v0.0.21 // indirect
201+
golang.getoutline.org/sdk/x v0.1.0 // indirect
202+
golang.org/x/crypto v0.48.0 // indirect
203+
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 // indirect
204+
golang.org/x/mod v0.32.0 // indirect
205+
golang.org/x/net v0.50.0 // indirect
95206
golang.org/x/sync v0.19.0 // indirect
96-
golang.org/x/sys v0.39.0 // indirect
97-
golang.org/x/term v0.38.0 // indirect
98-
golang.org/x/text v0.32.0 // indirect
207+
golang.org/x/sys v0.41.0 // indirect
208+
golang.org/x/term v0.40.0 // indirect
209+
golang.org/x/text v0.34.0 // indirect
99210
golang.org/x/time v0.14.0 // indirect
100-
golang.org/x/tools v0.39.0 // indirect
211+
golang.org/x/tools v0.41.0 // indirect
101212
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
102-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
103-
google.golang.org/grpc v1.78.0 // indirect
213+
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
214+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
215+
google.golang.org/grpc v1.79.2 // indirect
104216
google.golang.org/protobuf v1.36.11 // indirect
217+
gopkg.in/yaml.v3 v3.0.1 // indirect
105218
lukechampine.com/blake3 v1.3.0 // indirect
219+
modernc.org/libc v1.22.3 // indirect
220+
modernc.org/mathutil v1.5.0 // indirect
221+
modernc.org/memory v1.5.0 // indirect
222+
modernc.org/sqlite v1.21.1 // indirect
106223
rsc.io/qr v0.2.0 // indirect
224+
zombiezen.com/go/sqlite v0.13.1 // indirect
107225
)
108226

109-
replace github.com/sagernet/sing-box => github.com/getlantern/sing-box-minimal v1.11.6-0.20250411182257-639652d5e1c6
227+
replace github.com/sagernet/sing => github.com/getlantern/sing v0.7.18-lantern
228+
229+
replace github.com/sagernet/sing-box => github.com/getlantern/sing-box-minimal v1.12.19-lantern
230+
231+
replace github.com/tetratelabs/wazero => github.com/refraction-networking/wazero v1.7.1-w

0 commit comments

Comments
 (0)