daxi20/bird-lg-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

一些小改動 (#42)

Browse Source 
* 1. remove ":" at the start of port assignement. 2. use BIRDLG_PROXY_PORT at proxy. 3. add custom URL to brand

* goto / if only one server

* add BIRDLG_TRACEROUTE_BIN
This commit is contained in:
日下部 詩
2021-11-10 02:27:02 +08:00
committed by GitHub
parent 6481e7cc8d
commit 58847759b3
8 changed files with 78 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/go.mod
View File

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

19
proxy/main.go
View File

@@ -53,6 +53,7 @@ type settingType struct {
birdSocket string
listen string
allowedIPs []string
tr_bin string
}
var setting settingType
@@ -62,8 +63,9 @@ func main() {
// Prepare default socket paths, use environment variable if possible
var settingDefault = settingType{
"/var/run/bird/bird.ctl",
":8000",
"8000",
[]string{""},
"traceroute",
}
if birdSocketEnv := os.Getenv("BIRD_SOCKET"); birdSocketEnv != "" {
@@ -72,19 +74,32 @@ func main() {
if listenEnv := os.Getenv("BIRDLG_LISTEN"); listenEnv != "" {
settingDefault.listen = listenEnv
}
if listenEnv := os.Getenv("BIRDLG_PROXY_PORT"); listenEnv != "" {
settingDefault.listen = listenEnv
}
if AllowedIPsEnv := os.Getenv("ALLOWED_IPS"); AllowedIPsEnv != "" {
settingDefault.allowedIPs = strings.Split(AllowedIPsEnv, ",")
}
if tr_binEnv := os.Getenv("BIRDLG_TRACEROUTE_BIN"); tr_binEnv != "" {
settingDefault.tr_bin = tr_binEnv
}
// Allow parameters to override environment variables
birdParam := flag.String("bird", settingDefault.birdSocket, "socket file for bird, set either in parameter or environment variable BIRD_SOCKET")
listenParam := flag.String("listen", settingDefault.listen, "listen address, set either in parameter or environment variable BIRDLG_LISTEN")
listenParam := flag.String("listen", settingDefault.listen, "listen address, set either in parameter or environment variable BIRDLG_PROXY_PORT")
AllowedIPsParam := flag.String("allowed", strings.Join(settingDefault.allowedIPs, ","), "IPs allowed to access this proxy, separated by commas. Don't set to allow all IPs.")
tr_binParam := flag.String("traceroute_bin", settingDefault.tr_bin, "traceroute binary file, set either in parameter or environment variable BIRDLG_TRACEROUTE_BIN")
flag.Parse()
if !strings.Contains(*listenParam, ":") {
listenHost := ":" + (*listenParam)
listenParam = &listenHost
}
setting.birdSocket = *birdParam
setting.listen = *listenParam
setting.allowedIPs = strings.Split(*AllowedIPsParam, ",")
setting.tr_bin = *tr_binParam
// Start HTTP server
http.HandleFunc("/", invalidHandler)

10
proxy/traceroute.go
View File

@@ -50,8 +50,8 @@ func tracerouteHandler(httpW http.ResponseWriter, httpR *http.Request) {
if runtime.GOOS == "freebsd" || runtime.GOOS == "netbsd" || runtime.GOOS == "openbsd" {
result, errString = tracerouteTryExecute(
[]string{
"traceroute",
"traceroute",
setting.tr_bin,
setting.tr_bin,
},
[][]string{
append([]string{"-q1", "-w1"}, args...),
@@ -61,9 +61,9 @@ func tracerouteHandler(httpW http.ResponseWriter, httpR *http.Request) {
} else if runtime.GOOS == "linux" {
result, errString = tracerouteTryExecute(
[]string{
"traceroute",
"traceroute",
"traceroute",
setting.tr_bin,
setting.tr_bin,
setting.tr_bin,
},
[][]string{
append([]string{"-q1", "-N32", "-w1"}, args...),