patch through m and n key

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

hscontrol/noise.go

@@ -156,7 +156,7 @@ func isSupportedVersion(version tailcfg.CapabilityVersion) bool {
 	return version >= MinimumCapVersion
 }
 
-func rejectUnsupported(writer http.ResponseWriter, version tailcfg.CapabilityVersion) bool {
+func rejectUnsupported(writer http.ResponseWriter, version tailcfg.CapabilityVersion, mkey key.MachinePublic, nkey key.NodePublic) bool {
 	// Reject unsupported versions
 	if !isSupportedVersion(version) {
 		log.Error().
@@ -165,6 +165,8 @@ func rejectUnsupported(writer http.ResponseWriter, version tailcfg.CapabilityVer
 			Int("client_cap_ver", int(version)).
 			Str("minimum_version", capver.TailscaleVersion(MinimumCapVersion)).
 			Str("client_version", capver.TailscaleVersion(version)).
+			Str("node_key", nkey.ShortString()).
+			Str("machine_key", mkey.ShortString()).
 			Msg("unsupported client connected")
 		http.Error(writer, "unsupported client version", http.StatusBadRequest)
 
@@ -196,7 +198,7 @@ func (ns *noiseServer) NoisePollNetMapHandler(
 	}
 
 	// Reject unsupported versions
-	if rejectUnsupported(writer, mapRequest.Version) {
+	if rejectUnsupported(writer, mapRequest.Version, ns.machineKey, mapRequest.NodeKey) {
 		return
 	}
 
@@ -241,7 +243,7 @@ func (ns *noiseServer) NoiseRegistrationHandler(
 	}
 
 	// Reject unsupported versions
-	if rejectUnsupported(writer, registerRequest.Version) {
+	if rejectUnsupported(writer, registerRequest.Version, ns.machineKey, registerRequest.NodeKey) {
 		return
 	}