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

fix(clients): match non-ASCII capitals in the shared-email checks

Browse Source 
The checks that decide whether a client_traffics row is still used by
another inbound, whether an email is already taken under another subId,
and which depleted rows a scoped delete may drop compared a Go-lowered
email with LOWER(clients.email), which SQLite folds for ASCII only. An
email such as Иван was never seen as attached elsewhere, so the node
sweep deleted the usage row of a client the master's own inbound still
served and the client outlived its expiry and quota.

Each check now matches the lowered or the stored spelling and keys the
result in Go, so ASCII behaviour is unchanged.
This commit is contained in:
MHSanaei
2026-11-01 08:37:01 +01:00
parent 2024d34928
commit bd36053356
4 changed files with 216 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/inbound_traffic.go
+21 -16
View File
@@ -1012,33 +1012,38 @@ func (s *InboundService) DelDepletedClients(id int) (err error) {
if id < 0 {
return tx.Where(depletedClause, now).Delete(xray.ClientTraffic{}).Error
}
emails := make([]string, 0, len(depletedEmails))
for e := range depletedEmails {
emails = append(emails, e)
rowEmails := make([]string, 0, len(depletedRows))
for _, r := range depletedRows {
if r.Email != "" {
rowEmails = append(rowEmails, r.Email)
}
}
var stillReferenced []string
emailExpr := database.JSONFieldText("client.value", "email")
stillQuery := fmt.Sprintf(
"SELECT DISTINCT LOWER(%s) %s WHERE LOWER(%s) IN ?",
"SELECT DISTINCT %s %s WHERE LOWER(%s) IN ? OR %s IN ?",
emailExpr,
database.JSONClientsFromInbound(),
emailExpr,
emailExpr,
)
if err := tx.Raw(stillQuery, emails).Scan(&stillReferenced).Error; err != nil {
return err
stillSet := make(map[string]struct{}, len(rowEmails))
for _, batch := range chunkStrings(emailSpellings(rowEmails), sqlInChunk) {
var stillReferenced []string
if err := tx.Raw(stillQuery, batch, batch).Scan(&stillReferenced).Error; err != nil {
return err
}
for _, e := range stillReferenced {
stillSet[strings.ToLower(e)] = struct{}{}
}
}
stillSet := make(map[string]struct{}, len(stillReferenced))
for _, e := range stillReferenced {
stillSet[e] = struct{}{}
}
toDelete := make([]string, 0, len(emails))
for _, e := range emails {
if _, kept := stillSet[e]; !kept {
toDelete := make([]string, 0, len(rowEmails))
for _, e := range rowEmails {
if _, kept := stillSet[strings.ToLower(e)]; !kept {
toDelete = append(toDelete, e)
}
}
if len(toDelete) > 0 {
if err := tx.Where("LOWER(email) IN ?", toDelete).Delete(xray.ClientTraffic{}).Error; err != nil {
for _, batch := range chunkStrings(emailSpellings(toDelete), sqlInChunk) {
if err := tx.Where("LOWER(email) IN ? OR email IN ?", batch, batch).Delete(xray.ClientTraffic{}).Error; err != nil {
return err
}
}