Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d466e5f authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Get rid of wait_for_bond_event and wait_for_ui_event 

Use Matchers instead.

Tag: #gd-refactor
Bug: 155399771
Test: gd/cert/run --host --test_filter=LeSecurityTest
Change-Id: I894f6b501c1a73000efce740a881845bf28fdf67
parent ceb7ba7e

system/gd/cert/py_le_security.py

+0 −7
Original line number Diff line number Diff line
@@ -54,13 +54,6 @@ class PyLeSecurity(Closable): 
    def get_bond_stream(self):

        return self._bond_event_stream



    def wait_for_bond_event(self, expected_bond_event, timeout=timedelta(seconds=3)):

        assertThat(self._bond_event_stream).emits(

            lambda event: event.message_type == expected_bond_event, timeout=timeout)



    def wait_for_ui_event(self, expected_ui_event, timeout=timedelta(seconds=3)):

        assertThat(self._ui_event_stream).emits(lambda event: event.message_type == expected_ui_event, timeout=timeout)



    def wait_for_ui_event_passkey(self, timeout=timedelta(seconds=3)):

        display_passkey_capture = SecurityCaptures.DisplayPasskey()

        assertThat(self._ui_event_stream).emits(display_passkey_capture, timeout=timeout)

system/gd/security/cert/le_security_test.py

+24 −24
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ class LeSecurityTest(GdBaseTestClass): 
        """

        self._prepare_cert_for_connection()

        self.dut.security.CreateBondLe(self.cert_address)

        self.dut_security.wait_for_bond_event(

            expected_bond_event=BondMsgType.DEVICE_BOND_FAILED, timeout=timedelta(seconds=35))

        assertThat(self.dut_security.get_bond_stream()).emits(

            SecurityMatchers.BondMsg(BondMsgType.DEVICE_BOND_FAILED), timeout=timedelta(seconds=35))



    @metadata(pts_test_id="SM/SLA/PROT/BV-02-C", pts_test_name="SMP Time Out – IUT Responder")

    def test_le_smp_timeout_iut_responder(self):
@@ -138,8 +138,8 @@ class LeSecurityTest(GdBaseTestClass): 
        # 1. Lower Tester transmits Pairing Request.

        self.cert.security.CreateBondLe(self.dut_address)



        self.dut_security.wait_for_ui_event(

            expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT, timeout=timedelta(seconds=35))

        assertThat(self.dut_security.get_ui_stream()).emits(

            SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT), timeout=timedelta(seconds=35))



        # 2. IUT responds with Pairing Response.

        self.dut.security.SendUiCallback(
@@ -149,12 +149,12 @@ class LeSecurityTest(GdBaseTestClass): 
        # 3. In phase 2, Lower Tester does not issue the expected Pairing Confirm.



        # Here the cert receives DISPLAY_PASSKEY_ENTRY. By not replying to it we make sure Pairing Confirm is never sent

        self.cert_security.wait_for_ui_event(

            expected_ui_event=UiMsgType.DISPLAY_PASSKEY_ENTRY, timeout=timedelta(seconds=5))

        assertThat(self.cert_security.get_ui_stream()).emits(

            SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PASSKEY_ENTRY), timeout=timedelta(seconds=5))



        # 4. IUT times out 30 seconds after issued Pairing Response and reports the failure to the Upper Tester.

        self.dut_security.wait_for_bond_event(

            expected_bond_event=BondMsgType.DEVICE_BOND_FAILED, timeout=timedelta(seconds=35))

        assertThat(self.dut_security.get_bond_stream()).emits(

            SecurityMatchers.BondMsg(BondMsgType.DEVICE_BOND_FAILED), timeout=timedelta(seconds=35))



        # 5. After additionally (at least) 10 seconds the Lower Tester issues the expected Pairing Confirm.

        # 6. The IUT closes the connection before receiving the delayed response or does not respond to it when it is received.
@@ -184,7 +184,7 @@ class LeSecurityTest(GdBaseTestClass): 
        # c. AuthReq Bonding Flags set to ‘00’ and the MITM flag set to ‘0’ and all the reserved bits are set to ‘0’

        self.dut.security.CreateBondLe(self.cert_address)



        self.cert_security.wait_for_ui_event(expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT)

        assertThat(self.cert_security.get_ui_stream()).emits(SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT))



        # 2. Lower Tester responds with a Pairing Response command, with:

        # a. IO capability set to “KeyboardDisplay”
@@ -195,7 +195,7 @@ class LeSecurityTest(GdBaseTestClass): 
                message_type=UiCallbackType.PAIRING_PROMPT, boolean=True, unique_id=1, address=self.cert_address))



        # 3. IUT and Lower Tester perform phase 2 of the just works pairing procedure and establish an encrypted link with the key generated in phase 2.

        self.dut_security.wait_for_bond_event(expected_bond_event=BondMsgType.DEVICE_BONDED)

        assertThat(self.dut_security.get_bond_stream()).emits(SecurityMatchers.BondMsg(BondMsgType.DEVICE_BONDED))



    @metadata(pts_test_id="SM/SLA/JW/BV-02-C", pts_test_name="Just Works IUT Responder – Success")

    def test_just_works_iut_responder(self):
@@ -220,7 +220,7 @@ class LeSecurityTest(GdBaseTestClass): 
        # c. MITM flag set to ‘0’ and all reserved bits are set to ‘0’

        self.cert.security.CreateBondLe(self.dut_address)



        self.dut_security.wait_for_ui_event(expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT)

        assertThat(self.dut_security.get_ui_stream()).emits(SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT))



        # 2. IUT responds with a Pairing Response command, with:

        # a. IO capability set to any IO capability
@@ -230,7 +230,7 @@ class LeSecurityTest(GdBaseTestClass): 
                message_type=UiCallbackType.PAIRING_PROMPT, boolean=True, unique_id=1, address=self.dut_address))



        # IUT and Lower Tester perform phase 2 of the just works pairing and establish an encrypted link with the generated STK.

        self.dut_security.wait_for_bond_event(expected_bond_event=BondMsgType.DEVICE_BONDED)

        assertThat(self.dut_security.get_bond_stream()).emits(SecurityMatchers.BondMsg(BondMsgType.DEVICE_BONDED))



    @metadata(

        pts_test_id="SM/SLA/JW/BI-03-C", pts_test_name="Just Works IUT Responder – Handle AuthReq flag RFU correctly")
@@ -256,7 +256,7 @@ class LeSecurityTest(GdBaseTestClass): 
        # c. MITM set to ‘0’ and all reserved bits are set to ‘1’

        self.cert.security.CreateBondLe(self.dut_address)



        self.dut_security.wait_for_ui_event(expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT)

        assertThat(self.dut_security.get_ui_stream()).emits(SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT))



        # 2. IUT responds with a Pairing Response command, with:

        # a. IO capability set to any IO capability
@@ -267,7 +267,7 @@ class LeSecurityTest(GdBaseTestClass): 
                message_type=UiCallbackType.PAIRING_PROMPT, boolean=True, unique_id=1, address=self.dut_address))



        # 3. IUT and Lower Tester perform phase 2 of the just works pairing and establish an encrypted link with the generated STK.

        self.dut_security.wait_for_bond_event(expected_bond_event=BondMsgType.DEVICE_BONDED)

        assertThat(self.dut_security.get_bond_stream()).emits(SecurityMatchers.BondMsg(BondMsgType.DEVICE_BONDED))



    @metadata(

        pts_test_id="SM/MAS/JW/BI-04-C", pts_test_name="Just Works IUT Initiator – Handle AuthReq flag RFU correctly")
@@ -293,7 +293,7 @@ class LeSecurityTest(GdBaseTestClass): 
        # c. All reserved bits are set to ‘0’. For the purposes of this test the Secure Connections bit and the Keypress bits in the AuthReq bonding flag set by the IUT are ignored by the Lower Tester.

        self.dut.security.CreateBondLe(self.cert_address)



        self.cert_security.wait_for_ui_event(expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT)

        assertThat(self.cert_security.get_ui_stream()).emits(SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT))



        # 2. Lower Tester responds with a Pairing Response command, with:

        # a. IO Capability set to “NoInputNoOutput”
@@ -304,7 +304,7 @@ class LeSecurityTest(GdBaseTestClass): 
                message_type=UiCallbackType.PAIRING_PROMPT, boolean=True, unique_id=1, address=self.cert_address))



        # 3. IUT and Lower Tester perform phase 2 of the just works pairing and establish an encrypted link with the generated STK.

        self.cert_security.wait_for_bond_event(expected_bond_event=BondMsgType.DEVICE_BONDED)

        assertThat(self.dut_security.get_bond_stream()).emits(SecurityMatchers.BondMsg(BondMsgType.DEVICE_BONDED))



    @metadata(

        pts_test_id="SM/MAS/SCJW/BV-01-C", pts_test_name="Just Works, IUT Initiator, Secure Connections – Success")
@@ -330,7 +330,7 @@ class LeSecurityTest(GdBaseTestClass): 
        # c. AuthReq Bonding Flags set to ‘00’, the MITM flag set to either ‘0’ for Just Works or '1' for Numeric Comparison, Secure Connections flag set to '1' and all the reserved bits are set to ‘0’

        self.dut.security.CreateBondLe(self.cert_address)



        self.cert_security.wait_for_ui_event(expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT)

        assertThat(self.cert_security.get_ui_stream()).emits(SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT))



        # 2. Lower Tester responds with a Pairing Response command, with:

        # a. IO capability set to “KeyboardDisplay”
@@ -341,7 +341,7 @@ class LeSecurityTest(GdBaseTestClass): 
                message_type=UiCallbackType.PAIRING_PROMPT, boolean=True, unique_id=1, address=self.cert_address))



        # 3. IUT and Lower Tester perform phase 2 of the Just Works or Numeric Comparison pairing procedure according to the MITM flag and IO capabilities, and establish an encrypted link with the LTK generated in phase 2.

        self.dut_security.wait_for_bond_event(expected_bond_event=BondMsgType.DEVICE_BONDED)

        assertThat(self.dut_security.get_bond_stream()).emits(SecurityMatchers.BondMsg(BondMsgType.DEVICE_BONDED))



    @metadata(

        pts_test_id="SM/SLA/SCJW/BV-02-C", pts_test_name="Just Works, IUT Responder, Secure Connections – Success")
@@ -367,7 +367,7 @@ class LeSecurityTest(GdBaseTestClass): 
        # c. AuthReq Bonding Flags set to ‘00’, MITM flag set to ‘0’, Secure Connections flag set to '1' and all reserved bits are set to ‘0’

        self.cert.security.CreateBondLe(self.dut_address)



        self.dut_security.wait_for_ui_event(expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT)

        assertThat(self.dut_security.get_ui_stream()).emits(SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT))



        # 2. IUT responds with a Pairing Response command, with:

        # a. IO capability set to any IO capability
@@ -377,7 +377,7 @@ class LeSecurityTest(GdBaseTestClass): 
                message_type=UiCallbackType.PAIRING_PROMPT, boolean=True, unique_id=1, address=self.dut_address))



        # 3. UT and Lower Tester perform phase 2 of the Just Works or Numeric Comparison pairing procedure according to the MITM flag and IO capabilities, and establish an encrypted link with the LTK generated in phase 2.

        self.dut_security.wait_for_bond_event(expected_bond_event=BondMsgType.DEVICE_BONDED)

        assertThat(self.dut_security.get_bond_stream()).emits(SecurityMatchers.BondMsg(BondMsgType.DEVICE_BONDED))



    @metadata(

        pts_test_id="SM/SLA/SCJW/BV-03-C",
@@ -404,7 +404,7 @@ class LeSecurityTest(GdBaseTestClass): 
        # c. MITM set to ‘0’ and all reserved bits are set to a random value.

        self.cert.security.CreateBondLe(self.dut_address)



        self.dut_security.wait_for_ui_event(expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT)

        assertThat(self.dut_security.get_ui_stream()).emits(SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT))



        # 2. IUT responds with a Pairing Response command, with:

        # a. IO capability set to any IO capability
@@ -415,7 +415,7 @@ class LeSecurityTest(GdBaseTestClass): 
                message_type=UiCallbackType.PAIRING_PROMPT, boolean=True, unique_id=1, address=self.dut_address))



        # 3. IUT and Lower Tester perform phase 2 of the Just Works pairing and establish an encrypted link with the generated LTK.

        self.dut_security.wait_for_bond_event(expected_bond_event=BondMsgType.DEVICE_BONDED)

        assertThat(self.dut_security.get_bond_stream()).emits(SecurityMatchers.BondMsg(BondMsgType.DEVICE_BONDED))



    @metadata(

        pts_test_id="SM/MAS/SCJW/BV-04-C",
@@ -442,7 +442,7 @@ class LeSecurityTest(GdBaseTestClass): 
        # c. All reserved bits are set to ‘0’.

        self.dut.security.CreateBondLe(self.cert_address)



        self.cert_security.wait_for_ui_event(expected_ui_event=UiMsgType.DISPLAY_PAIRING_PROMPT)

        assertThat(self.cert_security.get_ui_stream()).emits(SecurityMatchers.UiMsg(UiMsgType.DISPLAY_PAIRING_PROMPT))



        # 2. Lower Tester responds with a Pairing Response command, with:

        # a. IO Capability set to “NoInputNoOutput”
@@ -453,7 +453,7 @@ class LeSecurityTest(GdBaseTestClass): 
                message_type=UiCallbackType.PAIRING_PROMPT, boolean=True, unique_id=1, address=self.cert_address))



        # 3. IUT and Lower Tester perform phase 2 of the Just Works pairing and establish an encrypted link with the generated LTK.

        self.cert_security.wait_for_bond_event(expected_bond_event=BondMsgType.DEVICE_BONDED)

        assertThat(self.dut_security.get_bond_stream()).emits(SecurityMatchers.BondMsg(BondMsgType.DEVICE_BONDED))



    @metadata(

        pts_test_id="SM/MAS/SCPK/BV-01-C", pts_test_name="Passkey Entry, IUT Initiator, Secure Connections – Success")