TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-16 18:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/sniproxy: switch to peterbourgon/ff for flags

Browse Source 
Add support for TS_APPC_* variables to supply arguments by
switching to https://github.com/peterbourgon/ff for CLI
flag parsing. For example:
TS_APPC_FORWARDS=tcp/22/github.com ./sniproxy

Updates https://github.com/tailscale/tailscale/issues/1748

Signed-off-by: Denton Gentry <dgentry@tailscale.com>
This commit is contained in:
Denton Gentry 2023-08-25 07:27:15 -07:00 committed by Denton Gentry
parent fe709c81e5
commit 29a35d4a5d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/sniproxy/sniproxy.go
View File

@ -16,10 +16,12 @@ import (
"log" "log"
"net" "net"
"net/http" "net/http"
"os"
"strconv" "strconv"
"strings" "strings"
"time" "time"
"github.com/peterbourgon/ff/v3"
"golang.org/x/net/dns/dnsmessage" "golang.org/x/net/dns/dnsmessage"
"inet.af/tcpproxy" "inet.af/tcpproxy"
"tailscale.com/client/tailscale" "tailscale.com/client/tailscale"
@ -32,14 +34,6 @@ import (
"tailscale.com/util/clientmetric" "tailscale.com/util/clientmetric"
) )
var (
ports = flag.String("ports", "443", "comma-separated list of ports to proxy")
forwards = flag.String("forwards", "", "comma-separated list of ports to transparently forward, protocol/number/destination. For example, --forwards=tcp/22/github.com,tcp/5432/sql.example.com")
wgPort = flag.Int("wg-listen-port", 0, "UDP port to listen on for WireGuard and peer-to-peer traffic; 0 means automatically select")
promoteHTTPS = flag.Bool("promote-https", true, "promote HTTP to HTTPS")
debugPort = flag.Int("debug-port", 8080, "Listening port for debug/metrics endpoint")
)
var tsMBox = dnsmessage.MustNewName("support.tailscale.com.") var tsMBox = dnsmessage.MustNewName("support.tailscale.com.")
// portForward is the state for a single port forwarding entry, as passed to the --forward flag. // portForward is the state for a single port forwarding entry, as passed to the --forward flag.
@ -74,7 +68,19 @@ func parseForward(value string) (*portForward, error) {
} }
func main() { func main() {
flag.Parse() fs := flag.NewFlagSet("sniproxy", flag.ContinueOnError)
var (
ports = fs.String("ports", "443", "comma-separated list of ports to proxy")
forwards = fs.String("forwards", "", "comma-separated list of ports to transparently forward, protocol/number/destination. For example, --forwards=tcp/22/github.com,tcp/5432/sql.example.com")
wgPort = fs.Int("wg-listen-port", 0, "UDP port to listen on for WireGuard and peer-to-peer traffic; 0 means automatically select")
promoteHTTPS = fs.Bool("promote-https", true, "promote HTTP to HTTPS")
debugPort = fs.Int("debug-port", 8080, "Listening port for debug/metrics endpoint")
)
err := ff.Parse(fs, os.Args[1:], ff.WithEnvVarPrefix("TS_APPC"))
if err != nil {
log.Fatal("ff.Parse")
}
if *ports == "" { if *ports == "" {
log.Fatal("no ports") log.Fatal("no ports")
} }
@ -126,7 +132,6 @@ func main() {
}) })
go s.forward(ln, forw) go s.forward(ln, forw)
} }
ln, err := s.ts.Listen("udp", ":53") ln, err := s.ts.Listen("udp", ":53")