burble.dn42/bird-lg-go
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix telegram api out of range

Browse Source
This commit is contained in:
Lan Tian 2020-04-07 23:55:45 +08:00
parent 0b69490757
commit 7effa8cf28
No known key found for this signature in database
GPG Key ID: 27F31700E751EC22
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/telegram_bot.go
View File

@ -45,7 +45,7 @@ func webHandlerTelegramBot(w http.ResponseWriter, r *http.Request) {
}
// Do not respond if not a tg Bot command (starting with /)
if request.Message.Text[0] != '/' {
if len(request.Message.Text) == 0 || request.Message.Text[0] != '/' {
return
}
@ -66,27 +66,27 @@ func webHandlerTelegramBot(w http.ResponseWriter, r *http.Request) {
// - traceroute
if telegramIsCommand(request.Message.Text, "trace") || telegramIsCommand(request.Message.Text, "trace4") {
commandResult = batchRequest([]string{server}, "traceroute", target)[0]
commandResult = strings.Join(batchRequest([]string{server}, "traceroute", target), "")
} else if telegramIsCommand(request.Message.Text, "trace6") {
commandResult = batchRequest([]string{server}, "traceroute6", target)[0]
commandResult = strings.Join(batchRequest([]string{server}, "traceroute6", target), "")
} else if telegramIsCommand(request.Message.Text, "route") || telegramIsCommand(request.Message.Text, "route4") {
commandResult = batchRequest([]string{server}, "bird", "show route for "+target+" primary")[0]
commandResult = strings.Join(batchRequest([]string{server}, "bird", "show route for "+target+" primary"), "")
} else if telegramIsCommand(request.Message.Text, "route6") {
commandResult = batchRequest([]string{server}, "bird6", "show route for "+target+" primary")[0]
commandResult = strings.Join(batchRequest([]string{server}, "bird6", "show route for "+target+" primary"), "")
} else if telegramIsCommand(request.Message.Text, "path") || telegramIsCommand(request.Message.Text, "path4") {
tempResult := batchRequest([]string{server}, "bird", "show route for "+target+" all primary")[0]
tempResult := strings.Join(batchRequest([]string{server}, "bird", "show route for "+target+" all primary"), "")
for _, s := range strings.Split(tempResult, "\n") {
if strings.Contains(s, "BGP.as_path: ") {
commandResult = strings.Split(s, "BGP.as_path: ")[1]
commandResult = strings.Split(s, ":")[1]
}
}
} else if telegramIsCommand(request.Message.Text, "path6") {
tempResult := batchRequest([]string{server}, "bird6", "show route for "+target+" all primary")[0]
tempResult := strings.Join(batchRequest([]string{server}, "bird6", "show route for "+target+" all primary"), "")
for _, s := range strings.Split(tempResult, "\n") {
if strings.Contains(s, "BGP.as_path: ") {
commandResult = strings.Split(s, "BGP.as_path: ")[1]
commandResult = strings.Split(s, ":")[1]
}
}
@ -94,12 +94,12 @@ func webHandlerTelegramBot(w http.ResponseWriter, r *http.Request) {
commandResult = whois(target)
} else if telegramIsCommand(request.Message.Text, "help") {
commandResult = strings.TrimSpace(`
commandResult = `
/[path|path6] <IP>
/[route|route6] <IP>
/[trace|trace6] <IP>
/whois <Target>
`)
`
}
// Create a JSON response
@ -107,7 +107,7 @@ func webHandlerTelegramBot(w http.ResponseWriter, r *http.Request) {
response := &tgWebhookResponse{
Method: "sendMessage",
ChatID: request.Message.Chat.ID,
Text: commandResult,
Text: strings.TrimSpace(commandResult),
}
err = json.NewEncoder(w).Encode(response)
if err != nil {