Fix build warning based on GCC-9
[platform/core/appfw/libeventsystem.git] / src / eventsystem.c
old mode 100755 (executable)
new mode 100644 (file)
index 8e0491d..7c4d4ec
@@ -6,10 +6,10 @@
 #include <stdlib.h>
 #include <dlog.h>
 #include <bundle.h>
+#include <bundle_internal.h>
 #include <glib.h>
 #include <gio/gio.h>
 #include <eventsystem.h>
-#include <openssl/md5.h>
 #include <fcntl.h>
 
 #undef LOG_TAG
 #define VALID_LAST_COUNT_FOR_EVENTNAME (VALID_COUNT_OF_EVENTNAME_TOKEN + 1)
 #define MAX_COUNT_FOR_EVENTNAME_CHECK (VALID_LAST_COUNT_FOR_EVENTNAME + 1)
 
+#define FREE_AND_NULL(ptr) do { \
+       if (ptr) { \
+               free((void *)ptr); \
+               ptr = NULL; \
+       } \
+} while (0)
+
 #define _E(fmt, arg...) LOGE(fmt, ##arg)
 #define _D(fmt, arg...) LOGD(fmt, ##arg)
 #define _W(fmt, arg...) LOGW(fmt, ##arg)
        } \
 } while (0)
 
+#define tryvm_if(expr, val, fmt, arg...) do { \
+        if (expr) { \
+               _E("(%s) "fmt, #expr, ##arg); \
+               val; \
+               goto catch; \
+       } \
+} while (0)
+
 pthread_mutex_t send_sync_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static GList *system_event_list;
 static int _initialized;
-static GHashTable *filter_tbl;
 static GHashTable *check_tbl;
+static GHashTable *filter_tbl;
+static GHashTable *last_data_tbl;
+
+struct last_data_item {
+       char *event_name;
+       GVariant *param;
+       GVariant *trusted_param;
+};
 
 typedef struct eventmap {
        char *event_name;
@@ -61,37 +83,38 @@ typedef struct eventmap {
                eventsystem_cb es_cb;
                eventsystem_handler ep_cb;
        };
+       void *user_data;
 } eventmap_s;
 
 typedef struct eventinfo {
        char *event_name;
+       char *destination_name;
        char *interface_name;
        char *object_path;
        char *member_name;
        bool is_user_event;
-       gboolean is_trusted;
+       bool is_trusted;
        bundle *event_data;
 } eventinfo_s;
 
 typedef struct sysevent_info {
        guint owner_id;
        guint owner_id_session;
+       char *own_name_system_bus;
+       char *own_name_session_bus;
 } sysevent_info_s;
 static sysevent_info_s s_info;
 
-static int __eventsystem_request_event_launch(const char *event_name, bundle *data);
-static bool __eventsystem_check_sender_validation_userevent(GDBusConnection *connection,
-               char *sender_name);
 static int __eventsystem_check_user_send_validation(const char *event_name);
-static int __eventsystem_check_user_certificate(int sender_pid);
-
-static int __event_compare_name_cb(gconstpointer a, gconstpointer b)
-{
-       eventmap_s *key1 = (eventmap_s *)a;
-       eventmap_s *key2 = (eventmap_s *)b;
-       return strcmp(key1->interface_name, key2->interface_name) |
-                       strcmp(key1->member_name, key2->member_name);
-}
+static int __eventsystem_request_destination_list(const char *event_name, GList **dest_list);
+static int __eventsystem_check_sender_validation(int sender_pid,
+               const char *event_name, char **sender);
+static eventmap_s *__create_eventmap(const char *interface_name,
+               const char *member_name, const char *event_name,
+               int event_type, eventsystem_cb callback, void *user_data);
+static void __destroy_eventmap(gpointer data);
+static int __eventsystem_launch_on_event_for_userevent(const char *event_name,
+               bundle *data, gboolean trusted);
 
 static int __event_compare_reg_id_cb(gconstpointer a, gconstpointer b)
 {
@@ -102,14 +125,56 @@ static int __event_compare_reg_id_cb(gconstpointer a, gconstpointer b)
 
 static void __initialize(void)
 {
+#if (GLIB_MAJOR_VERSION <= 2 && GLIB_MINOR_VERSION < 36)
        g_type_init();
+#endif
+
        _initialized = 1;
 }
 
+static int __eventsystem_get_sender_pid(GDBusConnection *conn, const char *sender_name)
+{
+       GDBusMessage *msg = NULL;
+       GDBusMessage *reply = NULL;
+       GError *err = NULL;
+       GVariant *body;
+       int pid = 0;
+
+       msg = g_dbus_message_new_method_call("org.freedesktop.DBus", "/org/freedesktop/DBus",
+               "org.freedesktop.DBus", "GetConnectionUnixProcessID");
+       if (!msg) {
+               _E("Can't allocate new method call");
+               goto out;
+       }
+
+       g_dbus_message_set_body(msg, g_variant_new("(s)", sender_name));
+       reply = g_dbus_connection_send_message_with_reply_sync(conn, msg,
+               G_DBUS_SEND_MESSAGE_FLAGS_NONE, -1, NULL, NULL, &err);
+
+       if (!reply) {
+               if (err != NULL) {
+                       _E("Failed to get pid [%s]", err->message);
+                       g_error_free(err);
+               }
+               goto out;
+       }
+
+       body = g_dbus_message_get_body(reply);
+       g_variant_get(body, "(u)", &pid);
+
+out:
+       if (msg)
+               g_object_unref(msg);
+       if (reply)
+               g_object_unref(reply);
+
+       return pid;
+}
+
 static char *__get_object_path(char *interface_name)
 {
        int i;
-       char *object_path = (char *)calloc(strlen(interface_name), sizeof(char)+2);
+       char *object_path = (char *)calloc(strlen(interface_name), sizeof(char) + 2);
 
        if (object_path == NULL) {
                _E("failed to allocate memory");
@@ -118,13 +183,11 @@ static char *__get_object_path(char *interface_name)
 
        object_path[0] = '/';
 
-       for (i = 0 ; interface_name[i] ; i++) {
-
-               if (interface_name[i] == '.') {
-                       object_path[i+1] = '/';
-               } else {
-                       object_path[i+1] = interface_name[i];
-               }
+       for (i = 0; interface_name[i]; i++) {
+               if (interface_name[i] == '.')
+                       object_path[i + 1] = '/';
+               else
+                       object_path[i + 1] = interface_name[i];
        }
 
        return object_path;
@@ -132,35 +195,27 @@ static char *__get_object_path(char *interface_name)
 
 static char *__get_encoded_interface_name(char *interface_name)
 {
-       unsigned char c[MD5_DIGEST_LENGTH] = {0, };
-       char *md5_evtid = NULL;
-       char *temp;
-       int index = 0;
-       MD5_CTX mdContext;
-
-       MD5_Init(&mdContext);
-       MD5_Update(&mdContext, interface_name, strlen(interface_name));
-       MD5_Final(c, &mdContext);
-
-       md5_evtid = (char *)calloc(EVENT_SYSTEM_PREFIX_LEN + (MD5_DIGEST_LENGTH * 2) + 1,
-               sizeof(char));
-       if (md5_evtid == NULL) {
-               _D("Malloc failed!!");
-               return NULL;
-       }
-
-       sprintf(md5_evtid, "%s", EVENT_SYSTEM_PREFIX);
+       char *evtid = NULL;
+       int evtid_len = 0;
+       gchar *encoded_value;
 
-       temp = md5_evtid;
+       encoded_value = g_compute_checksum_for_string(G_CHECKSUM_MD5,
+               interface_name, strlen(interface_name));
 
-       temp += EVENT_SYSTEM_PREFIX_LEN;
+       evtid_len = EVENT_SYSTEM_PREFIX_LEN + strlen(encoded_value) + 1;
 
-       for (index = 0; index < MD5_DIGEST_LENGTH; index++) {
-               sprintf(temp, "%02x", c[index]);
-               temp += 2;
+       evtid = (char *)calloc(evtid_len, sizeof(char));
+       if (evtid == NULL) {
+               _D("memory alloc failed");
+               g_free(encoded_value);
+               return NULL;
        }
 
-       return md5_evtid;
+       snprintf(evtid, evtid_len, "%s%s", EVENT_SYSTEM_PREFIX, (char *)encoded_value);
+
+       g_free(encoded_value);
+
+       return evtid;
 }
 
 static char *__get_member_name_from_eventname(char *event_name)
@@ -169,6 +224,7 @@ static char *__get_member_name_from_eventname(char *event_name)
        char *ptr_last = NULL;
        char *temp_name = NULL;
        char *member_name = NULL;
+       char *save_ptr = NULL;
        int count = 0;
 
        temp_name = strdup(event_name);
@@ -177,25 +233,26 @@ static char *__get_member_name_from_eventname(char *event_name)
                return NULL;
        }
 
-       ptr = strtok(temp_name, ".");
+       ptr = strtok_r(temp_name, ".", &save_ptr);
        if (ptr == NULL) {
                _E("invalid event_name(%s), count(%d)", event_name, count);
+               FREE_AND_NULL(temp_name);
                return NULL;
        }
        count++;
 
        while (count < MAX_COUNT_FOR_EVENTNAME_CHECK) {
-               ptr = strtok(NULL, ".");
+               ptr = strtok_r(NULL, ".", &save_ptr);
                if (ptr == NULL)
                        break;
                /* _D("(%d)ptr(%s)(%d)", count, ptr, strlen(ptr)); */
                ptr_last = ptr;
                count++;
        }
-       FREE_AND_NULL(temp_name);
 
        if (count != VALID_LAST_COUNT_FOR_EVENTNAME) {
                _E("invalid event_name(%s), count(%d)", event_name, count);
+               FREE_AND_NULL(temp_name);
                return NULL;
        }
 
@@ -204,30 +261,70 @@ static char *__get_member_name_from_eventname(char *event_name)
                member_name = strdup(ptr_last);
                if (!member_name) {
                        _E("out_of_memory");
+                       FREE_AND_NULL(temp_name);
                        return NULL;
                }
        } else {
                _E("ptr_last is NULL");
+               FREE_AND_NULL(temp_name);
                return NULL;
        }
 
        _D("member_name(%s)", member_name);
 
+       FREE_AND_NULL(temp_name);
        return member_name;
 }
 
+static int __check_validation_usrevent_sender(int sender_pid,
+               const char *interface_name, const char *event_name)
+{
+       char *sender_id = NULL;
+       char *key = NULL;
+       char *val = NULL;
+
+       if (__eventsystem_check_sender_validation(sender_pid,
+               event_name, &sender_id) < 0) {
+               _E("invalid user-event sender");
+               return ES_R_EINVAL;
+       }
+
+       if (sender_id == NULL) {
+               _E("sender_id is null");
+               return ES_R_EINVAL;
+       }
+
+       key = strdup(interface_name);
+       if (key == NULL) {
+               _E("out of memory");
+               g_free(sender_id);
+               return ES_R_ENOMEM;
+       }
+
+       val = strdup(sender_id);
+       if (val == NULL) {
+               _E("out of memory");
+               free(key);
+               g_free(sender_id);
+               return ES_R_ENOMEM;
+       }
+
+       g_hash_table_insert(filter_tbl, key, val);
+       g_free(sender_id);
+
+       return ES_R_OK;
+}
+
 static int __check_validation_user_defined_name(const char *event_name)
 {
        char *event_id = NULL;
        char *key = NULL;
        int ret = 1;
 
-       if (check_tbl == NULL) {
+       if (check_tbl == NULL)
                check_tbl = g_hash_table_new(g_str_hash, g_str_equal);
-       }
 
        event_id = (char *)g_hash_table_lookup(check_tbl, event_name);
-
        if (event_id == NULL) {
                if (__eventsystem_check_user_send_validation(event_name) < 0) {
                        _E("invalid user-event name");
@@ -246,93 +343,47 @@ static int __check_validation_user_defined_name(const char *event_name)
        return ret;
 }
 
-static int __check_eventname_validation_user(char *event_name)
+static int __check_interface_validation_user(char *interface_name)
 {
-       int ret = 1;
-       int len = strlen(USER_EVENT_NAME_PREFIX);
+       int len = strlen(EVENT_SYSTEM_PREFIX);
 
-       if (strncmp(event_name, USER_EVENT_NAME_PREFIX, len) != 0) {
-               ret = 0;
-       }
+       if (strncmp(interface_name, EVENT_SYSTEM_PREFIX, len) != 0)
+               return 0;
 
-       return ret;
+       return 1;
 }
 
-static int __check_eventname_validation_system(char *event_name)
+static int __check_eventname_validation_user(char *event_name)
 {
-       int ret = 1;
-       int len = strlen(SYS_EVENT_NAME_PREFIX);
+       int len = strlen(USER_EVENT_NAME_PREFIX);
 
-       if (strncmp(event_name, SYS_EVENT_NAME_PREFIX, len) != 0) {
-               ret = 0;
-       }
+       if (strncmp(event_name, USER_EVENT_NAME_PREFIX, len) != 0)
+               return 0;
 
-       return ret;
+       return 1;
 }
 
-static int __get_proc_status_by_pid(const char *what, int pid)
+static int __check_eventname_validation_system(char *event_name)
 {
-       int fd = 0;
-       int ret = 0;
-       int i = 0;
-       char ch = 0;
-       char _path[128] = {0, };
-       char _buf[1024] = {0, };
-       char *pval;
-       char *ptr;
-
-       snprintf(_path, 128, "/proc/%d/status", pid);
-
-       fd = open(_path, O_RDONLY);
-       if (fd < 0) {
-               _E("open file(%s) error(%d), pid(%d)", _path, fd, pid);
-               return fd;
-       }
-
-       ret = read(fd, _buf, 1024);
-       if (ret < 0) {
-               _E("read file(%s) error(%d), pid(%d)", _path, ret, pid);
-               goto error;
-       }
-
-       pval = strstr(_buf, what);
-       if (pval == NULL) {
-               _E("pval is NULL");
-               ret = -1;
-               goto error;
-       }
-
-       for (i = 0; i < strlen(pval); i++) {
-               ch = *pval;
-               if (ch == ' ' || ch == '\t') {
-                       ret = (int)strtol(pval, &ptr, 10);
-                       if (ret == 0) {
-                               if ((int)strlen(ptr) >= (int)strlen(pval)) {
-                                       _E("wrong 0 value");
-                                       ret = -2;
-                               }
-                       }
-                       break;
-               } else if (ch == '\n')
-                       break;
-               pval++;
-       }
+       int len = strlen(SYS_EVENT_NAME_PREFIX);
 
-error:
-       close(fd);
+       if (strncmp(event_name, SYS_EVENT_NAME_PREFIX, len) != 0)
+               return 0;
 
-       return ret;
+       return 1;
 }
 
-static int __get_gdbus_shared_connection(GDBusConnection **connection,
-               GBusType bus_type, const char *interface_name)
+static int __get_gdbus_shared_connection(GDBusConnection **connection, GBusType bus_type,
+               eventsystem_event_type event_type)
 {
        GError *error = NULL;
        guint owner_id = 0;
+       gchar *guid = NULL;
+       char own_name[128] = {0, };
+       GDBusConnection *conn_system = NULL;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        *connection = g_bus_get_sync(bus_type, NULL, &error);
        if (*connection == NULL) {
@@ -344,13 +395,19 @@ static int __get_gdbus_shared_connection(GDBusConnection **connection,
                return ES_R_ERROR;
        }
 
-       if (interface_name &&
-               ((bus_type == G_BUS_TYPE_SYSTEM && !s_info.owner_id) ||
+       if (((bus_type == G_BUS_TYPE_SYSTEM && !s_info.owner_id) ||
                (bus_type == G_BUS_TYPE_SESSION && !s_info.owner_id_session))) {
-               char own_name[128] = {0, };
-               snprintf(own_name, 128, "%s_%d_%d", interface_name,
-                       bus_type, getpid());
-               _D("own_name is [%s]", own_name);
+               guid = g_dbus_generate_guid();
+               if (guid == NULL) {
+                       _E("failed to get guid");
+                       return ES_R_ERROR;
+               }
+               snprintf(own_name, 128, "%s.%s.id%s_%d_%d", "event.busname",
+                       (bus_type == G_BUS_TYPE_SESSION ? "session" : "system"),
+                       guid, getuid(), getpid());
+               g_free(guid);
+
+               _D("bus_name is [%s]", own_name);
                owner_id = g_bus_own_name_on_connection(*connection, own_name,
                        G_BUS_NAME_OWNER_FLAGS_NONE,
                        NULL, NULL, NULL, NULL);
@@ -358,164 +415,119 @@ static int __get_gdbus_shared_connection(GDBusConnection **connection,
                        _E("g_bus_own_name_on_connection, error");
                        return ES_R_ERROR;
                }
+
+               if (bus_type == G_BUS_TYPE_SESSION && event_type == ES_TYPE_USER) {
+                       /* set same name on system-bus */
+                       error = NULL;
+                       conn_system = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
+                       if (conn_system == NULL) {
+                               _E("failed to get system connection");
+                               if (error != NULL) {
+                                       _E("error(%s)", error->message);
+                                       g_error_free(error);
+                               }
+                               return ES_R_ERROR;
+                       } else {
+                               owner_id = g_bus_own_name_on_connection(conn_system,
+                                       own_name, G_BUS_NAME_OWNER_FLAGS_NONE,
+                                       NULL, NULL, NULL, NULL);
+                               if (!owner_id) {
+                                       _E("g_bus_own_name_on_connection(for system), error");
+                                       g_object_unref(conn_system);
+                                       return ES_R_ERROR;
+                               }
+
+                               g_object_unref(conn_system);
+                       }
+               }
+
                if (bus_type == G_BUS_TYPE_SESSION) {
                        s_info.owner_id_session = owner_id;
+                       s_info.own_name_session_bus = strdup(own_name);
+                       if (s_info.own_name_session_bus == NULL) {
+                               _E("out of memory");
+                               return ES_R_ERROR;
+                       }
                } else {
                        s_info.owner_id = owner_id;
+                       s_info.own_name_system_bus = strdup(own_name);
+                       if (s_info.own_name_system_bus == NULL) {
+                               _E("out of memory");
+                               return ES_R_ERROR;
+                       }
                }
        }
 
        return ES_R_OK;
 }
 
-static int __get_sender_pid(GDBusConnection *conn, const char *sender_name)
-{
-       GDBusMessage *msg = NULL;
-       GDBusMessage *reply = NULL;
-       GError *err = NULL;
-       GVariant *body;
-       int pid = 0;
-
-       msg = g_dbus_message_new_method_call("org.freedesktop.DBus", "/org/freedesktop/DBus",
-               "org.freedesktop.DBus", "GetConnectionUnixProcessID");
-       if (!msg) {
-               _D("Can't allocate new method call");
-               goto out;
-       }
-
-       g_dbus_message_set_body(msg, g_variant_new ("(s)", sender_name));
-       reply = g_dbus_connection_send_message_with_reply_sync(conn, msg,
-               G_DBUS_SEND_MESSAGE_FLAGS_NONE, -1, NULL, NULL, &err);
-
-       if (!reply) {
-               if (err != NULL) {
-                       _E("Failed to get pid [%s]", err->message);
-                       g_error_free(err);
-               }
-               goto out;
-       }
-
-       body = g_dbus_message_get_body(reply);
-       g_variant_get(body, "(u)", &pid);
-
-out:
-       if (msg)
-               g_object_unref(msg);
-       if (reply)
-               g_object_unref(reply);
-
-  return pid;
-}
-
 static void __eventsystem_event_handler(GDBusConnection *connection,
                const gchar *sender_name, const gchar *object_path,
                const gchar *interface_name, const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
 {
        int len;
-       eventmap_s em;
+       eventmap_s *em = (eventmap_s *)user_data;
        GList *cb_list = NULL;
        bundle *buf = NULL;
        bundle_raw *raw = NULL;
-       gboolean is_trusted = FALSE;
 
-       em.interface_name = (char *)interface_name;
-       em.member_name = (char *)signal_name;
+       if (!em) {
+               _E("Critical error!");
+               return;
+       }
 
        _D("sender_name(%s), interface_name(%s), signal_name(%s)",
                sender_name, interface_name, signal_name);
 
-       cb_list = g_list_find_custom(system_event_list, &em,
-               (GCompareFunc)__event_compare_name_cb);
-       if (cb_list == NULL) {
+       cb_list = g_list_find(system_event_list, em);
+       if (cb_list == NULL)
                return;
-       }
 
-       g_variant_get(parameters, "(bus)", &is_trusted, &len, &raw);
+       g_variant_get(parameters, "(us)", &len, &raw);
 
        buf = bundle_decode((bundle_raw *)raw, len);
 
-       em.event_name = ((eventmap_s *)cb_list->data)->event_name;
-       em.ep_cb = ((eventmap_s *)cb_list->data)->ep_cb;
-       if (em.ep_cb) {
-               em.ep_cb(em.event_name, buf, user_data);
-       }
+       if (em->ep_cb)
+               em->ep_cb(em->event_name, buf, em->user_data);
 
        bundle_free_encoded_rawdata(&raw);
        bundle_free(buf);
 }
 
-static void __eventsystem_application_event_handler(GDBusConnection *connection,
-               const gchar *sender_name, const gchar *object_path,
+static void __eventsystem_application_event_handler(int sender_pid,
                const gchar *interface_name, const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
 {
-       GList *cb_list = NULL;
-       eventmap_s em;
+       GList *cb_list;
+       eventmap_s *em = (eventmap_s *)user_data;
        bundle_raw *raw = NULL;
        int len;
 
-       em.interface_name = (char *)interface_name;
-       em.member_name = (char *)signal_name;
-
-       _D("sender_name(%s), interface_name(%s), signal_name(%s)",
-               sender_name, interface_name, signal_name);
-
-       cb_list = g_list_find_custom(system_event_list, &em,
-               (GCompareFunc)__event_compare_name_cb);
-
-       if (cb_list == NULL) {
+       if (!em) {
+               _E("Critical error!");
                return;
        }
 
-       g_variant_get(parameters, "(bus)", NULL, &len, &raw);
-
-       em.event_name = ((eventmap_s *)cb_list->data)->event_name;
-       em.es_cb = ((eventmap_s *)cb_list->data)->es_cb;
-       if (em.es_cb) {
-               em.es_cb(em.event_name, raw, len, user_data);
-       }
-
-       bundle_free_encoded_rawdata(&raw);
-}
-
-static bool __eventsystem_check_sender_validation_userevent(GDBusConnection *connection,
-               char *sender_name)
-{
-       char *sender_id = NULL;
-       char *key = NULL;
-       int sender_pid = 0;
-
-       if (filter_tbl == NULL) {
-               filter_tbl = g_hash_table_new(g_str_hash, g_str_equal);
+       cb_list = g_list_find(system_event_list, em);
+       if (cb_list == NULL) {
+               _E("not interested event");
+               return;
        }
 
-       sender_id = (char *)g_hash_table_lookup(filter_tbl, sender_name);
-
-       if (sender_id == NULL) {
-               sender_pid = __get_sender_pid(connection, sender_name);
-
-               if (sender_pid > 0) {
-                       if (__eventsystem_check_user_certificate(sender_pid) < 0) {
-                               _E("not match");
-                               return false;
-                       }
-
-                       key = strdup(sender_name);
-                       if (key == NULL) {
-                               _E("out_of_memory");
-                               return false;
-                       }
-                       g_hash_table_insert(filter_tbl, key, key);
-               } else {
-                       _E("failed to get sender_pid");
-                       return false;
+       if (sender_pid > 0 && __check_interface_validation_user((char *)interface_name)) {
+               if (__check_validation_usrevent_sender(sender_pid,
+                       (const char *)interface_name, em->event_name) < 0) {
+                       _E("invalid sender");
+                       return;
                }
-       } else {
-               _D("sender_id(%s)", sender_id);
        }
 
-       return true;
+       g_variant_get(parameters, "(us)", &len, &raw);
+       if (em->es_cb)
+               em->es_cb(em->event_name, raw, len, em->user_data);
+
+       bundle_free_encoded_rawdata(&raw);
 }
 
 /**
@@ -526,21 +538,26 @@ static void __eventsystem_filter_userevent_for_application(GDBusConnection *conn
                const gchar *interface_name, const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
 {
-       gboolean is_trusted = FALSE;
+       char *sender_id = NULL;
+       int sender_pid = -1;
 
        _D("sender_name(%s), interface_name(%s)", sender_name, interface_name);
 
-       g_variant_get(parameters, "(bus)", &is_trusted, NULL, NULL);
+       if (filter_tbl == NULL)
+               filter_tbl = g_hash_table_new(g_str_hash, g_str_equal);
 
-       /* check signature */
-       if (is_trusted &&
-               __eventsystem_check_sender_validation_userevent(connection,
-                       (char *)sender_name) == false) {
-               return;
+       sender_id = (char *)g_hash_table_lookup(filter_tbl, interface_name);
+       if (sender_id == NULL) {
+               sender_pid = __eventsystem_get_sender_pid(connection, sender_name);
+               if (sender_pid <= 0) {
+                       _E("failed to get pid of sender(%s)", sender_name);
+                       return;
+               }
+               _D("sender_pid(%d)", sender_pid);
        }
 
-       __eventsystem_application_event_handler(connection, sender_name,
-               object_path, interface_name, signal_name, parameters, user_data);
+       __eventsystem_application_event_handler(sender_pid, interface_name,
+               signal_name, parameters, user_data);
 }
 
 /**
@@ -553,8 +570,8 @@ static void __eventsystem_filter_sysevent_for_application(GDBusConnection *conne
 {
        _D("sender_name(%s), interface_name(%s)", sender_name, interface_name);
 
-       __eventsystem_application_event_handler(connection, sender_name,
-               object_path, interface_name, signal_name, parameters, user_data);
+       __eventsystem_application_event_handler(-1, interface_name,
+               signal_name, parameters, user_data);
 }
 
 /**
@@ -590,11 +607,10 @@ static void __eventsystem_filter_sysevent_for_internal(GDBusConnection *connecti
 static int __eventsystem_register_event_internal(const char *event_name,
                eventmap_s **em_s, void *user_data)
 {
-       eventmap_s *em = NULL;
-       char *interface_name = NULL;
-       char *object_path = NULL;
-       char *member_name = NULL;
-       char *sender_name = NULL;
+       eventmap_s *em;
+       char *interface_name;
+       char *object_path;
+       char *member_name;
        GDBusSignalCallback filter;
        GBusType bus_type;
        guint subscription_id = 0;
@@ -660,24 +676,30 @@ static int __eventsystem_register_event_internal(const char *event_name,
                ret = ES_R_ERROR;
                goto out_3;
        }
-       sender_name = NULL;
 
        bus_type = G_BUS_TYPE_SYSTEM;
 
-       if (__get_gdbus_shared_connection(&conn, bus_type, interface_name) < 0) {
+       if (__get_gdbus_shared_connection(&conn, bus_type, evt_type) < 0) {
                _E("getting gdbus-connetion error");
                goto out_4;
        }
 
+       em = __create_eventmap(interface_name, member_name, event_name,
+                       evt_type, NULL, user_data);
+       if (!em) {
+               ret = ES_R_ENOMEM;
+               goto out_4;
+       }
+
        subscription_id = g_dbus_connection_signal_subscribe(conn,
-               sender_name, /* sender */
+               NULL, /* sender */
                interface_name,
                member_name, /* member */
                object_path, /* object_path */
                NULL, /* arg0 */
                G_DBUS_SIGNAL_FLAGS_NONE,
                filter,
-               user_data,
+               em,
                NULL); /* user_data_free_func */
 
        _D("event_name(%s), interface_name(%s)", event_name, interface_name);
@@ -685,33 +707,14 @@ static int __eventsystem_register_event_internal(const char *event_name,
                member_name, subscription_id, bus_type);
 
        if (subscription_id != 0) {
-               em = calloc(1, sizeof(eventmap_s));
-               if (!em) {
-                       _E("memory alloc failed");
-                       ret = ES_R_ENOMEM;
-               } else {
-                       em->interface_name = strdup(interface_name);
-                       em->member_name = strdup(member_name);
-                       em->event_name = strdup(event_name);
-                       em->bus_type = bus_type;
-                       em->reg_id = subscription_id;
-                       em->event_type = evt_type;
-
-                       if (!em->interface_name || !em->member_name || !em->event_name) {
-                               _E("out_of_memory");
-                               FREE_AND_NULL(em->interface_name);
-                               FREE_AND_NULL(em->member_name);
-                               FREE_AND_NULL(em->event_name);
-                               FREE_AND_NULL(em);
-                               ret = ES_R_ENOMEM;
-                               goto out_4;
-                       }
+               em->bus_type = bus_type;
+               em->reg_id = subscription_id;
 
-                       *em_s = em;
-                       ret = ES_R_OK;
-               }
+               *em_s = em;
+               ret = ES_R_OK;
        } else {
                _D("dbus subscribe: error(%d), event(%s)", subscription_id, event_name);
+               __destroy_eventmap(em);
                ret = ES_R_ERROR;
        }
 
@@ -722,9 +725,8 @@ out_3:
 out_2:
        FREE_AND_NULL(interface_name);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -743,19 +745,17 @@ int eventsystem_register_event(const char *event_name, unsigned int *reg_id,
        retvm_if(!reg_id, ES_R_EINVAL, "Invalid argument : reg_id");
        retvm_if(!callback, ES_R_EINVAL, "Invalid argument : callback");
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        ret = __eventsystem_register_event_internal(event_name, &em, user_data);
-
        if (ret == ES_R_OK && em) {
                em->ep_cb = callback;
                system_event_list = g_list_append(system_event_list, em);
                *reg_id = em->reg_id;
                ret = ES_R_OK;
        } else {
-               _E("error, ret(%d), em(%s)", ret, em);
+               _E("error, ret(%d), event_name(%s)", ret, event_name);
        }
 
        return ret;
@@ -771,12 +771,12 @@ int eventsystem_unregister_event(unsigned int reg_id)
        GBusType bus_type;
        GList *cb_list = NULL;
        GDBusConnection *conn = NULL;
+       eventsystem_event_type evt_type;
 
        retvm_if(reg_id == 0, ES_R_EINVAL, "Invalid argument : reg_id");
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        em.reg_id = reg_id;
        cb_list = g_list_find_custom(system_event_list, &em,
@@ -785,10 +785,11 @@ int eventsystem_unregister_event(unsigned int reg_id)
                em_data = (eventmap_s *)cb_list->data;
 
                bus_type = em_data->bus_type;
+               evt_type = em_data->event_type;
 
                _D("unsubscribe: reg_id(%d), bus_type(%d)", reg_id, bus_type);
 
-               if (__get_gdbus_shared_connection(&conn, bus_type, em_data->interface_name) < 0) {
+               if (__get_gdbus_shared_connection(&conn, bus_type, evt_type) < 0) {
                        _E("getting gdbus-connetion error");
                        return ES_R_ERROR;
                }
@@ -796,17 +797,14 @@ int eventsystem_unregister_event(unsigned int reg_id)
 
                system_event_list = g_list_remove(system_event_list, cb_list->data);
 
-               FREE_AND_NULL(em_data->interface_name);
-               FREE_AND_NULL(em_data->member_name);
-               FREE_AND_NULL(em_data->event_name);
-               FREE_AND_NULL(em_data);
+               __destroy_eventmap(em_data);
                g_object_unref(conn);
        }
 
        return ES_R_OK;
 }
 
-static int eventsystem_send_event(GDBusConnection *conn, eventinfo_s *evti, bundle *data)
+static int __eventsystem_send_event(GDBusConnection *conn, eventinfo_s *evti, bundle *data)
 {
        GError *error = NULL;
        GVariant *param = NULL;
@@ -818,12 +816,9 @@ static int eventsystem_send_event(GDBusConnection *conn, eventinfo_s *evti, bund
 
        bundle_encode(buf, &raw, &len);
 
-       if (!evti->is_user_event)
-               evti->is_trusted = FALSE;
-
-       param = g_variant_new("(bus)", evti->is_trusted, len, raw);
+       param = g_variant_new("(us)", len, raw);
        ret = g_dbus_connection_emit_signal(conn,
-               NULL,
+               evti->destination_name,
                evti->object_path,
                evti->interface_name,
                evti->member_name,
@@ -845,12 +840,56 @@ static int eventsystem_send_event(GDBusConnection *conn, eventinfo_s *evti, bund
        return ES_R_OK;
 }
 
+static void __eventsystem_free_trusted_list(gpointer data)
+{
+       char *name = (char *)data;
+
+       FREE_AND_NULL(name);
+}
+
+static int __eventsystem_send_trusted_event(GDBusConnection *conn, eventinfo_s *evti,
+               bundle *data, GList *dest_list)
+{
+       GList *tmp_list = NULL;
+       int ret = 0;
+       char *dest_name;
+
+       if (dest_list) {
+               tmp_list = g_list_first(dest_list);
+
+               while (tmp_list != NULL) {
+                       dest_name = (char *)tmp_list->data;
+                       if (dest_name && dest_name[0] != '\0') {
+                               _D("dest_name(%s)", dest_name);
+                               evti->destination_name = dest_name;
+                               ret = __eventsystem_send_event(conn, evti, data);
+                               if (ret != ES_R_OK) {
+                                       _E("send error");
+                                       ret = ES_R_ERROR;
+                                       break;
+                               }
+                       }
+                       tmp_list = g_list_next(tmp_list);
+               }
+       } else {
+               _E("dest_list is null");
+       }
+
+       return ES_R_OK;
+}
+
 /**
  * function : send the user-event
  */
 int eventsystem_send_user_event(const char *event_name, bundle *data, bool is_trusted)
 {
-       int ret = 0;
+       int ret = ES_R_OK;
+       eventinfo_s *evti = NULL;
+       struct last_data_item *item;
+       bundle_raw *raw = NULL;
+       int len;
+       GDBusConnection *conn = NULL;
+       GList *trusted_dest_list = NULL;
 
        /* check validation */
        retvm_if(!event_name, ES_R_EINVAL, "Invalid argument : event_name is NULL");
@@ -863,7 +902,6 @@ int eventsystem_send_user_event(const char *event_name, bundle *data, bool is_tr
                return ES_R_EINVAL;
        }
 
-       eventinfo_s *evti = NULL;
        evti = calloc(1, sizeof(eventinfo_s));
        if (!evti) {
                _E("memory alloc failed");
@@ -873,56 +911,93 @@ int eventsystem_send_user_event(const char *event_name, bundle *data, bool is_tr
        if (!evti->event_name) {
                _E("memory alloc failed");
                ret = ES_R_ENOMEM;
-               goto out_1;
+               goto out;
        }
 
        evti->interface_name = __get_encoded_interface_name(evti->event_name);
        if (!evti->interface_name) {
                _E("interface_name is NULL");
                ret = ES_R_ERROR;
-               goto out_2;
+               goto out;
        }
        evti->member_name = strdup(EVENT_SYSTEM_MEMBER);
        if (!evti->member_name) {
                _E("memory alloc failed");
                ret = ES_R_ENOMEM;
-               goto out_3;
+               goto out;
        }
 
        evti->object_path = __get_object_path(evti->interface_name);
        if (!evti->object_path) {
                _E("object_path is NULL");
                ret = ES_R_ERROR;
-               goto out_4;
+               goto out;
        }
 
+       evti->destination_name = NULL;
        evti->is_user_event = true;
-       evti->is_trusted = (gboolean)is_trusted;
+       evti->is_trusted = is_trusted;
 
-       GDBusConnection *conn = NULL;
-       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SESSION,
-               evti->interface_name) == ES_R_OK) {
-               ret = eventsystem_send_event(conn, evti, data);
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SESSION, ES_TYPE_USER) == ES_R_OK) {
+               if (bundle_encode(data, &raw, &len)) {
+                       _E("Unable to encode bundle");
+                       ret = ES_R_ERROR;
+                       goto out;
+               }
+
+               item = (struct last_data_item *)g_hash_table_lookup(last_data_tbl,
+                               evti->event_name);
+               if (item) {
+                       if (!evti->is_trusted) {
+                               if (item->param)
+                                       g_variant_unref(item->param);
+                               item->param = g_variant_new("(us)", len, raw);
+                       }
+                       if (item->trusted_param)
+                               g_variant_unref(item->trusted_param);
+                       item->trusted_param = g_variant_new("(us)", len, raw);
+               }
+
+               bundle_free_encoded_rawdata(&raw);
+
+               if (is_trusted) {
+                       if (__eventsystem_request_destination_list(evti->event_name, &trusted_dest_list) < 0) {
+                               _E("failed to get dest list");
+                               ret = ES_R_ERROR;
+                               goto out;
+                       }
+                       if (__eventsystem_send_trusted_event(conn, evti, data, trusted_dest_list) < 0) {
+                               _E("failed to send trusted event");
+                               ret = ES_R_ERROR;
+                               goto out;
+                       }
+
+                       if (__eventsystem_launch_on_event_for_userevent(evti->event_name, data, TRUE) < 0)
+                               _E("Failed to launch on event for userevent");
+               } else {
+                       if (__eventsystem_send_event(conn, evti, data) < 0) {
+                               _E("failed to send event");
+                               ret = ES_R_ERROR;
+                               goto out;
+                       }
 
-               if (ret == ES_R_OK) {
-                       __eventsystem_request_event_launch(evti->event_name, data);
+                       if (__eventsystem_launch_on_event_for_userevent(evti->event_name, data, FALSE) < 0)
+                               _E("Failed to launch on event for userevent");
                }
        } else {
                _E("getting gdbus-connetion error");
                ret = ES_R_ERROR;
        }
 
-       if (conn) {
+out:
+       if (conn)
                g_object_unref(conn);
-       }
+       if (trusted_dest_list)
+       g_list_free_full(trusted_dest_list, __eventsystem_free_trusted_list);
        FREE_AND_NULL(evti->object_path);
-out_4:
        FREE_AND_NULL(evti->member_name);
-out_3:
        FREE_AND_NULL(evti->interface_name);
-out_2:
        FREE_AND_NULL(evti->event_name);
-out_1:
        FREE_AND_NULL(evti);
 
        return ret;
@@ -934,26 +1009,21 @@ out_1:
 int eventsystem_send_system_event(const char *event_name, bundle *data)
 {
        int ret = 0;
+       eventinfo_s *evti = NULL;
+       GDBusConnection *conn = NULL;
 
        pthread_mutex_lock(&send_sync_lock);
 
        /* check validation */
-       retvm_if(!event_name, ES_R_EINVAL, "Invalid argument : event_name is NULL");
-       retvm_if(!data, ES_R_EINVAL, "Invalid argument : data is NULL");
-       retvm_if(!__check_eventname_validation_system((char *)event_name), ES_R_EINVAL,
+       tryvm_if(!event_name, ret = ES_R_EINVAL, "Invalid argument : event_name is NULL");
+       tryvm_if(!data, ret = ES_R_EINVAL, "Invalid argument : data is NULL");
+       tryvm_if(!__check_eventname_validation_system((char *)event_name), ret = ES_R_EINVAL,
                "Invalid argument : event_name(%s)", event_name);
-       retvm_if(!g_dbus_is_interface_name(event_name), ES_R_EINVAL,
+       tryvm_if(!g_dbus_is_interface_name(event_name), ret = ES_R_EINVAL,
                "Invalid argument : event_name(%s)", event_name);
 
-       /* only permitted process could send the system-evnet */
-       int pid = getpid();
-       int sender_ppid = __get_proc_status_by_pid("PPid:", pid);
-       int sender_uid = __get_proc_status_by_pid("Uid:", pid);
-
-       _D("event_name(%s), pid(%d), sender_ppid(%d), sender_uid(%d)",
-               event_name, pid, sender_ppid, sender_uid);
+       _D("event_name(%s)", event_name);
 
-       eventinfo_s *evti = NULL;
        evti = calloc(1, sizeof(eventinfo_s));
        if (!evti) {
                _E("memory alloc failed");
@@ -989,20 +1059,19 @@ int eventsystem_send_system_event(const char *event_name, bundle *data)
                ret = ES_R_ERROR;
                goto out_4;
        }
+       evti->destination_name = NULL;
        evti->is_user_event = false;
-       evti->is_trusted = FALSE;
 
-       GDBusConnection *conn = NULL;
-       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, evti->interface_name) == ES_R_OK) {
-               ret = eventsystem_send_event(conn, evti, data);
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) == ES_R_OK) {
+               ret = __eventsystem_send_event(conn, evti, data);
        } else {
                _E("getting gdbus-connection error");
                ret = ES_R_ERROR;
        }
 
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
+
        FREE_AND_NULL(evti->object_path);
 out_4:
        FREE_AND_NULL(evti->member_name);
@@ -1013,6 +1082,7 @@ out_2:
 out_1:
        FREE_AND_NULL(evti);
 
+catch:
        pthread_mutex_unlock(&send_sync_lock);
 
        return ret;
@@ -1035,18 +1105,17 @@ int eventsystem_request_sending_system_event(const char *event_name, bundle *dat
 
        _D("event_name(%s)", event_name);
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
-       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, NULL) < 0) {
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
                ret = ES_R_ERROR;
                goto out_1;
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1075,41 +1144,37 @@ int eventsystem_request_sending_system_event(const char *event_name, bundle *dat
        ret = ES_R_OK;
 
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
 
-static int __eventsystem_request_event_launch(const char *event_name, bundle *data)
+static int __eventsystem_check_sender_validation(int sender_pid, const char *event_name,
+               char **sender_id)
 {
-       int ret = 0;
+       int ret = ES_R_EINVAL;
        GDBusConnection *conn = NULL;
        GError *error = NULL;
        GDBusProxy *proxy = NULL;
        GVariant *param = NULL;
        GVariant *value = NULL;
        gint result = 0;
-       bundle_raw *raw = NULL;
-       int len = 0;
-
-       _D("event_name(%s)", event_name);
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
-       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, NULL) < 0) {
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
                ret = ES_R_ERROR;
                goto out_1;
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1119,10 +1184,64 @@ static int __eventsystem_request_event_launch(const char *event_name, bundle *da
                goto out_1;
        }
 
-       bundle_encode(data, &raw, &len);
+       param = g_variant_new("(is)", sender_pid, event_name);
+       value = g_dbus_proxy_call_sync(proxy, "CheckSenderValidation", param,
+               G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+       if (error != NULL) {
+               _E("proxy call sync error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_2;
+       }
 
-       param = g_variant_new("(ssi)", event_name, raw, len);
-       value = g_dbus_proxy_call_sync(proxy, "RequestEventLaunch", param,
+       g_variant_get(value, "(is)", &result, sender_id);
+
+       _D("result(%d)", result);
+
+       if (result == 1)
+               ret = ES_R_OK;
+out_2:
+       g_object_unref(proxy);
+       g_variant_unref(value);
+out_1:
+       if (conn)
+               g_object_unref(conn);
+
+       return ret;
+}
+
+static int __eventsystem_check_user_send_validation(const char *event_name)
+{
+       int ret = ES_R_EINVAL;
+       GDBusConnection *conn = NULL;
+       GError *error = NULL;
+       GDBusProxy *proxy = NULL;
+       GVariant *param = NULL;
+       GVariant *value = NULL;
+       gint result = 0;
+
+       if (!_initialized)
+               __initialize();
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
+               _E("getting gdbus-connetion error");
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       proxy = g_dbus_proxy_new_sync(conn,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
+               ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
+               NULL, &error);
+       if (proxy == NULL) {
+               _E("failed to create new proxy, error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       param = g_variant_new("(s)", event_name);
+       value = g_dbus_proxy_call_sync(proxy, "CheckUserSendValidation", param,
                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error != NULL) {
                _E("proxy call sync error(%s)", error->message);
@@ -1135,40 +1254,39 @@ static int __eventsystem_request_event_launch(const char *event_name, bundle *da
 
        _D("result(%d)", result);
 
-       ret = ES_R_OK;
-
+       if (result == 1)
+               ret = ES_R_OK;
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
 
-static int __eventsystem_check_user_certificate(int sender_pid)
+static int __eventsystem_check_privilege_validation(const char *event_name)
 {
-       int ret = 0;
+       int ret = ES_R_ENOTPERMITTED;
        GDBusConnection *conn = NULL;
        GError *error = NULL;
        GDBusProxy *proxy = NULL;
        GVariant *param = NULL;
        GVariant *value = NULL;
-       gint result = ES_R_ERROR;;
+       gint result = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
-       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, NULL) < 0) {
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
                ret = ES_R_ERROR;
                goto out_1;
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1178,8 +1296,8 @@ static int __eventsystem_check_user_certificate(int sender_pid)
                goto out_1;
        }
 
-       param = g_variant_new("(i)", sender_pid);
-       value = g_dbus_proxy_call_sync(proxy, "CheckUserCertValidation", param,
+       param = g_variant_new("(s)", event_name);
+       value = g_dbus_proxy_call_sync(proxy, "CheckPrivilegeValidation", param,
                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error != NULL) {
                _E("proxy call sync error(%s)", error->message);
@@ -1192,41 +1310,98 @@ static int __eventsystem_check_user_certificate(int sender_pid)
 
        _D("result(%d)", result);
 
-       if (result == 1) {
+       if (result == 1)
                ret = ES_R_OK;
-       }
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
 
-static int __eventsystem_check_user_send_validation(const char *event_name)
+static int __eventsystem_setup_trusted_peer(const char *event_name, const char *dest_bus_name)
 {
-       int ret = 0;
+       int ret = ES_R_ERROR;
        GDBusConnection *conn = NULL;
        GError *error = NULL;
        GDBusProxy *proxy = NULL;
        GVariant *param = NULL;
        GVariant *value = NULL;
-       gint result = ES_R_ERROR;;
+       gint result = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
+               _E("getting gdbus-connetion error");
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       proxy = g_dbus_proxy_new_sync(conn,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
+               ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
+               NULL, &error);
+       if (proxy == NULL) {
+               _E("failed to create new proxy, error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       param = g_variant_new("(ss)", event_name, dest_bus_name);
+       value = g_dbus_proxy_call_sync(proxy, "SetupTrustedPeer", param,
+               G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+       if (error != NULL) {
+               _E("proxy call sync error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_2;
        }
 
-       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, NULL) < 0) {
+       g_variant_get(value, "(i)", &result);
+
+       _D("result(%d)", result);
+
+       if (result == 1)
+               ret = ES_R_OK;
+out_2:
+       g_object_unref(proxy);
+       g_variant_unref(value);
+out_1:
+       if (conn)
+               g_object_unref(conn);
+
+       return ret;
+}
+
+static int __eventsystem_request_destination_list(const char *event_name, GList **dest_list)
+{
+       int ret = ES_R_ERROR;
+       GDBusConnection *conn = NULL;
+       GError *error = NULL;
+       GDBusProxy *proxy = NULL;
+       GVariant *param = NULL;
+       GVariant *value = NULL;
+       GVariantIter *iter;
+       gchar *str;
+       char *dest_name = NULL;
+       gint result = 0;
+
+       if (!_initialized)
+               __initialize();
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
                ret = ES_R_ERROR;
                goto out_1;
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1237,7 +1412,7 @@ static int __eventsystem_check_user_send_validation(const char *event_name)
        }
 
        param = g_variant_new("(s)", event_name);
-       value = g_dbus_proxy_call_sync(proxy, "CheckUserSendValidation", param,
+       value = g_dbus_proxy_call_sync(proxy, "GetTrustedPeerList", param,
                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error != NULL) {
                _E("proxy call sync error(%s)", error->message);
@@ -1246,22 +1421,36 @@ static int __eventsystem_check_user_send_validation(const char *event_name)
                goto out_2;
        }
 
-       g_variant_get(value, "(i)", &result);
+       g_variant_get(value, "(ias)", &result, &iter);
 
        _D("result(%d)", result);
 
        if (result == 1) {
                ret = ES_R_OK;
+               while (g_variant_iter_loop(iter, "s", &str)) {
+                       dest_name = strdup((char *)str);
+                       if (dest_name) {
+                               _D("dest name(%s)", str);
+                               *dest_list = g_list_append(*dest_list, dest_name);
+                       } else {
+                               _E("out of memory");
+                               ret = ES_R_ENOMEM;
+                               break;
+                       }
+               }
        }
+       g_variant_iter_free(iter);
+
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
+
 #ifdef APPFW_EVENT_SYSTEM_EARLIER_FEATURE
 static int __eventsystem_request_earlier_data(const char *event_name,
                eventsystem_cb callback, void *user_data)
@@ -1271,22 +1460,22 @@ static int __eventsystem_request_earlier_data(const char *event_name,
        GError *error = NULL;
        GDBusProxy *proxy = NULL;
        GVariant *param = NULL;
+       GVariant *value = NULL;
        gint result = 0;
        bundle_raw *raw = NULL;
        int len = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
-       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, NULL) < 0) {
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
                ret = ES_R_ERROR;
                goto out_1;
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
 
@@ -1298,7 +1487,7 @@ static int __eventsystem_request_earlier_data(const char *event_name,
        }
 
        param = g_variant_new("(s)", event_name);
-       GVariant *value = g_dbus_proxy_call_sync(proxy, "GetEarlierData", param,
+       value = g_dbus_proxy_call_sync(proxy, "GetEarlierData", param,
                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error != NULL) {
                _E("proxy call sync error(%s)", error->message);
@@ -1307,48 +1496,364 @@ static int __eventsystem_request_earlier_data(const char *event_name,
                goto out_2;
        }
 
-       g_variant_get(value, "(iis)", &result, &len, &raw);
-       g_variant_unref(value);
+       g_variant_get(value, "(ii&s)", &result, &len, &raw);
 
        _D("result(%d), len(%d)", result, len);
 
        if (!result && raw && len > 0) {
                callback(event_name, raw, len, user_data);
-               bundle_free_encoded_rawdata(&raw);
+               ret = ES_R_OK;
+       } else {
+               ret = ES_R_ERROR;
        }
 
-       ret = ES_R_OK;
+out_2:
+       g_object_unref(proxy);
+       g_variant_unref(value);
+out_1:
+       if (conn)
+               g_object_unref(conn);
+
+       return ret;
+}
+#endif
+
+static int __request_esd_for_last_data(const char *event_name, bool check)
+{
+       int ret = 0;
+       GDBusConnection *conn = NULL;
+       GError *error = NULL;
+       GDBusProxy *proxy = NULL;
+       GVariant *param = NULL;
+       GVariant *value = NULL;
+       gint result = 0;
+
+       if (!_initialized)
+               __initialize();
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM,
+                               ES_TYPE_SYSTEM) < 0) {
+               _E("getting gdbus-connetion error");
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       proxy = g_dbus_proxy_new_sync(conn,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
+               ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
+               NULL, &error);
+
+       if (proxy == NULL) {
+               _E("failed to create new proxy, error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       param = g_variant_new("(ss)", event_name,
+                       check ? s_info.own_name_session_bus :
+                       s_info.own_name_system_bus);
+       value = g_dbus_proxy_call_sync(proxy,
+                       check ? "CheckLastData" : "KeepLastData", param,
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+
+       if (error != NULL) {
+               _E("proxy call sync error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_2;
+       }
+
+       g_variant_get(value, "(i)", &result);
+
+       _D("result(%d)", result);
+
+       ret = result;
 
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
+
+       return ret;
+}
+
+static int __eventsystem_launch_on_event_for_userevent(const char *event_name,
+               bundle *data, gboolean trusted)
+{
+       int ret = ES_R_EINVAL;
+       GDBusConnection *conn = NULL;
+       GError *error = NULL;
+       GDBusProxy *proxy = NULL;
+       GVariant *param = NULL;
+       GVariant *value = NULL;
+       gint result = 0;
+       bundle_raw *raw = NULL;
+       bundle *buf = data;
+       int len;
+
+       if (!_initialized)
+               __initialize();
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
+               _E("getting gdbus-connetion error");
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       proxy = g_dbus_proxy_new_sync(conn,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
+               ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
+               NULL, &error);
+       if (proxy == NULL) {
+               _E("failed to create new proxy, error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       bundle_encode(buf, &raw, &len);
+
+       param = g_variant_new("(ssib)", event_name, raw, len, trusted);
+       value = g_dbus_proxy_call_sync(proxy, "LaunchOnEventFromUserEvent", param,
+               G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+       if (error != NULL) {
+               _E("proxy call sync error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_2;
        }
 
+       _D("Launch on event from user event (%s)", event_name);
+
+       g_variant_get(value, "(i)", &result);
+
+       _D("result(%d)", result);
+
+       ret = result;
+
+out_2:
+       bundle_free_encoded_rawdata(&raw);
+       g_object_unref(proxy);
+       g_variant_unref(value);
+out_1:
+       if (conn)
+               g_object_unref(conn);
+
        return ret;
 }
-#endif
+
+
+static void _send_last_user_event(const char *event_name,
+               bundle *data, void *user_data)
+{
+       GDBusConnection *conn = NULL;
+       GError *error = NULL;
+       eventinfo_s *evti = NULL;
+       int ret;
+       struct last_data_item *item;
+       const char *is_trusted;
+
+       _D("send last data");
+
+       if (g_strcmp0(event_name, SYS_EVENT_REQUEST_LAST_DATA) != 0)
+               return;
+
+       evti = calloc(1, sizeof(eventinfo_s));
+       if (!evti) {
+               _E("memory alloc failed");
+               return;
+       }
+
+       evti->event_name = (char *)bundle_get_val(data,
+                       EVT_KEY_KEPT_EVENT_NAME);
+       if (!evti->event_name) {
+               _E("memory alloc failed");
+               goto out_1;
+       }
+
+       item = (struct last_data_item *)g_hash_table_lookup(last_data_tbl,
+                       evti->event_name);
+       if (!item)
+               goto out_1;
+
+       evti->interface_name = __get_encoded_interface_name(evti->event_name);
+       if (!evti->interface_name) {
+               _E("interface_name is NULL");
+               goto out_1;
+       }
+
+       evti->member_name = strdup(EVENT_SYSTEM_MEMBER);
+       if (!evti->member_name) {
+               _E("memory alloc failed");
+               goto out_2;
+       }
+
+       evti->object_path = __get_object_path(evti->interface_name);
+       if (!evti->object_path) {
+               _E("object_path is NULL");
+               goto out_3;
+       }
+
+       evti->destination_name = (char *)bundle_get_val(data,
+                       EVT_KEY_KEPT_OWN_NAME);
+       if (!evti->destination_name) {
+               _E("object_path is NULL");
+               goto out_4;
+       }
+
+       is_trusted = bundle_get_val(data, EVT_KEY_KEPT_IS_TRUSTED);
+       if (!is_trusted) {
+               _E("object_path is NULL");
+               goto out_4;
+       }
+
+       if (strncmp("true", is_trusted, sizeof("true")) != 0) {
+                       if (!item->trusted_param)
+                               goto out_4;
+                       evti->is_trusted = true;
+       } else {
+                       if (!item->param)
+                               goto out_4;
+                       evti->is_trusted = false;
+       }
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SESSION,
+                               ES_TYPE_USER) == ES_R_OK) {
+               ret = g_dbus_connection_emit_signal(conn,
+                               evti->destination_name,
+                               evti->object_path,
+                               evti->interface_name,
+                               evti->member_name,
+                               evti->is_trusted ? item->trusted_param : item->param,
+                               &error);
+               if (ret == FALSE) {
+                       _E("Unable to connect to dbus: %s", error->message);
+                       g_error_free(error);
+               }
+       }
+
+       if (conn)
+               g_object_unref(conn);
+
+out_4:
+       FREE_AND_NULL(evti->object_path);
+out_3:
+       FREE_AND_NULL(evti->member_name);
+out_2:
+       FREE_AND_NULL(evti->interface_name);
+out_1:
+       FREE_AND_NULL(evti);
+}
+
+int eventsystem_keep_last_event_data(const char *event_name)
+{
+       int ret = 0;
+       unsigned int reg_id;
+       struct last_data_item *item;
+
+       if (last_data_tbl == NULL)
+               last_data_tbl = g_hash_table_new(g_str_hash, g_str_equal);
+
+       ret = __request_esd_for_last_data(event_name, false);
+       if (ret != ES_R_OK)
+               return ret;
+
+       item = calloc(1, sizeof(*item));
+       if (!item)
+               return ES_R_ENOMEM;
+
+       item->event_name = strdup(event_name);
+       item->param = NULL;
+       item->trusted_param = NULL;
+
+       g_hash_table_insert(last_data_tbl, item->event_name, item);
+
+       ret = eventsystem_register_event(SYS_EVENT_REQUEST_LAST_DATA,
+                       &reg_id, _send_last_user_event, NULL);
+
+       return ret;
+}
+
+static void __destroy_eventmap(gpointer data)
+{
+       eventmap_s *em = (eventmap_s *)data;
+
+       if (!em)
+               return;
+
+       if (em->interface_name)
+               free(em->interface_name);
+       if (em->member_name)
+               free(em->member_name);
+       if (em->event_name)
+               free(em->event_name);
+       free(em);
+}
+
+static eventmap_s *__create_eventmap(const char *interface_name,
+               const char *member_name, const char *event_name,
+               int event_type, eventsystem_cb callback, void *user_data)
+{
+       eventmap_s *em;
+
+       em = calloc(1, sizeof(eventmap_s));
+       if (!em) {
+               _E("Out of memory");
+               return NULL;
+       }
+
+       em->interface_name = strdup(interface_name);
+       if (!em->interface_name) {
+               _E("Failed to duplicate interface name");
+               __destroy_eventmap(em);
+               return NULL;
+       }
+
+       em->member_name = strdup(member_name);
+       if (!em->member_name) {
+               _E("Failed to duplicate member name");
+               __destroy_eventmap(em);
+               return NULL;
+       }
+
+       em->event_name = strdup(event_name);
+       if (!em->event_name) {
+               _E("Failed to duplicate event name");
+               __destroy_eventmap(em);
+               return NULL;
+       }
+
+       em->event_type = event_type;
+       em->es_cb = callback;
+       em->user_data = user_data;
+
+       return em;
+}
 
 int eventsystem_register_application_event(const char *event_name, unsigned int *reg_id,
                int *event_type, eventsystem_cb callback, void *user_data)
 {
        eventmap_s *em;
-       char *interface_name = NULL;
-       char *object_path = NULL;
-       char *member_name = NULL;
-       char *sender_name = NULL;
+       char *interface_name;
+       char *object_path;
+       char *member_name;
        GDBusSignalCallback filter;
        GBusType bus_type;
-       guint  subscription_id  = 0;
+       guint subscription_id = 0;
        int ret = 0;
        GDBusConnection *conn = NULL;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__check_eventname_validation_system((char *)event_name)) {
+               if (__eventsystem_check_privilege_validation(event_name) != ES_R_OK) {
+                       _E("invalid privilege(%s)", event_name);
+                       return ES_R_ENOTPERMITTED;
+               }
                *event_type = ES_TYPE_SYSTEM;
        } else if (__check_eventname_validation_user((char *)event_name)) {
                *event_type = ES_TYPE_USER;
@@ -1407,81 +1912,84 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
        object_path = __get_object_path(interface_name);
        if (!object_path) {
                _E("failed get object_path");
-               FREE_AND_NULL(interface_name);
-               FREE_AND_NULL(member_name);
-               return ES_R_ERROR;
+               ret = ES_R_ERROR;
+               goto end;
        }
-       sender_name = NULL;
 
        _D("interface_name(%s), object_path(%s)", interface_name, object_path);
-       _D(" member_name(%s), sender_name(%s), type(%d), bus_type(%d)",
-               member_name, sender_name, *event_type, bus_type);
+       _D(" member_name(%s), type(%d), bus_type(%d)",
+               member_name, *event_type, bus_type);
 
-       if (__get_gdbus_shared_connection(&conn, bus_type, interface_name) < 0) {
+       if (__get_gdbus_shared_connection(&conn, bus_type, *event_type) < 0) {
                _E("getting gdbus-connetion error");
-               FREE_AND_NULL(interface_name);
-               FREE_AND_NULL(object_path);
-               FREE_AND_NULL(member_name);
-               return ES_R_ERROR;
+               ret = ES_R_ERROR;
+               goto end;
        }
 
 #ifdef APPFW_EVENT_SYSTEM_EARLIER_FEATURE
        __eventsystem_request_earlier_data(event_name, callback, user_data);
 #endif
 
+       em = __create_eventmap(interface_name, member_name, event_name,
+                       *event_type, callback, user_data);
+       if (!em) {
+               ret = ES_R_ENOMEM;
+               goto end;
+       }
+
        subscription_id = g_dbus_connection_signal_subscribe(conn,
-               sender_name, /* sender */
+               NULL, /* sender */
                interface_name,
                member_name, /* member */
                object_path, /* object_path */
                NULL, /* arg0 */
                G_DBUS_SIGNAL_FLAGS_NONE,
                filter,
-               user_data,
+               em,
                NULL); /* user_data_free_func */
 
        _D("event_name(%s), subscription_id(%d)", event_name, subscription_id);
 
        if (subscription_id != 0) {
-               em = calloc(1, sizeof(eventmap_s));
-               if (!em) {
-                       _E("memory alloc failed");
-                       ret = ES_R_ENOMEM;
-               } else {
-                       em->interface_name = strdup(interface_name);
-                       em->member_name = strdup(member_name);
-                       em->event_name = strdup(event_name);
-                       em->es_cb = callback;
-                       em->bus_type = bus_type;
-                       em->reg_id = subscription_id;
-                       em->event_type = *event_type;
-
-                       if (!em->interface_name || !em->member_name ||
-                               !em->event_name) {
-                               _E("out_of_memory");
-                               FREE_AND_NULL(em->interface_name);
-                               FREE_AND_NULL(em->member_name);
-                               FREE_AND_NULL(em->event_name);
-                               FREE_AND_NULL(em);
-                               ret = ES_R_ENOMEM;
+               em->bus_type = bus_type;
+               em->reg_id = subscription_id;
+
+               system_event_list = g_list_append(system_event_list, em);
+               *reg_id = subscription_id;
+
+               ret = ES_R_OK;
+
+               if (em->bus_type == G_BUS_TYPE_SESSION &&
+                               em->event_type == ES_TYPE_USER) {
+                       if (s_info.own_name_session_bus == NULL) {
+                               _E("session bus is not ready");
+                               ret = ES_R_ERROR;
+                               g_dbus_connection_signal_unsubscribe(conn, subscription_id);
+                               __destroy_eventmap(em);
                        } else {
-                               system_event_list =
-                                       g_list_append(system_event_list, em);
-                               *reg_id = subscription_id;
-                               ret = ES_R_OK;
+                               if (__eventsystem_setup_trusted_peer(event_name,
+                                                       s_info.own_name_session_bus) < 0) {
+                                       _E("failed to setup trusted peer");
+                                       ret = ES_R_ERROR;
+                                       g_dbus_connection_signal_unsubscribe(conn, subscription_id);
+                                       __destroy_eventmap(em);
+                               }
                        }
                }
        } else {
-               _D("dbus subscribe: error(%d)", subscription_id);
+               _E("dbus subscribe: error(%d)", subscription_id);
+               __destroy_eventmap(em);
                ret = ES_R_ERROR;
        }
 
+       if (*event_type == ES_TYPE_USER)
+               __request_esd_for_last_data(event_name, true);
+end:
        FREE_AND_NULL(interface_name);
        FREE_AND_NULL(object_path);
        FREE_AND_NULL(member_name);
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -1489,91 +1997,118 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
 int eventsystem_unregister_application_event(unsigned int reg_id)
 {
        eventmap_s em;
-       eventmap_s *em_data = NULL;
+       eventmap_s *em_data;
        GBusType bus_type;
-       GList *cb_list = NULL;
+       GList *cb_list;
        GDBusConnection *conn = NULL;
+       eventsystem_event_type evt_type;
 
        retvm_if(reg_id == 0, ES_R_EINVAL, "Invalid argument : reg_id");
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        em.reg_id = reg_id;
        cb_list = g_list_find_custom(system_event_list, &em,
-               (GCompareFunc)__event_compare_reg_id_cb);
-       if (cb_list) {
-               em_data = (eventmap_s *)cb_list->data;
-
-               bus_type = em_data->bus_type;
+                       (GCompareFunc)__event_compare_reg_id_cb);
+       if (!cb_list) {
+               _E("not found matched item");
+               return ES_R_ERROR;
+       }
 
-               _D("unsubscribe: reg_id(%d), bus_type(%d)", reg_id, bus_type);
+       em_data = (eventmap_s *)cb_list->data;
 
-               if (__get_gdbus_shared_connection(&conn, bus_type, em_data->interface_name) < 0) {
-                       _E("getting gdbus-connetion error");
-                       return ES_R_ERROR;
-               }
-               g_dbus_connection_signal_unsubscribe(conn, reg_id);
+       bus_type = em_data->bus_type;
+       evt_type = em_data->event_type;
 
-               system_event_list = g_list_remove(system_event_list, cb_list->data);
+       _D("unsubscribe: reg_id(%d), bus_type(%d)", reg_id, bus_type);
 
-               FREE_AND_NULL(em_data->interface_name);
-               FREE_AND_NULL(em_data->member_name);
-               FREE_AND_NULL(em_data->event_name);
-               FREE_AND_NULL(em_data);
-               g_object_unref(conn);
-       } else {
-               _E("not found matched item");
+       if (__get_gdbus_shared_connection(&conn, bus_type, evt_type) < 0) {
+               _E("getting gdbus-connetion error");
                return ES_R_ERROR;
        }
+       g_dbus_connection_signal_unsubscribe(conn, reg_id);
+
+       system_event_list = g_list_remove(system_event_list, cb_list->data);
+
+       __destroy_eventmap(em_data);
+       g_object_unref(conn);
 
        return ES_R_OK;
 }
 
 int eventsystem_application_finalize(void)
 {
-       gpointer key, value;
+       gpointer key;
+       gpointer value;
+       GHashTableIter iter;
+       char *key_item;
+       char *val_item;
+       struct last_data_item *last_item;
 
        _D("release all resouces");
 
-       if (system_event_list) {
+       if (system_event_list)
                g_list_free(system_event_list);
+
+       if (check_tbl) {
+               g_hash_table_iter_init(&iter, check_tbl);
+
+               while (g_hash_table_iter_next(&iter, &key, &value)) {
+                       val_item = (char *)value;
+                       if (val_item)
+                               free(val_item);
+                       else
+                               _E("check_tbl, val_item is NULL");
+                       g_hash_table_iter_remove(&iter);
+               }
+               g_hash_table_unref(check_tbl);
        }
 
        if (filter_tbl) {
-               GHashTableIter iter;
-
                g_hash_table_iter_init(&iter, filter_tbl);
 
                while (g_hash_table_iter_next(&iter, &key, &value)) {
-                       char *val_item = (char *)value;
-                       if (val_item) {
+                       key_item = (char *)key;
+                       if (key_item)
+                               free(key_item);
+                       else
+                               _E("filter_tbl, key_item is NULL");
+
+                       val_item = (char *)value;
+                       if (val_item)
                                free(val_item);
-                       } else {
+                       else
                                _E("filter_tbl, val_item is NULL");
-                       }
+
                        g_hash_table_iter_remove(&iter);
                }
                g_hash_table_unref(filter_tbl);
        }
 
-       if (check_tbl) {
-               GHashTableIter iter;
-
-               g_hash_table_iter_init(&iter, check_tbl);
+       if (last_data_tbl) {
+               g_hash_table_iter_init(&iter, last_data_tbl);
 
                while (g_hash_table_iter_next(&iter, &key, &value)) {
-                       char *val_item = (char *)value;
-                       if (val_item) {
-                               free(val_item);
+                       last_item = (struct last_data_item *)value;
+                       if (last_item) {
+                               if (last_item->event_name)
+                                       free(last_item->event_name);
+                               if (last_item->param)
+                                       g_variant_unref(last_item->param);
+                               if (last_item->trusted_param)
+                                       g_variant_unref(last_item->trusted_param);
+                               free(last_item);
                        } else {
-                               _E("check_tbl, val_item is NULL");
+                               _E("last_data_tbl, val_item is NULL");
                        }
                        g_hash_table_iter_remove(&iter);
                }
-               g_hash_table_unref(check_tbl);
+               g_hash_table_unref(last_data_tbl);
        }
 
+       FREE_AND_NULL(s_info.own_name_system_bus);
+       FREE_AND_NULL(s_info.own_name_session_bus);
+
        return 0;
 }