mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-19 03:25:01 +03:00
fix(tgbot): keep the add-client draft with the chat that owns it (#6499)
* fix(tgbot): keep the add-client draft with the chat that owns it The wizard held one package-level draft for the whole bot. Its steps run on the ten-goroutine worker pool, so two admins adding a client at the same time wrote into the same form: whichever step ran last decided the email, the limits and the attached inbounds of a client the other chat went on to create, and the attach picker mutated one shared slice from several goroutines at once as well. Each chat now gets its own draft, reached only through the chat that owns it and held for the duration of a step, so a client is created from the values its own chat collected. * fix(tgbot): take the wizard's draft lock only for the wizard A queued report tap held one of the ten worker slots while it waited on the chat's draft, and every chat that reached answerCallback grew the draft map even when the admin gate rejected it. Both follow from acquiring the draft before the gate; the wizard's own steps are the only callers that read it. The draft is now looked up under the same admin-and-wizard check, addClient takes the draft its caller locked instead of looking it up again, a submit drops the entry, and StopBot clears the map with the conversation states.
This commit is contained in:
@@ -114,16 +114,20 @@ func (t *Tgbot) OnReceive() {
|
||||
defer recoverBotPanic()
|
||||
userStateMgr.maybePrune(time.Hour)
|
||||
if userState, exists := userStateMgr.get(message.Chat.ID); exists {
|
||||
// Only a wizard step touches the draft, so only it takes the lock.
|
||||
draft := addClientDrafts.forChat(message.Chat.ID)
|
||||
draft.Lock()
|
||||
defer draft.Unlock()
|
||||
switch userState {
|
||||
case "awaiting_email":
|
||||
if client_Email == strings.TrimSpace(message.Text) {
|
||||
if draft.email == strings.TrimSpace(message.Text) {
|
||||
t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
|
||||
userStateMgr.clear(message.Chat.ID)
|
||||
return nil
|
||||
}
|
||||
|
||||
client_Email = strings.TrimSpace(message.Text)
|
||||
if t.isSingleWord(client_Email) {
|
||||
draft.email = strings.TrimSpace(message.Text)
|
||||
if t.isSingleWord(draft.email) {
|
||||
userStateMgr.set(message.Chat.ID, "awaiting_email")
|
||||
|
||||
cancel_btn_markup := tu.InlineKeyboard(
|
||||
@@ -136,26 +140,26 @@ func (t *Tgbot) OnReceive() {
|
||||
} else {
|
||||
t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.received_email"), 3, tu.ReplyKeyboardRemove())
|
||||
userStateMgr.clear(message.Chat.ID)
|
||||
t.addClient(message.Chat.ID, t.BuildClientDraftMessage())
|
||||
t.addClient(message.Chat.ID, draft, t.BuildClientDraftMessage(draft))
|
||||
}
|
||||
case "awaiting_comment":
|
||||
if client_Comment == strings.TrimSpace(message.Text) {
|
||||
if draft.comment == strings.TrimSpace(message.Text) {
|
||||
t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
|
||||
userStateMgr.clear(message.Chat.ID)
|
||||
return nil
|
||||
}
|
||||
|
||||
client_Comment = strings.TrimSpace(message.Text)
|
||||
draft.comment = strings.TrimSpace(message.Text)
|
||||
t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.received_comment"), 3, tu.ReplyKeyboardRemove())
|
||||
userStateMgr.clear(message.Chat.ID)
|
||||
t.addClient(message.Chat.ID, t.BuildClientDraftMessage())
|
||||
t.addClient(message.Chat.ID, draft, t.BuildClientDraftMessage(draft))
|
||||
case "awaiting_tg_id":
|
||||
input := strings.TrimSpace(message.Text)
|
||||
if input == "" || input == "-" || strings.EqualFold(input, "none") {
|
||||
client_TgID = ""
|
||||
draft.tgID = ""
|
||||
t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
|
||||
userStateMgr.clear(message.Chat.ID)
|
||||
t.addClient(message.Chat.ID, t.BuildClientDraftMessage())
|
||||
t.addClient(message.Chat.ID, draft, t.BuildClientDraftMessage(draft))
|
||||
return nil
|
||||
}
|
||||
if _, err := strconv.ParseInt(input, 10, 64); err != nil {
|
||||
@@ -167,10 +171,10 @@ func (t *Tgbot) OnReceive() {
|
||||
t.SendMsgToTgbot(message.Chat.ID, t.I18nBot("tgbot.messages.incorrect_input"), cancel_btn_markup)
|
||||
return nil
|
||||
}
|
||||
client_TgID = input
|
||||
draft.tgID = input
|
||||
t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.userSaved"), 3, tu.ReplyKeyboardRemove())
|
||||
userStateMgr.clear(message.Chat.ID)
|
||||
t.addClient(message.Chat.ID, t.BuildClientDraftMessage())
|
||||
t.addClient(message.Chat.ID, draft, t.BuildClientDraftMessage(draft))
|
||||
}
|
||||
} else {
|
||||
if message.UsersShared != nil {
|
||||
@@ -312,6 +316,15 @@ func isCommandForBot(text string, username string) bool {
|
||||
func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool) {
|
||||
chatId := callbackQuery.Message.GetChat().ID
|
||||
|
||||
// Only an admin's wizard callbacks touch a draft, so only they take its lock:
|
||||
// a report tap must not wait on a slot, a rejected chat must not be stored.
|
||||
var draft *clientDraft
|
||||
if isAdmin && isAddClientStep(callbackQuery.Data) {
|
||||
draft = addClientDrafts.forChat(chatId)
|
||||
draft.Lock()
|
||||
defer draft.Unlock()
|
||||
}
|
||||
|
||||
if isAdmin {
|
||||
// get query from hash storage
|
||||
decodedQuery, err := t.decodeQuery(callbackQuery.Data)
|
||||
@@ -472,11 +485,11 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
t.searchClient(chatId, email, callbackQuery.Message.GetMessageID())
|
||||
case "add_client_limit_traffic_c":
|
||||
limitTraffic, _ := strconv.ParseInt(dataArray[1], 10, 64)
|
||||
client_TotalGB = limitTraffic * 1024 * 1024 * 1024
|
||||
draft.totalGB = limitTraffic * 1024 * 1024 * 1024
|
||||
messageId := callbackQuery.Message.GetMessageID()
|
||||
message_text := t.BuildClientDraftMessage()
|
||||
message_text := t.BuildClientDraftMessage(draft)
|
||||
|
||||
t.addClient(callbackQuery.Message.GetChat().ID, message_text, messageId)
|
||||
t.addClient(callbackQuery.Message.GetChat().ID, draft, message_text, messageId)
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.successfulOperation"))
|
||||
case "add_client_limit_traffic_in":
|
||||
if len(dataArray) >= 2 {
|
||||
@@ -599,24 +612,24 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.errorOperation"))
|
||||
t.searchClient(chatId, email, callbackQuery.Message.GetMessageID())
|
||||
case "add_client_reset_exp_c":
|
||||
client_ExpiryTime = 0
|
||||
draft.expiryTime = 0
|
||||
days, _ := strconv.ParseInt(dataArray[1], 10, 64)
|
||||
var date int64
|
||||
if client_ExpiryTime > 0 {
|
||||
if client_ExpiryTime-time.Now().Unix()*1000 < 0 {
|
||||
if draft.expiryTime > 0 {
|
||||
if draft.expiryTime-time.Now().Unix()*1000 < 0 {
|
||||
date = -(days * 24 * 60 * 60000)
|
||||
} else {
|
||||
date = client_ExpiryTime + days*24*60*60000
|
||||
date = draft.expiryTime + days*24*60*60000
|
||||
}
|
||||
} else {
|
||||
date = client_ExpiryTime - days*24*60*60000
|
||||
date = draft.expiryTime - days*24*60*60000
|
||||
}
|
||||
client_ExpiryTime = date
|
||||
draft.expiryTime = date
|
||||
|
||||
messageId := callbackQuery.Message.GetMessageID()
|
||||
message_text := t.BuildClientDraftMessage()
|
||||
message_text := t.BuildClientDraftMessage(draft)
|
||||
|
||||
t.addClient(callbackQuery.Message.GetChat().ID, message_text, messageId)
|
||||
t.addClient(callbackQuery.Message.GetChat().ID, draft, message_text, messageId)
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.successfulOperation"))
|
||||
case "add_client_reset_exp_in":
|
||||
if len(dataArray) >= 2 {
|
||||
@@ -717,13 +730,13 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
case "add_client_ip_limit_c":
|
||||
if len(dataArray) == 2 {
|
||||
count, _ := strconv.Atoi(dataArray[1])
|
||||
client_LimitIP = count
|
||||
draft.limitIP = count
|
||||
}
|
||||
|
||||
messageId := callbackQuery.Message.GetMessageID()
|
||||
message_text := t.BuildClientDraftMessage()
|
||||
message_text := t.BuildClientDraftMessage(draft)
|
||||
|
||||
t.addClient(callbackQuery.Message.GetChat().ID, message_text, messageId)
|
||||
t.addClient(callbackQuery.Message.GetChat().ID, draft, message_text, messageId)
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.successfulOperation"))
|
||||
case "add_client_ip_limit_in":
|
||||
if len(dataArray) >= 2 {
|
||||
@@ -843,15 +856,15 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
}
|
||||
t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseClient", "Inbound=="+inbound.Remark), clients)
|
||||
case "add_client_to":
|
||||
client_Email = t.randomLowerAndNum(8)
|
||||
client_LimitIP = 0
|
||||
client_TotalGB = 0
|
||||
client_ExpiryTime = 0
|
||||
client_Enable = true
|
||||
client_TgID = ""
|
||||
client_SubID = t.randomLowerAndNum(16)
|
||||
client_Comment = ""
|
||||
client_Reset = 0
|
||||
draft.email = t.randomLowerAndNum(8)
|
||||
draft.limitIP = 0
|
||||
draft.totalGB = 0
|
||||
draft.expiryTime = 0
|
||||
draft.enable = true
|
||||
draft.tgID = ""
|
||||
draft.subID = t.randomLowerAndNum(16)
|
||||
draft.comment = ""
|
||||
draft.reset = 0
|
||||
|
||||
inboundId := dataArray[1]
|
||||
inboundIdInt, err := strconv.Atoi(inboundId)
|
||||
@@ -859,9 +872,9 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
|
||||
return
|
||||
}
|
||||
receiver_inbound_ID = inboundIdInt
|
||||
receiver_inbound_IDs = []int{inboundIdInt}
|
||||
t.addClient(callbackQuery.Message.GetChat().ID, t.BuildClientDraftMessage())
|
||||
draft.receiverInboundID = inboundIdInt
|
||||
draft.receiverInboundIDs = []int{inboundIdInt}
|
||||
t.addClient(callbackQuery.Message.GetChat().ID, draft, t.BuildClientDraftMessage(draft))
|
||||
case "add_client_toggle_attach":
|
||||
inboundIdStr := dataArray[1]
|
||||
inboundIdInt, err := strconv.Atoi(inboundIdStr)
|
||||
@@ -870,18 +883,18 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
return
|
||||
}
|
||||
found := -1
|
||||
for i, id := range receiver_inbound_IDs {
|
||||
for i, id := range draft.receiverInboundIDs {
|
||||
if id == inboundIdInt {
|
||||
found = i
|
||||
break
|
||||
}
|
||||
}
|
||||
if found >= 0 {
|
||||
receiver_inbound_IDs = append(receiver_inbound_IDs[:found], receiver_inbound_IDs[found+1:]...)
|
||||
draft.receiverInboundIDs = append(draft.receiverInboundIDs[:found], draft.receiverInboundIDs[found+1:]...)
|
||||
} else {
|
||||
receiver_inbound_IDs = append(receiver_inbound_IDs, inboundIdInt)
|
||||
draft.receiverInboundIDs = append(draft.receiverInboundIDs, inboundIdInt)
|
||||
}
|
||||
picker, err := t.getInboundsAttachPicker()
|
||||
picker, err := t.getInboundsAttachPicker(draft)
|
||||
if err != nil {
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
|
||||
return
|
||||
@@ -1043,15 +1056,15 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.commands"))
|
||||
t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.commands.helpAdminCommands"))
|
||||
case "add_client":
|
||||
client_Email = t.randomLowerAndNum(8)
|
||||
client_LimitIP = 0
|
||||
client_TotalGB = 0
|
||||
client_ExpiryTime = 0
|
||||
client_Enable = true
|
||||
client_TgID = ""
|
||||
client_SubID = t.randomLowerAndNum(16)
|
||||
client_Comment = ""
|
||||
client_Reset = 0
|
||||
draft.email = t.randomLowerAndNum(8)
|
||||
draft.limitIP = 0
|
||||
draft.totalGB = 0
|
||||
draft.expiryTime = 0
|
||||
draft.enable = true
|
||||
draft.tgID = ""
|
||||
draft.subID = t.randomLowerAndNum(16)
|
||||
draft.comment = ""
|
||||
draft.reset = 0
|
||||
|
||||
inbounds, err := t.getInboundsAddClient()
|
||||
if err != nil {
|
||||
@@ -1068,7 +1081,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.use_default")).WithCallbackData("add_client_default_info"),
|
||||
),
|
||||
)
|
||||
prompt_message := t.I18nBot("tgbot.messages.email_prompt", "ClientEmail=="+html.EscapeString(client_Email))
|
||||
prompt_message := t.I18nBot("tgbot.messages.email_prompt", "ClientEmail=="+html.EscapeString(draft.email))
|
||||
t.SendMsgToTgbot(chatId, prompt_message, cancel_btn_markup)
|
||||
case "add_client_ch_default_comment":
|
||||
t.deleteMessageTgBot(chatId, callbackQuery.Message.GetMessageID())
|
||||
@@ -1078,7 +1091,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.use_default")).WithCallbackData("add_client_default_info"),
|
||||
),
|
||||
)
|
||||
prompt_message := t.I18nBot("tgbot.messages.comment_prompt", "ClientComment=="+html.EscapeString(client_Comment))
|
||||
prompt_message := t.I18nBot("tgbot.messages.comment_prompt", "ClientComment=="+html.EscapeString(draft.comment))
|
||||
t.SendMsgToTgbot(chatId, prompt_message, cancel_btn_markup)
|
||||
case "add_client_ch_default_tg_id":
|
||||
t.deleteMessageTgBot(chatId, callbackQuery.Message.GetMessageID())
|
||||
@@ -1088,7 +1101,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.use_default")).WithCallbackData("add_client_default_info"),
|
||||
),
|
||||
)
|
||||
current := client_TgID
|
||||
current := draft.tgID
|
||||
if current == "" {
|
||||
current = "—"
|
||||
}
|
||||
@@ -1184,68 +1197,65 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
|
||||
t.deleteMessageTgBot(chatId, callbackQuery.Message.GetMessageID())
|
||||
t.SendMsgToTgbotDeleteAfter(chatId, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
|
||||
userStateMgr.clear(chatId)
|
||||
t.addClient(chatId, t.BuildClientDraftMessage())
|
||||
t.addClient(chatId, draft, t.BuildClientDraftMessage(draft))
|
||||
case "add_client_cancel":
|
||||
userStateMgr.clear(chatId)
|
||||
receiver_inbound_ID = 0
|
||||
receiver_inbound_IDs = nil
|
||||
addClientDrafts.reset(chatId)
|
||||
t.deleteMessageTgBot(chatId, callbackQuery.Message.GetMessageID())
|
||||
t.SendMsgToTgbotDeleteAfter(chatId, t.I18nBot("tgbot.messages.cancel"), 3, tu.ReplyKeyboardRemove())
|
||||
case "add_client_default_traffic_exp":
|
||||
messageId := callbackQuery.Message.GetMessageID()
|
||||
message_text := t.BuildClientDraftMessage()
|
||||
t.addClient(chatId, message_text, messageId)
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.canceled", "Email=="+client_Email))
|
||||
message_text := t.BuildClientDraftMessage(draft)
|
||||
t.addClient(chatId, draft, message_text, messageId)
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.canceled", "Email=="+draft.email))
|
||||
case "add_client_default_ip_limit":
|
||||
messageId := callbackQuery.Message.GetMessageID()
|
||||
message_text := t.BuildClientDraftMessage()
|
||||
t.addClient(chatId, message_text, messageId)
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.canceled", "Email=="+client_Email))
|
||||
message_text := t.BuildClientDraftMessage(draft)
|
||||
t.addClient(chatId, draft, message_text, messageId)
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.canceled", "Email=="+draft.email))
|
||||
case "add_client_attach_more":
|
||||
picker, err := t.getInboundsAttachPicker()
|
||||
picker, err := t.getInboundsAttachPicker(draft)
|
||||
if err != nil {
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
|
||||
return
|
||||
}
|
||||
t.SendMsgToTgbot(chatId, "Pick inbound(s) to attach:", picker)
|
||||
case "add_client_attach_done":
|
||||
if receiver_inbound_ID == 0 && len(receiver_inbound_IDs) > 0 {
|
||||
receiver_inbound_ID = receiver_inbound_IDs[0]
|
||||
if draft.receiverInboundID == 0 && len(draft.receiverInboundIDs) > 0 {
|
||||
draft.receiverInboundID = draft.receiverInboundIDs[0]
|
||||
}
|
||||
if receiver_inbound_ID == 0 {
|
||||
if draft.receiverInboundID == 0 {
|
||||
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.getInboundsFailed"))
|
||||
return
|
||||
}
|
||||
message_text := t.BuildClientDraftMessage()
|
||||
message_text := t.BuildClientDraftMessage(draft)
|
||||
t.deleteMessageTgBot(chatId, callbackQuery.Message.GetMessageID())
|
||||
t.addClient(chatId, message_text)
|
||||
t.addClient(chatId, draft, message_text)
|
||||
case "add_client_submit_disable":
|
||||
client_Enable = false
|
||||
_, err := t.SubmitAddClient()
|
||||
draft.enable = false
|
||||
_, err := t.SubmitAddClient(draft)
|
||||
if err != nil {
|
||||
errorMessage := fmt.Sprintf("%v", err)
|
||||
t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.messages.error_add_client", "error=="+errorMessage), tu.ReplyKeyboardRemove())
|
||||
} else {
|
||||
t.deleteMessageTgBot(chatId, callbackQuery.Message.GetMessageID())
|
||||
t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.successfulOperation"), tu.ReplyKeyboardRemove())
|
||||
t.sendClientIndividualLinks(chatId, client_Email)
|
||||
t.sendClientQRLinks(chatId, client_Email)
|
||||
receiver_inbound_ID = 0
|
||||
receiver_inbound_IDs = nil
|
||||
t.sendClientIndividualLinks(chatId, draft.email)
|
||||
t.sendClientQRLinks(chatId, draft.email)
|
||||
addClientDrafts.reset(chatId)
|
||||
}
|
||||
case "add_client_submit_enable":
|
||||
client_Enable = true
|
||||
_, err := t.SubmitAddClient()
|
||||
draft.enable = true
|
||||
_, err := t.SubmitAddClient(draft)
|
||||
if err != nil {
|
||||
errorMessage := fmt.Sprintf("%v", err)
|
||||
t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.messages.error_add_client", "error=="+errorMessage), tu.ReplyKeyboardRemove())
|
||||
} else {
|
||||
t.deleteMessageTgBot(chatId, callbackQuery.Message.GetMessageID())
|
||||
t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.successfulOperation"), tu.ReplyKeyboardRemove())
|
||||
t.sendClientIndividualLinks(chatId, client_Email)
|
||||
t.sendClientQRLinks(chatId, client_Email)
|
||||
receiver_inbound_ID = 0
|
||||
receiver_inbound_IDs = nil
|
||||
t.sendClientIndividualLinks(chatId, draft.email)
|
||||
t.sendClientQRLinks(chatId, draft.email)
|
||||
addClientDrafts.reset(chatId)
|
||||
}
|
||||
case "reset_all_traffics_cancel":
|
||||
t.deleteMessageTgBot(chatId, callbackQuery.Message.GetMessageID())
|
||||
|
||||
Reference in New Issue
Block a user