mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-17 00:31:00 +00:00
feat(mtproto): adopt dolonet/mtg-multi and make MTProto inbounds multi-client
Replace the upstream 9seconds/mtg sidecar with the dolonet/mtg-multi fork so a single MTProto inbound can serve many per-user secrets. Each panel client is now one named FakeTLS secret in the fork's [secrets] section: clients are first-class (attach/detach, limits, expiry, per-client tg:// links) exactly like every other protocol, mirroring the WireGuard multi-client model. Per-client traffic and online status come from the fork's /stats JSON API (its Prometheus output has no per-user label), fed into the existing email-keyed client_traffics accumulator; an optional throttle caps concurrent connections. A one-time seeder converts each legacy single-secret inbound into a one-client inbound. The fork ships only linux/darwin amd64/arm64 binaries but is pure Go, so provisioning builds it from source for every supported platform (release.yml, DockerInit.sh) while keeping the panel-expected mtg-<os>-<arch> filename and the 'run' verb, so process.go is untouched. Also fixes a pre-existing update.sh gap that never renamed the mtg binary for armv6/armv7 updates.
This commit is contained in:
+9
-15
@@ -465,7 +465,7 @@ func (s *SubService) getInboundsBySubId(subId string) ([]*model.Inbound, error)
|
||||
JOIN client_inbounds ON client_inbounds.inbound_id = inbounds.id
|
||||
JOIN clients ON clients.id = client_inbounds.client_id
|
||||
WHERE
|
||||
inbounds.protocol in ('vmess','vless','trojan','shadowsocks','hysteria','wireguard')
|
||||
inbounds.protocol in ('vmess','vless','trojan','shadowsocks','hysteria','wireguard','mtproto')
|
||||
AND clients.sub_id = ? AND inbounds.enable = ?
|
||||
)`, subId, true).Order("sub_sort_index ASC").Order("id ASC").Find(&inbounds).Error
|
||||
if err != nil {
|
||||
@@ -662,29 +662,23 @@ func (s *SubService) genWireguardLink(inbound *model.Inbound, email string) stri
|
||||
return buildLinkWithParams(link, params, s.genRemark(inbound, email, "", ""))
|
||||
}
|
||||
|
||||
// genMtprotoLink builds a Telegram proxy deep link for an mtproto inbound:
|
||||
func (s *SubService) genMtprotoLink(inbound *model.Inbound, _ string) string {
|
||||
// genMtprotoLink builds a per-client Telegram proxy deep link for an mtproto
|
||||
// inbound: the server/port pair plus the client's own FakeTLS secret. Returns ""
|
||||
// when the client has no secret.
|
||||
func (s *SubService) genMtprotoLink(inbound *model.Inbound, email string) string {
|
||||
if inbound.Protocol != model.MTProto {
|
||||
return ""
|
||||
}
|
||||
settings := map[string]any{}
|
||||
_ = json.Unmarshal([]byte(inbound.Settings), &settings)
|
||||
secret, _ := settings["secret"].(string)
|
||||
if secret == "" {
|
||||
if healed, ok := model.HealMtprotoSecret(inbound.Settings); ok {
|
||||
_ = json.Unmarshal([]byte(healed), &settings)
|
||||
secret, _ = settings["secret"].(string)
|
||||
}
|
||||
}
|
||||
if secret == "" {
|
||||
resolved, ok := s.clientForLink(inbound, email)
|
||||
if !ok || resolved.Secret == "" {
|
||||
return ""
|
||||
}
|
||||
params := map[string]string{
|
||||
"server": s.resolveInboundAddress(inbound),
|
||||
"port": fmt.Sprintf("%d", inbound.Port),
|
||||
"secret": secret,
|
||||
"secret": resolved.Secret,
|
||||
}
|
||||
return buildLinkWithParams("tg://proxy", params, "")
|
||||
return buildLinkWithParams("tg://proxy", params, s.genRemark(inbound, email, "", ""))
|
||||
}
|
||||
|
||||
// Protocol link generators are intentionally ordered as:
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
package sub
|
||||
|
||||
import (
|
||||
"net/url"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
||||
)
|
||||
|
||||
const mtprotoTestSecret = "ee8196fe6ed8b637d001f91d6952cfcdf07777772e636c6f7564666c6172652e636f6d"
|
||||
|
||||
func TestGenMtprotoLinkFields(t *testing.T) {
|
||||
inbound := &model.Inbound{
|
||||
Listen: "203.0.113.7",
|
||||
Port: 8443,
|
||||
Protocol: model.MTProto,
|
||||
Remark: "mt-sub",
|
||||
Settings: `{"fakeTlsDomain":"www.cloudflare.com","clients":[{"email":"user","enable":true,"secret":"` + mtprotoTestSecret + `"}]}`,
|
||||
}
|
||||
|
||||
s := &SubService{}
|
||||
link := s.genMtprotoLink(inbound, "user")
|
||||
|
||||
u, err := url.Parse(link)
|
||||
if err != nil {
|
||||
t.Fatalf("link does not parse: %v\n got: %s", err, link)
|
||||
}
|
||||
if u.Scheme != "tg" || u.Host != "proxy" {
|
||||
t.Fatalf("link = %q, want a tg://proxy deep link", link)
|
||||
}
|
||||
q := u.Query()
|
||||
if q.Get("server") != "203.0.113.7" {
|
||||
t.Fatalf("server = %q, want 203.0.113.7", q.Get("server"))
|
||||
}
|
||||
if q.Get("port") != "8443" {
|
||||
t.Fatalf("port = %q, want 8443", q.Get("port"))
|
||||
}
|
||||
if q.Get("secret") != mtprotoTestSecret {
|
||||
t.Fatalf("secret = %q, want the client's FakeTLS secret", q.Get("secret"))
|
||||
}
|
||||
}
|
||||
|
||||
func TestGenMtprotoLinkWrongProtocol(t *testing.T) {
|
||||
s := &SubService{}
|
||||
vless := &model.Inbound{Protocol: model.VLESS, Settings: `{"clients":[{"email":"user"}]}`}
|
||||
if got := s.genMtprotoLink(vless, "user"); got != "" {
|
||||
t.Fatalf("wrong protocol should yield empty link, got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGenMtprotoLinkNoSecret(t *testing.T) {
|
||||
s := &SubService{}
|
||||
inbound := &model.Inbound{
|
||||
Protocol: model.MTProto,
|
||||
Port: 8443,
|
||||
Settings: `{"fakeTlsDomain":"www.cloudflare.com","clients":[{"email":"user"}]}`,
|
||||
}
|
||||
if got := s.genMtprotoLink(inbound, "user"); got != "" {
|
||||
t.Fatalf("client without secret should yield empty link, got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
// Regression: an mtproto inbound must resolve for a subscription id the same way
|
||||
// every other client-bearing protocol does. It was previously dropped from the
|
||||
// getInboundsBySubId protocol allowlist, so multi-client MTProto subscriptions
|
||||
// (and the public sub page) emitted no tg://proxy link at all.
|
||||
func TestGetInboundsBySubIdIncludesMtproto(t *testing.T) {
|
||||
initSubDB(t)
|
||||
db := database.GetDB()
|
||||
|
||||
in := &model.Inbound{
|
||||
Port: 8443,
|
||||
Protocol: model.MTProto,
|
||||
Enable: true,
|
||||
Tag: "mt-sub",
|
||||
Settings: `{"fakeTlsDomain":"www.cloudflare.com","clients":[{"email":"u@mt","enable":true,"subId":"submt","secret":"` + mtprotoTestSecret + `"}]}`,
|
||||
}
|
||||
if err := db.Create(in).Error; err != nil {
|
||||
t.Fatalf("create inbound: %v", err)
|
||||
}
|
||||
rec := &model.ClientRecord{Email: "u@mt", SubID: "submt", Enable: true, Secret: mtprotoTestSecret}
|
||||
if err := db.Create(rec).Error; err != nil {
|
||||
t.Fatalf("create client: %v", err)
|
||||
}
|
||||
if err := db.Create(&model.ClientInbound{ClientId: rec.Id, InboundId: in.Id}).Error; err != nil {
|
||||
t.Fatalf("create link: %v", err)
|
||||
}
|
||||
|
||||
s := &SubService{}
|
||||
inbounds, err := s.getInboundsBySubId("submt")
|
||||
if err != nil {
|
||||
t.Fatalf("getInboundsBySubId: %v", err)
|
||||
}
|
||||
if len(inbounds) != 1 || inbounds[0].Id != in.Id {
|
||||
t.Fatalf("mtproto inbound not returned for subId: %+v", inbounds)
|
||||
}
|
||||
|
||||
links, emails, _, _, err := s.GetSubs("submt", "sub.example.com")
|
||||
if err != nil {
|
||||
t.Fatalf("GetSubs: %v", err)
|
||||
}
|
||||
if len(links) != 1 || len(emails) != 1 || emails[0] != "u@mt" {
|
||||
t.Fatalf("subscription did not emit the mtproto client: links=%v emails=%v", links, emails)
|
||||
}
|
||||
if !strings.HasPrefix(links[0], "tg://proxy") || !strings.Contains(links[0], "secret="+mtprotoTestSecret) {
|
||||
t.Fatalf("subscription link is not a tg://proxy carrying the client secret: %q", links[0])
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user