Apply Tizen C++ coding style to Access Control

Change-Id: Ieb065f8f088a87cb616dd4057a418be97e25cd58
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/src/ClientRequest.cpp b/src/ClientRequest.cpp
index 8af07e5..6bd1e8a 100644 (file)
--- a/src/ClientRequest.cpp
+++ b/src/ClientRequest.cpp
@@ -19,11 +19,11 @@
 #include <app_manager.h>
 #include <types_internal.h>
 #include "DBusServer.h"
-#include "access_control/peer_creds.h"
+#include "access_control/PeerCreds.h"
 #include "ClientRequest.h"
 
 ctx::ClientRequest::ClientRequest(int type, int reqId, const char *subj, const char *desc,
-               ctx::credentials *creds, const char *sender, GDBusMethodInvocation *inv) :
+               ctx::Credentials *creds, const char *sender, GDBusMethodInvocation *inv) :
        RequestInfo(type, reqId, subj, desc),
        __credentials(creds),
        __dbusSender(sender),
@@ -39,7 +39,7 @@ ctx::ClientRequest::~ClientRequest()
        delete __credentials;
 }
 
-const ctx::credentials* ctx::ClientRequest::getCredentials()
+const ctx::Credentials* ctx::ClientRequest::getCredentials()
 {
        return __credentials;
 }
@@ -47,7 +47,7 @@ const ctx::credentials* ctx::ClientRequest::getCredentials()
 const char* ctx::ClientRequest::getPackageId()
 {
        if (__credentials)
-               return __credentials->package_id;
+               return __credentials->packageId;
 
        return NULL;
 }

diff --git a/src/ClientRequest.h b/src/ClientRequest.h
index db7480a..69d18e1 100644 (file)
--- a/src/ClientRequest.h
+++ b/src/ClientRequest.h
@@ -25,10 +25,10 @@ namespace ctx {
        class ClientRequest : public RequestInfo {
        public:
                ClientRequest(int type, int reqId, const char *subj, const char *desc,
-                               credentials *creds, const char *sender, GDBusMethodInvocation *inv);
+                               Credentials *creds, const char *sender, GDBusMethodInvocation *inv);
                ~ClientRequest();
 
-               const credentials* getCredentials();
+               const Credentials* getCredentials();
                const char* getPackageId();
                const char* getClient();
                bool reply(int error);
@@ -37,7 +37,7 @@ namespace ctx {
                bool publish(int error, ctx::Json &data);
 
        private:
-               credentials *__credentials;
+               Credentials *__credentials;
                std::string __dbusSender;
                GDBusMethodInvocation *__invocation;
        };

diff --git a/src/DBusServer.cpp b/src/DBusServer.cpp
index c7b85c9..e9a1d77 100644 (file)
--- a/src/DBusServer.cpp
+++ b/src/DBusServer.cpp
@@ -20,7 +20,7 @@
 #include <types_internal.h>
 #include "server.h"
 #include "ClientRequest.h"
-#include "access_control/peer_creds.h"
+#include "access_control/PeerCreds.h"
 #include "DBusServer.h"
 
 using namespace ctx;
@@ -69,7 +69,7 @@ void DBusServer::__processRequest(const char *sender, GVariant *param, GDBusMeth
        _I("[%d] ReqId: %d, Subject: %s", reqType, reqId, subject);
        _SI("Input: %s", input);
 
-       credentials *creds = NULL;
+       Credentials *creds = NULL;
 
        if (!peer_creds::get(__connection, sender, &creds)) {
                _E("Peer credentialing failed");

diff --git a/src/Request.cpp b/src/Request.cpp
index 0a7fd4e..cac54e6 100644 (file)
--- a/src/Request.cpp
+++ b/src/Request.cpp
@@ -40,7 +40,7 @@ int ctx::RequestInfo::getId()
        return _reqId;
 }
 
-const ctx::credentials* ctx::RequestInfo::getCredentials()
+const ctx::Credentials* ctx::RequestInfo::getCredentials()
 {
        return NULL;
 }

diff --git a/src/Request.h b/src/Request.h
index 261244e..7225fc1 100644 (file)
--- a/src/Request.h
+++ b/src/Request.h
@@ -23,7 +23,7 @@
 namespace ctx {
 
        /* Forward declaration */
-       class credentials;
+       class Credentials;
 
        class RequestInfo {
        public:
@@ -35,7 +35,7 @@ namespace ctx {
                const char* getSubject();
                ctx::Json& getDescription();
 
-               virtual const credentials* getCredentials();
+               virtual const Credentials* getCredentials();
                virtual const char* getPackageId();
                /* TODO: remove this getClient() */
                virtual const char* getClient();

diff --git a/src/access_control/peer_creds.cpp b/src/access_control/PeerCreds.cpp
similarity index 68%
rename from src/access_control/peer_creds.cpp
rename to src/access_control/PeerCreds.cpp
index 5d42a81..2459862 100644 (file)
--- a/src/access_control/peer_creds.cpp
+++ b/src/access_control/PeerCreds.cpp
@@ -19,58 +19,58 @@
 #include <app_manager.h>
 #include <package_manager.h>
 #include <types_internal.h>
-#include "peer_creds.h"
+#include "PeerCreds.h"
 
-ctx::credentials::credentials(char *_package_id, char *_client, char *_session, char *_user) :
-       package_id(_package_id),
+ctx::Credentials::Credentials(char *_packageId, char *_client, char *_session, char *_user) :
+       packageId(_packageId),
        client(_client),
        session(_session),
        user(_user)
 {
 }
 
-ctx::credentials::~credentials()
+ctx::Credentials::~Credentials()
 {
-       g_free(package_id);
+       g_free(packageId);
        g_free(client);
        g_free(session);
        g_free(user);
 }
 
-bool ctx::peer_creds::get(GDBusConnection *connection, const char *unique_name, ctx::credentials **creds)
+bool ctx::peer_creds::get(GDBusConnection *connection, const char *uniqueName, ctx::Credentials **creds)
 {
        pid_t pid = 0;
        char *app_id = NULL;
-       char *package_id = NULL;
+       char *packageId = NULL;
        gchar *client = NULL;
        char *session = NULL;
        gchar *user = NULL;
        int err;
 
-       err = cynara_creds_gdbus_get_pid(connection, unique_name, &pid);
+       err = cynara_creds_gdbus_get_pid(connection, uniqueName, &pid);
        IF_FAIL_RETURN_TAG(err == CYNARA_API_SUCCESS, false, _E, "Peer credentialing failed");
 
        app_manager_get_app_id(pid, &app_id);
-       package_manager_get_package_id_by_app_id(app_id, &package_id);
-       _D("AppId: %s, PackageId: %s", app_id, package_id);
+       package_manager_get_package_id_by_app_id(app_id, &packageId);
+       _D("AppId: %s, PackageId: %s", app_id, packageId);
 
-       err = cynara_creds_gdbus_get_client(connection, unique_name, CLIENT_METHOD_DEFAULT, &client);
+       err = cynara_creds_gdbus_get_client(connection, uniqueName, CLIENT_METHOD_DEFAULT, &client);
        IF_FAIL_CATCH_TAG(err == CYNARA_API_SUCCESS, _E, "Peer credentialing failed");
 
        session = cynara_session_from_pid(pid);
        IF_FAIL_CATCH_TAG(session, _E, "Peer credentialing failed");
 
-       err = cynara_creds_gdbus_get_user(connection, unique_name, USER_METHOD_DEFAULT, &user);
+       err = cynara_creds_gdbus_get_user(connection, uniqueName, USER_METHOD_DEFAULT, &user);
        IF_FAIL_CATCH_TAG(err == CYNARA_API_SUCCESS, _E, "Peer credentialing failed");
 
-       *creds = new(std::nothrow) credentials(package_id, client, session, user);
+       *creds = new(std::nothrow) Credentials(packageId, client, session, user);
        IF_FAIL_CATCH_TAG(*creds, _E, "Memory allocation failed");
 
        return true;
 
 CATCH:
        g_free(app_id);
-       g_free(package_id);
+       g_free(packageId);
        g_free(client);
        g_free(session);
        g_free(user);

diff --git a/src/access_control/peer_creds.h b/src/access_control/PeerCreds.h
similarity index 69%
rename from src/access_control/peer_creds.h
rename to src/access_control/PeerCreds.h
index 4be8167..72634cf 100644 (file)
--- a/src/access_control/peer_creds.h
+++ b/src/access_control/PeerCreds.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __CONTEXT_PEER_CREDENTIALS_H__
-#define __CONTEXT_PEER_CREDENTIALS_H__
+#ifndef _CONTEXT_PEER_CREDENTIALS_H_
+#define _CONTEXT_PEER_CREDENTIALS_H_
 
 #include <sys/types.h>
 #include <gio/gio.h>
@@ -23,19 +23,21 @@
 
 namespace ctx {
 
-       class credentials {
+       class Credentials {
        public:
-               char *package_id;
+               char *packageId;
                char *client;   /* default: smack label */
                char *session;
                char *user;             /* default: UID */
-               credentials(char *_package_id, char *_client, char *_session, char *_user);
-               ~credentials();
+               Credentials(char *_packageId, char *_client, char *_session, char *_user);
+               ~Credentials();
        };
 
        namespace peer_creds {
-               bool get(GDBusConnection *connection, const char *unique_name, credentials **creds);
-       }
+
+               bool get(GDBusConnection *connection, const char *uniqueName, Credentials **creds);
+
+       }       /* namespace peer_creds */
 }      /* namespace ctx */
 
-#endif /* End of __CONTEXT_PEER_CREDENTIALS_H__ */
+#endif /* End of _CONTEXT_PEER_CREDENTIALS_H_ */

diff --git a/src/access_control/privilege.cpp b/src/access_control/Privilege.cpp
similarity index 74%
rename from src/access_control/privilege.cpp
rename to src/access_control/Privilege.cpp
index a0951d9..d52a52e 100644 (file)
--- a/src/access_control/privilege.cpp
+++ b/src/access_control/Privilege.cpp
@@ -17,14 +17,14 @@
 #include <string>
 #include <cynara-client.h>
 #include <types_internal.h>
-#include "peer_creds.h"
-#include "privilege.h"
+#include "PeerCreds.h"
+#include "Privilege.h"
 
-class permission_checker {
+class PermissionChecker {
 private:
        cynara *__cynara;
 
-       permission_checker()
+       PermissionChecker()
        {
                if (cynara_initialize(&__cynara, NULL) != CYNARA_API_SUCCESS) {
                        _E("Cynara initialization failed");
@@ -34,7 +34,7 @@ private:
                _I("Cynara initialized");
        }
 
-       ~permission_checker()
+       ~PermissionChecker()
        {
                if (__cynara)
                        cynara_finish(__cynara);
@@ -43,13 +43,13 @@ private:
        }
 
 public:
-       static permission_checker& get_instance()
+       static PermissionChecker& getInstance()
        {
-               static permission_checker instance;
+               static PermissionChecker instance;
                return instance;
        }
 
-       bool has_permission(const ctx::credentials *creds, const char *privilege)
+       bool hasPermission(const ctx::Credentials *creds, const char *privilege)
        {
                IF_FAIL_RETURN_TAG(__cynara, false, _E, "Cynara not initialized");
                int ret = cynara_check(__cynara, creds->client, creds->session, creds->user, privilege);
@@ -57,12 +57,12 @@ public:
        }
 };
 
-bool ctx::privilege_manager::is_allowed(const ctx::credentials *creds, const char *privilege)
+bool ctx::privilege_manager::isAllowed(const ctx::Credentials *creds, const char *privilege)
 {
        IF_FAIL_RETURN(creds && privilege, true);
 
        std::string priv = "http://tizen.org/privilege/";
        priv += privilege;
 
-       return permission_checker::get_instance().has_permission(creds, priv.c_str());
+       return PermissionChecker::getInstance().hasPermission(creds, priv.c_str());
 }

diff --git a/src/access_control/privilege.h b/src/access_control/Privilege.h
similarity index 74%
rename from src/access_control/privilege.h
rename to src/access_control/Privilege.h
index bd6730c..53251c0 100644 (file)
--- a/src/access_control/privilege.h
+++ b/src/access_control/Privilege.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __CONTEXT_PRIVILEGE_MANAGER_H__
-#define __CONTEXT_PRIVILEGE_MANAGER_H__
+#ifndef _CONTEXT_PRIVILEGE_MANAGER_H_
+#define _CONTEXT_PRIVILEGE_MANAGER_H_
 
 #include <string>
 
@@ -24,13 +24,13 @@
 namespace ctx {
 
        /* Forward declaration */
-       class credentials;
+       class Credentials;
 
        namespace privilege_manager {
 
-               bool is_allowed(const credentials *creds, const char *privilege);
+               bool isAllowed(const Credentials *creds, const char *privilege);
 
-       }       /* namespace ctx::privilege_manager */
+       }       /* namespace privilege_manager */
 }      /* namespace ctx */
 
-#endif /* End of __CONTEXT_PRIVILEGE_MANAGER_H__ */
+#endif /* End of _CONTEXT_PRIVILEGE_MANAGER_H_ */

diff --git a/src/context_mgr_impl.cpp b/src/context_mgr_impl.cpp
index 66331cb..cd78e9b 100644 (file)
--- a/src/context_mgr_impl.cpp
+++ b/src/context_mgr_impl.cpp
@@ -22,7 +22,7 @@
 #include <Json.h>
 #include <provider_iface.h>
 #include "server.h"
-#include "access_control/privilege.h"
+#include "access_control/Privilege.h"
 #include "Request.h"
 #include "provider.h"
 #include "context_mgr_impl.h"
@@ -230,7 +230,7 @@ bool ctx::context_manager_impl::is_supported(const char *subject)
        return (it != provider_handle_map.end());
 }
 
-bool ctx::context_manager_impl::is_allowed(const ctx::credentials *creds, const char *subject)
+bool ctx::context_manager_impl::is_allowed(const ctx::Credentials *creds, const char *subject)
 {
        IF_FAIL_RETURN(creds, true);    /* In case internal requests */
        auto it = provider_handle_map.find(subject);

diff --git a/src/context_mgr_impl.h b/src/context_mgr_impl.h
index 65048e7..90785f5 100644 (file)
--- a/src/context_mgr_impl.h
+++ b/src/context_mgr_impl.h
@@ -26,7 +26,7 @@
 namespace ctx {
 
        /* Forward declaration */
-       class credentials;
+       class Credentials;
        class RequestInfo;
        class context_provider_handler;
 
@@ -40,7 +40,7 @@ namespace ctx {
 
                void assign_request(ctx::RequestInfo *request);
                bool is_supported(const char *subject);
-               bool is_allowed(const credentials *creds, const char *subject);
+               bool is_allowed(const Credentials *creds, const char *subject);
                bool pop_trigger_item(std::string &subject, int &operation, ctx::Json &attributes, ctx::Json &options, std::string &owner, bool& unregister);
 
                /* From the interface class */

diff --git a/src/provider.cpp b/src/provider.cpp
index 4861926..6511b72 100644 (file)
--- a/src/provider.cpp
+++ b/src/provider.cpp
@@ -17,7 +17,7 @@
 #include <glib.h>
 #include <types_internal.h>
 #include <Json.h>
-#include "access_control/privilege.h"
+#include "access_control/Privilege.h"
 #include "server.h"
 #include "Request.h"
 #include "provider.h"
@@ -43,10 +43,10 @@ ctx::context_provider_handler::~context_provider_handler()
        provider_info.destroy(provider_info.data);
 }
 
-bool ctx::context_provider_handler::is_allowed(const ctx::credentials *creds)
+bool ctx::context_provider_handler::is_allowed(const ctx::Credentials *creds)
 {
        IF_FAIL_RETURN(creds, true);    /* In case of internal requests */
-       return privilege_manager::is_allowed(creds, provider_info.privilege);
+       return privilege_manager::isAllowed(creds, provider_info.privilege);
 }
 
 ctx::context_provider_iface* ctx::context_provider_handler::get_provider(ctx::RequestInfo *request)

diff --git a/src/provider.h b/src/provider.h
index a5b22ce..0d4a8e0 100644 (file)
--- a/src/provider.h
+++ b/src/provider.h
@@ -24,7 +24,7 @@
 namespace ctx {
 
        class Json;
-       class credentials;
+       class Credentials;
        class RequestInfo;
 
        class context_provider_handler {
@@ -34,7 +34,7 @@ namespace ctx {
                context_provider_handler(const char *subj, context_provider_info &prvd);
                ~context_provider_handler();
 
-               bool is_allowed(const credentials *creds);
+               bool is_allowed(const Credentials *creds);
 
                void subscribe(RequestInfo *request);
                void unsubscribe(RequestInfo *request);

diff --git a/src/trigger/ContextMonitor.cpp b/src/trigger/ContextMonitor.cpp
index 368d3f9..9037143 100644 (file)
--- a/src/trigger/ContextMonitor.cpp
+++ b/src/trigger/ContextMonitor.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <types_internal.h>
-#include "../access_control/privilege.h"
+#include "../access_control/Privilege.h"
 #include "../context_mgr_impl.h"
 #include "ContextMonitor.h"
 #include "IContextListener.h"