Remove logs and Add ACE API that returns privacy access checking result.

[platform/framework/web/wrt-security.git] / ace_client / src / ace_client.cpp

diff --git a/ace_client/src/ace_client.cpp b/ace_client/src/ace_client.cpp
index c496c86..64e8909 100644 (file)
--- a/ace_client/src/ace_client.cpp
+++ b/ace_client/src/ace_client.cpp
@@ -92,6 +92,7 @@ class AceThinClientImpl {
     AcePreference getWidgetResourcePreference(
             const AceResource& resource,
             const AceWidgetHandle& handle) const;
+    bool checkPrivacy(const AceRequest& ace_request);
     AceResourcesPreferences* getGlobalResourcesPreferences() const;
     bool isInitialized() const;
 
@@ -101,7 +102,7 @@ class AceThinClientImpl {
   protected:
     bool containsNetworkDevCap(const AceRequest &ace_request);
     bool checkFeatureList(const AceRequest& ace_request);
-    bool checkPrivacy(const AceRequest& ace_request);
+    
   private:
     WebRuntimeImpl* m_wrt;
     ResourceInformationImpl* m_res;
@@ -128,11 +129,11 @@ class AceThinClientImpl {
 };
 
 AceThinClientImpl::AceThinClientImpl()
-  : m_communicationClient(NULL),
-    m_popupValidationClient(NULL),
-    m_wrt(new WebRuntimeImpl()),
+  : m_wrt(new WebRuntimeImpl()),
     m_res(new ResourceInformationImpl()),
     m_sys(new OperationSystemImpl()),
+    m_communicationClient(NULL),
+    m_popupValidationClient(NULL),
     m_pip(m_wrt, m_res, m_sys)
 {
     AceDB::AceDAOReadOnly::attachToThreadRO();
@@ -203,19 +204,8 @@ bool AceThinClientImpl::checkFeatureList(const AceRequest& ace_request)
 
 bool AceThinClientImpl::checkPrivacy(const AceRequest& ace_request)
 {
-    pid_t pid;
     int res;
-    char* app_id;
-
-    pid = getpid();
-
-    LogInfo("pid : " << pid);
 
-    res = app_manager_get_app_id(pid, &app_id);
-    if (res == APP_MANAGER_ERROR_NONE) {
-        LogInfo("Calling app_id : " << app_id);
-    }
-    
     WrtDB::WidgetDAOReadOnly dao(ace_request.widgetHandle);
     std::string tzPkgId = DPL::ToUTF8String(dao.getTzPkgId());
 
@@ -223,13 +213,14 @@ bool AceThinClientImpl::checkPrivacy(const AceRequest& ace_request)
 
     for (size_t i = 0; i < ace_request.apiFeatures.count; ++i) {
         res = privacy_checker_check_package_by_privilege(tzPkgId.c_str(), ace_request.apiFeatures.apiFeature[i]);
-        LogInfo(" privilege : " << ace_request.apiFeatures.apiFeature[i] << " : " << (res == PRIV_MGR_ERROR_SUCCESS) ? "true" : "false");
+        LogInfo(" privilege : " << ace_request.apiFeatures.apiFeature[i] << " : " << ((res == PRIV_MGR_ERROR_SUCCESS) ? "true" : "false"));
         if (res != PRIV_MGR_ERROR_SUCCESS)
             return false;
     }
 
     return true;
 }
+
 bool AceThinClientImpl::checkFunctionCall(const AceRequest& ace_request)
 {
     LogInfo("Enter");
@@ -460,8 +451,6 @@ bool AceThinClientImpl::checkFunctionCall(const AceRequest& ace_request)
             result = askUser(popupType, ace_request, request);
         }
     }
-    if (result)
-        result = checkPrivacy(ace_request);
 
     LogInfo("Result: " << (result ? "GRANTED" : "DENIED"));
     return result;
@@ -670,6 +659,12 @@ bool AceThinClient::checkFunctionCall(
     return m_impl->checkFunctionCall(ace_request);
 }
 
+bool AceThinClient::checkPrivacy(
+        const AceRequest& ace_request) const
+{
+    return m_impl->checkPrivacy(ace_request);
+}
+
 AcePreference AceThinClient::getWidgetResourcePreference(
         const AceResource& resource,
         const AceWidgetHandle& handle) const