Daemon consolidation with wrt-security

Change-Id: If05f5fb7ed45f91fcb4a6bfe8b415f6cb77f9e7b
Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>

diff --git a/packaging/privacy-manager-server.manifest b/packaging/privacy-manager-server.manifest
index 4bbd7a7..11614a9 100644 (file)
--- a/packaging/privacy-manager-server.manifest
+++ b/packaging/privacy-manager-server.manifest
@@ -7,16 +7,9 @@
                 </provide>
         </define>
         <request>
-                <domain name="privacy-manager" />
+                <domain name="_" />
         </request>
         <assign>
-                       <filesystem path="/usr/bin/privacy-manager-server" label="privacy-manager::daemon" exec_label="privacy-manager::daemon"/>
-                       <filesystem path="/usr/share/license/privacy-manager-server" label="_"/>
-                       <filesystem path="/etc/rc.d/init.d/privacy-manager-server.sh" label="_" exec_label="none"/>
-                       <filesystem path="/etc/rc.d/rc3.d/S10privacy-manager-server.sh" label="_" exec_label="none"/>
-                       <filesystem path="/etc/rc.d/rc5.d/S10privacy-manager-server.sh" label="_" exec_label="none"/>
-                       <filesystem path="/usr/lib/systemd/system/privacy-manager-server.service" label="_" exec_label="none" />
-                       <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/privacy-manager-server.service" label="_" exec_label="none" />
                        <filesystem path="/opt/dbspace/.privacylist.db" label="privacy-manager::db" exec_label="none" />
                </assign>
 </manifest>

diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index 77de1c8..10cd614 100755 (executable)
--- a/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@ -127,8 +127,6 @@ mkdir -p %{buildroot}/usr/share/license
 cp LICENSE.APLv2 %{buildroot}/usr/share/license/privacy-manager-server
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE.APLv2 %{buildroot}/usr/share/license/privacy-manager-client
-mkdir -p %{buildroot}/usr/bin
-cp res/usr/bin/* %{buildroot}/usr/bin/
 mkdir -p %{buildroot}/opt/dbspace
 cp res/opt/dbspace/.privacylist.db /%{buildroot}/opt/dbspace/
 #mkdir -p %{buildroot}/etc/rc.d/init.d
@@ -141,8 +139,8 @@ cp res/opt/dbspace/.privacylist.db /%{buildroot}/opt/dbspace/
 #ln -sf /etc/rc.d/init.d/privacy-manager-server.sh %{buildroot}/etc/rc.d/rc5.d/S10privacy-manager-server.sh
 
 mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/privacy-manager-server.service
-ln -sf /usr/lib/systemd/system/privacy-manager-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/privacy-manager-server.service
+#install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/privacy-manager-server.service
+#ln -sf /usr/lib/systemd/system/privacy-manager-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/privacy-manager-server.service
 
 %clean
 rm -rf %{buildroot}
@@ -163,16 +161,12 @@ fi
 %files -n privacy-manager-server
 %defattr(-,root,root,-)
 %manifest packaging/privacy-manager-server.manifest
-%{_bindir}/*
-%{_libdir}/systemd/*
-#/etc/rc.d/init.d/privacy-manager-server.sh
-#%attr(755,root,root) /etc/rc.d/init.d/privacy-manager-server.sh
-#/etc/rc.d/rc3.d/S10privacy-manager-server.sh
-#/etc/rc.d/rc5.d/S10privacy-manager-server.sh
+%{_libdir}/libprivacy-manager-server.so*
 /usr/share/license/privacy-manager-server
 /opt/dbspace/.privacylist.db
 
 %files -n privacy-manager-server-devel
+%{_includedir}/privacy_manager/privacy_manager_daemon.h
 %{_libdir}/pkgconfig/privacy-manager-server.pc
 
 %files -n privacy-manager-client
@@ -184,9 +178,16 @@ fi
 
 %files -n privacy-manager-client-devel
 %defattr(-,root,root,-)
-%{_includedir}/*
 %{_libdir}/pkgconfig/privacy-manager-client.pc
 
+%{_includedir}/privacy_manager/PrivacyManagerClient.h
+%{_includedir}/privacy_manager/PrivacyChecker.h
+%{_includedir}/privacy_manager/privacy_info_client.h
+%{_includedir}/privacy_manager/privacy_manager_client.h
+%{_includedir}/privacy_manager/privacy_checker_client.h
+%{_includedir}/privacy_manager/privacy_manager_client_types.h
+
+
 %files -n capi-security-privacy-manager
 %{_libdir}/libcapi-security-privacy-manager.so.*
 %manifest packaging/capi-security-privacy-manager.manifest

diff --git a/privacy-manager-server.pc.in b/privacy-manager-server.pc.in
index 0bba87a..6f117ea 100644 (file)
--- a/privacy-manager-server.pc.in
+++ b/privacy-manager-server.pc.in
@@ -1,9 +1,11 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
 libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
+includedir=/usr/include
 
-Name: privacy-manager-server
-Description: Privacy Manager Server
+Name: @PC_NAME@
+Description: @PC_DESCRIPTION@
 Version: @VERSION@
+Libs: -L${libdir} @PC_LDFLAGS@
+Cflags: @PC_CFLAGS@
 Requires: 

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 9886864..a7ed3a1 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -47,15 +47,16 @@ SET(PRIVACY_MANAGER_SERVER_SOURCES
        ${common_src_dir}/SocketConnection.cpp
        ${common_src_dir}/SocketStream.cpp
        ${common_src_dir}/PrivacyDb.cpp
-       ${server_src_dir}/main.cpp
+    #  ${server_src_dir}/main.cpp
        ${server_src_dir}/SocketService.cpp
        ${server_src_dir}/PrivacyManagerDaemon.cpp
        ${server_src_dir}/service/PrivacyInfoService.cpp
        ${server_src_dir}/PrivacyManagerServer.cpp
        ${server_src_dir}/NotificationServer.cpp
-
+       ${server_src_dir}/privacy_manager_daemon.cpp
        )
 SET(PRIVACY_MANAGER_SERVER_HEADERS
+       ${server_include_dir}/privacy_manager_daemon.h
     #  ${server_include_dir}/SocketService.h
     #   ${server_include_dir}/PrivacyManagerDaemon.h
     #  ${common_include_dir}/SocketConnection.h
@@ -66,15 +67,20 @@ SET(PRIVACY_MANAGER_SERVER_CFLAGS  " ${CFLAGS} -fPIC ")
 #SET(PRIVACY_MANAGER_SERVER_LIBADD " ")
 
 ADD_DEFINITIONS("-DLOG_TAG=\"PRIVACY-MANAGER-SERVER\"")
-ADD_EXECUTABLE(privacy-manager-server ${PRIVACY_MANAGER_SERVER_SOURCES})
+ADD_LIBRARY(privacy-manager-server SHARED ${PRIVACY_MANAGER_SERVER_SOURCES})
 TARGET_LINK_LIBRARIES(privacy-manager-server ${pkgs_LDFLAGS} ${pkgs_LIBRARIES})
 SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES COMPILE_FLAGS "${PRIVACY_MANAGER_SERVER_CFLAGS}")
-#SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES SOVERSION ${API_VERSION})
-#SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES VERSION ${VERSION})
+SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES SOVERSION ${API_VERSION})
+SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES VERSION ${VERSION})
 ###################################################################################################
 
+SET(PC_NAME privacy-manager-server)
+SET(PC_DESCRIPTION "Privacy Manager Server API")
+SET(PC_LDFLAGS -lprivacy-manager-server)
+SET(PC_CFLAGS -I\${includedir}/privacy_manager)
+
 CONFIGURE_FILE(../privacy-manager-server.pc.in privacy-manager-server.pc @ONLY)
 
-INSTALL(TARGETS privacy-manager-server DESTINATION ../bin COMPONENT RuntimeLibraries)
+INSTALL(TARGETS privacy-manager-server DESTINATION ../lib COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ../lib/pkgconfig)
-INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ../include/privacy_manager/server)
+INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ../include/privacy_manager)

diff --git a/server/inc/PrivacyManagerDaemon.h b/server/inc/PrivacyManagerDaemon.h
index 327df52..0659abb 100644 (file)
--- a/server/inc/PrivacyManagerDaemon.h
+++ b/server/inc/PrivacyManagerDaemon.h
@@ -17,9 +17,11 @@
 #ifndef _PRIVACY_MANAGER_DAEMON_H_\r
 #define _PRIVACY_MANAGER_DAEMON_H_\r
 \r
-#include <SocketService.h>\r
+#include <privacy_manager_client_types.h>\r
 \r
-class PrivacyManagerDaemon\r
+class SocketService;\r
+\r
+class EXTERN_API PrivacyManagerDaemon\r
 {\r
 private:\r
        static PrivacyManagerDaemon* pInstance;\r
@@ -32,7 +34,7 @@ private:
 \r
 public:\r
        static PrivacyManagerDaemon* getInstance(void);\r
-       int inialize(void);\r
+       int initialize(void);\r
        int start(void);\r
        int stop(void);\r
        int shutdown(void);\r

diff --git a/server/inc/privacy_manager_daemon.h b/server/inc/privacy_manager_daemon.h
new file mode 100644 (file)
index 0000000..fd52b10
--- /dev/null
+++ b/server/inc/privacy_manager_daemon.h
@@ -0,0 +1,37 @@
+/*\r
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the License);\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an AS IS BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License. \r
+ */\r
+\r
+#ifndef __PRIVACY_MANAGER_DAEMON_H__\r
+#define __PRIVACY_MANAGER_DAEMON_H__\r
+\r
+#include <privacy_manager_client_types.h>\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+\r
+int EXTERN_API privacy_manager_daemon_initialize(void);\r
+int EXTERN_API privacy_manager_daemon_start(void);\r
+int EXTERN_API privacy_manager_daemon_stop(void);\r
+int EXTERN_API privacy_manager_daemon_shutdown(void);\r
+\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+\r
+\r
+#endif //__PRIVACY_MANAGER_DAEMON_H__\r
+\r

diff --git a/server/src/PrivacyManagerDaemon.cpp b/server/src/PrivacyManagerDaemon.cpp
index b448e0a..61c2df4 100644 (file)
--- a/server/src/PrivacyManagerDaemon.cpp
+++ b/server/src/PrivacyManagerDaemon.cpp
@@ -18,6 +18,7 @@
 #include <PrivacyManagerDaemon.h>\r
 #include <PrivacyInfoService.h>\r
 #include <PrivacyManagerServer.h>\r
+#include <SocketService.h>\r
 \r
 PrivacyManagerDaemon* PrivacyManagerDaemon::pInstance = NULL;\r
 \r
@@ -42,7 +43,7 @@ PrivacyManagerDaemon::getInstance(void)
 }\r
 \r
 int\r
-PrivacyManagerDaemon::inialize(void)\r
+PrivacyManagerDaemon::initialize(void)\r
 {\r
        if (pSocketService == NULL)\r
                pSocketService = new SocketService();\r

diff --git a/server/src/privacy_manager_daemon.cpp b/server/src/privacy_manager_daemon.cpp
new file mode 100644 (file)
index 0000000..1cfb874
--- /dev/null
+++ b/server/src/privacy_manager_daemon.cpp
@@ -0,0 +1,46 @@
+/*\r
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the License);\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an AS IS BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License. \r
+ */\r
+\r
+#include <privacy_manager_daemon.h>\r
+#include <PrivacyManagerDaemon.h>\r
+\r
+int privacy_manager_daemon_initialize(void)\r
+{\r
+       PrivacyManagerDaemon* pPrivacyDaemon = PrivacyManagerDaemon::getInstance();\r
+\r
+       return pPrivacyDaemon->initialize();\r
+}\r
+\r
+int privacy_manager_daemon_start(void)\r
+{\r
+       PrivacyManagerDaemon* pInstance = PrivacyManagerDaemon::getInstance();\r
+\r
+       return pInstance->start();\r
+}\r
+\r
+int privacy_manager_daemon_stop(void)\r
+{\r
+       PrivacyManagerDaemon* pInstance = PrivacyManagerDaemon::getInstance();\r
+\r
+       return pInstance->stop();\r
+}\r
+\r
+int privacy_manager_daemon_shutdown(void)\r
+{\r
+       PrivacyManagerDaemon* pInstance = PrivacyManagerDaemon::getInstance();\r
+\r
+       return pInstance->shutdown();\r
+}\r