From 5ce0f55f353eb977ce814ac319c4e92f07af73b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=A5=E4=B8=8B=E9=83=A8=20=E8=A9=A9?=
<github@kskb.eu.org>
Date: Fri, 12 Aug 2022 10:34:39 +0800
Subject: [PATCH] 1. support local whois. 2 add some useful bird command (#59)
---
README.md | 2 +-
frontend/render.go | 32 ++++++++++++++++++++------------
frontend/webserver.go | 39 ++++++++++++++++++++++++++++++---------
frontend/whois.go | 37 ++++++++++++++++++++++++++-----------
4 files changed, 77 insertions(+), 33 deletions(-)
diff --git a/README.md b/README.md
index 04b541e..1148216 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Configuration is handled by [viper](https://github.com/spf13/viper), any config
| domain | --domain | BIRDLG_DOMAIN | server name domain suffixes |
| listen | --listen | BIRDLG_LISTEN | address bird-lg is listening on (default "5000") |
| proxy_port | --proxy-port | BIRDLG_PROXY_PORT | port bird-lgproxy is running on (default 8000) |
-| whois | --whois | BIRDLG_WHOIS | whois server for queries (default "whois.verisign-grs.com") |
+| whois | --whois | BIRDLG_WHOIS | whois server for queries (default "whois.verisign-grs.com"). Start with "/" to spacify local whois binary("/usr/local/whois"). |
| dns_interface | --dns-interface | BIRDLG_DNS_INTERFACE | dns zone to query ASN information (default "asn.cymru.com") |
| bgpmap_info | --bgpmap-info | BIRDLG_BGPMAP_INFO | the infos displayed in bgpmap, separated by comma, start with `:` means allow multiline (default "asn,as-name,ASName,descr") |
| title_brand | --title-brand | BIRDLG_TITLE_BRAND | prefix of page titles in browser tabs (default "Bird-lg Go") |
diff --git a/frontend/render.go b/frontend/render.go
index 0f6f4fd..96e6d10 100644
--- a/frontend/render.go
+++ b/frontend/render.go
@@ -13,18 +13,26 @@ import (
// static options map
var optionsMap = map[string]string{
- "summary": "show protocols",
- "detail": "show protocols all",
- "route": "show route for ...",
- "route_all": "show route for ... all",
- "route_bgpmap": "show route for ... (bgpmap)",
- "route_where": "show route where net ~ [ ... ]",
- "route_where_all": "show route where net ~ [ ... ] all",
- "route_where_bgpmap": "show route where net ~ [ ... ] (bgpmap)",
- "route_generic": "show route ...",
- "generic": "show ...",
- "whois": "whois ...",
- "traceroute": "traceroute ...",
+ "summary": "show protocols",
+ "detail": "show protocols all ...",
+ "route_from_protocol": "show route protocol ...",
+ "route_from_protocol_all": "show route protocol ... all",
+ "route_from_protocol_all_primary": "show route protocol ... all primary",
+ "route_filtered_from_protocol": "show route filtered protocol ...",
+ "route_filtered_from_protocol_all": "show route filtered protocol ... all",
+ "route_from_origin": "show route where bgp_path.last = ...",
+ "route_from_origin_all": "show route where bgp_path.last = ... all",
+ "route_from_origin_all_primary": "show route where bgp_path.last = ... all primary",
+ "route": "show route for ...",
+ "route_all": "show route for ... all",
+ "route_bgpmap": "show route for ... (bgpmap)",
+ "route_where": "show route where net ~ [ ... ]",
+ "route_where_all": "show route where net ~ [ ... ] all",
+ "route_where_bgpmap": "show route where net ~ [ ... ] (bgpmap)",
+ "route_generic": "show route ...",
+ "generic": "show ...",
+ "whois": "whois ...",
+ "traceroute": "traceroute ...",
}
// pre-compiled regexp and constant statemap for summary rendering
diff --git a/frontend/webserver.go b/frontend/webserver.go
index e01a270..0442c61 100644
--- a/frontend/webserver.go
+++ b/frontend/webserver.go
@@ -17,15 +17,26 @@ import (
)
var primitiveMap = map[string]string{
- "summary": "show protocols",
- "detail": "show protocols all %s",
- "route": "show route for %s",
- "route_all": "show route for %s all",
- "route_where": "show route where net ~ [ %s ]",
- "route_where_all": "show route where net ~ [ %s ] all",
- "route_generic": "show route %s",
- "generic": "show %s",
- "traceroute": "%s",
+ "summary": "show protocols",
+ "detail": "show protocols all %s",
+ "route_from_protocol": "show route protocol %s",
+ "route_from_protocol_all": "show route protocol %s all",
+ "route_from_protocol_primary": "show route protocol %s primary",
+ "route_from_protocol_all_primary": "show route protocol %s all primary",
+ "route_filtered_from_protocol": "show route filtered protocol %s",
+ "route_filtered_from_protocol_all": "show route filtered protocol %s all",
+ "route_from_origin": "show route where bgp_path.last = %s",
+ "route_from_origin_all": "show route where bgp_path.last = %s all",
+ "route_from_origin_primary": "show route where bgp_path.last = %s primary",
+ "route_from_origin_all_primary": "show route where bgp_path.last = %s all primary",
+ "route": "show route for %s",
+ "route_all": "show route for %s all",
+ "route_where": "show route where net ~ [ %s ]",
+ "route_where_all": "show route where net ~ [ %s ] all",
+ "route_generic": "show route %s",
+ "generic": "show %s",
+ "whois": "%s",
+ "traceroute": "%s",
}
// serve up a generic error
@@ -204,6 +215,16 @@ func webServerStart(l net.Listener) {
// backend routes
http.HandleFunc("/summary/", webBackendCommunicator("bird", "summary"))
http.HandleFunc("/detail/", webBackendCommunicator("bird", "detail"))
+ http.HandleFunc("/route_filtered_from_protocol/", webBackendCommunicator("bird", "route_filtered_from_protocol"))
+ http.HandleFunc("/route_filtered_from_protocol_all/", webBackendCommunicator("bird", "route_filtered_from_protocol_all"))
+ http.HandleFunc("/route_from_protocol/", webBackendCommunicator("bird", "route_from_protocol"))
+ http.HandleFunc("/route_from_protocol_all/", webBackendCommunicator("bird", "route_from_protocol_all"))
+ http.HandleFunc("/route_from_protocol_primary/", webBackendCommunicator("bird", "route_from_protocol_primary"))
+ http.HandleFunc("/route_from_protocol_all_primary/", webBackendCommunicator("bird", "route_from_protocol_all_primary"))
+ http.HandleFunc("/route_from_origin/", webBackendCommunicator("bird", "route_from_origin"))
+ http.HandleFunc("/route_from_origin_all/", webBackendCommunicator("bird", "route_from_origin_all"))
+ http.HandleFunc("/route_from_origin_primary/", webBackendCommunicator("bird", "route_from_origin_primary"))
+ http.HandleFunc("/route_from_origin_all_primary/", webBackendCommunicator("bird", "route_from_origin_all_primary"))
http.HandleFunc("/route/", webBackendCommunicator("bird", "route"))
http.HandleFunc("/route_all/", webBackendCommunicator("bird", "route_all"))
http.HandleFunc("/route_bgpmap/", webHandlerBGPMap("bird", "route_bgpmap"))
diff --git a/frontend/whois.go b/frontend/whois.go
index 8c28e1b..76735a6 100644
--- a/frontend/whois.go
+++ b/frontend/whois.go
@@ -3,6 +3,8 @@ package main
import (
"io"
"net"
+ "os/exec"
+ "strings"
"time"
)
@@ -12,18 +14,31 @@ func whois(s string) string {
return ""
}
- conn, err := net.DialTimeout("tcp", setting.whoisServer+":43", 5*time.Second)
- if err != nil {
- return err.Error()
- }
- defer conn.Close()
+ if strings.HasPrefix(setting.whoisServer, "/") {
+ cmd := exec.Command(setting.whoisServer, s)
+ output, err := cmd.CombinedOutput()
+ if err != nil {
+ return err.Error()
+ }
+ if len(output) > 65535 {
+ output = output[:65535]
+ }
+ return string(output)
+ } else {
+ buf := make([]byte, 65536)
+ conn, err := net.DialTimeout("tcp", setting.whoisServer+":43", 5*time.Second)
+ if err != nil {
+ return err.Error()
+ }
+ defer conn.Close()
- conn.Write([]byte(s + "\r\n"))
+ conn.Write([]byte(s + "\r\n"))
- buf := make([]byte, 65536)
- n, err := io.ReadFull(conn, buf)
- if err != nil && err != io.ErrUnexpectedEOF {
- return err.Error()
+ n, err := io.ReadFull(conn, buf)
+ if err != nil && err != io.ErrUnexpectedEOF {
+ return err.Error()
+ }
+ return string(buf[:n])
}
- return string(buf[:n])
+
}