From f8e0f4153bee5b958a43e0c6cccb21d67d24a142 Mon Sep 17 00:00:00 2001
From: Shingil Kang <shingil.kang@samsung.com>
Date: Tue, 12 Jul 2016 22:18:27 -0700
Subject: [PATCH] Revert "Revert "Modify modules that need root permission.""

This reverts commit 9395230cf70cc07bfd036f8aa374f5f9443c7983.

Change-Id: I3fb22370706706e8e8042fedd58b79d95b889946
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
---
 packaging/sdbd_device.service   |  2 ++
 packaging/sdbd_emulator.service |  2 ++
 src/file_sync_service.c         | 62 -----------------------------------------
 3 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/packaging/sdbd_device.service b/packaging/sdbd_device.service
index 0537fcd..b47e8f3 100644
--- a/packaging/sdbd_device.service
+++ b/packaging/sdbd_device.service
@@ -4,6 +4,8 @@ Requires=tizen-system-env.service
 After=tmp.mount
 
 [Service]
+User=sdk
+Group=sdk
 Type=forking
 #location of SDBD log file
 EnvironmentFile=-/run/tizen-system-env
diff --git a/packaging/sdbd_emulator.service b/packaging/sdbd_emulator.service
index 2129436..6e0ec0f 100644
--- a/packaging/sdbd_emulator.service
+++ b/packaging/sdbd_emulator.service
@@ -5,6 +5,8 @@ After=tmp.mount dbus.service
 #DefaultDependencies=false
 
 [Service]
+User=sdk
+Group=sdk
 Type=forking
 #location of SDBD log file
 Environment=DISPLAY=:0
diff --git a/src/file_sync_service.c b/src/file_sync_service.c
index 1675cd2..b2c2f4c 100644
--- a/src/file_sync_service.c
+++ b/src/file_sync_service.c
@@ -41,42 +41,11 @@
 
 #define SYNC_TIMEOUT 15
 
-struct sync_permit_rule
-{
-    const char *name;
-    char *regx;
-    int mode; // 0:push, 1: pull, 2: push&push
-};
-
-struct sync_permit_rule sdk_sync_permit_rule[] = {
-    /* 0 */ {"unitest", "", 1},
-    /* 1 */ {"codecoverage", "", 1},
-    /* 2 */ {"da", "", 1},
-    /* end */ {NULL, NULL, 0}
-};
-
 /* The typical default value for the umask is S_IWGRP | S_IWOTH (octal 022).
  * Before use the DIR_PERMISSION, the process umask value should be set 0 using umask().
  */
 #define DIR_PERMISSION 0777
 
-void init_sdk_sync_permit_rule_regx(void)
-{
-    int ret;
-    ret = asprintf(&sdk_sync_permit_rule[0].regx, "^((/tmp)|(%s)|(%s))/[a-zA-Z0-9]{10}/data/[a-zA-Z0-9_\\-]{1,50}\\.xml$", APP_INSTALL_PATH_PREFIX1, APP_INSTALL_PATH_PREFIX2);
-    if(ret < 0) {
-        D("failed to run asprintf for unittest\n");
-    }
-    ret = asprintf(&sdk_sync_permit_rule[1].regx, "^((/tmp)|(%s)|(%s))/[a-zA-Z0-9]{10}/data/+(.)*\\.gcda$", APP_INSTALL_PATH_PREFIX1, APP_INSTALL_PATH_PREFIX2);
-    if (ret < 0) {
-        D("failed to run asprintf for codecoverage\n");
-    }
-    ret = asprintf(&sdk_sync_permit_rule[2].regx, "^(/tmp/da/)*+[a-zA-Z0-9_\\-\\.]{1,50}\\.png$");
-    if (ret < 0) {
-        D("failed to run asprintf for da\n");
-    }
-}
-
 #if 0
 static void set_syncfile_smack_label(char *src) {
     char *label_transmuted = NULL;
@@ -592,37 +561,6 @@ static int do_recv(int s, const char *path, char *buffer)
     return 0;
 }
 
-static int verify_sync_rule(const char* path) {
-    regex_t regex;
-    int ret;
-    char buf[PATH_MAX];
-    int i=0;
-
-    init_sdk_sync_permit_rule_regx();
-    for (i=0; sdk_sync_permit_rule[i].regx != NULL; i++) {
-        ret = regcomp(&regex, sdk_sync_permit_rule[i].regx, REG_EXTENDED);
-        if(ret){
-            return 0;
-        }
-        // execute regular expression
-        ret = regexec(&regex, path, 0, NULL, 0);
-        if(!ret){
-            regfree(&regex);
-            D("found matched rule(%s) from %s path\n", sdk_sync_permit_rule[i].name, path);
-            return 1;
-        } else if( ret == REG_NOMATCH ){
-            // do nothin
-        } else{
-            regerror(ret, &regex, buf, sizeof(buf));
-            D("regex match failed(%s): %s\n",sdk_sync_permit_rule[i].name, buf);
-        }
-    }
-    regfree(&regex);
-    for (i=0; sdk_sync_permit_rule[i].regx != NULL; i++){
-       free(sdk_sync_permit_rule[i].regx);
-    }
-    return 0;
-}
 
 void file_sync_service(int fd, void *cookie)
 {
-- 
2.7.4