Remove warnings and performance problems reported by cppcheck.

[platform/core/security/key-manager.git] / src / manager / service / ckm-service.cpp

diff --git a/src/manager/service/ckm-service.cpp b/src/manager/service/ckm-service.cpp
index 0bc83a1..63095bb 100644 (file)
--- a/src/manager/service/ckm-service.cpp
+++ b/src/manager/service/ckm-service.cpp
@@ -31,15 +31,6 @@
 namespace {
 const CKM::InterfaceID SOCKET_ID_CONTROL = 0;
 const CKM::InterfaceID SOCKET_ID_STORAGE = 1;
-
-template <typename ...Args>
-CKM::RawBuffer disallowed(int command, int msgID, Args&&... args) {
-    LogError("Disallowed command: " << command);
-    return CKM::MessageBuffer::Serialize(command,
-                                         msgID,
-                                         CKM_API_ERROR_ACCESS_DENIED,
-                                         std::move(args)...).Pop();
-}
 } // namespace anonymous
 
 namespace CKM {
@@ -74,10 +65,12 @@ void CKMService::SetCommManager(CommMgr *manager)
     Register(*manager);
 }
 
+// CKMService does not support security check
+// so 3rd parameter is not used
 bool CKMService::ProcessOne(
     const ConnectionID &conn,
     ConnectionInfo &info,
-    bool allowed)
+    bool /*allowed*/)
 {
     LogDebug ("process One");
     RawBuffer response;
@@ -89,7 +82,7 @@ bool CKMService::ProcessOne(
         if (info.interfaceID == SOCKET_ID_CONTROL)
             response = ProcessControl(info.buffer);
         else
-            response = ProcessStorage(info.credentials, info.buffer, allowed);
+            response = ProcessStorage(info.credentials, info.buffer);
 
         m_serviceManager->Write(conn, response);
 
@@ -170,14 +163,13 @@ RawBuffer CKMService::ProcessControl(MessageBuffer &buffer) {
     }
 }
 
-RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, bool allowed)
+RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
 {
     int command = 0;
     int msgID = 0;
     int tmpDataType = 0;
     Name name;
     Label label, accessorLabel;
-    std::string user;
 
     buffer.Deserialize(command);
     buffer.Deserialize(msgID);
@@ -198,10 +190,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
             RawBuffer rawData;
             PolicySerializable policy;
             buffer.Deserialize(tmpDataType, name, label, rawData, policy);
-
-            if (!allowed)
-                return disallowed(command, msgID, static_cast<int>(DataType(tmpDataType)));
-
             return m_logic->saveData(
                 cred,
                 msgID,
@@ -217,10 +205,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
             PKCS12Serializable pkcs;
             PolicySerializable keyPolicy, certPolicy;
             buffer.Deserialize(name, label, pkcs, keyPolicy, certPolicy);
-
-            if (!allowed)
-                return disallowed(command, msgID);
-
             return m_logic->savePKCS12(
                 cred,
                 msgID,
@@ -233,10 +217,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
         case LogicCommand::REMOVE:
         {
             buffer.Deserialize(name, label);
-
-            if (!allowed)
-                return disallowed(command, msgID);
-
             return m_logic->removeData(
                 cred,
                 msgID,
@@ -247,13 +227,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
         {
             Password password;
             buffer.Deserialize(tmpDataType, name, label, password);
-
-            if (!allowed)
-                return disallowed(command,
-                                  msgID,
-                                  static_cast<int>(DataType(tmpDataType)),
-                                  RawBuffer());
-
             return m_logic->getData(
                 cred,
                 msgID,
@@ -270,10 +243,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
                                label,
                                passKey,
                                passCert);
-
-            if (!allowed)
-                return disallowed(command, msgID, PKCS12Serializable());
-
             return m_logic->getPKCS12(
                 cred,
                 msgID,
@@ -285,13 +254,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
         case LogicCommand::GET_LIST:
         {
             buffer.Deserialize(tmpDataType);
-
-            if (!allowed)
-                return disallowed(command,
-                                  msgID,
-                                  static_cast<int>(DataType(tmpDataType)),
-                                  LabelNameVector());
-
             return m_logic->getDataList(
                 cred,
                 msgID,
@@ -307,10 +269,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
                                policyKey,
                                keyName,
                                keyLabel);
-
-            if (!allowed)
-                return disallowed(command, msgID);
-
             return m_logic->createKeyAES(
                 cred,
                 msgID,
@@ -335,10 +293,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
                                privateKeyLabel,
                                publicKeyName,
                                publicKeyLabel);
-
-            if (!allowed)
-                return disallowed(command, msgID);
-
             return m_logic->createKeyPair(
                 cred,
                 msgID,
@@ -357,10 +311,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
             RawBufferVector trustedVector;
             bool systemCerts = false;
             buffer.Deserialize(certificate, untrustedVector, trustedVector, systemCerts);
-
-            if (!allowed)
-                return disallowed(command, msgID, RawBufferVector());
-
             return m_logic->getCertificateChain(
                 cred,
                 msgID,
@@ -376,10 +326,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
             LabelNameVector trustedVector;
             bool systemCerts = false;
             buffer.Deserialize(certificate, untrustedVector, trustedVector, systemCerts);
-
-            if (!allowed)
-                return disallowed(command, msgID, LabelNameVector());
-
             return m_logic->getCertificateChain(
                 cred,
                 msgID,
@@ -394,10 +340,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
             RawBuffer message;
             int padding = 0, hash = 0;
             buffer.Deserialize(name, label, password, message, hash, padding);
-
-            if (!allowed)
-                return disallowed(command, msgID, RawBuffer());
-
             return m_logic->createSignature(
                   cred,
                   msgID,
@@ -423,10 +365,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
                                signature,
                                hash,
                                padding);
-
-            if (!allowed)
-                return disallowed(command, msgID);
-
             return m_logic->verifySignature(
                 cred,
                 msgID,
@@ -442,10 +380,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer, b
         {
             PermissionMask permissionMask = 0;
             buffer.Deserialize(name, label, accessorLabel, permissionMask);
-
-            if (!allowed)
-                return disallowed(command, msgID);
-
             return m_logic->setPermission(
                 cred,
                 command,
@@ -477,5 +411,16 @@ void CKMService::ProcessMessage(MsgKeyRequest msg)
     }
 }
 
+void CKMService::CustomHandle(const ReadEvent &event) {
+    LogDebug("Read event");
+    auto &info = m_connectionInfoMap[event.connectionID.counter];
+    info.buffer.Push(event.rawBuffer);
+    while(ProcessOne(event.connectionID, info, true));
+}
+
+void CKMService::CustomHandle(const SecurityEvent & /*event*/) {
+    LogError("This should not happend! SecurityEvent was called on CKMService!");
+}
+
 } // namespace CKM