Support bird3 notation for BGP AS path

Author: ribetm

frontend/bgpmap.go

@@ -15,7 +15,7 @@ var protocolNameRe = regexp.MustCompile(`\[(.*?) .*\]`)
 var routeSplitRe = regexp.MustCompile("(unicast|blackhole|unreachable|prohibited)")
 
 var routeViaRe = regexp.MustCompile(`(?m)^\t(via .*?)$`)
-var routeASPathRe = regexp.MustCompile(`(?m)^\tBGP\.as_path: (.*?)$`)
+var routeASPathRe = regexp.MustCompile(`(?mi)^\tBGP(?:\.as)?_path: (.*?)$`)
 
 func makeEdgeAttrs(preferred bool) RouteAttrs {
 	result := RouteAttrs{

frontend/render.go

@@ -89,7 +89,7 @@ func smartFormatter(s string) template.HTML {
 	s = template.HTMLEscapeString(s)
 	for _, line := range strings.Split(s, "\n") {
 		var lineFormatted string
-		if strings.HasPrefix(strings.TrimSpace(line), "BGP.as_path:") || strings.HasPrefix(strings.TrimSpace(line), "Neighbor AS:") || strings.HasPrefix(strings.TrimSpace(line), "Local AS:") {
+		if strings.HasPrefix(strings.TrimSpace(line), "BGP.as_path:") || strings.HasPrefix(strings.TrimSpace(line), "bgp_path:") || strings.HasPrefix(strings.TrimSpace(line), "Neighbor AS:") || strings.HasPrefix(strings.TrimSpace(line), "Local AS:") {
 			lineFormatted = regexp.MustCompile(`(\d+)`).ReplaceAllString(line, `<a href="/whois/AS${1}" class="whois">${1}</a>`)
 		} else {
 			lineFormatted = regexp.MustCompile(`([a-zA-Z0-9\-]*\.([a-zA-Z]{2,3}){1,2})(\s|$)`).ReplaceAllString(line, `<a href="/whois/${1}" class="whois">${1}</a>${3}`)

frontend/telegram_bot.go

@@ -97,7 +97,7 @@ func webHandlerTelegramBot(w http.ResponseWriter, r *http.Request) {
 	} else if telegramIsCommand(request.Message.Text, "path") {
 		commandResult = telegramBatchRequestFormat(servers, "bird", "show route for "+target+" all primary", func(result string) string {
 			for _, s := range strings.Split(result, "\n") {
-				if strings.Contains(s, "BGP.as_path: ") {
+				if strings.Contains(s, "BGP.as_path: ") || strings.Contains(s, "bgp_path: ") {
 					return strings.TrimSpace(strings.Split(s, ":")[1])
 				}
 			}