From 19fd44c28e9b437b306296e318241b8e38be7743 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Thu, 26 Mar 2020 01:05:13 +0800 Subject: [PATCH] Multiple UI and functionality fixes --- frontend/lgproxy.go | 89 +++++----- frontend/template.go | 402 +++++++++++++++++++----------------------- frontend/webserver.go | 205 ++++++++------------- proxy/bird.go | 144 ++++++++------- proxy/main.go | 102 +++++------ proxy/traceroute.go | 110 ++++++------ 6 files changed, 485 insertions(+), 567 deletions(-) diff --git a/frontend/lgproxy.go b/frontend/lgproxy.go index 9c820ee..06ec203 100644 --- a/frontend/lgproxy.go +++ b/frontend/lgproxy.go @@ -1,58 +1,61 @@ package main import ( - "net/http" - "net/url" - "io/ioutil" - "strconv" + "io/ioutil" + "net/http" + "net/url" + "strconv" ) type channelData struct { - id int - data string + id int + data string } // Send commands to lgproxy instances in parallel, and retrieve their responses 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)) + // Channel and array for storing responses + var ch chan channelData = make(chan channelData) + 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 - var isValidServer bool = false - for _, validServer := range settingServers { - if validServer == server { - isValidServer = true - break - } - } + for i, server := range servers { + // Check if the server is in the valid server list passed at startup + var isValidServer bool = false + for _, validServer := range settingServers { + if validServer == server { + isValidServer = true + break + } + } - if !isValidServer { - // If the server is not valid, create a dummy goroutine to return a failure - go func (i int) { - ch <- channelData{i, "request failed: invalid server\n"} - } (i) - } else { - // Compose URL and send the request - url := "http://" + server + "." + settingServersDomain + ":" + strconv.Itoa(settingServersPort) + "/" + url.PathEscape(endpoint) + "?q=" + url.QueryEscape(command) - go func (url string, i int){ - response, err := http.Get(url) - if err != nil { - ch <- channelData{i, "request failed: " + err.Error() + "\n"} - return - } - text, _ := ioutil.ReadAll(response.Body) - ch <- channelData{i, string(text)} - } (url, i) - } - } + if !isValidServer { + // If the server is not valid, create a dummy goroutine to return a failure + go func(i int) { + ch <- channelData{i, "request failed: invalid server\n"} + }(i) + } else { + // Compose URL and send the request + url := "http://" + server + "." + settingServersDomain + ":" + strconv.Itoa(settingServersPort) + "/" + url.PathEscape(endpoint) + "?q=" + url.QueryEscape(command) + go func(url string, i int) { + response, err := http.Get(url) + if err != nil { + ch <- channelData{i, "request failed: " + err.Error() + "\n"} + 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) + } + } - // Sort the responses by their ids, to return data in order - for range servers { - var output channelData = <-ch - response_array[output.id] = output.data - } + // Sort the responses by their ids, to return data in order + for range servers { + var output channelData = <-ch + responseArray[output.id] = output.data + } - return response_array + return responseArray } diff --git a/frontend/template.go b/frontend/template.go index 4a9fade..bb2ba50 100644 --- a/frontend/template.go +++ b/frontend/template.go @@ -1,144 +1,106 @@ package main import ( - "net" - "net/http" - "strings" - "strconv" + "net" + "net/http" + "strconv" + "strings" ) // Helper to check if the IP is valid func isIP(s string) bool { - return nil != net.ParseIP(s) + return nil != net.ParseIP(s) } // Helper to check if the number is valid func isNumber(s string) bool { - _, err := strconv.Atoi(s) - return nil == err + _, err := strconv.Atoi(s) + return nil == err } // 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 - } + // Mark if the URL is for a whois query + 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 { - path += "/" - } + // Use a default URL if the request URL is too short + // The URL is for return to IPv4 summary page + if len(split) < 3 { + path = "ipv4/summary/" + strings.Join(settingServers[:], "+") + "/" + } else if len(split) == 3 { + path += "/" + } - // Compose URLs for link in navbar - split = strings.Split(path, "/") - split[1] = "ipv4" - ipv4_url := strings.Join(split, "/") + split = strings.Split(path, "/") - split = strings.Split(path, "/") - split[1] = "ipv6" - ipv6_url := strings.Join(split, "/") + // Compose URLs for link in navbar + 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:], "/")}, "/") - split = strings.Split(path, "/") - split[3] = strings.Join(settingServers[:], "+") - all_url := strings.Join(split, "/") + // Check if the "All Server" link should be marked as active + var serverAllActive bool = strings.ToLower(split[2]) == strings.ToLower(strings.Join(settingServers[:], "+")) - // 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" - } - - // Print the IPv4, IPv6, All Servers link in navbar - var serverNavigation string = ` -
  • - IPv4 -
    • -
  • - IPv6 -
    • + // Print the IPv4, IPv6, All Servers link in navbar + var serverNavigation string = ` +
  • IPv4
    • +
  • IPv6
    • |
  • - All Servers -
    • - ` + All Servers + ` - // Add a link for each of the servers - for _, server := range settingServers { - split = strings.Split(path, "/") - var serverActive string - if split[3] == server { - serverActive = " active" - } - split[3] = server - server_url := strings.Join(split, "/") + // Add a link for each of the servers + for _, server := range settingServers { + var serverActive string + if split[2] == server { + serverActive = " active" + } + serverURL := "/" + strings.Join([]string{split[0], split[1], server, strings.Join(split[3:], "/")}, "/") - serverNavigation += ` + serverNavigation += `
  • - ` + server + ` -
    • - ` - } + ` + server + ` + ` + } - // Add the options in navbar form, and check if they are active - var options string - split = strings.Split(path, "/") - if split[2] == "summary" { - options += `` - } else { - options += `` - } - if split[2] == "route" { - options += `` - } else { - options += `` - } - if split[2] == "route_all" { - options += `` - } else { - options += `` - } - if split[2] == "route_where" { - options += `` - } else { - options += `` - } - if split[2] == "route_where_all" { - options += `` - } else { - options += `` - } - if isWhois { - options += `` - } else { - options += `` - } - if split[2] == "traceroute" { - options += `` - } else { - options += `` - } + // 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 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 { - // This is a normal request, just extract the target - target = strings.Join(split[4:], "/") - } + var options string + for optionKeyID, optionKey := range optionKeys { + options += "