all: remove deadcode (#2952)

hscontrol/app.go

@@ -941,18 +941,6 @@ func (h *Headscale) getTLSSettings() (*tls.Config, error) {
 	}
 }
 
-func notFoundHandler(
-	writer http.ResponseWriter,
-	req *http.Request,
-) {
-	log.Trace().
-		Interface("header", req.Header).
-		Interface("proto", req.Proto).
-		Interface("url", req.URL).
-		Msg("Request did not match")
-	writer.WriteHeader(http.StatusNotFound)
-}
-
 func readOrCreatePrivateKey(path string) (*key.MachinePrivate, error) {
 	dir := filepath.Dir(path)
 	err := util.EnsureDir(dir)

hscontrol/handlers.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chasefleming/elem-go/styles"
 	"github.com/gorilla/mux"
 	"github.com/juanfont/headscale/hscontrol/assets"
 	"github.com/juanfont/headscale/hscontrol/templates"
@@ -228,13 +227,6 @@ func (h *Headscale) VersionHandler(
 	}
 }
 
-var codeStyleRegisterWebAPI = styles.Props{
-	styles.Display:         "block",
-	styles.Padding:         "20px",
-	styles.Border:          "1px solid #bbb",
-	styles.BackgroundColor: "#eee",
-}
-
 type AuthProviderWeb struct {
 	serverURL string
 }

hscontrol/mapper/batcher_lockfree.go

@@ -35,7 +35,6 @@ type LockFreeBatcher struct {
 
 	// Metrics
 	totalNodes      atomic.Int64
-	totalUpdates    atomic.Int64
 	workQueuedCount atomic.Int64
 	workProcessed   atomic.Int64
 	workErrors      atomic.Int64

hscontrol/mapper/utils.go

@@ -1,47 +0,0 @@
-package mapper
-
-import "tailscale.com/tailcfg"
-
-// mergePatch takes the current patch and a newer patch
-// and override any field that has changed.
-func mergePatch(currPatch, newPatch *tailcfg.PeerChange) {
-	if newPatch.DERPRegion != 0 {
-		currPatch.DERPRegion = newPatch.DERPRegion
-	}
-
-	if newPatch.Cap != 0 {
-		currPatch.Cap = newPatch.Cap
-	}
-
-	if newPatch.CapMap != nil {
-		currPatch.CapMap = newPatch.CapMap
-	}
-
-	if newPatch.Endpoints != nil {
-		currPatch.Endpoints = newPatch.Endpoints
-	}
-
-	if newPatch.Key != nil {
-		currPatch.Key = newPatch.Key
-	}
-
-	if newPatch.KeySignature != nil {
-		currPatch.KeySignature = newPatch.KeySignature
-	}
-
-	if newPatch.DiscoKey != nil {
-		currPatch.DiscoKey = newPatch.DiscoKey
-	}
-
-	if newPatch.Online != nil {
-		currPatch.Online = newPatch.Online
-	}
-
-	if newPatch.LastSeen != nil {
-		currPatch.LastSeen = newPatch.LastSeen
-	}
-
-	if newPatch.KeyExpiry != nil {
-		currPatch.KeyExpiry = newPatch.KeyExpiry
-	}
-}

hscontrol/metrics.go

@@ -32,31 +32,16 @@ var (
 		Name:      "mapresponse_sent_total",
 		Help:      "total count of mapresponses sent to clients",
 	}, []string{"status", "type"})
-	mapResponseUpdateReceived = promauto.NewCounterVec(prometheus.CounterOpts{
-		Namespace: prometheusNamespace,
-		Name:      "mapresponse_updates_received_total",
-		Help:      "total count of mapresponse updates received on update channel",
-	}, []string{"type"})
 	mapResponseEndpointUpdates = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: prometheusNamespace,
 		Name:      "mapresponse_endpoint_updates_total",
 		Help:      "total count of endpoint updates received",
 	}, []string{"status"})
-	mapResponseReadOnly = promauto.NewCounterVec(prometheus.CounterOpts{
-		Namespace: prometheusNamespace,
-		Name:      "mapresponse_readonly_requests_total",
-		Help:      "total count of readonly requests received",
-	}, []string{"status"})
 	mapResponseEnded = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: prometheusNamespace,
 		Name:      "mapresponse_ended_total",
 		Help:      "total count of new mapsessions ended",
 	}, []string{"reason"})
-	mapResponseClosed = promauto.NewCounterVec(prometheus.CounterOpts{
-		Namespace: prometheusNamespace,
-		Name:      "mapresponse_closed_total",
-		Help:      "total count of calls to mapresponse close",
-	}, []string{"return"})
 	httpDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{
 		Namespace: prometheusNamespace,
 		Name:      "http_duration_seconds",

hscontrol/noise.go

@@ -29,9 +29,6 @@ const (
 	// of length. Then that many bytes of JSON-encoded tailcfg.EarlyNoise.
 	// The early payload is optional. Some servers may not send it... But we do!
 	earlyPayloadMagic = "\xff\xff\xffTS"
-
-	// EarlyNoise was added in protocol version 49.
-	earlyNoiseCapabilityVersion = 49
 )
 
 type noiseServer struct {

hscontrol/oidc.go

@@ -173,11 +173,6 @@ func (a *AuthProviderOIDC) RegisterHandler(
 	http.Redirect(writer, req, authURL, http.StatusFound)
 }
 
-type oidcCallbackTemplateConfig struct {
-	User string
-	Verb string
-}
-
 // OIDCCallbackHandler handles the callback from the OIDC endpoint
 // Retrieves the nkey from the state cache and adds the node to the users email user
 // TODO: A confirmation page for new nodes should be added to avoid phishing vulnerabilities

hscontrol/poll.go

@@ -319,41 +319,6 @@ var keepAlive = tailcfg.MapResponse{
 	KeepAlive: true,
 }
 
-func logTracePeerChange(hostname string, hostinfoChange bool, peerChange *tailcfg.PeerChange) {
-	trace := log.Trace().Caller().Uint64("node.id", uint64(peerChange.NodeID)).Str("hostname", hostname)
-
-	if peerChange.Key != nil {
-		trace = trace.Str("node.key", peerChange.Key.ShortString())
-	}
-
-	if peerChange.DiscoKey != nil {
-		trace = trace.Str("disco.key", peerChange.DiscoKey.ShortString())
-	}
-
-	if peerChange.Online != nil {
-		trace = trace.Bool("online", *peerChange.Online)
-	}
-
-	if peerChange.Endpoints != nil {
-		eps := make([]string, len(peerChange.Endpoints))
-		for idx, ep := range peerChange.Endpoints {
-			eps[idx] = ep.String()
-		}
-
-		trace = trace.Strs("endpoints", eps)
-	}
-
-	if hostinfoChange {
-		trace = trace.Bool("hostinfo_changed", hostinfoChange)
-	}
-
-	if peerChange.DERPRegion != 0 {
-		trace = trace.Int("derp_region", peerChange.DERPRegion)
-	}
-
-	trace.Time("last_seen", *peerChange.LastSeen).Msg("PeerChange received")
-}
-
 // logf adds common mapSession context to a zerolog event.
 func (m *mapSession) logf(event *zerolog.Event) *zerolog.Event {
 	return event.

hscontrol/util/dns.go

@@ -22,10 +22,7 @@ const (
 	LabelHostnameLength = 63
 )
 
-var (
-	invalidDNSRegex         = regexp.MustCompile("[^a-z0-9-.]+")
-	invalidCharsInUserRegex = regexp.MustCompile("[^a-z0-9-.]+")
-)
+var invalidDNSRegex = regexp.MustCompile("[^a-z0-9-.]+")
 
 var ErrInvalidHostName = errors.New("invalid hostname")