Skip to content

Commit 85f2729

Browse files
al1imgal1img
committed
iam: certhandler: remove cert provider instance
Cert handler implements same methods as cert provider and it can be used instead. Signed-off-by: Oleksandr Grytsov <[email protected]>
1 parent 66caa0a commit 85f2729

File tree

8 files changed

+28
-181
lines changed

8 files changed

+28
-181
lines changed

‎src/core/iam/certhandler/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ set(TARGET_NAME certhandler)
1414
# Sources
1515
# ######################################################################################################################
1616

17-
set(SOURCES certhandler.cpp certmodule.cpp certprovider.cpp)
17+
set(SOURCES certhandler.cpp certmodule.cpp)
1818

1919
# ######################################################################################################################
2020
# Headers
2121
# ######################################################################################################################
2222

23-
set(HEADERS certhandler.hpp certmodule.hpp certprovider.hpp hsm.hpp)
23+
set(HEADERS certhandler.hpp certmodule.hpp hsm.hpp)
2424

2525
# ######################################################################################################################
2626
# Libraries

‎src/core/iam/certhandler/certhandler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ Error CertHandler::ApplyCertificate(const String& certType, const String& pemCer
127127
return UpdateCerts(*module);
128128
}
129129

130-
Error CertHandler::GetCertificate(
131-
const String& certType, const Array<uint8_t>& issuer, const Array<uint8_t>& serial, CertInfo& resCert)
130+
Error CertHandler::GetCert(
131+
const String& certType, const Array<uint8_t>& issuer, const Array<uint8_t>& serial, CertInfo& resCert) const
132132
{
133133
LockGuard lock {mMutex};
134134

‎src/core/iam/certhandler/certhandler.hpp‎

Lines changed: 21 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -78,36 +78,6 @@ class CertHandlerItf {
7878
*/
7979
virtual Error ApplyCertificate(const String& certType, const String& pemCert, CertInfo& info) = 0;
8080

81-
/**
82-
* Returns certificate info.
83-
*
84-
* @param certType certificate type.
85-
* @param issuer issuer name.
86-
* @param serial serial number.
87-
* @param[out] resCert result certificate.
88-
* @returns Error.
89-
*/
90-
virtual Error GetCertificate(
91-
const String& certType, const Array<uint8_t>& issuer, const Array<uint8_t>& serial, CertInfo& resCert)
92-
= 0;
93-
94-
/**
95-
* Subscribes certificates listener.
96-
*
97-
* @param certType certificate type.
98-
* @param certListener certificate listener.
99-
* @returns Error.
100-
*/
101-
virtual Error SubscribeListener(const String& certType, iamclient::CertListenerItf& certListener) = 0;
102-
103-
/**
104-
* Unsubscribes certificate listener.
105-
*
106-
* @param certListener certificate listener.
107-
* @returns Error.
108-
*/
109-
virtual Error UnsubscribeListener(iamclient::CertListenerItf& certListener) = 0;
110-
11181
/**
11282
* Creates a self signed certificate.
11383
*
@@ -140,7 +110,7 @@ class CertHandlerItf {
140110
/**
141111
* Handles keys and certificates.
142112
*/
143-
class CertHandler : public CertHandlerItf, private NonCopyable {
113+
class CertHandler : public CertHandlerItf, public iamclient::CertProviderItf, private NonCopyable {
144114
public:
145115
/**
146116
* Creates a new object instance.
@@ -203,50 +173,50 @@ class CertHandler : public CertHandlerItf, private NonCopyable {
203173
Error ApplyCertificate(const String& certType, const String& pemCert, CertInfo& info) override;
204174

205175
/**
206-
* Returns certificate info.
176+
* Creates a self signed certificate.
207177
*
208178
* @param certType certificate type.
209-
* @param issuer issuer name.
210-
* @param serial serial number.
211-
* @param[out] resCert result certificate.
179+
* @param password owner password.
212180
* @returns Error.
213181
*/
214-
Error GetCertificate(
215-
const String& certType, const Array<uint8_t>& issuer, const Array<uint8_t>& serial, CertInfo& resCert) override;
182+
Error CreateSelfSignedCert(const String& certType, const String& password) override;
216183

217184
/**
218-
* Subscribes certificates receiver.
185+
* Returns module configuration.
219186
*
220187
* @param certType certificate type.
221-
* @param certListener certificate listener.
222-
* @returns Error.
188+
* @return RetWithError<ModuleConfig>
223189
*/
224-
Error SubscribeListener(const String& certType, iamclient::CertListenerItf& certListener) override;
190+
RetWithError<ModuleConfig> GetModuleConfig(const String& certType) const override;
225191

226192
/**
227-
* Unsubscribes certificate listener.
193+
* Returns certificate info.
228194
*
229-
* @param certListener certificate listener.
195+
* @param certType certificate type.
196+
* @param issuer issuer name.
197+
* @param serial serial number.
198+
* @param[out] resCert result certificate.
230199
* @returns Error.
231200
*/
232-
Error UnsubscribeListener(iamclient::CertListenerItf& certListener) override;
201+
Error GetCert(const String& certType, const Array<uint8_t>& issuer, const Array<uint8_t>& serial,
202+
CertInfo& resCert) const override;
233203

234204
/**
235-
* Creates a self signed certificate.
205+
* Subscribes certificates listener.
236206
*
237207
* @param certType certificate type.
238-
* @param password owner password.
208+
* @param certListener certificate listener.
239209
* @returns Error.
240210
*/
241-
Error CreateSelfSignedCert(const String& certType, const String& password) override;
211+
Error SubscribeListener(const String& certType, iamclient::CertListenerItf& certListener) override;
242212

243213
/**
244-
* Returns module configuration.
214+
* Unsubscribes certificate listener.
245215
*
246-
* @param certType certificate type.
247-
* @return RetWithError<ModuleConfig>
216+
* @param certListener certificate listener.
217+
* @returns Error.
248218
*/
249-
RetWithError<ModuleConfig> GetModuleConfig(const String& certType) const override;
219+
Error UnsubscribeListener(iamclient::CertListenerItf& certListener) override;
250220

251221
/**
252222
* Destroys certificate handler object instance.

‎src/core/iam/certhandler/certprovider.cpp‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/core/iam/certhandler/tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set(TARGET_NAME certhandler_test)
1010
# Sources
1111
# ######################################################################################################################
1212

13-
set(SOURCES certhandler.cpp certmodules.cpp certprovider.cpp)
13+
set(SOURCES certhandler.cpp certmodules.cpp)
1414

1515
# ######################################################################################################################
1616
# Libraries

‎src/core/iam/certhandler/tests/certhandler.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,7 @@ TEST_F(CerthandlerTest, GetCertificate)
325325

326326
CertInfo certInfo;
327327

328-
ASSERT_TRUE(
329-
mCertHandler->GetCertificate("iam", storageCerts[0].mIssuer, storageCerts[0].mSerial, certInfo).IsNone());
328+
ASSERT_TRUE(mCertHandler->GetCert("iam", storageCerts[0].mIssuer, storageCerts[0].mSerial, certInfo).IsNone());
330329
ASSERT_EQ(certInfo, storageCerts[0]);
331330
}
332331

@@ -353,7 +352,7 @@ TEST_F(CerthandlerTest, GetCertificateEmptySerial)
353352

354353
const auto empty = Array<uint8_t>(nullptr, 0);
355354

356-
ASSERT_TRUE(mCertHandler->GetCertificate("iam", empty, empty, certInfo).IsNone());
355+
ASSERT_TRUE(mCertHandler->GetCert("iam", empty, empty, certInfo).IsNone());
357356
ASSERT_EQ(certInfo, storageCerts[1]);
358357
}
359358

‎src/core/iam/certhandler/tests/certprovider.cpp‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎src/core/iam/tests/mocks/certhandlermock.hpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ class CertHandlerMock : public CertHandlerItf {
2323
MOCK_METHOD(Error, Clear, (const String&), (override));
2424
MOCK_METHOD(Error, CreateKey, (const String&, const String&, const String&, String&), (override));
2525
MOCK_METHOD(Error, ApplyCertificate, (const String&, const String&, CertInfo&), (override));
26-
MOCK_METHOD(
27-
Error, GetCertificate, (const String&, const Array<uint8_t>&, const Array<uint8_t>&, CertInfo&), (override));
28-
MOCK_METHOD(Error, SubscribeListener, (const String&, iamclient::CertListenerItf&), (override));
29-
MOCK_METHOD(Error, UnsubscribeListener, (iamclient::CertListenerItf & certListener), (override));
3026
MOCK_METHOD(Error, CreateSelfSignedCert, (const String&, const String&), (override));
3127
MOCK_METHOD(RetWithError<ModuleConfig>, GetModuleConfig, (const String&), (const, override));
3228
};

0 commit comments

Comments
 (0)