Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support client verify for derp (add integration tests) #2046

Merged
merged 13 commits into from
Nov 22, 2024
Merged
39 changes: 18 additions & 21 deletions hscontrol/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,37 +71,34 @@ func (h *Headscale) VerifyHandler(
Str("handler", "/verify").
Msg("verify client")

body, err := io.ReadAll(req.Body)
if err != nil {
log.Error().
Str("handler", "/verify").
Err(err).
Msg("Cannot read request body")
http.Error(writer, "Internal error", http.StatusInternalServerError)
return
}
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 {
log.Error().
Caller().
Err(err).
Msg("Cannot parse derpAdmitClientRequest")
http.Error(writer, "Internal error", http.StatusInternalServerError)
return
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
}

nodes, err := h.db.ListNodes()
allow, err := doVerify()
if err != nil {
log.Error().
Caller().
Err(err).
Msg("Cannot list nodes")
Msg("Failed to verify client")
http.Error(writer, "Internal error", http.StatusInternalServerError)
}

allow := nodes.ContainsNodeKey(derpAdmitClientRequest.NodePublic)

resp := tailcfg.DERPAdmitClientResponse{
Allow: allow,
}
Expand Down
Loading