add privilege to ui gaget

Change-Id: I4b3783735a2a329402537e384b96ec20cc6016ec
Signed-off-by: junsuk77.oh <junsuk77.oh@samsung.com>

diff --git a/client/src/pkgmgr.c b/client/src/pkgmgr.c
index ebc72be..d83e837 100755 (executable)
--- a/client/src/pkgmgr.c
+++ b/client/src/pkgmgr.c
@@ -53,6 +53,9 @@
 
 #define PKG_TMP_PATH "/opt/usr/apps/tmp"
 
+#define BINSH_NAME     "/bin/sh"
+#define BINSH_SIZE     7
+
 static int _get_request_id()
 {
        static int internal_req_id = 1;
@@ -440,6 +443,161 @@ static char *__get_type_from_path(const char *pkg_path)
        return strdup(pkg_type);
 }
 
+static int __get_pkgid_by_appid(const char *appid, char **pkgid)
+{
+       pkgmgrinfo_appinfo_h pkgmgrinfo_appinfo = NULL;
+       int ret = -1;
+       char *pkg_id = NULL;
+       char *pkg_id_dup = NULL;
+
+       if (pkgmgrinfo_appinfo_get_appinfo(appid, &pkgmgrinfo_appinfo) != PMINFO_R_OK)
+               return -1;
+
+       if (pkgmgrinfo_appinfo_get_pkgname(pkgmgrinfo_appinfo, &pkg_id) != PMINFO_R_OK)
+               goto err;
+
+       pkg_id_dup = strdup(pkg_id);
+       if (pkg_id_dup == NULL)
+               goto err;
+
+       *pkgid = pkg_id_dup;
+       ret = PMINFO_R_OK;
+
+err:
+       pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo);
+
+       return ret;
+}
+
+static inline ail_cb_ret_e __appinfo_cb(const ail_appinfo_h appinfo, void *user_data)
+{
+       char *package;
+       ail_cb_ret_e ret = AIL_CB_RET_CONTINUE;
+
+       ail_appinfo_get_str(appinfo, AIL_PROP_PACKAGE_STR, &package);
+
+       if (package) {
+               (* (char **) user_data) = strdup(package);
+               ret = AIL_CB_RET_CANCEL;
+       }
+
+       return ret;
+}
+
+static char *__get_app_info_from_db_by_apppath(const char *apppath)
+{
+       char *caller_appid = NULL;
+       ail_filter_h filter;
+       ail_error_e ret;
+       int count;
+
+       if (apppath == NULL)
+               return NULL;
+
+       ret = ail_filter_new(&filter);
+       if (ret != AIL_ERROR_OK) {
+               return NULL;
+       }
+
+       ret = ail_filter_add_str(filter, AIL_PROP_X_SLP_EXE_PATH, apppath);
+       if (ret != AIL_ERROR_OK) {
+               ail_filter_destroy(filter);
+               return NULL;
+       }
+
+       ret = ail_filter_count_appinfo(filter, &count);
+       if (ret != AIL_ERROR_OK) {
+               ail_filter_destroy(filter);
+               return NULL;
+       }
+       if (count < 1) {
+               ail_filter_destroy(filter);
+               return NULL;
+       }
+
+       ail_filter_list_appinfo_foreach(filter, __appinfo_cb, &caller_appid);
+
+       ail_filter_destroy(filter);
+
+       return caller_appid;
+}
+
+static inline int __read_proc(const char *path, char *buf, int size)
+{
+       int fd = 0;
+       int ret = 0;
+
+       if (buf == NULL || path == NULL)
+               return -1;
+
+       fd = open(path, O_RDONLY);
+       if (fd < 0)
+               return -1;
+
+       ret = read(fd, buf, size - 1);
+       if (ret <= 0) {
+               close(fd);
+               return -1;
+       } else
+               buf[ret] = 0;
+
+       close(fd);
+
+       return ret;
+}
+
+char *__proc_get_cmdline_bypid(int pid)
+{
+       char buf[PKG_STRING_LEN_MAX] = {'\0', };
+       int ret = 0;
+
+       snprintf(buf, sizeof(buf), "/proc/%d/cmdline", pid);
+       ret = __read_proc(buf, buf, sizeof(buf));
+       if (ret <= 0)
+               return NULL;
+
+       /* support app launched by shell script*/
+       if (strncmp(buf, BINSH_NAME, BINSH_SIZE) == 0)
+               return strdup(&buf[BINSH_SIZE + 1]);
+       else
+               return strdup(buf);
+}
+
+static int __get_appid_bypid(int pid, char *pkgname, int len)
+{
+       char *cmdline = NULL;
+       char *caller_appid = NULL;
+
+       cmdline = __proc_get_cmdline_bypid(pid);
+       if (cmdline == NULL)
+               return -1;
+
+       caller_appid = __get_app_info_from_db_by_apppath(cmdline);
+       snprintf(pkgname, len, "%s", caller_appid);
+
+       free(cmdline);
+       free(caller_appid);
+
+       return 0;
+}
+
+static char *__get_caller_pkgid()
+{
+       char *caller_appid[PKG_STRING_LEN_MAX] = {0, };
+       char *caller_pkgid = NULL;
+
+       if (__get_appid_bypid(getpid(), caller_appid, sizeof(caller_appid)) < 0) {
+               _LOGE("get appid fail!!!\n");
+               return NULL;
+       }
+       if (__get_pkgid_by_appid(caller_appid, &caller_pkgid) < 0){
+               _LOGE("get pkgid fail!!!\n");
+               return NULL;
+       }
+
+       return caller_pkgid;
+}
+
 static inline int __pkgmgr_read_proc(const char *path, char *buf, int size)
 {
        int fd;
@@ -1022,6 +1180,11 @@ API int pkgmgr_client_install(pkgmgr_client * pc, const char *pkg_type,
        char *temp = NULL;
        int ret = 0;
        char *cookie = NULL;
+       char *caller_pkgid = NULL;
+
+       caller_pkgid = __get_caller_pkgid();
+       if (caller_pkgid == NULL)
+               _LOGE("caller dont have pkgid..\n");
 
        /* Check for NULL value of pc */
        retvm_if(pc == NULL, PKGMGR_R_EINVAL, "package manager client handle is NULL");
@@ -1084,7 +1247,13 @@ API int pkgmgr_client_install(pkgmgr_client * pc, const char *pkg_type,
                argv[argcnt++] = strdup("-o");
                argv[argcnt++] = strdup(optional_file);
        }
-       /* argv[6] -q option should be located at the end of command !! */
+       if (caller_pkgid) {
+               argv[argcnt++] = strdup("-p");
+               argv[argcnt++] = strdup(caller_pkgid);
+       }
+
+
+/* argv[6] -q option should be located at the end of command !! */
        if (mode == PM_QUIET)
                argv[argcnt++] = strdup("-q");
 
@@ -1263,6 +1432,11 @@ API int pkgmgr_client_uninstall(pkgmgr_client *pc, const char *pkg_type,
        int ret = -1;
        char *cookie = NULL;
        bool removable = false;
+       char *caller_pkgid = NULL;
+
+       caller_pkgid = __get_caller_pkgid();
+       if (caller_pkgid == NULL)
+               _LOGE("caller dont have pkgid..\n");
 
        /* Check for NULL value of pc */
        retvm_if(pc == NULL, PKGMGR_R_EINVAL, "package manager client handle is NULL\n");
@@ -1327,6 +1501,10 @@ API int pkgmgr_client_uninstall(pkgmgr_client *pc, const char *pkg_type,
        argv[argcnt++] = strdup("-d");
        /* argv[4] */
        argv[argcnt++] = strdup(pkgid);
+       if (caller_pkgid) {
+               argv[argcnt++] = strdup("-p");
+               argv[argcnt++] = caller_pkgid;
+       }
        /* argv[5] -q option should be located at the end of command !! */
        if (mode == PM_QUIET)
                argv[argcnt++] = strdup("-q");

diff --git a/comm/pkgmgr_installer.c b/comm/pkgmgr_installer.c
index 37ddcd0..4233c8e 100755 (executable)
--- a/comm/pkgmgr_installer.c
+++ b/comm/pkgmgr_installer.c
@@ -60,6 +60,7 @@ struct pkgmgr_installer {
        char *license_path;
        char *quiet_socket_path;
        char *optional_data;
+       char *caller_pkgid;
 
        DBusConnection *conn;
 };
@@ -99,6 +100,8 @@ API int pkgmgr_installer_free(pkgmgr_installer *pi)
                free(pi->session_id);
        if (pi->optional_data)
                free(pi->optional_data);
+       if (pi->caller_pkgid)
+               free(pi->caller_pkgid);
 
        if (pi->conn)
                comm_status_broadcast_server_disconnect(pi->conn);
@@ -215,6 +218,13 @@ pkgmgr_installer_receive_request(pkgmgr_installer *pi,
 
                        break;
 
+               case 'p': /* caller pkgid*/
+                       if (pi->caller_pkgid)
+                               free(pi->caller_pkgid);
+                       pi->caller_pkgid = strndup(optarg, MAX_STRLEN);
+
+                       break;
+
                case 'o': /* optional data*/
                        pi->optional_data = strndup(optarg, MAX_STRLEN);
                        break;
@@ -279,6 +289,12 @@ API int pkgmgr_installer_get_move_type(pkgmgr_installer *pi)
        return pi->move_type;
 }
 
+API const char *pkgmgr_installer_get_caller_pkgid(pkgmgr_installer *pi)
+{
+       CHK_PI_RET(PKGMGR_REQ_INVALID);
+       return pi->caller_pkgid;
+}
+
 API int
 pkgmgr_installer_send_signal(pkgmgr_installer *pi,
                             const char *pkg_type,

diff --git a/comm/pkgmgr_installer.h b/comm/pkgmgr_installer.h
index aed5b6a..11e9bb5 100755 (executable)
--- a/comm/pkgmgr_installer.h
+++ b/comm/pkgmgr_installer.h
@@ -409,6 +409,40 @@ int main(int argc, char **argv)
 int pkgmgr_installer_get_move_type(pkgmgr_installer *pi);
 
 /**
+       @brief          Get caller package id
+       @pre            pkgmgr_installer_receive_request() must be called.
+       @post           None
+       @see            pkgmgr_installer_receive_request
+       @param[in]      pi      pkgmgr_installer object
+       @return         Operation result
+       @retval         enum value of move type
+       @remark         None
+       @code
+#include <pkgmgr_installer.h>
+int main(int argc, char **argv)
+{
+       pkgmgr_installer *pi;
+       int r = 0;
+       char *pkgid = NULL;
+
+       pi = pkgmgr_installer_new();
+       if(!pi) return -1;
+       if(pkgmgr_installer_receive_request(pi, argc, argv)) {
+               r = -1;
+               goto CLEANUP_RET;
+       }
+       pkgid = (char *) pkgmgr_installer_get_caller_pkgid(pi);
+
+       // Do something...
+
+       pkgmgr_installer_free(pi);
+       return r;
+}
+       @endcode
+ */
+const char *pkgmgr_installer_get_caller_pkgid(pkgmgr_installer *pi);
+
+/**
        @brief          Send a process status signal 
        @pre            None
        @post           None

diff --git a/comm/pkgmgr_installer_config.h b/comm/pkgmgr_installer_config.h
index aee7291..8fd32e0 100755 (executable)
--- a/comm/pkgmgr_installer_config.h
+++ b/comm/pkgmgr_installer_config.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 /* Supported options */
-const char *short_opts = "k:l:i:d:c:m:t:o:r:q";
+const char *short_opts = "k:l:i:d:c:m:t:o:r:p:q";
 const struct option long_opts[] = {
        { "session-id", 1, NULL, 'k' },
        { "license-path", 1, NULL, 'l' },
@@ -43,6 +43,7 @@ const struct option long_opts[] = {
        { "move-type", 1, NULL, 't' },
        { "optional-data", 0, NULL, 'o' },
        { "reinstall", 0, NULL, 'r' },
+       { "caller-pkgid", 1, NULL, 'p' },
        { "quiet", 1, NULL, 'q' },
        { 0, 0, 0, 0 }  /* sentinel */
 };

diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec
index b95363e..0764e6e 100755 (executable)
--- a/packaging/pkgmgr.spec
+++ b/packaging/pkgmgr.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/s/slp-pkgmgr pkgmgr 0.1.103 29b53909a5d6e8728429f0a188177eac691cb6ce
 Name:       pkgmgr
 Summary:    Packager Manager client library package
-Version:    0.2.104
+Version:    0.2.105
 Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0

diff --git a/tool/pkg_fota.c b/tool/pkg_fota.c
index 91c2639..dd02e4e 100644 (file)
--- a/tool/pkg_fota.c
+++ b/tool/pkg_fota.c
@@ -216,16 +216,36 @@ static int pkg_fota_change_perm(const char *db_file)
 
 static int pkg_fota_give_smack()
 {
+       int ret = 0;
+
        const char *argv_parser[] = { "/usr/bin/chsmack", "-a", PKG_INFO_DB_LABEL, PKG_PARSER_DB_FILE, NULL };
-       pkg_fota_xsystem(argv_parser);
+       ret = pkg_fota_xsystem(argv_parser);
+       if (ret == -1) {
+               _E("exec : argv_parser fail");
+               return -1;
+       }
        const char *argv_parserjn[] = { "/usr/bin/chsmack", "-a", PKG_INFO_DB_LABEL, PKG_PARSER_DB_FILE_JOURNAL, NULL };
-       pkg_fota_xsystem(argv_parserjn);
+       ret = pkg_fota_xsystem(argv_parserjn);
+       if (ret == -1) {
+               _E("exec : argv_parserjn fail");
+               return -1;
+       }
        const char *argv_cert[] = { "/usr/bin/chsmack", "-a", PKG_INFO_DB_LABEL, PKG_CERT_DB_FILE, NULL };
-       pkg_fota_xsystem(argv_cert);
+       ret = pkg_fota_xsystem(argv_cert);
+       if (ret == -1) {
+               _E("exec : argv_cert fail");
+               return -1;
+       }
        const char *argv_certjn[] = { "/usr/bin/chsmack", "-a", PKG_INFO_DB_LABEL, PKG_CERT_DB_FILE_JOURNAL, NULL };
-       pkg_fota_xsystem(argv_certjn);
+       ret = pkg_fota_xsystem(argv_certjn);
+       if (ret == -1) {
+               _E("exec : argv_certjn fail");
+               return -1;
+       }
 
+       return 0;
 }
+
 static int __is_authorized()
 {
        /* pkg_init db should be called by as root privilege. */
@@ -273,7 +293,11 @@ int main(int argc, char *argv[])
                return -1;
        }
 
-       pkg_fota_give_smack();
+       ret = pkg_fota_give_smack();
+       if (ret == -1) {
+               _E("cannot pkg_fota_give_smack.");
+               return -1;
+       }
 
        return 0;
 }

diff --git a/tool/pkg_smack.c b/tool/pkg_smack.c
index 7afdb0d..2918228 100755 (executable)
--- a/tool/pkg_smack.c
+++ b/tool/pkg_smack.c
@@ -390,9 +390,8 @@ static int __additional_rpm_for_smack()
 {
        char *pkgid = "ui-gadget::client";
        char *perm[] = {"http://tizen.org/privilege/appsetting", NULL};
-       
-       __apply_shared_privileges(pkgid, 0);
 
+       __apply_shared_privileges(pkgid, 0);
        __pkg_smack_enable_permissions(pkgid, 1, perm, 1);
        return 0;
 }