Reduce number of error logs in ckm.

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

diff --git a/src/manager/service/file-system.cpp b/src/manager/service/file-system.cpp
index cefea59..376d78d 100644 (file)
--- a/src/manager/service/file-system.cpp
+++ b/src/manager/service/file-system.cpp
@@ -20,6 +20,7 @@
  * @brief       Sample service implementation.
  */
 #include <string.h>
+#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -36,6 +37,7 @@
 #include <dpl/fstream_accessors.h>
 #include <dpl/log/log.h>
 
+#include <exception.h>
 #include <file-system.h>
 
 namespace {
@@ -83,9 +85,15 @@ std::string FileSystem::getRemovedAppsPath() const {
 RawBuffer FileSystem::loadFile(const std::string &path) const {
     std::ifstream is(path);
 
-    if (is.fail())
+    if (is.fail() && ENOENT == errno)
         return RawBuffer();
 
+    if (is.fail()) {
+        auto description = GetErrnoString(errno);
+        ThrowErr(Exc::FileSystemFailed,
+                 "Error opening file: ", path, " Reason: ", description);
+    }
+
     std::istreambuf_iterator<char> begin(is),end;
     std::vector<char> buff(begin,end); // This trick does not work with boost vector
 
@@ -104,34 +112,38 @@ RawBuffer FileSystem::getDBDEK() const
     return loadFile(getDBDEKPath());
 }
 
-bool FileSystem::saveFile(const std::string &path, const RawBuffer &buffer) const {
+void FileSystem::saveFile(const std::string &path, const RawBuffer &buffer) const {
     std::ofstream os(path, std::ios::out | std::ofstream::binary | std::ofstream::trunc);
     std::copy(buffer.begin(), buffer.end(), std::ostreambuf_iterator<char>(os));
-    if (os.fail())
-        return false;
 
     // Prevent desynchronization in batter remove test.
     os.flush();
     fsync(FstreamAccessors<std::ofstream>::GetFd(os)); // flush kernel space buffer
     os.close();
-    return !os.fail();
+
+    if (os.fail())
+        ThrowErr(Exc::FileSystemFailed, "Failed to save file: ", path);
 }
 
-bool FileSystem::saveDKEK(const RawBuffer &buffer) const {
-    return saveFile(getDKEKPath(), buffer);
+void FileSystem::saveDKEK(const RawBuffer &buffer) const {
+    saveFile(getDKEKPath(), buffer);
 }
 
-bool FileSystem::saveDBDEK(const RawBuffer &buffer) const {
-    return saveFile(getDBDEKPath(), buffer);
+void FileSystem::saveDBDEK(const RawBuffer &buffer) const {
+    saveFile(getDBDEKPath(), buffer);
 }
 
-bool FileSystem::addRemovedApp(const std::string &smackLabel) const
+void FileSystem::addRemovedApp(const std::string &smackLabel) const
 {
     std::ofstream outfile;
     outfile.open(getRemovedAppsPath(), std::ios_base::app);
     outfile << smackLabel << std::endl;
     outfile.close();
-    return !outfile.fail();
+    if (outfile.fail()) {
+        auto desc = GetErrnoString(errno);
+        ThrowErr(Exc::FileSystemFailed,
+                 "Could not update file: ", getRemovedAppsPath(), " Reason: ", desc);
+    }
 }
 
 AppLabelVector FileSystem::clearRemovedsApps() const
@@ -159,8 +171,7 @@ int FileSystem::init() {
     errno = 0;
     if ((mkdir(CKM_DATA_PATH.c_str(), 0700)) && (errno != EEXIST)) {
         int err = errno;
-        LogError("Error in mkdir. Data directory could not be created. Errno: "
-            << err << " (" << GetErrnoString(err) << ")");
+        LogError("Error in mkdir " << CKM_DATA_PATH << ". Reason: " << GetErrnoString(err));
         return -1; // TODO set up some error code
     }
     return 0;
@@ -189,7 +200,6 @@ UidVector FileSystem::getUIDsFromDBFile() {
     struct dirent* pDirEntry = NULL;
 
     while ( (!readdir_r(dirp.get(), pEntry.get(), &pDirEntry)) && pDirEntry ) {
-
         // Ignore files with diffrent prefix
         if (strncmp(pDirEntry->d_name, CKM_KEY_PREFIX.c_str(), CKM_KEY_PREFIX.size())) {
             continue;
@@ -199,10 +209,10 @@ UidVector FileSystem::getUIDsFromDBFile() {
         try {
             uids.push_back(static_cast<uid_t>(std::stoi((pDirEntry->d_name)+CKM_KEY_PREFIX.size())));
         } catch (const std::invalid_argument) {
-            LogError("Error in extracting uid from db file. Error=std::invalid_argument."
+            LogDebug("Error in extracting uid from db file. Error=std::invalid_argument."
                 "This will be ignored.File=" << pDirEntry->d_name << "");
         } catch(const std::out_of_range) {
-            LogError("Error in extracting uid from db file. Error=std::out_of_range."
+            LogDebug("Error in extracting uid from db file. Error=std::out_of_range."
                 "This will be ignored. File="<< pDirEntry->d_name << "");
         }
     }
@@ -216,28 +226,28 @@ int FileSystem::removeUserData() const {
     if (unlink(getDBPath().c_str())) {
         retCode = -1;
         err = errno;
-        LogError("Error in unlink user database: " << getDBPath()
+        LogDebug("Error in unlink user database: " << getDBPath()
             << "Errno: " << errno << " " << GetErrnoString(err));
     }
 
     if (unlink(getDKEKPath().c_str())) {
         retCode = -1;
         err = errno;
-        LogError("Error in unlink user DKEK: " << getDKEKPath()
+        LogDebug("Error in unlink user DKEK: " << getDKEKPath()
             << "Errno: " << errno << " " << GetErrnoString(err));
     }
 
     if (unlink(getDBDEKPath().c_str())) {
         retCode = -1;
         err = errno;
-        LogError("Error in unlink user DBDEK: " << getDBDEKPath()
+        LogDebug("Error in unlink user DBDEK: " << getDBDEKPath()
             << "Errno: " << errno << " " << GetErrnoString(err));
     }
 
     if (unlink(getRemovedAppsPath().c_str())) {
         retCode = -1;
         err = errno;
-        LogError("Error in unlink user's Removed Apps File: " << getRemovedAppsPath()
+        LogDebug("Error in unlink user's Removed Apps File: " << getRemovedAppsPath()
             << "Errno: " << errno << " " << GetErrnoString(err));
     }