ns: Reject unexpected RekeyInd

TheThingsNetwork · Oct 16, 2023 · 18a44f1 · 18a44f1
1 parent 658b840
commit 18a44f1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/networkserver/mac/rekey.go b/pkg/networkserver/mac/rekey.go
@@ -42,10 +42,12 @@ func HandleRekeyInd(ctx context.Context, dev *ttnpb.EndDevice, pld *ttnpb.MACCom
 	evs := events.Builders{
 		EvtReceiveRekeyIndication.With(events.WithData(pld)),
 	}
-	if !dev.SupportsJoin {
+	if !dev.SupportsJoin || !macspec.UseRekeyInd(dev.LorawanVersion) {
 		return evs, nil
 	}
-	if dev.PendingSession != nil && dev.MacState.PendingJoinRequest != nil && types.MustDevAddr(dev.PendingSession.DevAddr).OrZero().Equal(devAddr) {
+	if dev.PendingSession != nil &&
+		dev.MacState.PendingJoinRequest != nil &&
+		types.MustDevAddr(dev.PendingSession.DevAddr).OrZero().Equal(devAddr) {
 		dev.Ids.DevAddr = dev.PendingSession.DevAddr
 		dev.Session = dev.PendingSession
 	}