perform radical pkexecectomy

Author: barak

ChangeLog

@@ -3,6 +3,9 @@
 # Copyright (c) 2022 Greg Kroah-Hartman <[email protected]>
 #
 
+version 3.0.x
+	- remove now-unnecessary policykit/pkexec support
+
 version 3.0
 	- remove need for debugfs/usbdevfs/usbfs file entirely, rely only on
 	  sysfs now.  This removes the need to run the program as root, which

Makefile.am

@@ -28,19 +28,13 @@ interface.o: $(icon_bitmaps_xpm)
 
 EXTRA_DIST = $(man_MANS) usbview_icon.svg usbview.desktop	\
 	usbview_logo.xcf				\
-	org.freedesktop.pkexec.usbview.policy		\
 	LICENSES/GPL-2.0-only.txt
 
 desktopdir = $(datadir)/applications
 if DESKTOP
 desktop_DATA = usbview.desktop
 endif
 
-polkitactiondir = $(datadir)/polkit-1/actions
-if POLKIT
-polkitaction_DATA = org.freedesktop.pkexec.usbview.policy
-endif
-
 icondir = $(datadir)/icons
 
 icon_bitmaps_png = \

configure.ac

@@ -27,13 +27,6 @@ AC_ARG_ENABLE(desktop,
 	[desktop=yes])
 AC_MSG_RESULT([$desktop])
 
-AC_MSG_CHECKING([whether to try to install policykit file])
-AC_ARG_ENABLE(polkit,
-	[AS_HELP_STRING([--enable-policykit],[try to install policykit file (default=yes)])],
-	[polkit=$enableval],
-	[polkit=yes])
-AC_MSG_RESULT([$polkit])
-
 # Checks for programs.
 
 AC_PROG_CC
@@ -49,7 +42,6 @@ AS_IF([test "$have_convert" = "no"],
        icons=no])
 
 AM_CONDITIONAL(DESKTOP,[test x${desktop} = xyes])
-AM_CONDITIONAL(POLKIT,[test x${polkit} = xyes])
 AM_CONDITIONAL(ICONS,[test x${icons} = xyes])
 
 # Checks for libraries.

main.c

@@ -16,11 +16,8 @@
 int main (int argc, char *argv[])
 {
 	GtkWidget *window1;
-	gboolean is_pkexec = getenv("PKEXEC_UID") != NULL;
 
-	// only evalute command line parameters if not running in pkexec
-	// privilege escalation context to avoid potential attack vectors
-	gtk_init (is_pkexec ? NULL : &argc, is_pkexec ? NULL : &argv);
+	gtk_init (&argc, &argv);
 
 	initialize_stuff();
 

org.freedesktop.pkexec.usbview.policy

@@ -2,7 +2,7 @@
 Name=USBView
 GenericName=USB Device Viewer
 Comment=View USB devices attached to system
-Exec=pkexec /usr/bin/usbview
+Exec=usbview
 Icon=usbview
 Terminal=false
 Type=Application

usbview.desktop

@@ -147,12 +147,6 @@ LicenseConcluded: NOASSERTION
 LicenseInfoInFile: GPL-2.0-only
 FileCopyrightText: <text>Copyright (c) 1999, 2000 by Greg Kroah-Hartman, <[email protected]></text>
 
-FileName: ./org.freedesktop.pkexec.usbview.policy
-SPDXID: SPDXRef-e1edd9361c0b2f7f3a558b68a2678aa1
-FileChecksum: SHA1: 0b4c127e5936771ffe64804894c307167d2cd258
-LicenseConcluded: NOASSERTION
-FileCopyrightText: NONE
-
 FileName: ./sysfs.c
 SPDXID: SPDXRef-63056d996de2c47eaf5023eb00f93cce
 FileChecksum: SHA1: a2233ef39597b84d31656e763859e31eb2f11a0b