From 693d5e1279ee27cc8a758ad5f627086279a21b36 Mon Sep 17 00:00:00 2001
From: hyunuktak <hyunuk.tak@samsung.com>
Date: Wed, 9 Sep 2015 16:07:49 +0900
Subject: [PATCH] Apply cynara security checks on DBUS method

Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
Change-Id: I050918085c1580124eb5699b5d91a7641bc7df24
---
 CMakeLists.txt                                |  4 +-
 packaging/net-config.spec                     |  2 +-
 resources/etc/dbus-1/system.d/net-config.conf | 44 ++++++++++++++++---
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b52a8f..92e9cd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,9 +74,7 @@ IF(TIZEN_WEARABLE)
 	SET(WEARABLE_REQUIRED_PKGS "weconn")
 ENDIF(TIZEN_WEARABLE)
 
-IF(TIZEN_TELEPHONY_ENABLE)
-	ADD_DEFINITIONS(-TIZEN_TELEPHONY_ENABLE)
-ENDIF(TIZEN_TELEPHONY_ENABLE)
+ADD_DEFINITIONS(-DTIZEN_TELEPHONY_ENABLE)
 
 IF(TIZEN_DEBUG_DISABLE)
 	ADD_DEFINITIONS(-DTIZEN_DEBUG_DISABLE)
diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 8ae9230..5b2fe0b 100755
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,6 +1,6 @@
 Name:		net-config
 Summary:	TIZEN Network Configuration service
-Version:	1.1.35
+Version:	1.1.36
 Release:	2
 Group:		System/Network
 License:	Apache-2.0
diff --git a/resources/etc/dbus-1/system.d/net-config.conf b/resources/etc/dbus-1/system.d/net-config.conf
index 67d2760..6a6182c 100644
--- a/resources/etc/dbus-1/system.d/net-config.conf
+++ b/resources/etc/dbus-1/system.d/net-config.conf
@@ -6,10 +6,44 @@
 		<allow send_destination="net.netconfig"/>
 	</policy>
 	<policy context="default">
-		<check send_destination="net.netconfig" privilege="http://tizen.org/privilege/network.set" />
-		<check send_destination="net.netconfig" send_interface="net.netconfig.network_statistics" send_member="GetWifiTotalTxBytes" privilege="http://tizen.org/privilege/network.get" />
-		<check send_destination="net.netconfig" send_interface="net.netconfig.network_statistics" send_member="GetWifiTotalRxBytes" privilege="http://tizen.org/privilege/network.get" />
-		<check send_destination="net.netconfig" send_interface="net.netconfig.network_statistics" send_member="GetWifiLastTxBytes" privilege="http://tizen.org/privilege/network.get" />
-		<check send_destination="net.netconfig" send_interface="net.netconfig.network_statistics" send_member="GetWifiLastRxBytes" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network" send_member="AddRoute" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network" send_member="RemoveRoute" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network" send_member="CheckGetPrivilege" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network" send_member="CheckProfilePrivilege" privilege="http://tizen.org/privilege/network.profile" />
+
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="GetWifiLastRxBytes" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="GetWifiLastTxBytes" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="GetWifiTotalRxBytes" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="GetWifiTotalTxBytes" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="ResetCellularLastRxBytes" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="ResetCellularLastTxBytes" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="ResetCellularTotalRxBytes" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="ResetCellularTotalTxBytes" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="ResetWifiLastRxBytes" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="ResetWifiLastTxBytes" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="ResetWifiTotalRxBytes" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.network_statistics" send_member="ResetWifiTotalTxBytes" privilege="http://tizen.org/privilege/network.set" />
+
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="DeleteEapConfig" privilege="http://tizen.org/privilege/network.profile" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="RequestSpecificScan" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="RequestWpsScan" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="CreateEapConfig" privilege="http://tizen.org/privilege/network.profile" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="LoadDriver" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="RemoveDriver" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="SetBgscan" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="ResumeBgscan" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="PauseBgscan" privilege="http://tizen.org/privilege/network.set" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="LaunchDirect" privilege="http://tizen.org/privilege/network.wifidirect" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="SaveConfiguration" privilege="http://tizen.org/privilege/network.profile" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="RemoveConfiguration" privilege="http://tizen.org/privilege/network.profile" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="LoadConfiguration" privilege="http://tizen.org/privilege/network.profile" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="GetConfigIds" privilege="http://tizen.org/privilege/network.profile" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="SetConfigField" privilege="http://tizen.org/privilege/network.profile" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="PowerOnCompleted" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="PowerOffCompleted" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="SpecificScanCompleted" privilege="http://tizen.org/privilege/network.get" />
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.wifi" send_member="WpsScanCompleted" privilege="http://tizen.org/privilege/network.get" />
+
+		<check send_destination="net.netconfig" send_path="/net/netconfig/*" send_interface="net.netconfig.Agent" send_member="SetField" privilege="http://tizen.org/privilege/network.profile" />
 	</policy>
 </busconfig>
-- 
2.34.1