Add additional logs to security-manager

Per explicit request of Visual Display division.
One log changed to warning, also for specific request.

Change-Id: I6fbfc528002a78afd78e60699e342795248f4a1b

diff --git a/src/client/client-security-manager.cpp b/src/client/client-security-manager.cpp
index cc50da2b51f9d387dc39f2e42393e471b7689dfb..b94db7acce733b91f216b721024955302a25f37b 100644 (file)
--- a/src/client/client-security-manager.cpp
+++ b/src/client/client-security-manager.cpp
@@ -856,7 +856,9 @@ static int setupSharedRO(const std::string &pkg_name, bool enabledSharedRO, cons
     }
 
     if (FS::directoryStatus(userAppsRWSharedDir) > 0) {
+        LogDebug("Attempting to bindMountRO for pkg name: " << pkg_name << ", path: " << userAppsRWSharedDir);
         ret = MountNS::bindMountRO(userAppsRWSharedDir, userAppsRWSharedDir);
+        LogDebug("bindMountRO for pkg name: " << pkg_name << " returned: " << ret);
         if (ret != SECURITY_MANAGER_SUCCESS)
             return ret;
     } else
@@ -973,14 +975,15 @@ int security_manager_prepare_app2(const char *app_name, const char *subsession_i
         return SECURITY_MANAGER_ERROR_INPUT_PARAM;
     }
 
-    LOG_EXECUTION_TIME("security_manager_prepare_app2(" + std::string(app_name) + "," +
-            (subsession_id ?: "(default)") + ")", Credentials::getCredentialsFromSelf());
-
     if (subsession_id)
         LogDebug("security_manager_prepare_app2() called for app " << app_name << " subsession " << subsession_id);
     else
         LogDebug("security_manager_prepare_app2() called for app " << app_name);
 
+
+    LOG_EXECUTION_TIME("security_manager_prepare_app2(" + std::string(app_name) + "," +
+            (subsession_id ?: "(default)") + ")", Credentials::getCredentialsFromSelf());
+
     return try_catch([&] {
 
         std::string appLabel, pkgName;
@@ -1021,6 +1024,8 @@ int security_manager_prepare_app2(const char *app_name, const char *subsession_i
             throw;
         }
 
+        LogDebug("security_manager_prepare_app2() finished with return code " << ret);
+
         return ret;
     });
 }

diff --git a/src/client/include/client-request.h b/src/client/include/client-request.h
index 852c1d382ab6cb9d1bbd788f0b00d759c3c5067c..82f729fa4ee388bf6929c2bd4ab8a0b167b4b268 100644 (file)
--- a/src/client/include/client-request.h
+++ b/src/client/include/client-request.h
@@ -92,7 +92,9 @@ public:
         const auto tid = gettid();
         if (resource_set_cpu_inheritance(tid, RESOURCE_CPU_DEST_NAME, 1000) != 0)
             LogError("resource_set_cpu_inheritance failed");
+        LogDebug("Sending request to server & waiting for response");
         m_status = sendToServer(SERVICE_SOCKET, m_buffer);
+        LogDebug("Request sent, response should be received; m_status: " << m_status);
         if (resource_clear_cpu_inheritance(tid, RESOURCE_CPU_DEST_NAME) != 0)
             LogError("resource_clear_cpu_inheritance failed");
         if (!failed())

diff --git a/src/common/service_impl.cpp b/src/common/service_impl.cpp
index b39ab6a9479e355d6a208a6e4cdba05643164d59..e73188d07948316529aad6103fcf8df4ab721a80 100644 (file)
--- a/src/common/service_impl.cpp
+++ b/src/common/service_impl.cpp
@@ -2248,11 +2248,12 @@ int ServiceImpl::prepareApp(const Credentials &creds, const std::string &appName
         std::vector<gid_t> &forbiddenGroups, std::vector<gid_t> &allowedGroups, std::vector<bool> &privPathsStatusVector)
 {
     try {
-        LogDebug("Requested prepareApp for application " << appName);
+        LogWarning("Requested prepareApp for application " << appName);
 
         bool isHybrid, enabledSharedRO;
         if (!m_privilegeDb.GetAppPkgInfo(appName, pkgName, isHybrid, enabledSharedRO))
             return SECURITY_MANAGER_ERROR_UNKNOWN;
+        LogDebug("Package ID: " << pkgName << ", hybrid status: " << isHybrid << ", enabledSharedRO: " << enabledSharedRO);
         prepareAppFlags = m_prepareAppFlags | (enabledSharedRO ? PREPARE_APP_SHARED_RO_FLAG : 0);
         label = SmackLabels::generateProcessLabel(appName, pkgName, isHybrid);
 
@@ -2263,6 +2264,8 @@ int ServiceImpl::prepareApp(const Credentials &creds, const std::string &appName
             return ret;
         }
 
+        LogDebug("Allowed privileges returned - number: " << allowedPrivileges.size());
+
         std::string authorHash;
         m_privilegeDb.GetPkgAuthorHash(pkgName, authorHash);
 
@@ -2287,6 +2290,9 @@ int ServiceImpl::prepareApp(const Credentials &creds, const std::string &appName
 
         ret = getForbiddenAndAllowedGroups(label, allowedPrivileges, forbiddenGroups,
                                         allowedGroups);
+
+        LogDebug("getForbiddenAndAllowedGroups returned: " << ret);
+
         return ret != SECURITY_MANAGER_SUCCESS ? ret
             : appSetupNamespace(creds, label, privPathsVector, privPathsStatusVector);
     } catch (const FS::Exception::Base &e) {