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

Commit facf6afc authored by Martin Brabham's avatar Martin Brabham
Browse files

Check for MITM required. 

Per specification; if MITM is required then AUTO is NOT ALLOWED!

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: Icedbc393ae03610a3b8095c26a5f6ff5dfdec6c2
parent c91873ed

system/gd/cert/py_security.py

+2 −1
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ class PySecurity(Closable): 
            for Cert it isn't needed.

        """

        logging.debug("DUT: Waiting for Bond Event")

        assertThat(self._bond_event_stream).emits(lambda event: event.message_type == expected_bond_event)

        assertThat(self._bond_event_stream).emits(

            lambda event: event.message_type == expected_bond_event or logging.info("DUT: %s" % event.message_type))



    def wait_for_enforce_security_event(self, expected_enforce_security_event):

        """

system/gd/security/cert/cert_security.py

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ class CertSecurity(PySecurity): 
        """

        logging.info("Cert: setting IO Capabilities data to '%s'" % self._io_capabilities_name_lookup.get(

            io_capabilities, "ERROR"))

        self._io_caps = self._io_cap_lookup.get(io_capabilities, hci_packets.IoCapability.DISPLAY_YES_NO)

        self._io_caps = self._io_cap_lookup.get(io_capabilities, hci_packets.IoCapability.DISPLAY_ONLY)



    def set_authentication_requirements(self, auth_reqs):

        """
@@ -210,8 +210,8 @@ class CertSecurity(PySecurity): 
        """

            Cert side needs to pass

        """

        logging.info("Cert: Waiting for DISCONNECT_COMPLETE")

        assertThat(self._hci_event_stream).emits(HciMatchers.DisconnectionComplete())

        pass



    def close(self):

        safeClose(self._hci)

system/gd/security/cert/security_test.py

+72 −32
Original line number Diff line number Diff line
@@ -40,6 +40,22 @@ class SecurityTest(GdBaseTestClass): 
        different (unique) combinations of io capabilities, authentication requirements, and oob data.

    """



    _io_capabilities_name_lookup = {

        IoCapabilities.DISPLAY_ONLY: "DISPLAY_ONLY",

        IoCapabilities.DISPLAY_YES_NO_IO_CAP: "DISPLAY_YES_NO_IO_CAP",

        #IoCapabilities.KEYBOARD_ONLY:"KEYBOARD_ONLY",

        IoCapabilities.NO_INPUT_NO_OUTPUT: "NO_INPUT_NO_OUTPUT",

    }



    _auth_reqs_name_lookup = {

        AuthenticationRequirements.NO_BONDING: "NO_BONDING",

        AuthenticationRequirements.NO_BONDING_MITM_PROTECTION: "NO_BONDING_MITM_PROTECTION",

        AuthenticationRequirements.DEDICATED_BONDING: "DEDICATED_BONDING",

        AuthenticationRequirements.DEDICATED_BONDING_MITM_PROTECTION: "DEDICATED_BONDING_MITM_PROTECTION",

        AuthenticationRequirements.GENERAL_BONDING: "GENERAL_BONDING",

        AuthenticationRequirements.GENERAL_BONDING_MITM_PROTECTION: "GENERAL_BONDING_MITM_PROTECTION",

    }



    # Possible IO Capabilities

    io_capabilities = (

        IoCapabilities.DISPLAY_ONLY,
@@ -67,6 +83,10 @@ class SecurityTest(GdBaseTestClass): 
        #"P192_AND_256_PRESENT"

    )



    mitm_auth_reqs = (AuthenticationRequirements.DEDICATED_BONDING_MITM_PROTECTION,

                      AuthenticationRequirements.GENERAL_BONDING_MITM_PROTECTION,

                      AuthenticationRequirements.NO_BONDING_MITM_PROTECTION)



    def setup_class(self):

        super().setup_class(dut_module='SECURITY', cert_module='L2CAP')
@@ -130,10 +150,10 @@ class SecurityTest(GdBaseTestClass): 
    def test_dut_initiated_no_input_no_output_no_input_no_output_twice_same_acl(self):

        # Arrange

        self.dut_security.set_io_capabilities(IoCapabilities.NO_INPUT_NO_OUTPUT)

        self.dut_security.set_authentication_requirements(AuthenticationRequirements.DEDICATED_BONDING_MITM_PROTECTION)

        self.dut_security.set_authentication_requirements(AuthenticationRequirements.DEDICATED_BONDING)

        self.dut_security.set_oob_data(OobDataPresent.NOT_PRESENT)

        self.cert_security.set_io_capabilities(IoCapabilities.NO_INPUT_NO_OUTPUT)

        self.cert_security.set_authentication_requirements(AuthenticationRequirements.DEDICATED_BONDING_MITM_PROTECTION)

        self.cert_security.set_authentication_requirements(AuthenticationRequirements.DEDICATED_BONDING)

        self.cert_security.set_oob_data(OobDataPresent.NOT_PRESENT)



        # Act and Assert
@@ -149,7 +169,7 @@ class SecurityTest(GdBaseTestClass): 


        self.dut_security.enforce_security_policy(self.cert.address,

                                                  common.BluetoothAddressTypeEnum.PUBLIC_DEVICE_ADDRESS,

                                                  ClassicSecurityPolicy.AUTHENTICATED_ENCRYPTED_TRANSPORT)

                                                  ClassicSecurityPolicy.ENCRYPTED_TRANSPORT)



        self._verify_ssp_numeric_comparison(

            initiator=self.dut_security,
@@ -167,10 +187,10 @@ class SecurityTest(GdBaseTestClass): 
    def test_dut_initiated_no_input_no_output_no_input_no_output_twice_with_remove_bond(self):

        # Arrange

        self.dut_security.set_io_capabilities(IoCapabilities.NO_INPUT_NO_OUTPUT)

        self.dut_security.set_authentication_requirements(AuthenticationRequirements.DEDICATED_BONDING_MITM_PROTECTION)

        self.dut_security.set_authentication_requirements(AuthenticationRequirements.DEDICATED_BONDING)

        self.dut_security.set_oob_data(OobDataPresent.NOT_PRESENT)

        self.cert_security.set_io_capabilities(IoCapabilities.NO_INPUT_NO_OUTPUT)

        self.cert_security.set_authentication_requirements(AuthenticationRequirements.DEDICATED_BONDING_MITM_PROTECTION)

        self.cert_security.set_authentication_requirements(AuthenticationRequirements.DEDICATED_BONDING)

        self.cert_security.set_oob_data(OobDataPresent.NOT_PRESENT)



        # Act and Assert
@@ -186,8 +206,8 @@ class SecurityTest(GdBaseTestClass): 


        self.dut_security.remove_bond(self.cert.address, common.BluetoothAddressTypeEnum.PUBLIC_DEVICE_ADDRESS)



        # Give time for ACL to disconnect

        time.sleep(1)

        self.dut_security.wait_for_disconnect_event()

        self.cert_security.wait_for_disconnect_event()



        # Act and Assert

        self._run_ssp_numeric_comparison(
@@ -205,26 +225,29 @@ class SecurityTest(GdBaseTestClass): 
            self.io_capabilities) * len(self.auth_reqs) * len(self.oob_present)

        logging.info("Loading %d test combinations" % test_count)

        i = 0

        for init_io_capability in self.io_capabilities:

            for init_auth_reqs in self.auth_reqs:

                for init_oob_present in self.oob_present:

                    for resp_io_capability in self.io_capabilities:

        for dut_io_capability in self.io_capabilities:

            for dut_auth_reqs in self.auth_reqs:

                for dut_oob_present in self.oob_present:

                    for cert_io_capability in self.io_capabilities:

                        for cert_auth_reqs in self.auth_reqs:

                            for cert_oob_present in self.oob_present:

                                i = i + 1

                                logging.info("")

                                logging.info("===================================================")

                                logging.info("Running test %d of %d" % (i, test_count))

                                logging.info("DUT Test Config: %d ; %d ; %d " % (init_io_capability, init_auth_reqs,

                                                                                 init_oob_present))

                                logging.info("CERT Test Config: %d ; %d ; %d " % (resp_io_capability, cert_auth_reqs,

                                                                                  cert_oob_present))

                                logging.info("DUT Test Config: %s ; %s ; %s " % (self._io_capabilities_name_lookup.get(

                                    dut_io_capability, "ERROR"), self._auth_reqs_name_lookup.get(

                                        dut_auth_reqs, "ERROR"), dut_oob_present))

                                logging.info(

                                    "CERT Test Config: %s ; %s ; %s " %

                                    (self._io_capabilities_name_lookup.get(cert_io_capability, "ERROR"),

                                     self._auth_reqs_name_lookup.get(cert_auth_reqs, "ERROR"), cert_oob_present))

                                logging.info("===================================================")

                                logging.info("")

                                self.dut_security.set_io_capabilities(init_io_capability)

                                self.dut_security.set_authentication_requirements(init_auth_reqs)

                                self.dut_security.set_oob_data(init_oob_present)

                                self.cert_security.set_io_capabilities(resp_io_capability)

                                self.dut_security.set_io_capabilities(dut_io_capability)

                                self.dut_security.set_authentication_requirements(dut_auth_reqs)

                                self.dut_security.set_oob_data(dut_oob_present)

                                self.cert_security.set_io_capabilities(cert_io_capability)

                                self.cert_security.set_authentication_requirements(cert_auth_reqs)

                                self.cert_security.set_oob_data(cert_oob_present)

                                init_ui_response = True
@@ -233,32 +256,46 @@ class SecurityTest(GdBaseTestClass): 
                                expected_resp_ui_event = None  # None is auto accept

                                expected_init_bond_event = BondMsgType.DEVICE_BONDED

                                expected_resp_bond_event = None

                                if init_io_capability == IoCapabilities.DISPLAY_ONLY:

                                    if resp_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                if dut_io_capability == IoCapabilities.DISPLAY_ONLY:

                                    if cert_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                        expected_resp_ui_event = UiMsgType.DISPLAY_YES_NO_WITH_VALUE

                                    elif resp_io_capability == IoCapabilities.KEYBOARD_ONLY:

                                        if dut_auth_reqs in self.mitm_auth_reqs or cert_auth_reqs in self.mitm_auth_reqs:

                                            expected_init_bond_event = BondMsgType.DEVICE_BOND_FAILED

                                    elif cert_io_capability == IoCapabilities.KEYBOARD_ONLY:

                                        expected_resp_ui_event = UiMsgType.DISPLAY_PASSKEY_ENTRY

                                elif init_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                    elif cert_io_capability == IoCapabilities.DISPLAY_ONLY:

                                        if dut_auth_reqs in self.mitm_auth_reqs or cert_auth_reqs in self.mitm_auth_reqs:

                                            expected_init_bond_event = BondMsgType.DEVICE_BOND_FAILED

                                    elif cert_io_capability == IoCapabilities.NO_INPUT_NO_OUTPUT:

                                        if dut_auth_reqs in self.mitm_auth_reqs or cert_auth_reqs in self.mitm_auth_reqs:

                                            expected_init_bond_event = BondMsgType.DEVICE_BOND_FAILED

                                elif dut_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                    expected_init_ui_event = UiMsgType.DISPLAY_YES_NO_WITH_VALUE

                                    if resp_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                    if cert_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                        expected_resp_ui_event = UiMsgType.DISPLAY_YES_NO_WITH_VALUE

                                    elif resp_io_capability == IoCapabilities.KEYBOARD_ONLY:

                                    elif cert_io_capability == IoCapabilities.KEYBOARD_ONLY:

                                        expected_init_ui_event = UiMsgType.DISPLAY_PASSKEY

                                        expected_resp_ui_event = UiMsgType.DISPLAY_PASSKEY_ENTRY

                                    elif resp_io_capability == IoCapabilities.NO_INPUT_NO_OUTPUT:

                                    elif cert_io_capability == IoCapabilities.NO_INPUT_NO_OUTPUT:

                                        expected_init_ui_event = UiMsgType.DISPLAY_YES_NO  # No value

                                elif init_io_capability == IoCapabilities.KEYBOARD_ONLY:

                                elif dut_io_capability == IoCapabilities.KEYBOARD_ONLY:

                                    expected_init_ui_event = UiMsgType.DISPLAY_PASSKEY_ENTRY

                                    if resp_io_capability == IoCapabilities.DISPLAY_ONLY:

                                    if cert_io_capability == IoCapabilities.DISPLAY_ONLY:

                                        expected_resp_ui_event = UiMsgType.DISPLAY_PASSKEY

                                    elif resp_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                    elif cert_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                        expected_resp_ui_event = UiMsgType.DISPLAY_PASSKEY_ENTRY

                                    elif resp_io_capability == IoCapabilities.KEYBOARD_ONLY:

                                    elif cert_io_capability == IoCapabilities.KEYBOARD_ONLY:

                                        expected_resp_ui_event = UiMsgType.DISPLAY_PASSKEY_ENTRY

                                elif init_io_capability == IoCapabilities.NO_INPUT_NO_OUTPUT:

                                    if resp_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                    elif cert_io_capability == IoCapabilities.NO_INPUT_NO_OUTPUT:

                                        if dut_auth_reqs in self.mitm_auth_reqs or cert_auth_reqs in self.mitm_auth_reqs:

                                            expected_init_bond_event = BondMsgType.DEVICE_BOND_FAILED

                                elif dut_io_capability == IoCapabilities.NO_INPUT_NO_OUTPUT:

                                    if cert_io_capability == IoCapabilities.DISPLAY_YES_NO_IO_CAP:

                                        expected_resp_ui_event = UiMsgType.DISPLAY_YES_NO  # No value



                                    if dut_auth_reqs in self.mitm_auth_reqs or cert_auth_reqs in self.mitm_auth_reqs:

                                        expected_init_bond_event = BondMsgType.DEVICE_BOND_FAILED



                                self._run_ssp_numeric_comparison(

                                    initiator=self.dut_security,

                                    responder=self.cert_security,
@@ -274,5 +311,8 @@ class SecurityTest(GdBaseTestClass): 
                                self.cert_security.remove_bond(self.dut_security.get_address(),

                                                               common.BluetoothAddressTypeEnum.PUBLIC_DEVICE_ADDRESS)



                                self.dut_security.wait_for_bond_event(BondMsgType.DEVICE_UNBONDED)

                                self.cert_security.wait_for_bond_event(BondMsgType.DEVICE_UNBONDED)



                                self.dut_security.wait_for_disconnect_event()

                                self.cert_security.wait_for_disconnect_event()

system/gd/security/pairing/classic_pairing_handler.cc

+56 −16
Original line number Diff line number Diff line
@@ -305,15 +305,25 @@ void ClassicPairingHandler::OnReceive(hci::UserConfirmationRequestView packet) { 
        case hci::IoCapability::DISPLAY_ONLY:

          // NumericComparison, Both auto confirm

          LOG_INFO("Numeric Comparison: A and B auto confirm");

          if (!GetRecord()->RequiresMitmProtection()) {

            GetChannel()->SendCommand(

                hci::UserConfirmationRequestReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

          } else {

            GetChannel()->SendCommand(hci::UserConfirmationRequestNegativeReplyBuilder::Create(

                GetRecord()->GetPseudoAddress()->GetAddress()));

          }

          // Unauthenticated

          GetRecord()->SetAuthenticated(false);

          break;

        case hci::IoCapability::DISPLAY_YES_NO:

          // NumericComparison, Initiator auto confirm, Responder display

          if (!GetRecord()->RequiresMitmProtection()) {

            GetChannel()->SendCommand(

                hci::UserConfirmationRequestReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

          } else {

            GetChannel()->SendCommand(hci::UserConfirmationRequestNegativeReplyBuilder::Create(

                GetRecord()->GetPseudoAddress()->GetAddress()));

          }

          LOG_INFO("Numeric Comparison: A auto confirm");

          // Unauthenticated

          GetRecord()->SetAuthenticated(true);
@@ -328,8 +338,13 @@ void ClassicPairingHandler::OnReceive(hci::UserConfirmationRequestView packet) { 
        case hci::IoCapability::NO_INPUT_NO_OUTPUT:

          // NumericComparison, Both auto confirm

          LOG_INFO("Numeric Comparison: A and B auto confirm");

          if (!GetRecord()->RequiresMitmProtection()) {

            GetChannel()->SendCommand(

                hci::UserConfirmationRequestReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

          } else {

            GetChannel()->SendCommand(hci::UserConfirmationRequestNegativeReplyBuilder::Create(

                GetRecord()->GetPseudoAddress()->GetAddress()));

          }

          // Unauthenticated

          GetRecord()->SetAuthenticated(true);

          break;
@@ -393,8 +408,13 @@ void ClassicPairingHandler::OnReceive(hci::UserConfirmationRequestView packet) { 
        case hci::IoCapability::NO_INPUT_NO_OUTPUT:

          // NumericComparison, both auto confirm

          LOG_INFO("Numeric Comparison: A and B auto confirm");

          if (!GetRecord()->RequiresMitmProtection()) {

            GetChannel()->SendCommand(

                hci::UserConfirmationRequestReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

          } else {

            GetChannel()->SendCommand(hci::UserConfirmationRequestNegativeReplyBuilder::Create(

                GetRecord()->GetPseudoAddress()->GetAddress()));

          }

          // Unauthenticated

          GetRecord()->SetAuthenticated(false);

          break;
@@ -405,32 +425,52 @@ void ClassicPairingHandler::OnReceive(hci::UserConfirmationRequestView packet) { 
        case hci::IoCapability::DISPLAY_ONLY:

          // NumericComparison, both auto confirm

          LOG_INFO("Numeric Comparison: A and B auto confirm");

          if (!GetRecord()->RequiresMitmProtection()) {

            GetChannel()->SendCommand(

                hci::UserConfirmationRequestReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

          } else {

            GetChannel()->SendCommand(hci::UserConfirmationRequestNegativeReplyBuilder::Create(

                GetRecord()->GetPseudoAddress()->GetAddress()));

          }

          // Unauthenticated

          GetRecord()->SetAuthenticated(false);

          break;

        case hci::IoCapability::DISPLAY_YES_NO:

          // NumericComparison, Initiator auto confirm, Responder Yes/No confirm, no show conf val

          LOG_INFO("Numeric Comparison: A auto confirm");

          if (!GetRecord()->RequiresMitmProtection()) {

            GetChannel()->SendCommand(

                hci::UserConfirmationRequestReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

          } else {

            GetChannel()->SendCommand(hci::UserConfirmationRequestNegativeReplyBuilder::Create(

                GetRecord()->GetPseudoAddress()->GetAddress()));

          }

          // Unauthenticated

          GetRecord()->SetAuthenticated(false);

          break;

        case hci::IoCapability::KEYBOARD_ONLY:

          // NumericComparison, both auto confirm

          LOG_INFO("Numeric Comparison: A and B auto confirm");

          if (!GetRecord()->RequiresMitmProtection()) {

            GetChannel()->SendCommand(

                hci::UserConfirmationRequestReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

          } else {

            GetChannel()->SendCommand(hci::UserConfirmationRequestNegativeReplyBuilder::Create(

                GetRecord()->GetPseudoAddress()->GetAddress()));

          }

          // Unauthenticated

          GetRecord()->SetAuthenticated(false);

          break;

        case hci::IoCapability::NO_INPUT_NO_OUTPUT:

          // NumericComparison, both auto confirm

          LOG_INFO("Numeric Comparison: A and B auto confirm");

          if (!GetRecord()->RequiresMitmProtection()) {

            GetChannel()->SendCommand(

                hci::UserConfirmationRequestReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

          } else {

            GetChannel()->SendCommand(hci::UserConfirmationRequestNegativeReplyBuilder::Create(

                GetRecord()->GetPseudoAddress()->GetAddress()));

          }

          // Unauthenticated

          GetRecord()->SetAuthenticated(false);

          break;