From 83fc8d450806d36d6c1dd9fa1db17c0874d599fe Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:16:20 +0900 Subject: [PATCH] clean up code --- go/cmd/nekobox_core/go.mod | 24 ++-- go/cmd/nekobox_core/go.sum | 48 +++---- go/cmd/nekoray_core/go.mod | 3 - go/cmd/nekoray_core/go.sum | 9 -- go/cmd/nekoray_core/import.go | 2 - go/cmd/nekoray_core/v2ray_sip/args.go | 117 ------------------ .../v2ray_sip/errors.generated.go | 17 --- go/cmd/nekoray_core/v2ray_sip/sip_obfs.go | 64 ---------- go/cmd/nekoray_core/v2ray_sip/sip_ssr.go | 113 ----------------- libs/get_source_env.sh | 4 +- 10 files changed, 38 insertions(+), 363 deletions(-) delete mode 100644 go/cmd/nekoray_core/v2ray_sip/args.go delete mode 100644 go/cmd/nekoray_core/v2ray_sip/errors.generated.go delete mode 100644 go/cmd/nekoray_core/v2ray_sip/sip_obfs.go delete mode 100644 go/cmd/nekoray_core/v2ray_sip/sip_ssr.go diff --git a/go/cmd/nekobox_core/go.mod b/go/cmd/nekobox_core/go.mod index fea9e4f..2fa9a86 100644 --- a/go/cmd/nekobox_core/go.mod +++ b/go/cmd/nekobox_core/go.mod @@ -12,8 +12,8 @@ require ( require ( berty.tech/go-libtor v1.0.385 // indirect - github.com/Dreamacro/clash v1.16.0 // indirect - github.com/Dreamacro/protobytes v0.0.0-20230324064118-87bc784139cd // indirect + github.com/Dreamacro/clash v1.17.0 // indirect + github.com/Dreamacro/protobytes v0.0.0-20230617041236-6500a9f4f158 // indirect github.com/ajg/form v1.5.1 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/caddyserver/certmagic v0.18.2 // indirect @@ -56,14 +56,14 @@ require ( github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect github.com/sagernet/quic-go v0.0.0-20230615020047-10f05c797c02 // indirect github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 // indirect - github.com/sagernet/sing v0.2.7 // indirect - github.com/sagernet/sing-dns v0.1.6 // indirect - github.com/sagernet/sing-mux v0.1.0 // indirect - github.com/sagernet/sing-shadowsocks v0.2.2 // indirect - github.com/sagernet/sing-shadowsocks2 v0.1.1 // indirect - github.com/sagernet/sing-shadowtls v0.1.2 // indirect - github.com/sagernet/sing-tun v0.1.8 // indirect - github.com/sagernet/sing-vmess v0.1.6 // indirect + github.com/sagernet/sing v0.2.8-0.20230707055657-7c9b4d624da7 // indirect + github.com/sagernet/sing-dns v0.1.7-0.20230703131656-fd65b6178bf9 // indirect + github.com/sagernet/sing-mux v0.1.1-0.20230703132253-2cedde0fbc90 // indirect + github.com/sagernet/sing-shadowsocks v0.2.3-0.20230703131347-b044960bd355 // indirect + github.com/sagernet/sing-shadowsocks2 v0.1.2-0.20230703131506-ca0c6adde968 // indirect + github.com/sagernet/sing-shadowtls v0.1.3-0.20230703132509-93bbad3057e4 // indirect + github.com/sagernet/sing-tun v0.1.9-0.20230703134424-fd850d00e5cd // indirect + github.com/sagernet/sing-vmess v0.1.7-0.20230703132834-48803e0fd8af // indirect github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37 // indirect github.com/sagernet/tfo-go v0.0.0-20230303015439-ffcfd8c41cf9 // indirect github.com/sagernet/utls v0.0.0-20230309024959-6732c2ab36f2 // indirect @@ -80,7 +80,7 @@ require ( go.uber.org/zap v1.24.0 // indirect go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 // indirect golang.org/x/crypto v0.10.0 // indirect - golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect + golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.11.0 // indirect golang.org/x/sys v0.9.0 // indirect @@ -90,7 +90,7 @@ require ( golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect google.golang.org/grpc v1.56.1 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect lukechampine.com/blake3 v1.2.1 // indirect ) diff --git a/go/cmd/nekobox_core/go.sum b/go/cmd/nekobox_core/go.sum index 0a76e8f..d70b423 100644 --- a/go/cmd/nekobox_core/go.sum +++ b/go/cmd/nekobox_core/go.sum @@ -5,10 +5,10 @@ cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Dreamacro/clash v1.16.0 h1:Ve+8mvtsCv7ySa6f53/GOW6Tho0AFp5RNFsgQZFKcZs= -github.com/Dreamacro/clash v1.16.0/go.mod h1:ZM3UI2gqqUN7UL7L/F9aTHODTByya6sbC/WivQpaoJk= -github.com/Dreamacro/protobytes v0.0.0-20230324064118-87bc784139cd h1:ygk7IF14j4ep4H2ZyeDe3IEoMZF8JdbX851RVVa/4D8= -github.com/Dreamacro/protobytes v0.0.0-20230324064118-87bc784139cd/go.mod h1:QvmEZ/h6KXszPOr2wUFl7Zn3hfFNYdfbXwPVDTyZs6k= +github.com/Dreamacro/clash v1.17.0 h1:LWtp6KcnrCiujY58ufI8pylI+hbCBgSCsLI90EWhpi4= +github.com/Dreamacro/clash v1.17.0/go.mod h1:PtcAft7sdsK325BD6uwm8wvhOkMV3TCeED6dfZ/lnfE= +github.com/Dreamacro/protobytes v0.0.0-20230617041236-6500a9f4f158 h1:JFnwKplz9hj8ubqYjm8HkgZS1Rvz9yW+u/XCNNTxr0k= +github.com/Dreamacro/protobytes v0.0.0-20230617041236-6500a9f4f158/go.mod h1:QvmEZ/h6KXszPOr2wUFl7Zn3hfFNYdfbXwPVDTyZs6k= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= @@ -139,22 +139,22 @@ github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byL github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU= github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY= github.com/sagernet/sing v0.1.8/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk= -github.com/sagernet/sing v0.2.7 h1:cOy0FfPS8q7m0aJ51wS7LRQAGc9wF+fWhHtBDj99wy8= -github.com/sagernet/sing v0.2.7/go.mod h1:Ta8nHnDLAwqySzKhGoKk4ZIB+vJ3GTKj7UPrWYvM+4w= -github.com/sagernet/sing-dns v0.1.6 h1:qQRxmtUjCYkRLyzkTHpBvZQeAMeKpZwYsBOcs4U7gns= -github.com/sagernet/sing-dns v0.1.6/go.mod h1:DY3LYJXIsM/kezUIJxf2TwBzqTTQAepi2KgazkDfahA= -github.com/sagernet/sing-mux v0.1.0 h1:xihlDRNs1J+hYwmvW9/ZmaghjDx7O0Y5dty0pOLQGB4= -github.com/sagernet/sing-mux v0.1.0/go.mod h1:i3jKjV4pRTFTV/ly5V3oa2JMPy0SAZ5X8X4tDU9Hw94= -github.com/sagernet/sing-shadowsocks v0.2.2 h1:ezSdVhrmIcwDXmCZF3bOJVMuVtTQWpda+1Op+Ie2TA4= -github.com/sagernet/sing-shadowsocks v0.2.2/go.mod h1:JIBWG6a7orB2HxBxYElViQFLUQxFVG7DuqIj8gD7uCQ= -github.com/sagernet/sing-shadowsocks2 v0.1.1 h1:/cZteeSFXyHKg0uOparIFNj8hHrV8F2rRzTm8arpBTs= -github.com/sagernet/sing-shadowsocks2 v0.1.1/go.mod h1:p18C731ogLED66ZgC1SNYMOXAOxJIRwcTSUk73q/rsc= -github.com/sagernet/sing-shadowtls v0.1.2 h1:wkPf4gF+cmaP0cIbArpyq+mc6GcwbMx60CssmmhEQ0s= -github.com/sagernet/sing-shadowtls v0.1.2/go.mod h1:rTxhbSY8jGWZOWjdeOe1vP3E+hkgen8aRA2p7YccM88= -github.com/sagernet/sing-tun v0.1.8 h1:nc5mAdsYVB5TAv0UI0DaZJrd+sOv+HVf6V5B6XfJgSI= -github.com/sagernet/sing-tun v0.1.8/go.mod h1:Vj0AcDoneVIYMx8QujpXs2NQJ5Byc0FPhnRj5V3RGdo= -github.com/sagernet/sing-vmess v0.1.6 h1:u9VhPNMP0u1vaEjWRWitJQ4KKYPhTF0rorpAlQZcFBg= -github.com/sagernet/sing-vmess v0.1.6/go.mod h1:XYXpk405G+kxRMNfREhROJsBxh1ccHy1v/fWSV5lx38= +github.com/sagernet/sing v0.2.8-0.20230707055657-7c9b4d624da7 h1:sKQu4Gc6vMfzleoFK3h8ROfn/TP2U36qQME3/iYaoqA= +github.com/sagernet/sing v0.2.8-0.20230707055657-7c9b4d624da7/go.mod h1:Ta8nHnDLAwqySzKhGoKk4ZIB+vJ3GTKj7UPrWYvM+4w= +github.com/sagernet/sing-dns v0.1.7-0.20230703131656-fd65b6178bf9 h1:35qe74ygIKj5uQkDDD0Xtv+iWOspQsS/Lqhs2XiY0Ak= +github.com/sagernet/sing-dns v0.1.7-0.20230703131656-fd65b6178bf9/go.mod h1:wgmbh0yruJXRO8tmfwPx6hOl6pyReWRoeHdkRehWkmw= +github.com/sagernet/sing-mux v0.1.1-0.20230703132253-2cedde0fbc90 h1:aEe2HrRc9OTS7IZ8RHyh224OhltnwRQs4/y89UsHPo8= +github.com/sagernet/sing-mux v0.1.1-0.20230703132253-2cedde0fbc90/go.mod h1:sm126rB5EUi9HLf4jCSHTqo+XRPbh4BoEVeLbr2WRbE= +github.com/sagernet/sing-shadowsocks v0.2.3-0.20230703131347-b044960bd355 h1:XOgNZYnkDrx5qtNS4kqIOHMhjZuc7mJ2pY/x3EyZX8Q= +github.com/sagernet/sing-shadowsocks v0.2.3-0.20230703131347-b044960bd355/go.mod h1:atEATsxqPo8qCPcFt8Rw7TFEJ70egCoMR7PziX4jmjI= +github.com/sagernet/sing-shadowsocks2 v0.1.2-0.20230703131506-ca0c6adde968 h1:UctXygnZfqsFR+2hZXfpWK3pSYKLbBQMuli9GDE6QU0= +github.com/sagernet/sing-shadowsocks2 v0.1.2-0.20230703131506-ca0c6adde968/go.mod h1:xFxUGbtnqRLxtQftCILFeKf43GE6S83f0I6CsO9BxGE= +github.com/sagernet/sing-shadowtls v0.1.3-0.20230703132509-93bbad3057e4 h1:ZjLyCkEENqXzGp4PRZbQGk5wPzEq0Rg+/2jK82lmy3Q= +github.com/sagernet/sing-shadowtls v0.1.3-0.20230703132509-93bbad3057e4/go.mod h1:8ZSSHJSNOG7cUCUYJemZNH873EsKdFqABykTypoS/2M= +github.com/sagernet/sing-tun v0.1.9-0.20230703134424-fd850d00e5cd h1:lkJA/P1L2XE5lNDnzA2fygx6DZIks3Sx87GN2OE0jNY= +github.com/sagernet/sing-tun v0.1.9-0.20230703134424-fd850d00e5cd/go.mod h1:XNQoXtvsmeva+dADmo/57KktLNgm5ubOyR67Niahqj8= +github.com/sagernet/sing-vmess v0.1.7-0.20230703132834-48803e0fd8af h1:NS433dd7XSieIAiR5cMK6ArhC8ILbXJul48IMLRxqhI= +github.com/sagernet/sing-vmess v0.1.7-0.20230703132834-48803e0fd8af/go.mod h1:HoYH8kt5m1RejF0KSYn+QkZ9Cg4a8LlHnV9ykaeNJu4= github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37 h1:HuE6xSwco/Xed8ajZ+coeYLmioq0Qp1/Z2zczFaV8as= github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37/go.mod h1:3skNSftZDJWTGVtVaM2jfbce8qHnmH/AGDRe62iNOg0= github.com/sagernet/tfo-go v0.0.0-20230303015439-ffcfd8c41cf9 h1:2ItpW1nMNkPzmBTxV0/eClCklHrFSQMnUGcpUmJxVeE= @@ -208,8 +208,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5 golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= +golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -296,8 +296,8 @@ google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/go/cmd/nekoray_core/go.mod b/go/cmd/nekoray_core/go.mod index 0580e0a..bed849c 100644 --- a/go/cmd/nekoray_core/go.mod +++ b/go/cmd/nekoray_core/go.mod @@ -3,7 +3,6 @@ module nekoray_core go 1.19 require ( - github.com/Dreamacro/clash v1.9.0 github.com/jsimonetti/rtnetlink v1.2.2 github.com/matsuridayo/libneko v1.0.0 // replaced github.com/xtls/xray-core v1.0.0 // replaced @@ -12,7 +11,6 @@ require ( ) require ( - github.com/Dreamacro/go-shadowsocks2 v0.1.7 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect github.com/francoispqt/gojay v1.2.13 // indirect @@ -43,7 +41,6 @@ require ( github.com/sagernet/sing-shadowsocks v0.2.2 // indirect github.com/sagernet/wireguard-go v0.0.0-20221116151939-c99467f53f2c // indirect github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect - github.com/sirupsen/logrus v1.8.1 // indirect github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect github.com/xtls/reality v0.0.0-20230613075828-e07c3b04b983 // indirect go.uber.org/atomic v1.11.0 // indirect diff --git a/go/cmd/nekoray_core/go.sum b/go/cmd/nekoray_core/go.sum index 82218c6..fae4bb3 100644 --- a/go/cmd/nekoray_core/go.sum +++ b/go/cmd/nekoray_core/go.sum @@ -11,10 +11,6 @@ dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Dreamacro/clash v1.9.0 h1:IfmPW86Klngu0iQ4LL6Bhxcvtr+QaI7Oppa9qRPX/Q8= -github.com/Dreamacro/clash v1.9.0/go.mod h1:vOzDB9KKD/PirNdSlsH4soMl1xF5lk8SwNQiVY5UacE= -github.com/Dreamacro/go-shadowsocks2 v0.1.7 h1:8CtbE1HoPPMfrQZGXmlluq6dO2lL31W6WRRE8fabc4Q= -github.com/Dreamacro/go-shadowsocks2 v0.1.7/go.mod h1:8p5G4cAj5ZlXwUR+Ww63gfSikr8kvw8uw3TDwLAJpUc= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= @@ -195,8 +191,6 @@ github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go. github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -228,7 +222,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -256,7 +249,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -285,7 +277,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/go/cmd/nekoray_core/import.go b/go/cmd/nekoray_core/import.go index 869f4db..791e6a3 100644 --- a/go/cmd/nekoray_core/import.go +++ b/go/cmd/nekoray_core/import.go @@ -77,6 +77,4 @@ import ( // Load config from file or http(s) _ "github.com/xtls/xray-core/main/confloader/external" - // Custom - // _ "nekoray_core/v2ray_sip" ) diff --git a/go/cmd/nekoray_core/v2ray_sip/args.go b/go/cmd/nekoray_core/v2ray_sip/args.go deleted file mode 100644 index ea77444..0000000 --- a/go/cmd/nekoray_core/v2ray_sip/args.go +++ /dev/null @@ -1,117 +0,0 @@ -package v2ray_sip - -import ( - "bytes" - "fmt" -) - -// Args maps a string key to a list of values. It is similar to url.Values. -type Args map[string][]string - -// Get the first value associated with the given key. If there are any values -// associated with the key, the value return has the value and ok is set to -// true. If there are no values for the given key, value is "" and ok is false. -// If you need access to multiple values, use the map directly. -func (args Args) Get(key string) (value string, ok bool) { - if args == nil { - return "", false - } - vals, ok := args[key] - if !ok || len(vals) == 0 { - return "", false - } - return vals[0], true -} - -// Add Append value to the list of values for key. -func (args Args) Add(key, value string) { - args[key] = append(args[key], value) -} - -// Return the index of the next unescaped byte in s that is in the term set, or -// else the length of the string if no terminators appear. Additionally return -// the unescaped string up to the returned index. -func indexUnescaped(s string, term []byte) (int, string, error) { - var i int - unesc := make([]byte, 0) - for i = 0; i < len(s); i++ { - b := s[i] - // A terminator byte? - if bytes.IndexByte(term, b) != -1 { - break - } - if b == '\\' { - i++ - if i >= len(s) { - return 0, "", fmt.Errorf("nothing following final escape in %q", s) - } - b = s[i] - } - unesc = append(unesc, b) - } - return i, string(unesc), nil -} - -// ParsePluginOptions Parse a name–value mapping as from SS_PLUGIN_OPTIONS. -// -// " is a k=v string value with options that are to be passed to the -// transport. semicolons, equal signs and backslashes must be escaped -// with a backslash." -// Example: secret=nou;cache=/tmp/cache;secret=yes -func ParsePluginOptions(s string) (opts Args, err error) { - opts = make(Args) - if len(s) == 0 { - return - } - i := 0 - for { - var key, value string - var offset, begin int - - if i >= len(s) { - break - } - begin = i - // Read the key. - offset, key, err = indexUnescaped(s[i:], []byte{'=', ';'}) - if err != nil { - return - } - if len(key) == 0 { - err = fmt.Errorf("empty key in %q", s[begin:i]) - return - } - i += offset - // End of string or no equals sign? - if i >= len(s) || s[i] != '=' { - opts.Add(key, "1") - // Skip the semicolon. - i++ - continue - } - // Skip the equals sign. - i++ - // Read the value. - offset, value, err = indexUnescaped(s[i:], []byte{';'}) - if err != nil { - return - } - i += offset - opts.Add(key, value) - // Skip the semicolon. - i++ - } - return opts, nil -} - -// Escape backslashes and all the bytes that are in set. -func backslashEscape(s string, set []byte) string { - var buf bytes.Buffer - for _, b := range []byte(s) { - if b == '\\' || bytes.IndexByte(set, b) != -1 { - buf.WriteByte('\\') - } - buf.WriteByte(b) - } - return buf.String() -} diff --git a/go/cmd/nekoray_core/v2ray_sip/errors.generated.go b/go/cmd/nekoray_core/v2ray_sip/errors.generated.go deleted file mode 100644 index 1066edd..0000000 --- a/go/cmd/nekoray_core/v2ray_sip/errors.generated.go +++ /dev/null @@ -1,17 +0,0 @@ -package v2ray_sip - -import ( - "fmt" - - "github.com/xtls/xray-core/common/errors" -) - -type errPathObjHolder struct{} - -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).WithPathObj(errPathObjHolder{}) -} - -func newErrorf(format string, a ...interface{}) *errors.Error { - return errors.New(fmt.Sprintf(format, a)).WithPathObj(errPathObjHolder{}) -} diff --git a/go/cmd/nekoray_core/v2ray_sip/sip_obfs.go b/go/cmd/nekoray_core/v2ray_sip/sip_obfs.go deleted file mode 100644 index 6cb8829..0000000 --- a/go/cmd/nekoray_core/v2ray_sip/sip_obfs.go +++ /dev/null @@ -1,64 +0,0 @@ -package v2ray_sip - -import ( - "context" - - obfs "github.com/Dreamacro/clash/transport/simple-obfs" - "github.com/xtls/xray-core/proxy/shadowsocks" - "github.com/xtls/xray-core/transport/internet" -) - -var _ shadowsocks.StreamPlugin = (*obfsLocalPlugin)(nil) - -func init() { - shadowsocks.RegisterPlugin("obfs-local", func() shadowsocks.SIP003Plugin { - return new(obfsLocalPlugin) - }) -} - -type obfsLocalPlugin struct { - tls bool - host string - port string -} - -func (p *obfsLocalPlugin) Init(_ context.Context, _ string, _ string, _ string, remotePort string, pluginOpts string, _ []string, _ *shadowsocks.MemoryAccount) error { - options, err := ParsePluginOptions(pluginOpts) - if err != nil { - return newError("obfs-local: failed to parse plugin options").Base(err) - } - - mode := "http" - - if s, ok := options.Get("obfs"); ok { - mode = s - } - - if s, ok := options.Get("obfs-host"); ok { - p.host = s - } - - switch mode { - case "http": - case "tls": - p.tls = true - default: - return newError("unknown obfs mode ", mode) - } - - p.port = remotePort - - return nil -} - -func (p *obfsLocalPlugin) StreamConn(connection internet.Connection) internet.Connection { - if !p.tls { - return obfs.NewHTTPObfs(connection, p.host, p.port) - } else { - return obfs.NewTLSObfs(connection, p.host) - } -} - -func (p *obfsLocalPlugin) Close() error { - return nil -} diff --git a/go/cmd/nekoray_core/v2ray_sip/sip_ssr.go b/go/cmd/nekoray_core/v2ray_sip/sip_ssr.go deleted file mode 100644 index a9bd19e..0000000 --- a/go/cmd/nekoray_core/v2ray_sip/sip_ssr.go +++ /dev/null @@ -1,113 +0,0 @@ -package v2ray_sip - -import ( - "bytes" - "context" - "flag" - "strconv" - - "github.com/Dreamacro/clash/transport/ssr/obfs" - "github.com/Dreamacro/clash/transport/ssr/protocol" - "github.com/xtls/xray-core/common/buf" - "github.com/xtls/xray-core/proxy/shadowsocks" - "github.com/xtls/xray-core/transport/internet" -) - -var ( - _ shadowsocks.SIP003Plugin = (*shadowsocksrPlugin)(nil) - _ shadowsocks.StreamPlugin = (*shadowsocksrPlugin)(nil) - _ shadowsocks.ProtocolPlugin = (*shadowsocksrPlugin)(nil) -) - -func init() { - shadowsocks.RegisterPlugin("shadowsocksr", func() shadowsocks.SIP003Plugin { - return new(shadowsocksrPlugin) - }) -} - -type shadowsocksrPlugin struct { - host string - port int - obfs string - obfsParam string - protocol string - protocolParam string - - o obfs.Obfs - p protocol.Protocol -} - -func (p *shadowsocksrPlugin) Init(_ context.Context, _ string, _ string, remoteHost string, remotePort string, _ string, pluginArgs []string, account *shadowsocks.MemoryAccount) error { - fs := flag.NewFlagSet("shadowsocksr", flag.ContinueOnError) - fs.StringVar(&p.obfs, "obfs", "origin", "") - fs.StringVar(&p.obfsParam, "obfs-param", "", "") - fs.StringVar(&p.protocol, "protocol", "origin", "") - fs.StringVar(&p.protocolParam, "protocol-param", "", "") - if err := fs.Parse(pluginArgs); err != nil { - return newError("shadowsocksr: failed to parse args").Base(err) - } - p.host = remoteHost - p.port, _ = strconv.Atoi(remotePort) - - obfs, obfsOverhead, err := obfs.PickObfs(p.obfs, &obfs.Base{ - Host: p.host, - Port: p.port, - Key: account.Key, - IVSize: int(account.Cipher.IVSize()), - Param: p.obfsParam, - }) - if err != nil { - return newError("failed to create ssr obfs").Base(err) - } - - protocol, err := protocol.PickProtocol(p.protocol, &protocol.Base{ - Key: account.Key, - Overhead: obfsOverhead, - Param: p.protocolParam, - }) - if err != nil { - return newError("failed to create ssr protocol").Base(err) - } - - p.o = obfs - p.p = protocol - - return nil -} - -func (p *shadowsocksrPlugin) Close() error { - return nil -} - -func (p *shadowsocksrPlugin) StreamConn(conn internet.Connection) internet.Connection { - return p.o.StreamConn(conn) -} - -func (p *shadowsocksrPlugin) ProtocolConn(conn *shadowsocks.ProtocolConn, iv []byte) { - upstream := buf.NewConnection(buf.ConnectionOutputMulti(conn), buf.ConnectionInputMulti(conn)) - downstream := p.p.StreamConn(upstream, iv) - if upstream == downstream { - conn.ProtocolReader = conn - conn.ProtocolWriter = conn - } else { - conn.ProtocolReader = buf.NewReader(downstream) - conn.ProtocolWriter = buf.NewWriter(downstream) - } -} - -func (p *shadowsocksrPlugin) EncodePacket(data []byte) ([]byte, error) { - dst := &bytes.Buffer{} - err := p.p.EncodePacket(dst, data) - if err != nil { - return nil, err - } - return dst.Bytes(), nil -} - -func (p *shadowsocksrPlugin) DecodePacket(data []byte) ([]byte, error) { - dst, err := p.p.DecodePacket(data) - if err != nil { - return nil, err - } - return dst, nil -} diff --git a/libs/get_source_env.sh b/libs/get_source_env.sh index edc436a..64f4dba 100644 --- a/libs/get_source_env.sh +++ b/libs/get_source_env.sh @@ -1,6 +1,6 @@ if [ ! -z $ENV_NEKORAY ]; then - export COMMIT_SING_BOX_EXTRA="9400fd007ad5a19b5892a7c42aae0951e1163747" - export COMMIT_MATSURI_XRAY="8134d3cc23aa6b8e2a056887addf22d7d22bd969" + export COMMIT_SING_BOX_EXTRA="c0127f6e833ecad55f9ba8f6ece60c9a8d7acd86" + export COMMIT_MATSURI_XRAY="ded0ebf36791af0d72332a622e262df604b57ebb" fi if [ ! -z $ENV_SING_BOX_EXTRA ]; then