temp

Signed-off-by: Kristoffer Dalby <[email protected]>

Dockerfile.tailscale-HEAD

@@ -6,7 +6,8 @@ RUN apt-get update \
 
 RUN useradd --shell=/bin/bash --create-home ssh-it-user
 
-RUN git clone https://github.com/tailscale/tailscale.git
+# RUN git clone https://github.com/tailscale/tailscale.git
+COPY tailscale /go/tailscale
 
 WORKDIR /go/tailscale
 

hscontrol/app.go

@@ -49,6 +49,8 @@ import (
  "tailscale.com/tailcfg"
  "tailscale.com/types/dnstype"
  "tailscale.com/types/key"
+
+ _ "net/http/pprof"
 )
 
 var (
@@ -93,7 +95,7 @@ type Headscale struct {
  shutdownChan chan struct{}
  pollNetMapStreamWG sync.WaitGroup
 
- pollStreamOpenMu sync.Mutex
+ // pollStreamOpenMu sync.Mutex
 }
 
 func NewHeadscale(cfg *types.Config) (*Headscale, error) {
@@ -439,6 +441,7 @@ func (h *Headscale) ensureUnixSocketIsAbsent() error {
 
 func (h *Headscale) createRouter(grpcMux *runtime.ServeMux) *mux.Router {
  router := mux.NewRouter()
+ router.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
 
  router.HandleFunc(ts2021UpgradePath, h.NoiseUpgradeHandler).Methods(http.MethodPost)
 

hscontrol/auth.go

@@ -27,10 +27,14 @@ func (h *Headscale) handleRegister(
  isNoise bool,
 ) {
  now := time.Now().UTC()
+ log.Trace().Msg("STEP 2")
  machine, err := h.db.GetMachineByAnyKey(machineKey, registerRequest.NodeKey, registerRequest.OldNodeKey)
+ log.Trace().Msg("STEP 3")
  if errors.Is(err, gorm.ErrRecordNotFound) {
+ log.Trace().Msg("STEP 4")
  // If the machine has AuthKey set, handle registration via PreAuthKeys
  if registerRequest.Auth.AuthKey != "" {
+ log.Trace().Msg("STEP 5")
  h.handleAuthKey(writer, registerRequest, machineKey, isNoise)
 
  return
@@ -236,7 +240,9 @@ func (h *Headscale) handleAuthKey(
  Msgf("Processing auth key for %s", registerRequest.Hostinfo.Hostname)
  resp := tailcfg.RegisterResponse{}
 
+ log.Trace().Msg("STEP 5")
  pak, err := h.db.ValidatePreAuthKey(registerRequest.Auth.AuthKey)
+ log.Trace().Msg("STEP 6")
  if err != nil {
  log.Error().
  Caller().

hscontrol/auth_noise.go

@@ -23,6 +23,7 @@ func (ns *noiseServer) NoiseRegistrationHandler(
 
  log.Trace().
  Any("headers", req.Header).
+ Caller().
  Msg("Headers")
 
  body, _ := io.ReadAll(req.Body)
@@ -40,5 +41,7 @@ func (ns *noiseServer) NoiseRegistrationHandler(
 
  ns.nodeKey = registerRequest.NodeKey
 
+ log.Trace().Msg("STEP 1")
+
  ns.headscale.handleRegister(writer, req, registerRequest, ns.conn.Peer(), true)
 }

hscontrol/poll.go

@@ -69,7 +69,7 @@ func (h *Headscale) handlePoll(
  // following updates missing
  var updateChan chan types.StateUpdate
  if mapRequest.Stream {
- h.pollStreamOpenMu.Lock()
+ // h.pollStreamOpenMu.Lock()
  h.pollNetMapStreamWG.Add(1)
  defer h.pollNetMapStreamWG.Done()
 
@@ -233,6 +233,8 @@ func (h *Headscale) handlePoll(
  return
  }
 
+ // h.pollStreamOpenMu.Unlock()
+
  // Send the client an update to make sure we send an initial mapresponse
  _, err = writer.Write(mapResp)
  if err != nil {
@@ -254,8 +256,6 @@ func (h *Headscale) handlePoll(
  ctx, cancel := context.WithCancel(ctx)
  defer cancel()
 
- h.pollStreamOpenMu.Unlock()
-
  for {
  logInfo("Waiting for update on stream channel")
  select {

hscontrol/poll_noise.go

@@ -31,6 +31,7 @@ func (ns *noiseServer) NoisePollNetMapHandler(
 
  log.Trace().
  Any("headers", req.Header).
+ Caller().
  Msg("Headers")
 
  body, _ := io.ReadAll(req.Body)

integration/tsic/tsic.go

@@ -361,7 +361,7 @@ func (t *TailscaleInContainer) Login(
  )
  }
 
- if _, _, err := t.Execute(command); err != nil {
+ if _, _, err := t.Execute(command, dockertestutil.ExecuteCommandTimeout(60*time.Second)); err != nil {
  return fmt.Errorf(
  "%s failed to join tailscale client (%s): %w",
  t.hostname,