Shrink client manager impl a bit

Change-Id: I766a79b2504b0d564db4b4b3811fcd8a176001af

diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp
index 0640d81..19a2815 100644 (file)
--- a/src/manager/client/client-manager-impl.cpp
+++ b/src/manager/client/client-manager-impl.cpp
@@ -73,7 +73,7 @@ int getCertChain(
                if (cert->empty())
                        return CKM_API_ERROR_BAD_RESPONSE;
 
-               certificateChainVector.push_back(cert);
+               certificateChainVector.push_back(std::move(cert));
        }
 
        return retCode;
@@ -81,11 +81,16 @@ int getCertChain(
        EXCEPTION_GUARD_END
 }
 
+template <class...T>
+int doRequest(MessageBuffer &recv, CKM::ServiceConnection &conn, T&&...t)
+{
+       return conn.processRequest(SerializeMessage(std::forward<T>(t)...), recv);
+}
+
 } // namespace
 
 Manager::Impl::Impl()
-       : m_counter(0),
-         m_storageConnection(SERVICE_SOCKET_CKM_STORAGE),
+       : m_storageConnection(SERVICE_SOCKET_CKM_STORAGE),
          m_ocspConnection(SERVICE_SOCKET_OCSP),
          m_encryptionConnection(SERVICE_SOCKET_ENCRYPTION)
 {
@@ -96,9 +101,7 @@ Manager::Impl::Request::Request(Manager::Impl &impl, Cmd cmd, CKM::ServiceConnec
 {
        static_assert(sizeof cmd <= sizeof(int));
        const auto msgId = m_msgId = ++impl.m_counter;
-       m_retCode = conn.processRequest(
-                       SerializeMessage(static_cast<int>(cmd), msgId, std::forward<T>(t)...),
-                       m_recv);
+       m_retCode = doRequest(m_recv, conn, static_cast<int>(cmd), msgId, std::forward<T>(t)...);
 }
 
 Manager::Impl::Request::operator bool() const {
@@ -149,7 +152,6 @@ int Manager::Impl::saveKey(const Alias &alias, const KeyShPtr &key,
 {
        if (key.get() == NULL || key->empty())
                return CKM_API_ERROR_INPUT_PARAM;
-
        try {
                return saveBinaryData(alias, DataType(key->getType()), key->getDER(), policy);
        } catch (const Exc::Exception &e) {
@@ -163,19 +165,17 @@ int Manager::Impl::saveCertificate(
        const CertificateShPtr &cert,
        const Policy &policy)
 {
-       if (cert.get() == NULL || cert->empty())
-               return CKM_API_ERROR_INPUT_PARAM;
-
-       return saveBinaryData(alias, DataType::CERTIFICATE, cert->getDER(), policy);
+       return cert.get() == NULL || cert->empty()
+               ? CKM_API_ERROR_INPUT_PARAM
+               : saveBinaryData(alias, DataType::CERTIFICATE, cert->getDER(), policy);
 }
 
 int Manager::Impl::saveData(const Alias &alias, const RawBuffer &rawData,
                                                        const Policy &policy)
 {
-       if (!policy.extractable)
-               return CKM_API_ERROR_INPUT_PARAM;
-
-       return saveBinaryData(alias, DataType::BINARY_DATA, rawData, policy);
+       return !policy.extractable
+               ? CKM_API_ERROR_INPUT_PARAM
+               : saveBinaryData(alias, DataType::BINARY_DATA, rawData, policy);
 }
 
 
@@ -217,14 +217,10 @@ int Manager::Impl::getPKCS12(const Alias &alias, const Password &keyPass,
 
        int msgId = ++m_counter;
        MessageBuffer recv;
-       auto send = SerializeMessage(static_cast<int>(LogicCommand::GET_PKCS12),
-                                                                msgId,
-                                                                helper.getName(),
-                                                                helper.getOwner(),
-                                                                keyPass,
-                                                                certPass);
 
-       int retCode = m_storageConnection.processRequest(send, recv);
+       int retCode = doRequest(recv, m_storageConnection,
+                       static_cast<int>(LogicCommand::GET_PKCS12), msgId,
+                       helper.getName(), helper.getOwner(), keyPass, certPass);
 
        if (CKM_API_SUCCESS != retCode)
                return retCode;
@@ -292,18 +288,16 @@ int Manager::Impl::getBinaryDataEncryptionStatus(const DataType sendDataType,
 
        AliasSupport helper(alias);
        DataType tmpDataType;
-       bool passwordProtectionStatus;
 
        int retCode = Request(*this, LogicCommand::GET_PROTECTION_STATUS, m_storageConnection,
                        sendDataType, helper.getName(), helper.getOwner()
-               ).maybeDeserialize(tmpDataType, passwordProtectionStatus);
+               ).maybeDeserialize(tmpDataType, status);
+
+       if (retCode != CKM_API_SUCCESS)
+               status = false;
+
+       return retCode;
 
-       if (retCode != CKM_API_SUCCESS) {
-               return retCode;
-       } else {
-               status = passwordProtectionStatus;
-               return CKM_API_SUCCESS;
-       }
        EXCEPTION_GUARD_END
 }
 
@@ -313,22 +307,12 @@ int Manager::Impl::getKey(const Alias &alias, const Password &password,
        DataType recvDataType;
        RawBuffer rawData;
 
-       int retCode = getBinaryData(
-                                         alias,
-                                         DataType::KEY_RSA_PUBLIC,
-                                         password,
-                                         recvDataType,
-                                         rawData);
+       int retCode = getBinaryData(alias, DataType::KEY_RSA_PUBLIC, password, recvDataType, rawData);
 
        if (retCode != CKM_API_SUCCESS)
                return retCode;
 
-       KeyShPtr keyParsed;
-
-       if (recvDataType.isSKey())
-               keyParsed = Key::createAES(rawData);
-       else
-               keyParsed = Key::create(rawData);
+       KeyShPtr keyParsed = recvDataType.isSKey() ? Key::createAES(rawData) : Key::create(rawData);
 
        if (!keyParsed) {
                LogDebug("Key empty - failed to parse!");
@@ -346,12 +330,7 @@ int Manager::Impl::getCertificate(const Alias &alias, const Password &password,
        DataType recvDataType;
        RawBuffer rawData;
 
-       int retCode = getBinaryData(
-                                         alias,
-                                         DataType::CERTIFICATE,
-                                         password,
-                                         recvDataType,
-                                         rawData);
+       int retCode = getBinaryData(alias, DataType::CERTIFICATE, password, recvDataType, rawData);
 
        if (retCode != CKM_API_SUCCESS)
                return retCode;
@@ -364,7 +343,7 @@ int Manager::Impl::getCertificate(const Alias &alias, const Password &password,
        if (certParsed->empty())
                return CKM_API_ERROR_BAD_RESPONSE;
 
-       cert = certParsed;
+       cert = std::move(certParsed);
 
        return CKM_API_SUCCESS;
 }
@@ -374,20 +353,12 @@ int Manager::Impl::getData(const Alias &alias, const Password &password,
 {
        DataType recvDataType = DataType::BINARY_DATA;
 
-       int retCode = getBinaryData(
-                                         alias,
-                                         DataType::BINARY_DATA,
-                                         password,
-                                         recvDataType,
-                                         rawData);
+       int retCode = getBinaryData(alias, DataType::BINARY_DATA, password, recvDataType, rawData);
 
        if (retCode != CKM_API_SUCCESS)
                return retCode;
 
-       if (!recvDataType.isBinaryData())
-               return CKM_API_ERROR_BAD_RESPONSE;
-
-       return CKM_API_SUCCESS;
+       return recvDataType.isBinaryData() ? CKM_API_SUCCESS : CKM_API_ERROR_BAD_RESPONSE;
 }
 
 int Manager::Impl::getBinaryDataAliasVectorHelper(DataType dataType,
@@ -519,8 +490,8 @@ int Manager::Impl::createKeyPairECDSA(
        const Policy &policyPublicKey)
 {
        return this->createKeyPair(CKM::KeyType::KEY_ECDSA_PUBLIC,
-                                                          static_cast<int>(type), privateKeyAlias, publicKeyAlias, policyPrivateKey,
-                                                          policyPublicKey);
+                                                          static_cast<int>(type), privateKeyAlias, publicKeyAlias,
+                                                          policyPrivateKey, policyPublicKey);
 }
 
 int Manager::Impl::createKeyAES(
@@ -616,15 +587,9 @@ int Manager::Impl::getCertificateChain(
                trustedVector.push_back(e->getDER());
        }
 
-       return getCertChain(
-                          m_storageConnection,
-                          LogicCommand::GET_CHAIN_CERT,
-                          *this,
-                          certificate,
-                          untrustedVector,
-                          trustedVector,
-                          useTrustedSystemCertificates,
-                          certificateChainVector);
+       return getCertChain(m_storageConnection, LogicCommand::GET_CHAIN_CERT, *this,
+                           certificate, untrustedVector, trustedVector,
+                           useTrustedSystemCertificates, certificateChainVector);
 }
 
 int Manager::Impl::getCertificateChain(
@@ -650,15 +615,9 @@ int Manager::Impl::getCertificateChain(
                trustedVector.push_back(std::make_pair(helper.getOwner(), helper.getName()));
        }
 
-       return getCertChain(
-                          m_storageConnection,
-                          LogicCommand::GET_CHAIN_ALIAS,
-                          *this,
-                          certificate,
-                          untrustedVector,
-                          trustedVector,
-                          useTrustedSystemCertificates,
-                          certificateChainVector);
+       return getCertChain(m_storageConnection, LogicCommand::GET_CHAIN_ALIAS, *this,
+                           certificate, untrustedVector, trustedVector,
+                           useTrustedSystemCertificates, certificateChainVector);
 }
 
 int Manager::Impl::createSignature(
@@ -718,9 +677,7 @@ int Manager::Impl::ocspCheck(const CertificateShPtrVector &certChain,
                rawCertChain.push_back(e->getDER());
        }
 
-       auto send = SerializeMessage(msgId, rawCertChain);
-
-       int retCode = m_ocspConnection.processRequest(send, recv);
+       int retCode = doRequest(recv, m_ocspConnection, msgId, rawCertChain);
 
        if (CKM_API_SUCCESS != retCode)
                return retCode;

diff --git a/src/manager/client/client-manager-impl.h b/src/manager/client/client-manager-impl.h
index 939e2ac..133ac08 100644 (file)
--- a/src/manager/client/client-manager-impl.h
+++ b/src/manager/client/client-manager-impl.h
@@ -28,10 +28,9 @@
 
 namespace CKM {
 
-class Manager::Impl {
+class Manager::Impl final {
 public:
        Impl();
-       virtual ~Impl() {}
 
        int saveKey(const Alias &alias, const KeyShPtr &key, const Policy &policy);
        int getKey(const Alias &alias, const Password &password, KeyShPtr &key);
@@ -136,7 +135,7 @@ public:
                                const RawBuffer &encrypted,
                                RawBuffer &decrypted);
 
-protected:
+private:
        int saveBinaryData(
                const Alias &alias,
                DataType dataType,
@@ -183,12 +182,11 @@ protected:
                          const RawBuffer &input,
                          RawBuffer &output);
 
-       int m_counter;
+       int m_counter = 0;
        CKM::ServiceConnection m_storageConnection;
        CKM::ServiceConnection m_ocspConnection;
        CKM::ServiceConnection m_encryptionConnection;
 
-private:
        class Request final {
                int m_msgId, m_retCode;
                MessageBuffer m_recv;
@@ -199,7 +197,7 @@ private:
                Request &operator=(const Request &) = delete;
 
                template <class Cmd, class...T>
-               Request(Manager::Impl &, Cmd, CKM::ServiceConnection &, T&&...);
+               explicit Request(Manager::Impl &, Cmd, CKM::ServiceConnection &, T&&...);
 
                explicit operator bool() const;
                int err() const;