pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-10-25 15:25:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(hosts): give a host a pool of SNIs, random per config or shared (#6923)

Browse Source 
Rotating SNIs meant one host entry per domain. A host now takes a pool of
SNIs: with more than one, every generated config gets a random entry,
or, with the shared switch on, the whole host group uses one pick per
subscription fetch. Raw, JSON and Clash output, the panel's link preview
and node adoption all carry the pool.

sni stays the pool's first entry, so a rolled-back binary and API callers
that only know the single field keep working; an sni outside the pool
becomes its primary. A host with one SNI renders exactly as before.
This commit is contained in:
Pejman Yousefi
2026-10-24 22:35:42 +03:30
committed by GitHub
parent 14c9bdff89
commit 8da3b3c344
33 changed files with 675 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/database/db.go
+1
View File
@@ -1018,6 +1018,7 @@ func externalProxyEntryToHost(inboundId, index int, ep map[string]any) *model.Ho
Port: port,
Security: security,
Sni: sni,
Snis: anyToNonEmptyStrings([]any{sni}),
Fingerprint: fingerprint,
Alpn: anyToNonEmptyStrings(ep["alpn"]),
PinnedPeerCertSha256: anyToNonEmptyStrings(ep["pinnedPeerCertSha256"]),
internal/database/model/model.go
+2
View File
@@ -1186,6 +1186,8 @@ type Host struct {
Security string `json:"security" form:"security" gorm:"default:same" validate:"omitempty,oneof=same tls none reality" example:"same"`
Sni string `json:"sni" form:"sni"`
Snis []string `json:"snis,omitempty" form:"snis" gorm:"serializer:json;column:snis"`
SniSharedRandom bool `json:"sniSharedRandom" form:"sniSharedRandom" gorm:"column:sni_shared_random"`
HostHeader string `json:"hostHeader" form:"hostHeader" gorm:"column:host_header"`
Path string `json:"path" form:"path"`
Alpn []string `json:"alpn" form:"alpn" gorm:"serializer:json"`
internal/sub/host_order.go
+1 -1
View File
@@ -104,7 +104,7 @@ func (v subscriptionHostVariant) endpoint(s *SubService, inbound *model.Inbound)
if v.host == nil {
return nil
}
return hostEndpointMaps(v.host, s.resolveInboundAddress(inbound), inbound.Port)
return s.hostEndpointMaps(v.host, s.resolveInboundAddress(inbound), inbound.Port)
}
func (v subscriptionHostVariant) inbound(s *SubService, inbound *model.Inbound) *model.Inbound {
internal/sub/host_sub.go
+52 -4
View File
@@ -1,9 +1,11 @@
package sub
import (
"crypto/rand"
"encoding/json"
"fmt"
"maps"
"math/big"
"slices"
"github.com/mhsanaei/3x-ui/v3/internal/database"
@@ -86,7 +88,7 @@ func (s *SubService) clientHostEndpoints(inbound *model.Inbound, client model.Cl
if h.IsDisabled || slices.Contains(h.ExcludeFromSubTypes, format) {
continue
}
eps = append(eps, hostEndpointMaps(h, defaultDest, inbound.Port)...)
eps = append(eps, s.hostEndpointMaps(h, defaultDest, inbound.Port)...)
}
return eps, true
}
@@ -136,14 +138,15 @@ func (s *SubService) hostEndpoints(inbound *model.Inbound, format string) []map[
if h.IsDisabled || slices.Contains(h.ExcludeFromSubTypes, format) {
continue
}
eps = append(eps, hostEndpointMaps(h, defaultDest, inbound.Port)...)
eps = append(eps, s.hostEndpointMaps(h, defaultDest, inbound.Port)...)
}
return eps
}
// hostEndpointMaps is one host's externalProxy entries: a CIDR address expands into RandomCount
// random addresses from the range, any other address is a single entry.
func hostEndpointMaps(h *model.Host, defaultDest string, defaultPort int) []map[string]any {
func (s *SubService) hostEndpointMaps(h *model.Host, defaultDest string, defaultPort int) []map[string]any {
shared := s.sharedHostSni(h)
if IsCIDR(h.Address) {
count := max(h.RandomCount, 1)
if ips, err := RandomIPsFromCIDR(h.Address, count); err == nil && len(ips) > 0 {
@@ -158,12 +161,57 @@ func hostEndpointMaps(h *model.Host, defaultDest string, defaultPort int) []map[
hCopy.Remark = fmt.Sprintf("%d", i+1)
}
}
hCopy.Sni = endpointSni(h, shared)
eps = append(eps, hostToExternalProxyMap(&hCopy, defaultDest, defaultPort))
}
return eps
}
}
return []map[string]any{hostToExternalProxyMap(h, defaultDest, defaultPort)}
hCopy := *h
hCopy.Sni = endpointSni(h, shared)
return []map[string]any{hostToExternalProxyMap(&hCopy, defaultDest, defaultPort)}
}
// endpointSni is the SNI one endpoint of h advertises: the request's shared pick, a fresh random
// entry of a multi-SNI pool, or the single SNI; the address and blank overrides apply later.
func endpointSni(h *model.Host, shared string) string {
switch {
case shared != "":
return shared
case len(h.Snis) > 1:
return randomSni(h.Snis)
}
return h.Sni
}
// sharedHostSni picks one SNI of a shared pool per host group and request, so every endpoint of
// the group carries the same one; "" when h does not share.
func (s *SubService) sharedHostSni(h *model.Host) string {
if !h.SniSharedRandom || len(h.Snis) < 2 {
return ""
}
key := h.GroupId
if key == "" {
key = fmt.Sprintf("host-%d", h.Id)
}
if sni, ok := s.sharedGroupSni[key]; ok {
return sni
}
if s.sharedGroupSni == nil {
s.sharedGroupSni = make(map[string]string)
}
sni := randomSni(h.Snis)
s.sharedGroupSni[key] = sni
return sni
}
func randomSni(snis []string) string {
idx, err := rand.Int(rand.Reader, big.NewInt(int64(len(snis))))
if err != nil {
return snis[0]
}
return snis[idx.Int64()]
}
// hostToExternalProxyMap projects a Host onto the externalProxy entry shape the
internal/sub/host_sub_test.go
+170
View File
@@ -1707,3 +1707,173 @@ func TestSub_ClientHostRule_SurvivesGroupEdit(t *testing.T) {
t.Fatalf("clash must not contain the unbound host or old SNI:\n%s", yaml)
}
}
func TestSub_HostMultiSNI_RandomizePerConfig(t *testing.T) {
seedSubDB(t)
ib := seedSubInbound(t, "s1", "sni-rand", 4465, 1,
`{"network":"tcp","security":"tls"}`)
snis := []string{"sni1.example.com", "sni2.example.com"}
seedHost(t, &model.Host{
InboundId: ib.Id,
SortOrder: 0,
Remark: "MultiSNI-CIDR",
Address: "198.51.100.0/24",
Port: 8443,
Security: "tls",
RandomCount: 30,
Snis: snis,
})
links, _, _, _, err := NewSubService("").GetSubs("s1", "req.example.com")
if err != nil {
t.Fatalf("GetSubs: %v", err)
}
parts := strings.Split(strings.Join(links, "\n"), "\n")
if len(parts) != 30 {
t.Fatalf("len(parts) = %d, want 30", len(parts))
}
seenSNIs := make(map[string]int)
for _, l := range parts {
if strings.Contains(l, "sni=sni1.example.com") {
seenSNIs["sni1.example.com"]++
} else if strings.Contains(l, "sni=sni2.example.com") {
seenSNIs["sni2.example.com"]++
} else {
t.Fatalf("link carries unexpected SNI: %s", l)
}
}
if len(seenSNIs) < 2 {
t.Fatalf("expected both SNIs to be picked across 30 randomized configs, got: %v", seenSNIs)
}
}
func TestSub_HostMultiSNI_SharedRandom(t *testing.T) {
seedSubDB(t)
ib := seedSubInbound(t, "s1", "sni-shared", 4466, 1,
`{"network":"tcp","security":"tls"}`)
snis := []string{"sniA.example.com", "sniB.example.com"}
groupId := "grp_multi_sni_shared"
seedHost(t, &model.Host{
GroupId: groupId,
InboundId: ib.Id,
SortOrder: 1,
Remark: "Host1",
Address: "h1.example.com",
Port: 8443,
Security: "tls",
Snis: snis,
SniSharedRandom: true,
})
seedHost(t, &model.Host{
GroupId: groupId,
InboundId: ib.Id,
SortOrder: 2,
Remark: "Host2",
Address: "h2.example.com",
Port: 8443,
Security: "tls",
Snis: snis,
SniSharedRandom: true,
})
seedHost(t, &model.Host{
GroupId: groupId,
InboundId: ib.Id,
SortOrder: 3,
Remark: "Host3",
Address: "h3.example.com",
Port: 8443,
Security: "tls",
Snis: snis,
SniSharedRandom: true,
})
links, _, _, _, err := NewSubService("").GetSubs("s1", "req.example.com")
if err != nil {
t.Fatalf("GetSubs: %v", err)
}
parts := strings.Split(strings.Join(links, "\n"), "\n")
if len(parts) != 3 {
t.Fatalf("len(parts) = %d, want 3", len(parts))
}
var firstSNI string
for i, l := range parts {
var sni string
if strings.Contains(l, "sni=sniA.example.com") {
sni = "sniA.example.com"
} else if strings.Contains(l, "sni=sniB.example.com") {
sni = "sniB.example.com"
} else {
t.Fatalf("link[%d] missing expected SNI: %s", i, l)
}
if firstSNI == "" {
firstSNI = sni
} else if sni != firstSNI {
t.Fatalf("shared random mode mismatch: link[%d] had %s, expected %s across all configs in same group", i, sni, firstSNI)
}
}
// Verify that across independent subscription fetches, both pool SNIs are selected
seenAcrossFetches := make(map[string]bool)
seenAcrossFetches[firstSNI] = true
for i := 0; i < 25; i++ {
l, _, _, _, err := NewSubService("").GetSubs("s1", "req.example.com")
if err == nil && len(l) > 0 {
if strings.Contains(l[0], "sni=sniA.example.com") {
seenAcrossFetches["sniA.example.com"] = true
} else if strings.Contains(l[0], "sni=sniB.example.com") {
seenAcrossFetches["sniB.example.com"] = true
}
}
}
if len(seenAcrossFetches) < 2 {
t.Fatalf("expected both SNIs to be selected across independent fetches, got: %v", seenAcrossFetches)
}
}
func TestSub_HostMultiSNI_Overrides(t *testing.T) {
seedSubDB(t)
ib := seedSubInbound(t, "s1", "sni-overrides", 4467, 1,
`{"network":"tcp","security":"tls"}`)
snis := []string{"sni1.example.com", "sni2.example.com"}
// When OverrideSniFromAddress is true, address is used as SNI.
seedHost(t, &model.Host{
InboundId: ib.Id,
SortOrder: 1,
Remark: "AddrAsSni",
Address: "addr.example.com",
Port: 8443,
Security: "tls",
Snis: snis,
OverrideSniFromAddress: true,
})
// When KeepSniBlank is true, SNI is omitted.
seedHost(t, &model.Host{
InboundId: ib.Id,
SortOrder: 2,
Remark: "BlankSni",
Address: "blank.example.com",
Port: 8443,
Security: "tls",
Snis: snis,
KeepSniBlank: true,
})
links, _, _, _, err := NewSubService("").GetSubs("s1", "req.example.com")
if err != nil {
t.Fatalf("GetSubs: %v", err)
}
parts := strings.Split(strings.Join(links, "\n"), "\n")
if len(parts) != 2 {
t.Fatalf("len(parts) = %d, want 2", len(parts))
}
if !strings.Contains(parts[0], "sni=addr.example.com") {
t.Errorf("expected address as sni: %s", parts[0])
}
if strings.Contains(parts[1], "sni=") {
t.Errorf("expected blank sni: %s", parts[1])
}
}
internal/sub/service.go
+2
View File
@@ -80,6 +80,7 @@ type SubService struct {
hostsByInbound map[int][]*model.Host
hostGroupOrders map[string]hostEntryOrder
hostsFirst bool
sharedGroupSni map[string]string
}
// NewSubService creates a new subscription service with the given configuration.
@@ -117,6 +118,7 @@ func (s *SubService) PrepareForRequest(host string) {
s.settingsByInbound = map[int]map[string]any{}
s.hostsByInbound = nil
s.hostGroupOrders = nil
s.sharedGroupSni = nil
mode, _ := s.settingService.GetSubHostSortMode()
s.hostsFirst = mode == "hosts-first"
s.loadNodes()
internal/web/entity/entity.go
+2
View File
@@ -428,6 +428,8 @@ type HostGroup struct {
Port int `json:"port" validate:"gte=0,lte=65535"`
Security string `json:"security" validate:"omitempty,oneof=same tls none reality"`
Sni string `json:"sni"`
Snis []string `json:"snis"`
SniSharedRandom bool `json:"sniSharedRandom"`
HostHeader string `json:"hostHeader"`
Path string `json:"path"`
Alpn []string `json:"alpn"`
internal/web/service/host.go
+47 -1
View File
@@ -42,6 +42,8 @@ func newHostGroup(h *model.Host, groupId string) *entity.HostGroup {
Port: h.Port,
Security: h.Security,
Sni: h.Sni,
Snis: h.Snis,
SniSharedRandom: h.SniSharedRandom,
HostHeader: h.HostHeader,
Path: h.Path,
Alpn: h.Alpn,
@@ -96,6 +98,12 @@ func groupHosts(hosts []*model.Host) []*entity.HostGroup {
if h.RandomCount > g.RandomCount {
g.RandomCount = h.RandomCount
}
if len(h.Snis) > 0 && len(g.Snis) == 0 {
g.Snis = h.Snis
}
if h.SniSharedRandom {
g.SniSharedRandom = true
}
}
res := make([]*entity.HostGroup, 0, len(orderedGroupIds))
@@ -117,6 +125,13 @@ func groupHosts(hosts []*model.Host) []*entity.HostGroup {
}
func buildHostRows(groupId string, req *entity.HostGroup) []*model.Host {
snis := hostSniPool(req.Sni, req.Snis)
primarySni := ""
if len(snis) > 0 {
primarySni = snis[0]
}
shared := req.SniSharedRandom && len(snis) > 1
hostsToProcess := req.Hosts
if len(hostsToProcess) == 0 {
hostsToProcess = []string{""}
@@ -137,7 +152,9 @@ func buildHostRows(groupId string, req *entity.HostGroup) []*model.Host {
Address: addr,
Port: port,
Security: req.Security,
Sni: req.Sni,
Sni: primarySni,
Snis: snis,
SniSharedRandom: shared,
HostHeader: req.HostHeader,
Path: req.Path,
Alpn: req.Alpn,
@@ -483,3 +500,32 @@ func clampRandomCount(n int) int {
}
return n
}
// hostSniPool is the group's SNI pool, primary first: an sni outside the pool (a caller that only
// knows the single field) becomes the primary, replacing a one-entry pool.
func hostSniPool(sni string, pool []string) []string {
snis := cleanSnis(pool)
sni = strings.TrimSpace(sni)
switch {
case sni == "" || (len(snis) > 0 && snis[0] == sni):
return snis
case len(snis) <= 1:
return []string{sni}
}
return append([]string{sni}, slices.DeleteFunc(snis, func(s string) bool { return s == sni })...)
}
func cleanSnis(snis []string) []string {
var out []string
seen := make(map[string]struct{})
for _, s := range snis {
trimmed := strings.TrimSpace(s)
if trimmed != "" {
if _, exists := seen[trimmed]; !exists {
seen[trimmed] = struct{}{}
out = append(out, trimmed)
}
}
}
return out
}
internal/web/service/host_test.go
+76
View File
@@ -525,3 +525,79 @@ func TestHostGroup_CipherSuitesRoundTrip(t *testing.T) {
t.Fatalf("CipherSuites = %q, want %q", g.CipherSuites, suites)
}
}
func TestHostGroup_MultiSNIRoundTrip(t *testing.T) {
setupBulkDB(t)
svc := &HostService{}
ib := mkInbound(t, 443, model.VLESS, `{"clients":[]}`)
snis := []string{"sni1.example.com", "sni2.example.com"}
created, err := svc.AddHostGroup(&entity.HostGroup{
InboundIds: []int{ib.Id},
Remark: "multi-sni",
Hosts: []string{"h1.example.com", "h2.example.com"},
Security: "tls",
Snis: snis,
})
if err != nil {
t.Fatalf("AddHostGroup: %v", err)
}
if len(created) != 2 {
t.Fatalf("created %d rows, want 2", len(created))
}
for i, row := range created {
if !reflect.DeepEqual(row.Snis, snis) {
t.Fatalf("row[%d].Snis = %v, want %v", i, row.Snis, snis)
}
if row.Sni != snis[0] {
t.Fatalf("row[%d].Sni = %q, want primary %q", i, row.Sni, snis[0])
}
if row.SniSharedRandom {
t.Fatalf("row[%d] shares its SNI by default", i)
}
}
g, err := svc.GetHostGroup(created[0].GroupId)
if err != nil {
t.Fatalf("GetHostGroup: %v", err)
}
if g.Security != "tls" {
t.Fatalf("g.Security = %q, want %q", g.Security, "tls")
}
if !reflect.DeepEqual(g.Snis, snis) {
t.Fatalf("g.Snis = %v, want %v", g.Snis, snis)
}
if g.SniSharedRandom {
t.Fatalf("g shares its SNI by default")
}
// Now update to SniSharedRandom and verify Security and mode preservation
g.SniSharedRandom = true
updated, err := svc.UpdateHostGroup(g.GroupId, g)
if err != nil {
t.Fatalf("UpdateHostGroup: %v", err)
}
for i, row := range updated {
if row.Security != "tls" {
t.Fatalf("updated row[%d].Security = %q, want %q", i, row.Security, "tls")
}
if !row.SniSharedRandom {
t.Fatalf("updated row[%d] lost SniSharedRandom", i)
}
}
// Verify REST script updating req.Sni independently is honored and synchronized
g.Sni = "rest-updated.example.com"
updatedSni, err := svc.UpdateHostGroup(g.GroupId, g)
if err != nil {
t.Fatalf("UpdateHostGroup with updated Sni: %v", err)
}
for i, row := range updatedSni {
if row.Sni != "rest-updated.example.com" {
t.Fatalf("row[%d].Sni = %q, want %q", i, row.Sni, "rest-updated.example.com")
}
if len(row.Snis) == 0 || row.Snis[0] != "rest-updated.example.com" {
t.Fatalf("row[%d].Snis[0] = %v, want %q", i, row.Snis, "rest-updated.example.com")
}
}
}
internal/web/translation/ar-EG.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "الإجراءات",
"security": "الأمان",
"sni": "SNI",
"sniSharedRandom": "نفس الـ SNI العشوائي لجميع التكوينات",
"overrideSniFromAddress": "استخدم العنوان كـ SNI",
"keepSniBlank": "اترك SNI فارغاً",
"hostHeader": "ترويسة Host",
internal/web/translation/en-US.json
+1
View File
@@ -1122,6 +1122,7 @@
"actions": "Actions",
"security": "Security",
"sni": "SNI",
"sniSharedRandom": "Same random SNI for all configs",
"overrideSniFromAddress": "Use address as SNI",
"keepSniBlank": "Keep SNI blank",
"hostHeader": "Host header",
internal/web/translation/es-ES.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "Acciones",
"security": "Seguridad",
"sni": "SNI",
"sniSharedRandom": "Mismo SNI aleatorio para todas las configuraciones",
"overrideSniFromAddress": "Usar la dirección como SNI",
"keepSniBlank": "Dejar el SNI en blanco",
"hostHeader": "Cabecera Host",
internal/web/translation/fa-IR.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "عملیات",
"security": "امنیت",
"sni": "SNI",
"sniSharedRandom": "یک SNI تصادفی یکسان برای تمام کانفیگ‌ها",
"overrideSniFromAddress": "استفاده از آدرس به‌عنوان SNI",
"keepSniBlank": "SNI خالی بماند",
"hostHeader": "هدر Host",
internal/web/translation/id-ID.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "Aksi",
"security": "Keamanan",
"sni": "SNI",
"sniSharedRandom": "SNI acak yang sama untuk semua konfigurasi",
"overrideSniFromAddress": "Gunakan alamat sebagai SNI",
"keepSniBlank": "Biarkan SNI kosong",
"hostHeader": "Header Host",
internal/web/translation/ja-JP.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "操作",
"security": "セキュリティ",
"sni": "SNI",
"sniSharedRandom": "すべての設定で同じランダムな SNI",
"overrideSniFromAddress": "アドレスを SNI として使用",
"keepSniBlank": "SNI を空のままにする",
"hostHeader": "Host ヘッダー",
internal/web/translation/pt-BR.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "Ações",
"security": "Segurança",
"sni": "SNI",
"sniSharedRandom": "Mesmo SNI aleatório para todas as configurações",
"overrideSniFromAddress": "Usar endereço como SNI",
"keepSniBlank": "Manter SNI em branco",
"hostHeader": "Cabeçalho Host",
internal/web/translation/ru-RU.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "Действия",
"security": "Безопасность",
"sni": "SNI",
"sniSharedRandom": "Один случайный SNI для всех конфигураций",
"overrideSniFromAddress": "Использовать адрес как SNI",
"keepSniBlank": "Оставить SNI пустым",
"hostHeader": "Заголовок Host",
internal/web/translation/sk-SK.json
+1
View File
@@ -1122,6 +1122,7 @@
"actions": "Akcie",
"security": "Bezpečnosť",
"sni": "SNI",
"sniSharedRandom": "Rovnaké náhodné SNI pre všetky konfigurácie",
"overrideSniFromAddress": "Použiť adresu ako SNI",
"keepSniBlank": "Ponechať SNI prázdne",
"hostHeader": "Hlavička Host",
internal/web/translation/tr-TR.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "İşlemler",
"security": "Güvenlik",
"sni": "Toplumsal ve Ulusal Kimlik",
"sniSharedRandom": "Tüm yapılandırmalar için aynı rastgele SNI",
"overrideSniFromAddress": "Adresi SNI olarak kullan",
"keepSniBlank": "SNI'yi boş bırak",
"hostHeader": "Host başlığı",
internal/web/translation/uk-UA.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "Дії",
"security": "Безпека",
"sni": "SNI",
"sniSharedRandom": "Один випадковий SNI для всіх конфігурацій",
"overrideSniFromAddress": "Використовувати адресу як SNI",
"keepSniBlank": "Залишити SNI порожнім",
"hostHeader": "Заголовок Host",
internal/web/translation/vi-VN.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "Hành động",
"security": "Bảo mật",
"sni": "SNI",
"sniSharedRandom": "Cùng một SNI ngẫu nhiên cho tất cả cấu hình",
"overrideSniFromAddress": "Dùng địa chỉ làm SNI",
"keepSniBlank": "Để trống SNI",
"hostHeader": "Host header",
internal/web/translation/zh-CN.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "操作",
"security": "安全",
"sni": "SNI",
"sniSharedRandom": "所有配置使用相同的随机 SNI",
"overrideSniFromAddress": "使用地址作为 SNI",
"keepSniBlank": "保持 SNI 为空",
"hostHeader": "Host 头",
internal/web/translation/zh-TW.json
+1
View File
@@ -2394,6 +2394,7 @@
"actions": "操作",
"security": "安全",
"sni": "SNI",
"sniSharedRandom": "所有設定使用相同的隨機 SNI",
"overrideSniFromAddress": "使用地址作為 SNI",
"keepSniBlank": "保持 SNI 留空",
"hostHeader": "Host 標頭",