From ffa99d3783641b72a9ed96b187a38c59d3f67472 Mon Sep 17 00:00:00 2001
From: Kevin Yue <yuezk001@gmail.com>
Date: Mon, 23 May 2022 22:20:06 +0800
Subject: [PATCH] Revert "fix: improve the dbus security"

This reverts commit 829298bb84ee16fa570645d4c66cd776b18c6e28.
---
 GPService/CMakeLists.txt                      |  8 +-------
 GPService/dbus/com.yuezk.qt.GPService.conf    | 18 +++++++++++++++++
 GPService/dbus/com.yuezk.qt.GPService.conf.in | 20 -------------------
 debian/rules                                  |  2 --
 packaging/aur/gp.install                      |  5 +----
 packaging/obs/globalprotect-openconnect.spec  |  2 --
 6 files changed, 20 insertions(+), 35 deletions(-)
 create mode 100644 GPService/dbus/com.yuezk.qt.GPService.conf
 delete mode 100644 GPService/dbus/com.yuezk.qt.GPService.conf.in

diff --git a/GPService/CMakeLists.txt b/GPService/CMakeLists.txt
index 7f20655..98e6b9b 100644
--- a/GPService/CMakeLists.txt
+++ b/GPService/CMakeLists.txt
@@ -4,12 +4,6 @@ project(GPService)
 
 set(gpservice_GENERATED_SOURCES)
 
-execute_process(COMMAND logname OUTPUT_VARIABLE CMAKE_LOGNAME)
-string(STRIP "${CMAKE_LOGNAME}" CMAKE_LOGNAME)
-
-message(STATUS "CMAKE_LOGNAME: ${CMAKE_LOGNAME}")
-
-configure_file(dbus/com.yuezk.qt.GPService.conf.in dbus/com.yuezk.qt.GPService.conf)
 configure_file(dbus/com.yuezk.qt.GPService.service.in dbus/com.yuezk.qt.GPService.service)
 configure_file(systemd/gpservice.service.in systemd/gpservice.service)
 
@@ -71,7 +65,7 @@ target_link_libraries(gpservice
 target_compile_definitions(gpservice PUBLIC QAPPLICATION_CLASS=QCoreApplication)
 
 install(TARGETS gpservice DESTINATION bin)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dbus/com.yuezk.qt.GPService.conf" DESTINATION share/dbus-1/system.d )
+install(FILES "dbus/com.yuezk.qt.GPService.conf" DESTINATION share/dbus-1/system.d )
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dbus/com.yuezk.qt.GPService.service" DESTINATION share/dbus-1/system-services)
 install(FILES "gp.conf" DESTINATION /etc/gpservice)
 
diff --git a/GPService/dbus/com.yuezk.qt.GPService.conf b/GPService/dbus/com.yuezk.qt.GPService.conf
new file mode 100644
index 0000000..41069f1
--- /dev/null
+++ b/GPService/dbus/com.yuezk.qt.GPService.conf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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="root">
+                <allow own="com.yuezk.qt.GPService"/>
+        </policy>
+
+        <policy context="default">
+                <allow send_destination="com.yuezk.qt.GPService"
+                        send_interface="com.yuezk.qt.GPService"
+                        />
+                <allow send_destination="com.yuezk.qt.GPService"
+                        send_interface="org.freedesktop.DBus.Introspectable"
+                        />
+        </policy>
+</busconfig>
diff --git a/GPService/dbus/com.yuezk.qt.GPService.conf.in b/GPService/dbus/com.yuezk.qt.GPService.conf.in
deleted file mode 100644
index 7e4d36c..0000000
--- a/GPService/dbus/com.yuezk.qt.GPService.conf.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE busconfig PUBLIC
-"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-	<policy context="default">
-		<deny own="com.yuezk.qt.GPService"/>
-		<deny send_destination="com.yuezk.qt.GPService" />
-	</policy>
-	<policy user="root">
-		<allow own="com.yuezk.qt.GPService"/>
-		<allow send_destination="com.yuezk.qt.GPService" />
-	</policy>
-
-	<!--LOGNAME-->
-	<policy user="@CMAKE_LOGNAME@">
-		<allow own="com.yuezk.qt.GPService"/>
-		<allow send_destination="com.yuezk.qt.GPService" />
-	</policy>
-</busconfig>
diff --git a/debian/rules b/debian/rules
index 5e1130b..6637bfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,4 @@ export DEBIAN_PACKAGE=1
 %:
 	dh $@
 override_dh_installsystemd:
-	# Update the the dbus user to logname
-	sed -i "/LOGNAME/N;s/user=\".*\"/user=\"$(logname)\"/" /usr/share/dbus-1/system.d/com.yuezk.qt.GPService.conf
 	dh_installsystemd gpservice.service
diff --git a/packaging/aur/gp.install b/packaging/aur/gp.install
index 7ae9062..e2cabbc 100755
--- a/packaging/aur/gp.install
+++ b/packaging/aur/gp.install
@@ -1,11 +1,8 @@
 post_install() {
-    # Update the the dbus user to logname
-    sed -i "/LOGNAME/N;s/user=\".*\"/user=\"$(logname)\"/" /usr/share/dbus-1/system.d/com.yuezk.qt.GPService.conf
-
     systemctl enable gpservice.service
     systemctl restart gpservice.service
 }
 
 post_upgrade() {
     post_install
-}
+}
\ No newline at end of file
diff --git a/packaging/obs/globalprotect-openconnect.spec b/packaging/obs/globalprotect-openconnect.spec
index 2bd5047..51936f4 100644
--- a/packaging/obs/globalprotect-openconnect.spec
+++ b/packaging/obs/globalprotect-openconnect.spec
@@ -33,8 +33,6 @@ A GlobalProtect VPN client (GUI) for Linux based on OpenConnect and built with Q
 
 %post
 
-sed -i "/LOGNAME/N;s/user=\".*\"/user=\"$(logname)\"/" /usr/share/dbus-1/system.d/com.yuezk.qt.GPService.conf
-
 %if 0%{?suse_version}
     %service_add_post gpservice.service
 %else