Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-11-10 01:20:58 +01:00
Code Issues Projects Releases Wiki Activity

Update after running make fmt

Browse Source
This commit is contained in:
TeejMcSteez 2025-10-31 03:22:59 -04:00
parent 903351d44f
commit 29f4fb91e8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hscontrol/handlers.go
View File

@ -101,6 +101,7 @@ func (h *Headscale) handleVerifyRequest(
// Check if any node has the requested NodeKey // Check if any node has the requested NodeKey
var nodeKeyFound bool var nodeKeyFound bool
for _, node := range nodes.All() { for _, node := range nodes.All() {
if node.NodeKey() == derpAdmitClientRequest.NodePublic { if node.NodeKey() == derpAdmitClientRequest.NodePublic {
nodeKeyFound = true nodeKeyFound = true
@ -131,6 +132,7 @@ func (h *Headscale) VerifyHandler(
httpError(writer, err) httpError(writer, err)
return return
} }
writer.Header().Set("Content-Type", "application/json") writer.Header().Set("Content-Type", "application/json")
} }
@ -152,6 +154,7 @@ func (h *Headscale) KeyHandler(
resp := tailcfg.OverTLSPublicKeyResponse{ resp := tailcfg.OverTLSPublicKeyResponse{
PublicKey: h.noisePrivateKey.Public(), PublicKey: h.noisePrivateKey.Public(),
} }
writer.Header().Set("Content-Type", "application/json") writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(resp) json.NewEncoder(writer).Encode(resp)
@ -174,13 +177,14 @@ func (h *Headscale) HealthHandler(
if err != nil { if err != nil {
writer.WriteHeader(http.StatusInternalServerError) writer.WriteHeader(http.StatusInternalServerError)
res.Status = "fail" res.Status = "fail"
} }
json.NewEncoder(writer).Encode(res) json.NewEncoder(writer).Encode(res)
} }
err := h.state.PingDB(req.Context())
if err := h.state.PingDB(req.Context()); err != nil { if err != nil {
respond(err) respond(err)
return return
@ -195,6 +199,7 @@ func (h *Headscale) RobotsHandler(
) { ) {
writer.Header().Set("Content-Type", "text/plain") writer.Header().Set("Content-Type", "text/plain")
writer.WriteHeader(http.StatusOK) writer.WriteHeader(http.StatusOK)
_, err := writer.Write([]byte("User-agent: *\nDisallow: /")) _, err := writer.Write([]byte("User-agent: *\nDisallow: /"))
if err != nil { if err != nil {
log.Error(). log.Error().
@ -214,7 +219,8 @@ func (h *Headscale) VersionHandler(
writer.WriteHeader(http.StatusOK) writer.WriteHeader(http.StatusOK)
versionInfo := types.GetVersionInfo() versionInfo := types.GetVersionInfo()
if err := json.NewEncoder(writer).Encode(versionInfo); err != nil { err := json.NewEncoder(writer).Encode(versionInfo)
if err != nil {
log.Error(). log.Error().
Caller(). Caller().
Err(err). Err(err).
@ -273,12 +279,14 @@ func (a *AuthProviderWeb) RegisterHandler(
} }
//go:embed assets/favicon.png //go:embed assets/favicon.png
var favicon[] byte var favicon []byte
func FaviconHandler(writer http.ResponseWriter, req *http.Request) { func FaviconHandler(writer http.ResponseWriter, req *http.Request) {
writer.Header().Set("Content-Type", "image/png") writer.Header().Set("Content-Type", "image/png")
http.ServeContent(writer, req, "favicon.ico", time.Unix(0, 0), bytes.NewReader(favicon)) http.ServeContent(writer, req, "favicon.ico", time.Unix(0, 0), bytes.NewReader(favicon))
} }
// Returns a blank page with favicon linked
// Returns a blank page with favicon linked.
func BlankHandler(writer http.ResponseWriter, res *http.Request) { func BlankHandler(writer http.ResponseWriter, res *http.Request) {
writer.Header().Set("Content-Type", "text/html; charset=utf-8") writer.Header().Set("Content-Type", "text/html; charset=utf-8")
io.WriteString(writer, ` io.WriteString(writer, `
@ -286,4 +294,4 @@ func BlankHandler(writer http.ResponseWriter, res *http.Request) {
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
</head><body></body></html> </head><body></body></html>
`) `)
} }