MyFavMirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-02-22 05:22:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

use tailscale version in all unsupported errs (#2426)

Browse Source
This commit is contained in:
Kristoffer Dalby 2025-02-14 13:43:33 +01:00 committed by GitHub
parent 604f7f6282
commit bbe57f6cd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hscontrol/noise.go
View File

@ -116,9 +116,13 @@ func (h *Headscale) NoiseUpgradeHandler(
) )
} }
func unsupportedClientError(version tailcfg.CapabilityVersion) error {
return fmt.Errorf("unsupported client version: %s (%d)", capver.TailscaleVersion(version), version)
}
func (ns *noiseServer) earlyNoise(protocolVersion int, writer io.Writer) error { func (ns *noiseServer) earlyNoise(protocolVersion int, writer io.Writer) error {
if !isSupportedVersion(tailcfg.CapabilityVersion(protocolVersion)) { if !isSupportedVersion(tailcfg.CapabilityVersion(protocolVersion)) {
return fmt.Errorf("unsupported client version: %d", protocolVersion) return unsupportedClientError(tailcfg.CapabilityVersion(protocolVersion))
} }
earlyJSON, err := json.Marshal(&tailcfg.EarlyNoise{ earlyJSON, err := json.Marshal(&tailcfg.EarlyNoise{
@ -171,7 +175,7 @@ func rejectUnsupported(
Str("node_key", nkey.ShortString()). Str("node_key", nkey.ShortString()).
Str("machine_key", mkey.ShortString()). Str("machine_key", mkey.ShortString()).
Msg("unsupported client connected") Msg("unsupported client connected")
http.Error(writer, "unsupported client version", http.StatusBadRequest) http.Error(writer, unsupportedClientError(version).Error(), http.StatusBadRequest)
return true return true
} }