Extract privet::AuthManager from privet::SecurityManager
BUG:25934385
Change-Id: I45fb7c79053a6009330b4debae1065266d1ce972
Reviewed-on: https://weave-review.googlesource.com/1735
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
diff --git a/src/privet/security_manager.h b/src/privet/security_manager.h
index bb513e6..26a42d4 100644
--- a/src/privet/security_manager.h
+++ b/src/privet/security_manager.h
@@ -30,6 +30,8 @@
namespace privet {
+class AuthManager;
+
class SecurityManager : public SecurityDelegate {
public:
using PairingStartListener =
@@ -49,7 +51,7 @@
virtual const std::string& GetKey() const = 0;
};
- SecurityManager(const std::string& secret,
+ SecurityManager(AuthManager* auth_manager,
const std::set<PairingType>& pairing_modes,
const std::string& embedded_code,
bool disable_security,
@@ -82,12 +84,6 @@
void RegisterPairingListeners(const PairingStartListener& on_start,
const PairingEndListener& on_end);
- void SetCertificateFingerprint(const std::vector<uint8_t>& fingerprint) {
- certificate_fingerprint_ = fingerprint;
- }
-
- std::string GetSecret() const;
-
private:
FRIEND_TEST_ALL_PREFIXES(SecurityManagerTest, ThrottlePairing);
// Allows limited number of new sessions without successful authorization.
@@ -95,6 +91,8 @@
bool ClosePendingSession(const std::string& session_id);
bool CloseConfirmedSession(const std::string& session_id);
+ AuthManager* auth_manager_{nullptr};
+
// If true allows unencrypted pairing and accepts any access code.
bool is_security_disabled_{false};
std::set<PairingType> pairing_modes_;
@@ -105,8 +103,6 @@
std::map<std::string, std::unique_ptr<KeyExchanger>> confirmed_sessions_;
mutable int pairing_attemts_{0};
mutable base::Time block_pairing_until_;
- std::vector<uint8_t> secret_;
- std::vector<uint8_t> certificate_fingerprint_;
PairingStartListener on_start_;
PairingEndListener on_end_;