From 121be57b2d42332ae25f4a4dee48a8d2e1e61cad Mon Sep 17 00:00:00 2001
From: ArcticLampyrid <ArcticLampyrid@outlook.com>
Date: Sun, 17 Nov 2024 01:57:04 +0800
Subject: [PATCH] refactor: make `doVerify` a seperated func

---
 hscontrol/handlers.go | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/hscontrol/handlers.go b/hscontrol/handlers.go
index 64bc1bc3..3858df93 100644
--- a/hscontrol/handlers.go
+++ b/hscontrol/handlers.go
@@ -57,6 +57,27 @@ func parseCabailityVersion(req *http.Request) (tailcfg.CapabilityVersion, error)
 	return tailcfg.CapabilityVersion(clientCapabilityVersion), nil
 }
 
+func (h *Headscale) handleVerifyRequest(
+	req *http.Request,
+) (bool, error) {
+	body, err := io.ReadAll(req.Body)
+	if err != nil {
+		return false, fmt.Errorf("cannot read request body: %w", err)
+	}
+
+	var derpAdmitClientRequest tailcfg.DERPAdmitClientRequest
+	if err := json.Unmarshal(body, &derpAdmitClientRequest); err != nil {
+		return false, fmt.Errorf("cannot parse derpAdmitClientRequest: %w", err)
+	}
+
+	nodes, err := h.db.ListNodes()
+	if err != nil {
+		return false, fmt.Errorf("cannot list nodes: %w", err)
+	}
+
+	return nodes.ContainsNodeKey(derpAdmitClientRequest.NodePublic), nil
+}
+
 // see https://github.com/tailscale/tailscale/blob/964282d34f06ecc06ce644769c66b0b31d118340/derp/derp_server.go#L1159, Derp use verifyClientsURL to verify whether a client is allowed to connect to the DERP server.
 func (h *Headscale) VerifyHandler(
 	writer http.ResponseWriter,
@@ -71,26 +92,7 @@ func (h *Headscale) VerifyHandler(
 		Str("handler", "/verify").
 		Msg("verify client")
 
-	doVerify := func() (bool, error) {
-		body, err := io.ReadAll(req.Body)
-		if err != nil {
-			return false, fmt.Errorf("cannot read request body: %w", err)
-		}
-
-		var derpAdmitClientRequest tailcfg.DERPAdmitClientRequest
-		if err := json.Unmarshal(body, &derpAdmitClientRequest); err != nil {
-			return false, fmt.Errorf("cannot parse derpAdmitClientRequest: %w", err)
-		}
-
-		nodes, err := h.db.ListNodes()
-		if err != nil {
-			return false, fmt.Errorf("cannot list nodes: %w", err)
-		}
-
-		return nodes.ContainsNodeKey(derpAdmitClientRequest.NodePublic), nil
-	}
-
-	allow, err := doVerify()
+	allow, err := h.handleVerifyRequest(req)
 	if err != nil {
 		log.Error().
 			Caller().