From 66bb8fc463fdb22c50537b56728cabf1cc5d39cd Mon Sep 17 00:00:00 2001
From: Jiung Yu <jiung.yu@samsung.com>
Date: Mon, 26 Jun 2017 12:59:50 +0900
Subject: [PATCH] Migrate root daemon to non root

Change-Id: Ic743918cb550846114f108717e8df1f1f29de10f
Signed-off-by: Yu jiung <jiung.yu@samsung.com>
---
 packaging/asp-manager.spec      | 8 ++++----
 packaging/dbus-asp-manager.conf | 4 ++++
 packaging/net.asp.service       | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packaging/asp-manager.spec b/packaging/asp-manager.spec
index 0bd2b17..731e887 100755
--- a/packaging/asp-manager.spec
+++ b/packaging/asp-manager.spec
@@ -1,6 +1,6 @@
 Name:       asp-manager
 Summary:    ASP(application service platform) manager
-Version:    0.0.16
+Version:    0.0.17
 Release:    2
 Group:      Network & Connectivity/Other
 License:    Apache-2.0
@@ -59,9 +59,9 @@ cp asp-manager.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/asp-manager.conf
 %files
 %manifest %{name}.manifest
 %license LICENSE
-%defattr(-,root,root,-)
-%attr(500,root,root) %{_bindir}/*
+%defattr(-,network_fw,network_fw,-)
+%attr(500,network_fw,network_fw) %{_bindir}/*
 
 #DBus DAC
-%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
+%attr(644,network_fw,network_fw) %{_sysconfdir}/dbus-1/system.d/*
 %attr(644,-,-) %{_datadir}/dbus-1/system-services/*.service
diff --git a/packaging/dbus-asp-manager.conf b/packaging/dbus-asp-manager.conf
index 2e120c7..ad90008 100755
--- a/packaging/dbus-asp-manager.conf
+++ b/packaging/dbus-asp-manager.conf
@@ -1,6 +1,10 @@
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
+        <policy user="network_fw">
+                <allow own="net.asp"/>
+                <allow send_destination="net.asp"/>
+                <allow send_interface="net.asp"/>
         <policy user="root">
                 <allow own="net.asp"/>
                 <allow send_destination="net.asp"/>
diff --git a/packaging/net.asp.service b/packaging/net.asp.service
index 338bb16..4e85c69 100755
--- a/packaging/net.asp.service
+++ b/packaging/net.asp.service
@@ -1,4 +1,5 @@
 [D-BUS Service]
 Name=net.asp
 Exec=/usr/bin/asp-manager
-User=root
+User=network_fw
+Group=network_fw
-- 
2.7.4