TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-20 11:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/sniproxy: add client metrics

Browse Source 
Count number of sessions, number of DNS queries answered
successfully and in error, and number of http->https redirects.

Updates #1748

Signed-off-by: Denton Gentry <dgentry@tailscale.com>
This commit is contained in:
Denton Gentry 2023-07-29 00:11:19 -07:00 committed by Denton Gentry
parent eef15b4ffc
commit ec9213a627
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/sniproxy/sniproxy.go
View File

@ -22,6 +22,7 @@ import (
"tailscale.com/net/netutil" "tailscale.com/net/netutil"
"tailscale.com/tsnet" "tailscale.com/tsnet"
"tailscale.com/types/nettype" "tailscale.com/types/nettype"
"tailscale.com/util/clientmetric"
) )
var ( var (
@ -32,6 +33,14 @@ var (
var tsMBox = dnsmessage.MustNewName("support.tailscale.com.") var tsMBox = dnsmessage.MustNewName("support.tailscale.com.")
var (
numSessions = clientmetric.NewCounter("sniproxy_sessions")
numBadAddrPort = clientmetric.NewCounter("sniproxy_bad_addrport")
dnsResponses = clientmetric.NewCounter("sniproxy_dns_responses")
dnsFailures = clientmetric.NewCounter("sniproxy_dns_failed")
httpPromoted = clientmetric.NewCounter("sniproxy_http_promoted")
)
func main() { func main() {
flag.Parse() flag.Parse()
if *ports == "" { if *ports == "" {
@ -109,6 +118,7 @@ func (s *server) serveDNSConn(c nettype.ConnPacketConn) {
n, err := c.Read(buf) n, err := c.Read(buf)
if err != nil { if err != nil {
log.Printf("c.Read failed: %v\n ", err) log.Printf("c.Read failed: %v\n ", err)
dnsFailures.Add(1)
return return
} }
@ -116,20 +126,25 @@ func (s *server) serveDNSConn(c nettype.ConnPacketConn) {
err = msg.Unpack(buf[:n]) err = msg.Unpack(buf[:n])
if err != nil { if err != nil {
log.Printf("dnsmessage unpack failed: %v\n ", err) log.Printf("dnsmessage unpack failed: %v\n ", err)
dnsFailures.Add(1)
return return
} }
buf, err = s.dnsResponse(&msg) buf, err = s.dnsResponse(&msg)
if err != nil { if err != nil {
log.Printf("s.dnsResponse failed: %v\n", err) log.Printf("s.dnsResponse failed: %v\n", err)
dnsFailures.Add(1)
return return
} }
_, err = c.Write(buf) _, err = c.Write(buf)
if err != nil { if err != nil {
log.Printf("c.Write failed: %v\n", err) log.Printf("c.Write failed: %v\n", err)
dnsFailures.Add(1)
return return
} }
dnsResponses.Add(1)
} }
func (s *server) serveConn(c net.Conn) { func (s *server) serveConn(c net.Conn) {
@ -137,6 +152,7 @@ func (s *server) serveConn(c net.Conn) {
_, port, err := net.SplitHostPort(addrPortStr) _, port, err := net.SplitHostPort(addrPortStr)
if err != nil { if err != nil {
log.Printf("bogus addrPort %q", addrPortStr) log.Printf("bogus addrPort %q", addrPortStr)
numBadAddrPort.Add(1)
c.Close() c.Close()
return return
} }
@ -149,6 +165,7 @@ func (s *server) serveConn(c net.Conn) {
return netutil.NewOneConnListener(c, nil), nil return netutil.NewOneConnListener(c, nil), nil
} }
p.AddSNIRouteFunc(addrPortStr, func(ctx context.Context, sniName string) (t tcpproxy.Target, ok bool) { p.AddSNIRouteFunc(addrPortStr, func(ctx context.Context, sniName string) (t tcpproxy.Target, ok bool) {
numSessions.Add(1)
return &tcpproxy.DialProxy{ return &tcpproxy.DialProxy{
Addr: net.JoinHostPort(sniName, port), Addr: net.JoinHostPort(sniName, port),
DialContext: dialer.DialContext, DialContext: dialer.DialContext,
@ -218,6 +235,7 @@ func (s *server) dnsResponse(req *dnsmessage.Message) (buf []byte, err error) {
func (s *server) promoteHTTPS(ln net.Listener) { func (s *server) promoteHTTPS(ln net.Listener) {
err := http.Serve(ln, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { err := http.Serve(ln, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
httpPromoted.Add(1)
http.Redirect(w, r, "https://"+r.Host+r.RequestURI, http.StatusFound) http.Redirect(w, r, "https://"+r.Host+r.RequestURI, http.StatusFound)
})) }))
log.Fatalf("promoteHTTPS http.Serve: %v", err) log.Fatalf("promoteHTTPS http.Serve: %v", err)