Merge "Fix bug that state machine gets stuck in Receiving"

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
index 44ef0d3d..12e32af6 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
@@ -110,6 +110,7 @@ import com.android.ike.ikev2.message.IkeMessage.DecodeResult;
 import com.android.ike.ikev2.message.IkeMessage.DecodeResultOk;
 import com.android.ike.ikev2.message.IkeMessage.DecodeResultPartial;
 import com.android.ike.ikev2.message.IkeMessage.DecodeResultProtectedError;
+import com.android.ike.ikev2.message.IkeMessage.DecodeResultUnprotectedError;
 import com.android.ike.ikev2.message.IkeMessage.IIkeMessageHelper;
 import com.android.ike.ikev2.message.IkeMessage.IkeMessageHelper;
 import com.android.ike.ikev2.message.IkeNoncePayload;
@@ -418,6 +419,18 @@ public final class IkeSessionStateMachineTest {
         return new ReceivedIkePacket(header, dummyPacket);
     }
 
+    private ReceivedIkePacket makeDummyReceivedIkePacketWithUnprotectedError(
+            IkeSaRecord ikeSaRecord, boolean isResp, int eType, IkeException exception) {
+        IkeHeader header =
+                makeDummyIkeHeader(ikeSaRecord, isResp, eType, IkePayload.PAYLOAD_TYPE_SK);
+        byte[] dummyPacket = new byte[0];
+        when(mMockIkeMessageHelper.decode(
+                        anyInt(), any(), any(), eq(ikeSaRecord), eq(header), any(), any()))
+                .thenReturn(new DecodeResultUnprotectedError(exception));
+
+        return new ReceivedIkePacket(header, dummyPacket);
+    }
+
     private ReceivedIkePacket makeDummyReceivedIkeFragmentPacket(
             IkeSaRecord ikeSaRecord,
             boolean isResp,
@@ -3249,6 +3262,9 @@ public final class IkeSessionStateMachineTest {
         assertArrayEquals(dummyIkeResp, mIkeSessionStateMachine.mLastSentIkeResp);
         assertArrayEquals(
                 dummyIkeReqFirstPacket, mIkeSessionStateMachine.mLastReceivedIkeReqFirstPacket);
+
+        assertTrue(
+                mIkeSessionStateMachine.getCurrentState() instanceof IkeSessionStateMachine.Idle);
     }
 
     @Test
@@ -3302,6 +3318,9 @@ public final class IkeSessionStateMachineTest {
 
         assertArrayEquals(dummyIkeResp, mIkeSessionStateMachine.mLastSentIkeResp);
         verify(mSpyIkeSocket, never()).sendIkePacket(any(), any());
+
+        assertTrue(
+                mIkeSessionStateMachine.getCurrentState() instanceof IkeSessionStateMachine.Idle);
     }
 
     @Test
@@ -3948,4 +3967,20 @@ public final class IkeSessionStateMachineTest {
         assertNull(mIkeSessionStateMachine.getCurrentState());
         verify(mMockIkeSessionCallback).onError(any(InvalidSyntaxException.class));
     }
+
+    @Test
+    public void testIdleHandlesUnprotectedPacket() throws Exception {
+        setupIdleStateMachine();
+
+        ReceivedIkePacket req =
+                makeDummyReceivedIkePacketWithUnprotectedError(
+                        mSpyCurrentIkeSaRecord,
+                        false /*isResp*/,
+                        EXCHANGE_TYPE_INFORMATIONAL,
+                        mock(IkeException.class));
+
+        mLooper.dispatchAll();
+        assertTrue(
+                mIkeSessionStateMachine.getCurrentState() instanceof IkeSessionStateMachine.Idle);
+    }
 }