Restore client authentication

Change-Id: I5b73fd3f5523ce8002fca6d912552c3527291f63

diff --git a/src/common/cynara.cpp b/src/common/cynara.cpp
index 576a33829aade29cc83b9b513f9e0fe15c3abd54..758a9fcd0e6eadb893eb9147753d2662cb294a21 100644 (file)
--- a/src/common/cynara.cpp
+++ b/src/common/cynara.cpp
@@ -557,6 +557,13 @@ void CynaraAdmin::userInit(uid_t uid, security_manager_user_type userType)
             ThrowMsg(CynaraException::InvalidParam, "User type incorrect");
     }
 
+    if (!smack_simple_check()) {
+        policies.emplace_back(CynaraAdminPolicy(
+            CYNARA_ADMIN_WILDCARD, userStr, CYNARA_ADMIN_WILDCARD,
+            static_cast<int>(CynaraAdminPolicy::Operation::Allow),
+            Buckets.at(Bucket::MANIFESTS_GLOBAL)));
+    }
+
     policies.push_back(CynaraAdminPolicy(CYNARA_ADMIN_WILDCARD,
                                          userStr,
                                          CYNARA_ADMIN_WILDCARD,

diff --git a/src/server/service/service.cpp b/src/server/service/service.cpp
index 607dcf811b9219de659386b2155f801ac934f8d0..0bcc4d71ad41c4a7aa17a8165d81c3ed3f193697 100644 (file)
--- a/src/server/service/service.cpp
+++ b/src/server/service/service.cpp
@@ -59,11 +59,8 @@ void Service::processEvent(Event &&msg)
         int call_type_int;
         Deserialization::Deserialize(msg.buffer, call_type_int);
         SecurityModuleCall call_type = static_cast<SecurityModuleCall>(call_type_int);
-        if (!smack_simple_check()) {
-            LogWarning("Running in no-smack mode, treating connection as authenticated - privileges will not be checked!");
-            msg.creds.authenticated = true;
-        }
-        LogWarning("Processing event from client - smack label: " << msg.creds.label << ", pid: " << msg.creds.pid);
+        LogWarning("Processing event from client - smack label: " << msg.creds.label << ", pid: "
+                   << msg.creds.pid << ", uid: " << msg.creds.uid);
         LOG_EXECUTION_TIME(SecurityModuleCallToString(call_type), msg.creds);
         switch (call_type) {
             case SecurityModuleCall::NOOP: