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

proxy: support arbitraty traceroute arguments

Browse Source
This commit is contained in:
Lan Tian 2021-02-27 16:42:42 +08:00
parent f6ddc5761b
commit f49f8bac5e
No known key found for this signature in database
GPG Key ID: 3D2E9DC81E5791C7
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/bird.go
View File

@ -59,7 +59,9 @@ func birdHandler(httpW http.ResponseWriter, httpR *http.Request) {
// Initialize BIRDv4 socket
bird, err := net.Dial("unix", setting.birdSocket)
if err != nil {
panic(err)
httpW.WriteHeader(http.StatusInternalServerError)
httpW.Write([]byte(err.Error()))
return
}
defer bird.Close()

5
proxy/go.mod
View File

@ -2,4 +2,7 @@ module github.com/xddxdd/bird-lg-go/proxy
go 1.15
require github.com/gorilla/handlers v1.5.1
require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/gorilla/handlers v1.5.1
)

2
proxy/go.sum
View File

@ -1,4 +1,6 @@
github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=

20
proxy/traceroute.go
View File

@ -2,13 +2,14 @@ package main
import (
"fmt"
"html"
"net/http"
"os/exec"
"regexp"
"runtime"
"strconv"
"strings"
"github.com/google/shlex"
)
func tracerouteTryExecute(cmd []string, args [][]string) ([]byte, string) {
@ -31,10 +32,17 @@ func tracerouteTryExecute(cmd []string, args [][]string) ([]byte, string) {
func tracerouteHandler(httpW http.ResponseWriter, httpR *http.Request) {
query := string(httpR.URL.Query().Get("q"))
query = strings.TrimSpace(query)
query = html.EscapeString(query)
if query == "" {
invalidHandler(httpW, httpR)
} else {
args, err := shlex.Split(query)
if err != nil {
httpW.WriteHeader(http.StatusInternalServerError)
httpW.Write([]byte(fmt.Sprintf("failed to parse args: %s\n", err.Error())))
return
}
var result []byte
var errString string
skippedCounter := 0
@ -45,7 +53,8 @@ func tracerouteHandler(httpW http.ResponseWriter, httpR *http.Request) {
"traceroute",
},
[][]string{
{"-q1", "-w1", query},
append([]string{"-q1", "-w1"}, args...),
args,
},
)
} else if runtime.GOOS == "linux" {
@ -55,8 +64,9 @@ func tracerouteHandler(httpW http.ResponseWriter, httpR *http.Request) {
"traceroute",
},
[][]string{
{"-q1", "-N32", "-w1", query},
{"-q1", "-w1", query},
append([]string{"-q1", "-N32", "-w1"}, args...),
append([]string{"-q1", "-w1"}, args...),
args,
},
)
} else {