Merge pull request TheThingsNetwork#6637 from TheThingsNetwork/fix/re…

…key-unknown Fix unexpected RekeyInd handling
barryzxy · Oct 18, 2023 · dceeff8 · dceeff8
2 parents d9f3ec7 + ddc3323
commit dceeff8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/pkg/networkserver/grpc_gsns.go b/pkg/networkserver/grpc_gsns.go
@@ -1396,7 +1396,7 @@ func (ns *NetworkServer) handleJoinRequest(ctx context.Context, up *ttnpb.Uplink
 	return nil
 }
 
-var errRejoinRequest = errors.DefineUnimplemented("rejoin_request", "rejoin-request handling is not implemented")
+var errRejoinRequest = errors.DefineUnavailable("rejoin_request", "rejoin-request handling is not implemented")
 
 func (ns *NetworkServer) handleRejoinRequest(ctx context.Context, up *ttnpb.UplinkMessage) error {
 	defer trace.StartRegion(ctx, "handle rejoin request").End()

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
 	}

diff --git a/pkg/networkserver/mac/rekey_test.go b/pkg/networkserver/mac/rekey_test.go
@@ -28,6 +28,7 @@ import (
 )
 
 func TestHandleRekeyInd(t *testing.T) {
+	t.Parallel()
 	for _, tc := range []struct {
 		Name             string
 		Device, Expected *ttnpb.EndDevice
@@ -48,8 +49,9 @@ func TestHandleRekeyInd(t *testing.T) {
 		{
 			Name: "empty queue/original",
 			Device: &ttnpb.EndDevice{
-				SupportsJoin: true,
-				Ids:          &ttnpb.EndDeviceIdentifiers{},
+				LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
+				SupportsJoin:   true,
+				Ids:            &ttnpb.EndDeviceIdentifiers{},
 				PendingSession: &ttnpb.Session{
 					DevAddr:       test.DefaultDevAddr.Bytes(),
 					LastFCntUp:    42,
@@ -62,7 +64,8 @@ func TestHandleRekeyInd(t *testing.T) {
 				},
 			},
 			Expected: &ttnpb.EndDevice{
-				SupportsJoin: true,
+				LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
+				SupportsJoin:   true,
 				Ids: &ttnpb.EndDeviceIdentifiers{
 					DevAddr: test.DefaultDevAddr.Bytes(),
 				},
@@ -95,7 +98,8 @@ func TestHandleRekeyInd(t *testing.T) {
 		{
 			Name: "empty queue/retransmission/non-matching pending session",
 			Device: &ttnpb.EndDevice{
-				SupportsJoin: true,
+				LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
+				SupportsJoin:   true,
 				Ids: &ttnpb.EndDeviceIdentifiers{
 					DevAddr: test.DefaultDevAddr.Bytes(),
 				},
@@ -116,7 +120,8 @@ func TestHandleRekeyInd(t *testing.T) {
 				},
 			},
 			Expected: &ttnpb.EndDevice{
-				SupportsJoin: true,
+				LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
+				SupportsJoin:   true,
 				Ids: &ttnpb.EndDeviceIdentifiers{
 					DevAddr: test.DefaultDevAddr.Bytes(),
 				},
@@ -149,7 +154,8 @@ func TestHandleRekeyInd(t *testing.T) {
 		{
 			Name: "empty queue/retransmission/no pending session",
 			Device: &ttnpb.EndDevice{
-				SupportsJoin: true,
+				LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
+				SupportsJoin:   true,
 				Ids: &ttnpb.EndDeviceIdentifiers{
 					DevAddr: test.DefaultDevAddr.Bytes(),
 				},
@@ -161,7 +167,8 @@ func TestHandleRekeyInd(t *testing.T) {
 				MacState: &ttnpb.MACState{},
 			},
 			Expected: &ttnpb.EndDevice{
-				SupportsJoin: true,
+				LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
+				SupportsJoin:   true,
 				Ids: &ttnpb.EndDeviceIdentifiers{
 					DevAddr: test.DefaultDevAddr.Bytes(),
 				},
@@ -194,8 +201,9 @@ func TestHandleRekeyInd(t *testing.T) {
 		{
 			Name: "non-empty queue",
 			Device: &ttnpb.EndDevice{
-				SupportsJoin: true,
-				Ids:          &ttnpb.EndDeviceIdentifiers{},
+				LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
+				SupportsJoin:   true,
+				Ids:            &ttnpb.EndDeviceIdentifiers{},
 				PendingSession: &ttnpb.Session{
 					DevAddr:       test.DefaultDevAddr.Bytes(),
 					LastFCntUp:    42,
@@ -212,7 +220,8 @@ func TestHandleRekeyInd(t *testing.T) {
 				},
 			},
 			Expected: &ttnpb.EndDevice{
-				SupportsJoin: true,
+				LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
+				SupportsJoin:   true,
 				Ids: &ttnpb.EndDeviceIdentifiers{
 					DevAddr: test.DefaultDevAddr.Bytes(),
 				},