Multiple UI and functionality fixes
This commit is contained in:
Lan Tian
parent
5d91c9d6d1
commit
19fd44c28e
@ -1,9 +1,9 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"io/ioutil"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
@ -16,7 +16,7 @@ type channelData struct {
|
||||
func batchRequest(servers []string, endpoint string, command string) []string {
|
||||
// Channel and array for storing responses
|
||||
var ch chan channelData = make(chan channelData)
|
||||
var response_array []string = make([]string, len(servers))
|
||||
var responseArray []string = make([]string, len(servers))
|
||||
|
||||
for i, server := range servers {
|
||||
// Check if the server is in the valid server list passed at startup
|
||||
@ -43,6 +43,9 @@ func batchRequest(servers []string, endpoint string, command string) []string {
|
||||
return
|
||||
}
|
||||
text, _ := ioutil.ReadAll(response.Body)
|
||||
if len(text) == 0 {
|
||||
text = []byte("node returned empty response, please refresh to try again.")
|
||||
}
|
||||
ch <- channelData{i, string(text)}
|
||||
}(url, i)
|
||||
}
|
||||
@ -51,8 +54,8 @@ func batchRequest(servers []string, endpoint string, command string) []string {
|
||||
// Sort the responses by their ids, to return data in order
|
||||
for range servers {
|
||||
var output channelData = <-ch
|
||||
response_array[output.id] = output.data
|
||||
responseArray[output.id] = output.data
|
||||
}
|
||||
|
||||
return response_array
|
||||
return responseArray
|
||||
}
|
||||
|
||||
@ -3,8 +3,8 @@ package main
|
||||
import (
|
||||
"net"
|
||||
"net/http"
|
||||
"strings"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// Helper to check if the IP is valid
|
||||
@ -20,122 +20,84 @@ func isNumber(s string) bool {
|
||||
|
||||
// Print HTML header to the given http response
|
||||
func templateHeader(w http.ResponseWriter, r *http.Request, title string) {
|
||||
path := r.URL.Path
|
||||
split := strings.Split(r.URL.Path, "/")
|
||||
path := r.URL.Path[1:]
|
||||
split := strings.Split(path, "/")
|
||||
|
||||
// Mark if the URL is for a whois query
|
||||
var isWhois bool = false
|
||||
if len(split) >= 2 && split[1] == "whois" {
|
||||
isWhois = true
|
||||
}
|
||||
var isWhois bool = split[0] == "whois"
|
||||
var whoisTarget string = strings.Join(split[1:], "/")
|
||||
|
||||
// Use a default URL if the request URL is too short
|
||||
// The URL is for return to IPv4 summary page
|
||||
if len(split) < 4 {
|
||||
path = "/ipv4/summary/" + strings.Join(settingServers[:], "+") + "/"
|
||||
} else if len(split) == 4 {
|
||||
if len(split) < 3 {
|
||||
path = "ipv4/summary/" + strings.Join(settingServers[:], "+") + "/"
|
||||
} else if len(split) == 3 {
|
||||
path += "/"
|
||||
}
|
||||
|
||||
split = strings.Split(path, "/")
|
||||
|
||||
// Compose URLs for link in navbar
|
||||
split = strings.Split(path, "/")
|
||||
split[1] = "ipv4"
|
||||
ipv4_url := strings.Join(split, "/")
|
||||
|
||||
split = strings.Split(path, "/")
|
||||
split[1] = "ipv6"
|
||||
ipv6_url := strings.Join(split, "/")
|
||||
|
||||
split = strings.Split(path, "/")
|
||||
split[3] = strings.Join(settingServers[:], "+")
|
||||
all_url := strings.Join(split, "/")
|
||||
ipv4URL := "/" + strings.Join([]string{"ipv4", split[1], split[2], strings.Join(split[3:], "/")}, "/")
|
||||
ipv6URL := "/" + strings.Join([]string{"ipv6", split[1], split[2], strings.Join(split[3:], "/")}, "/")
|
||||
allURL := "/" + strings.Join([]string{split[0], split[1], strings.Join(settingServers[:], "+"), strings.Join(split[3:], "/")}, "/")
|
||||
|
||||
// Check if the "All Server" link should be marked as active
|
||||
split = strings.Split(path, "/")
|
||||
var serverAllActive string
|
||||
if split[3] == strings.Join(settingServers[:], "+") {
|
||||
serverAllActive = " active"
|
||||
}
|
||||
var serverAllActive bool = strings.ToLower(split[2]) == strings.ToLower(strings.Join(settingServers[:], "+"))
|
||||
|
||||
// Print the IPv4, IPv6, All Servers link in navbar
|
||||
var serverNavigation string = `
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="` + ipv4_url + `"> IPv4 </a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="` + ipv6_url + `"> IPv6 </a>
|
||||
</li>
|
||||
<li class="nav-item"><a class="nav-link" href="` + ipv4URL + `"` + (map[bool]string{true: " active"})[strings.ToLower(split[0]) == "ipv4"] + `> IPv4 </a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="` + ipv6URL + `"` + (map[bool]string{true: " active"})[strings.ToLower(split[0]) == "ipv6"] + `> IPv6 </a></li>
|
||||
<span class="navbar-text">|</span>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link` + serverAllActive + `" href="` + all_url + `"> All Servers </a>
|
||||
</li>
|
||||
`
|
||||
<a class="nav-link` + (map[bool]string{true: " active"})[serverAllActive] + `" href="` + allURL + `"> All Servers </a>
|
||||
</li>`
|
||||
|
||||
// Add a link for each of the servers
|
||||
for _, server := range settingServers {
|
||||
split = strings.Split(path, "/")
|
||||
var serverActive string
|
||||
if split[3] == server {
|
||||
if split[2] == server {
|
||||
serverActive = " active"
|
||||
}
|
||||
split[3] = server
|
||||
server_url := strings.Join(split, "/")
|
||||
serverURL := "/" + strings.Join([]string{split[0], split[1], server, strings.Join(split[3:], "/")}, "/")
|
||||
|
||||
serverNavigation += `
|
||||
<li class="nav-item">
|
||||
<a class="nav-link` + serverActive + `" href="` + server_url + `">` + server + `</a>
|
||||
</li>
|
||||
`
|
||||
<a class="nav-link` + serverActive + `" href="` + serverURL + `">` + server + `</a>
|
||||
</li>`
|
||||
}
|
||||
|
||||
// Add the options in navbar form, and check if they are active
|
||||
var optionKeys = []string{"summary", "detail", "route", "route_all", "route_where", "route_where_all", "whois", "traceroute"}
|
||||
var optionDisplays = []string{
|
||||
"show protocol",
|
||||
"show protocol all",
|
||||
"show route for ...",
|
||||
"show route for ... all",
|
||||
"show route where net ~ [ ... ]",
|
||||
"show route where net ~ [ ... ] all",
|
||||
"whois ...",
|
||||
"traceroute ...",
|
||||
}
|
||||
|
||||
var options string
|
||||
split = strings.Split(path, "/")
|
||||
if split[2] == "summary" {
|
||||
options += `<option value="summary" selected>show protocol</option>`
|
||||
} else {
|
||||
options += `<option value="summary">show protocol</option>`
|
||||
for optionKeyID, optionKey := range optionKeys {
|
||||
options += "<option value=\"" + optionKey + "\""
|
||||
if (optionKey == "whois" && isWhois) || optionKey == split[1] {
|
||||
options += " selected"
|
||||
}
|
||||
if split[2] == "route" {
|
||||
options += `<option value="route" selected>show route for ...</option>`
|
||||
} else {
|
||||
options += `<option value="route">show route for ...</option>`
|
||||
}
|
||||
if split[2] == "route_all" {
|
||||
options += `<option value="route_all" selected>show route for ... all</option>`
|
||||
} else {
|
||||
options += `<option value="route_all">show route for ... all</option>`
|
||||
}
|
||||
if split[2] == "route_where" {
|
||||
options += `<option value="route_where" selected>show route where net ~ [ ... ]</option>`
|
||||
} else {
|
||||
options += `<option value="route_where">show route where net ~ [ ... ]</option>`
|
||||
}
|
||||
if split[2] == "route_where_all" {
|
||||
options += `<option value="route_where_all" selected>show route where net ~ [ ... ] all</option>`
|
||||
} else {
|
||||
options += `<option value="route_where_all">show route where net ~ [ ... ] all</option>`
|
||||
}
|
||||
if isWhois {
|
||||
options += `<option value="whois" selected>whois ...</option>`
|
||||
} else {
|
||||
options += `<option value="whois">whois ...</option>`
|
||||
}
|
||||
if split[2] == "traceroute" {
|
||||
options += `<option value="traceroute" selected>traceroute ...</option>`
|
||||
} else {
|
||||
options += `<option value="traceroute">traceroute ...</option>`
|
||||
options += ">" + optionDisplays[optionKeyID] + "</option>"
|
||||
}
|
||||
|
||||
var target string
|
||||
if isWhois {
|
||||
// This is a whois request, use original path URL instead of the modified one
|
||||
// and extract the target
|
||||
whoisSplit := strings.Split(r.URL.Path, "/")
|
||||
target = strings.Join(whoisSplit[2:], "/")
|
||||
} else if len(split) >= 5 {
|
||||
target = whoisTarget
|
||||
} else if len(split) >= 4 {
|
||||
// This is a normal request, just extract the target
|
||||
target = strings.Join(split[4:], "/")
|
||||
target = strings.Join(split[3:], "/")
|
||||
}
|
||||
|
||||
w.Write([]byte(`
|
||||
@ -162,8 +124,8 @@ func templateHeader(w http.ResponseWriter, r *http.Request, title string) {
|
||||
<form class="form-inline" action="/redir" method="GET">
|
||||
<div class="input-group">
|
||||
<select name="action" class="form-control">` + options + `</select>
|
||||
<input name="proto" class="d-none" value="` + split[1] + `">
|
||||
<input name="server" class="d-none" value="` + split[3] + `">
|
||||
<input name="proto" class="d-none" value="` + split[0] + `">
|
||||
<input name="server" class="d-none" value="` + split[2] + `">
|
||||
<input name="target" class="form-control" placeholder="Target" aria-label="Target" value="` + target + `">
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-outline-success" type="submit">»</button>
|
||||
@ -191,84 +153,76 @@ func templateFooter(w http.ResponseWriter) {
|
||||
func smartWriter(w http.ResponseWriter, s string) {
|
||||
w.Write([]byte("<pre>"))
|
||||
for _, line := range strings.Split(s, "\n") {
|
||||
var tabPending bool = false
|
||||
var isFirstWord bool = true
|
||||
var isASes bool = false
|
||||
for _, word := range strings.Split(line, " ") {
|
||||
// Process each word
|
||||
|
||||
var lineFormatted string
|
||||
words := strings.Split(line, " ")
|
||||
|
||||
for wordID, word := range words {
|
||||
if len(word) == 0 {
|
||||
// Indicates that two spaces are connected together
|
||||
// Replace this with a tab later
|
||||
tabPending = true
|
||||
continue
|
||||
}
|
||||
if wordID > 0 && (len(words[wordID-1]) == 0 || words[wordID-1][len(words[wordID-1])-1] == ':') {
|
||||
// Insert TAB if there are multiple spaces before this word
|
||||
lineFormatted += "\t"
|
||||
} else {
|
||||
if isFirstWord {
|
||||
// Do not add space before the first word
|
||||
isFirstWord = false
|
||||
} else if tabPending {
|
||||
// A tab should be added; add it
|
||||
w.Write([]byte("\t"))
|
||||
tabPending = false
|
||||
} else {
|
||||
// Two words separated by a space, just print the space
|
||||
w.Write([]byte(" "))
|
||||
lineFormatted += " "
|
||||
}
|
||||
|
||||
if isIP(word) {
|
||||
// Add whois link to the IP, handles IPv4 and IPv6
|
||||
w.Write([]byte("<a href=\"/whois/" + word + "\">" + word + "</a>"))
|
||||
lineFormatted += "<a href=\"/whois/" + word + "\">" + word + "</a>"
|
||||
} else if len(strings.Split(word, "%")) == 2 && isIP(strings.Split(word, "%")[0]) {
|
||||
// IPv6 link-local with interface name, like fd00::1%eth0
|
||||
// Add whois link to address part
|
||||
w.Write([]byte("<a href=\"/whois/" + strings.Split(word, "%")[0] + "\">" + strings.Split(word, "%")[0] + "</a>"))
|
||||
w.Write([]byte("%" + strings.Split(word, "%")[1]))
|
||||
lineFormatted += "<a href=\"/whois/" + strings.Split(word, "%")[0] + "\">" + strings.Split(word, "%")[0] + "</a>"
|
||||
lineFormatted += "%" + strings.Split(word, "%")[1]
|
||||
} else if len(strings.Split(word, "/")) == 2 && isIP(strings.Split(word, "/")[0]) {
|
||||
// IP with a CIDR range, like 192.168.0.1/24
|
||||
// Add whois link to first part
|
||||
w.Write([]byte("<a href=\"/whois/" + strings.Split(word, "/")[0] + "\">" + strings.Split(word, "/")[0] + "</a>"))
|
||||
w.Write([]byte("/" + strings.Split(word, "/")[1]))
|
||||
lineFormatted += "<a href=\"/whois/" + strings.Split(word, "/")[0] + "\">" + strings.Split(word, "/")[0] + "</a>"
|
||||
lineFormatted += "/" + strings.Split(word, "/")[1]
|
||||
} else if word == "AS:" || word == "\tBGP.as_path:" {
|
||||
// Bird will output ASNs later
|
||||
isASes = true
|
||||
w.Write([]byte(word))
|
||||
lineFormatted += word
|
||||
} else if isASes && isNumber(word) {
|
||||
// Bird is outputing ASNs, ass whois for them
|
||||
w.Write([]byte("<a href=\"/whois/AS" + word + "\">" + word + "</a>"))
|
||||
lineFormatted += "<a href=\"/whois/AS" + word + "\">" + word + "</a>"
|
||||
} else {
|
||||
// Just an ordinary word, print it and done
|
||||
w.Write([]byte(word))
|
||||
lineFormatted += word
|
||||
}
|
||||
}
|
||||
}
|
||||
w.Write([]byte("\n"))
|
||||
lineFormatted += "\n"
|
||||
w.Write([]byte(lineFormatted))
|
||||
}
|
||||
w.Write([]byte("</pre>"))
|
||||
}
|
||||
|
||||
// Output a table for the summary page
|
||||
func summaryTable(w http.ResponseWriter, isIPv6 bool, data string, serverName string) {
|
||||
// w.Write([]byte("<pre>" + data + "</pre>"))
|
||||
w.Write([]byte("<table class=\"table table-striped table-bordered table-sm\">"))
|
||||
for lineId, line := range strings.Split(data, "\n") {
|
||||
var tabPending bool = false
|
||||
var tableCells int = 0
|
||||
for lineID, line := range strings.Split(data, "\n") {
|
||||
var row [6]string
|
||||
for i, word := range strings.Split(line, " ") {
|
||||
var rowIndex int = 0
|
||||
|
||||
words := strings.Split(line, " ")
|
||||
for wordID, word := range words {
|
||||
if len(word) == 0 {
|
||||
tabPending = true
|
||||
} else {
|
||||
if i == 0 {
|
||||
tabPending = true
|
||||
} else if tabPending {
|
||||
// Allow up to 6 columns in the table, any more is ignored
|
||||
if tableCells < 5 {
|
||||
tableCells++
|
||||
} else {
|
||||
row[tableCells] += " "
|
||||
continue
|
||||
}
|
||||
tabPending = false
|
||||
} else {
|
||||
row[tableCells] += " "
|
||||
if rowIndex < 4 {
|
||||
row[rowIndex] += word
|
||||
rowIndex++
|
||||
} else if len(words[wordID-1]) == 0 && rowIndex < len(row)-1 {
|
||||
if len(row[rowIndex]) > 0 {
|
||||
rowIndex++
|
||||
}
|
||||
row[tableCells] += word
|
||||
row[rowIndex] += word
|
||||
} else {
|
||||
row[rowIndex] += " " + word
|
||||
}
|
||||
}
|
||||
|
||||
@ -277,7 +231,7 @@ func summaryTable(w http.ResponseWriter, isIPv6 bool, data string, serverName st
|
||||
continue
|
||||
}
|
||||
|
||||
if lineId == 0 {
|
||||
if lineID == 0 {
|
||||
// Draw the table head
|
||||
w.Write([]byte("<thead>"))
|
||||
for i := 0; i < 6; i++ {
|
||||
@ -286,11 +240,11 @@ func summaryTable(w http.ResponseWriter, isIPv6 bool, data string, serverName st
|
||||
w.Write([]byte("</thead><tbody>"))
|
||||
} else {
|
||||
// Draw the row in red if the link isn't up
|
||||
if row[3] == "up" {
|
||||
w.Write([]byte("<tr>"))
|
||||
} else if lineId != 0 {
|
||||
w.Write([]byte("<tr class=\"table-danger\">"))
|
||||
}
|
||||
w.Write([]byte("<tr class=\"" + (map[string]string{
|
||||
"up": "table-success",
|
||||
"down": "table-danger",
|
||||
"start": "table-danger",
|
||||
})[row[3]] + "\">"))
|
||||
// Add link to detail for first column
|
||||
if isIPv6 {
|
||||
w.Write([]byte("<td><a href=\"/ipv6/detail/" + serverName + "/" + row[0] + "\">" + row[0] + "</a></td>"))
|
||||
|
||||
@ -1,72 +1,12 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"html"
|
||||
"net/http"
|
||||
"strings"
|
||||
"html"
|
||||
)
|
||||
|
||||
func webDispatcherIPv4Summary(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv4/summary/"):], "/")
|
||||
webHandler(w, r, "bird", split[0], "show protocols")
|
||||
}
|
||||
|
||||
func webDispatcherIPv6Summary(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv6/summary/"):], "/")
|
||||
webHandler(w, r, "bird6", split[0], "show protocols")
|
||||
}
|
||||
|
||||
func webDispatcherIPv4Detail(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv4/detail/"):], "/")
|
||||
webHandler(w, r, "bird", split[0], "show protocols all " + split[1])
|
||||
}
|
||||
|
||||
func webDispatcherIPv6Detail(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv6/detail/"):], "/")
|
||||
webHandler(w, r, "bird6", split[0], "show protocols all " + split[1])
|
||||
}
|
||||
|
||||
func webDispatcherIPv4Route(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv4/route/"):], "/")
|
||||
webHandler(w, r, "bird", split[0], "show route for " + strings.Join(split[1:], "/"))
|
||||
}
|
||||
|
||||
func webDispatcherIPv6Route(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv6/route/"):], "/")
|
||||
webHandler(w, r, "bird6", split[0], "show route for " + strings.Join(split[1:], "/"))
|
||||
}
|
||||
|
||||
func webDispatcherIPv4RouteAll(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv4/route_all/"):], "/")
|
||||
webHandler(w, r, "bird", split[0], "show route for " + strings.Join(split[1:], "/") + " all")
|
||||
}
|
||||
|
||||
func webDispatcherIPv6RouteAll(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv6/route_all/"):], "/")
|
||||
webHandler(w, r, "bird6", split[0], "show route for " + strings.Join(split[1:], "/") + " all")
|
||||
}
|
||||
|
||||
func webDispatcherIPv4RouteWhere(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv4/route_where/"):], "/")
|
||||
webHandler(w, r, "bird", split[0], "show route where net ~ [ " + strings.Join(split[1:], "/") + " ]")
|
||||
}
|
||||
|
||||
func webDispatcherIPv6RouteWhere(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv6/route_where/"):], "/")
|
||||
webHandler(w, r, "bird6", split[0], "show route where net ~ [ " + strings.Join(split[1:], "/") + " ]")
|
||||
}
|
||||
|
||||
func webDispatcherIPv4RouteWhereAll(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv4/route_where_all/"):], "/")
|
||||
webHandler(w, r, "bird", split[0], "show route where net ~ [ " + strings.Join(split[1:], "/") + " ] all")
|
||||
}
|
||||
|
||||
func webDispatcherIPv6RouteWhereAll(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv6/route_where_all/"):], "/")
|
||||
webHandler(w, r, "bird6", split[0], "show route where net ~ [ " + strings.Join(split[1:], "/") + " ] all")
|
||||
}
|
||||
|
||||
func webDispatcherWhois(w http.ResponseWriter, r *http.Request) {
|
||||
func webHandlerWhois(w http.ResponseWriter, r *http.Request) {
|
||||
var target string = r.URL.Path[len("/whois/"):]
|
||||
|
||||
templateHeader(w, r, "Bird-lg Go - whois "+html.EscapeString(target))
|
||||
@ -77,25 +17,28 @@ func webDispatcherWhois(w http.ResponseWriter, r *http.Request) {
|
||||
templateFooter(w)
|
||||
}
|
||||
|
||||
func webDispatcherIPv4Traceroute(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv4/traceroute/"):], "/")
|
||||
webHandler(w, r, "traceroute", split[0], strings.Join(split[1:], "/"))
|
||||
}
|
||||
func webBackendCommunicator(w http.ResponseWriter, r *http.Request, endpoint string, command string) {
|
||||
split := strings.Split(r.URL.Path[1:], "/")
|
||||
urlCommands := strings.Join(split[3:], "/")
|
||||
|
||||
func webDispatcherIPv6Traceroute(w http.ResponseWriter, r *http.Request) {
|
||||
split := strings.Split(r.URL.Path[len("/ipv6/traceroute/"):], "/")
|
||||
webHandler(w, r, "traceroute6", split[0], strings.Join(split[1:], "/"))
|
||||
}
|
||||
command = (map[string]string{
|
||||
"summary": "show protocols",
|
||||
"detail": "show protocols all " + urlCommands,
|
||||
"route": "show route for " + urlCommands,
|
||||
"route_all": "show route for " + urlCommands + " all",
|
||||
"route_where": "show route where net ~ [ " + urlCommands + " ]",
|
||||
"route_where_all": "show route where net ~ [ " + urlCommands + " ] all",
|
||||
"traceroute": urlCommands,
|
||||
})[command]
|
||||
|
||||
func webHandler(w http.ResponseWriter, r *http.Request, endpoint string, serverQuery string, command string) {
|
||||
templateHeader(w, r, "Bird-lg Go - "+html.EscapeString(endpoint+" "+command))
|
||||
|
||||
var servers []string = strings.Split(serverQuery, "+")
|
||||
var servers []string = strings.Split(split[2], "+")
|
||||
|
||||
var responses []string = batchRequest(servers, endpoint, command)
|
||||
for i, response := range responses {
|
||||
w.Write([]byte("<h2>" + html.EscapeString(servers[i]) + ": " + html.EscapeString(command) + "</h2>"))
|
||||
if (endpoint == "bird" || endpoint == "bird6") && command == "show protocols" && strings.ToLower(response[0:4]) == "name" {
|
||||
if (endpoint == "bird" || endpoint == "bird6") && command == "show protocols" && len(response) > 4 && strings.ToLower(response[0:4]) == "name" {
|
||||
var isIPv6 bool = endpoint[len(endpoint)-1] == '6'
|
||||
summaryTable(w, isIPv6, response, servers[i])
|
||||
} else {
|
||||
@ -106,11 +49,7 @@ func webHandler(w http.ResponseWriter, r *http.Request, endpoint string, serverQ
|
||||
templateFooter(w)
|
||||
}
|
||||
|
||||
func defaultRedirect(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, "/ipv4/summary/" + strings.Join(settingServers[:], "+"), 302)
|
||||
}
|
||||
|
||||
func navbarFormRedirect(w http.ResponseWriter, r *http.Request) {
|
||||
func webHandlerNavbarFormRedirect(w http.ResponseWriter, r *http.Request) {
|
||||
query := r.URL.Query()
|
||||
if query.Get("action") == "whois" {
|
||||
http.Redirect(w, r, "/"+query.Get("action")+"/"+query.Get("target"), 302)
|
||||
@ -123,22 +62,26 @@ func navbarFormRedirect(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
func webServerStart() {
|
||||
// Start HTTP server
|
||||
http.HandleFunc("/", defaultRedirect)
|
||||
http.HandleFunc("/ipv4/summary/", webDispatcherIPv4Summary)
|
||||
http.HandleFunc("/ipv6/summary/", webDispatcherIPv6Summary)
|
||||
http.HandleFunc("/ipv4/detail/", webDispatcherIPv4Detail)
|
||||
http.HandleFunc("/ipv6/detail/", webDispatcherIPv6Detail)
|
||||
http.HandleFunc("/ipv4/route/", webDispatcherIPv4Route)
|
||||
http.HandleFunc("/ipv6/route/", webDispatcherIPv6Route)
|
||||
http.HandleFunc("/ipv4/route_all/", webDispatcherIPv4RouteAll)
|
||||
http.HandleFunc("/ipv6/route_all/", webDispatcherIPv6RouteAll)
|
||||
http.HandleFunc("/ipv4/route_where/", webDispatcherIPv4RouteWhere)
|
||||
http.HandleFunc("/ipv6/route_where/", webDispatcherIPv6RouteWhere)
|
||||
http.HandleFunc("/ipv4/route_where_all/", webDispatcherIPv4RouteWhereAll)
|
||||
http.HandleFunc("/ipv6/route_where_all/", webDispatcherIPv6RouteWhereAll)
|
||||
http.HandleFunc("/ipv4/traceroute/", webDispatcherIPv4Traceroute)
|
||||
http.HandleFunc("/ipv6/traceroute/", webDispatcherIPv6Traceroute)
|
||||
http.HandleFunc("/whois/", webDispatcherWhois)
|
||||
http.HandleFunc("/redir/", navbarFormRedirect)
|
||||
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, "/ipv4/summary/"+strings.Join(settingServers[:], "+"), 302)
|
||||
})
|
||||
http.HandleFunc("/ipv4/summary/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird", "summary") })
|
||||
http.HandleFunc("/ipv6/summary/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird6", "summary") })
|
||||
http.HandleFunc("/ipv4/detail/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird", "detail") })
|
||||
http.HandleFunc("/ipv6/detail/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird6", "detail") })
|
||||
http.HandleFunc("/ipv4/route/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird", "route") })
|
||||
http.HandleFunc("/ipv6/route/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird6", "route") })
|
||||
http.HandleFunc("/ipv4/route_all/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird", "route_all") })
|
||||
http.HandleFunc("/ipv6/route_all/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird6", "route_all") })
|
||||
http.HandleFunc("/ipv4/route_where/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird", "route_where") })
|
||||
http.HandleFunc("/ipv6/route_where/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird6", "route_where") })
|
||||
http.HandleFunc("/ipv4/route_where_all/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird", "route_where_all") })
|
||||
http.HandleFunc("/ipv6/route_where_all/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "bird6", "route_where_all") })
|
||||
http.HandleFunc("/ipv4/traceroute/", func(w http.ResponseWriter, r *http.Request) { webBackendCommunicator(w, r, "traceroute", "traceroute") })
|
||||
http.HandleFunc("/ipv6/traceroute/", func(w http.ResponseWriter, r *http.Request) {
|
||||
webBackendCommunicator(w, r, "traceroute6", "traceroute")
|
||||
})
|
||||
http.HandleFunc("/whois/", webHandlerWhois)
|
||||
http.HandleFunc("/redir/", webHandlerNavbarFormRedirect)
|
||||
http.ListenAndServe(settingListen, nil)
|
||||
}
|
||||
|
||||
@ -22,7 +22,9 @@ func birdReadln(bird io.Reader, w io.Writer) bool {
|
||||
c := make([]byte, 1024, 1024)
|
||||
pos := 0
|
||||
for {
|
||||
if pos >= 1024 { break }
|
||||
if pos >= 1024 {
|
||||
break
|
||||
}
|
||||
_, err := bird.Read(c[pos : pos+1])
|
||||
if err != nil {
|
||||
panic(err)
|
||||
@ -41,7 +43,9 @@ func birdReadln(bird io.Reader, w io.Writer) bool {
|
||||
// Line is too short to have a status number
|
||||
if w != nil {
|
||||
pos = 0
|
||||
for c[pos] == byte(' ') { pos++ }
|
||||
for c[pos] == byte(' ') {
|
||||
pos++
|
||||
}
|
||||
w.Write(c[pos:])
|
||||
}
|
||||
return true
|
||||
@ -49,7 +53,9 @@ func birdReadln(bird io.Reader, w io.Writer) bool {
|
||||
// There is a status number at beginning, remove first 5 bytes
|
||||
if w != nil && pos > 6 {
|
||||
pos = 5
|
||||
for c[pos] == byte(' ') { pos++ }
|
||||
for c[pos] == byte(' ') {
|
||||
pos++
|
||||
}
|
||||
w.Write(c[pos:])
|
||||
}
|
||||
return c[0] != byte('0') && c[0] != byte('8') && c[0] != byte('9')
|
||||
@ -57,7 +63,9 @@ func birdReadln(bird io.Reader, w io.Writer) bool {
|
||||
// There is no status number, only remove preceding spaces
|
||||
if w != nil {
|
||||
pos = 0
|
||||
for c[pos] == byte(' ') { pos++ }
|
||||
for c[pos] == byte(' ') {
|
||||
pos++
|
||||
}
|
||||
w.Write(c[pos:])
|
||||
}
|
||||
return true
|
||||
@ -80,7 +88,8 @@ func birdHandler(httpW http.ResponseWriter, httpR *http.Request) {
|
||||
|
||||
println(query)
|
||||
birdWriteln(bird, query)
|
||||
for birdReadln(bird, httpW) {}
|
||||
for birdReadln(bird, httpW) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -95,6 +104,7 @@ func bird6Handler(httpW http.ResponseWriter, httpR *http.Request) {
|
||||
|
||||
println(query)
|
||||
birdWriteln(bird6, query)
|
||||
for birdReadln(bird6, httpW) {}
|
||||
for birdReadln(bird6, httpW) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"net"
|
||||
"net/http"
|
||||
"flag"
|
||||
"os"
|
||||
)
|
||||
|
||||
|
||||
@ -2,8 +2,8 @@ package main
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"runtime"
|
||||
"os/exec"
|
||||
"runtime"
|
||||
)
|
||||
|
||||
// Wrapper of traceroute, IPv4
|
||||
@ -25,10 +25,18 @@ func tracerouteRealHandler(useIPv6 bool, httpW http.ResponseWriter, httpR *http.
|
||||
var cmd string
|
||||
var args []string
|
||||
if runtime.GOOS == "freebsd" || runtime.GOOS == "netbsd" {
|
||||
if useIPv6 { cmd = "traceroute6" } else { cmd = "traceroute" }
|
||||
if useIPv6 {
|
||||
cmd = "traceroute6"
|
||||
} else {
|
||||
cmd = "traceroute"
|
||||
}
|
||||
args = []string{"-a", "-q1", "-w1", "-m15", query}
|
||||
} else if runtime.GOOS == "openbsd" {
|
||||
if useIPv6 { cmd = "traceroute6" } else { cmd = "traceroute" }
|
||||
if useIPv6 {
|
||||
cmd = "traceroute6"
|
||||
} else {
|
||||
cmd = "traceroute"
|
||||
}
|
||||
args = []string{"-A", "-q1", "-w1", "-m15", query}
|
||||
} else if runtime.GOOS == "linux" {
|
||||
cmd = "traceroute"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user