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

Commit d533dd33 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2cap: Rename SecurityManager integration interface am: 51d03dde 

Change-Id: Ib98ac84d09abe7d3789cc80c854ce47966982d4a
parents 14a3afd2 51d03dde

system/gd/l2cap/classic/internal/dynamic_channel_service_manager_impl.h

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "l2cap/classic/dynamic_channel_service.h"

#include "l2cap/classic/internal/dynamic_channel_service_impl.h"

#include "l2cap/classic/security_module_interface.h"

#include "l2cap/classic/security_enforcement_interface.h"

#include "l2cap/psm.h"

#include "os/handler.h"

#include "os/log.h"
@@ -47,18 +47,18 @@ class DynamicChannelServiceManagerImpl { 
  virtual std::vector<std::pair<Psm, DynamicChannelServiceImpl*>> GetRegisteredServices();



  // Implementation is set by SecurityManager through L2capModule

  void SetSecurityModuleInterface(SecurityModuleInterface* impl) {

    security_module_interface_ = impl;

  void SetSecurityEnforcementInterface(SecurityEnforcementInterface* impl) {

    security_enforcement_interface_ = impl;

  }



  virtual SecurityModuleInterface* GetSecurityModuleInterface() {

    return security_module_interface_;

  virtual SecurityEnforcementInterface* GetSecurityEnforcementInterface() {

    return security_enforcement_interface_;

  }



 private:

  os::Handler* l2cap_layer_handler_ = nullptr;

  std::unordered_map<Psm, DynamicChannelServiceImpl> service_map_;

  SecurityModuleInterface* security_module_interface_ = nullptr;

  SecurityEnforcementInterface* security_enforcement_interface_ = nullptr;

};

}  // namespace internal

}  // namespace classic

system/gd/l2cap/classic/internal/dynamic_channel_service_manager_impl_mock.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#pragma once



#include "l2cap/classic/internal/dynamic_channel_service_manager_impl.h"

#include "l2cap/classic/security_module_interface.h"

#include "l2cap/classic/security_enforcement_interface.h"

#include "l2cap/internal/dynamic_channel_impl.h"



#include <gmock/gmock.h>
@@ -38,7 +38,7 @@ class MockDynamicChannelServiceManagerImpl : public DynamicChannelServiceManager 
  MOCK_METHOD(bool, IsServiceRegistered, (Psm psm), (const, override));

  MOCK_METHOD(DynamicChannelServiceImpl*, GetService, (Psm psm), (override));

  MOCK_METHOD((std::vector<std::pair<Psm, DynamicChannelServiceImpl*>>), GetRegisteredServices, (), (override));

  MOCK_METHOD(SecurityModuleInterface*, GetSecurityModuleInterface, (), (override));

  MOCK_METHOD(SecurityEnforcementInterface*, GetSecurityEnforcementInterface, (), (override));

};



}  // namespace testing

system/gd/l2cap/classic/internal/link.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "l2cap/classic/internal/dynamic_channel_service_manager_impl.h"

#include "l2cap/classic/internal/fixed_channel_impl.h"

#include "l2cap/classic/internal/fixed_channel_service_manager_impl.h"

#include "l2cap/classic/security_module_interface.h"

#include "l2cap/classic/security_enforcement_interface.h"

#include "l2cap/internal/data_pipeline_manager.h"

#include "l2cap/internal/dynamic_channel_allocator.h"

#include "l2cap/internal/dynamic_channel_impl.h"

system/gd/l2cap/classic/internal/link_manager_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -91,12 +91,12 @@ class L2capClassicLinkManagerTest : public ::testing::Test { 
TEST_F(L2capClassicLinkManagerTest, connect_fixed_channel_service_without_acl) {

  MockFixedChannelServiceManagerImpl mock_classic_fixed_channel_service_manager;

  MockDynamicChannelServiceManagerImpl mock_classic_dynamic_channel_service_manager;

  SecurityModuleRejectAllImpl security_module_impl;

  SecurityEnforcementRejectAllImpl security_module_impl;

  MockDynamicChannelServiceImpl service;

  ON_CALL(service, GetSecurityPolicy())

      .WillByDefault(Return(SecurityPolicy::_SDP_ONLY_NO_SECURITY_WHATSOEVER_PLAINTEXT_TRANSPORT_OK));



  ON_CALL(mock_classic_dynamic_channel_service_manager, GetSecurityModuleInterface())

  ON_CALL(mock_classic_dynamic_channel_service_manager, GetSecurityEnforcementInterface())

      .WillByDefault(Return(&security_module_impl));

  MockAclManager mock_acl_manager;

  hci::Address device{{0x01, 0x02, 0x03, 0x04, 0x05, 0x06}};

system/gd/l2cap/classic/internal/link_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ class L2capClassicLinkTest : public ::testing::Test { 
  NiceMock<MockParameterProvider> mock_parameter_provider_;

  MockFixedChannelServiceManagerImpl mock_classic_fixed_channel_service_manager_;

  MockDynamicChannelServiceManagerImpl mock_classic_dynamic_channel_service_manager_;

  SecurityModuleRejectAllImpl security_module_impl_;

  SecurityEnforcementRejectAllImpl security_module_impl_;



  std::promise<void> on_open_promise_;

  std::promise<void> on_fail_promise_;
@@ -128,7 +128,7 @@ TEST_F(L2capClassicLinkTest, pending_channels_get_notified_on_acl_disconnect) { 
  ON_CALL(service, GetSecurityPolicy())

      .WillByDefault(::testing::Return(SecurityPolicy::_SDP_ONLY_NO_SECURITY_WHATSOEVER_PLAINTEXT_TRANSPORT_OK));



  EXPECT_CALL(mock_classic_dynamic_channel_service_manager_, GetSecurityModuleInterface())

  EXPECT_CALL(mock_classic_dynamic_channel_service_manager_, GetSecurityEnforcementInterface())

      .WillOnce(::testing::Return(&security_module_impl_));

  EXPECT_CALL(mock_classic_dynamic_channel_service_manager_, GetService(::testing::_))

      .WillOnce(::testing::Return(&service));