Merge lp:~brian-murray/apport/system-slice into lp:~ubuntu-core-dev/ubuntu/hirsute/apport/ubuntu

[Brian Murray]

[lp:~brian-murray/apport/system-slice]

2830. By Brian Murray on 2020-11-03

remove extra comment

2831. By Brian Murray on 2020-11-04

switch from using grep to opening the cgroup file

[Brian Murray (brian-murray)]

review: Approve

=== modified file 'data/apport'
--- data/apport	2020-10-12 20:44:02 +0000
+++ data/apport	2020-11-04 18:59:12 +0000
@@ -355,6 +355,18 @@
         else:
             raise
 
+    # check to see if the process is part of the system.slice (LP: #1870060)
+    if os.path.exists('/proc/%s/cgroup' % pid):
+
+        global proc_pid_fd
+        proc_pid_fd = os.open('/proc/%s' % pid, os.O_RDONLY | os.O_PATH | os.O_DIRECTORY)
+
+        with open('cgroup', opener=proc_pid_opener) as cgroup:
+            for line in cgroup:
+                fields = line.split(':')
+                if fields[-1].startswith('/system.slice'):
+                    return True
+
     return False
 
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2020-10-12 21:43:36 +0000
+++ debian/changelog	2020-11-04 18:59:12 +0000
@@ -1,3 +1,11 @@
+apport (2.20.11-0ubuntu51) UNRELEASED; urgency=medium
+
+  * data/apport: Modify the check for whether or not a process is running in
+    the same namespace so that crashes from processes running protected in the
+    system.slice are considered as being from the same namespace. (LP: #1870060)
+
+ -- Brian Murray <[e-mail]>  Tue, 03 Nov 2020 09:01:34 -0800
+
 apport (2.20.11-0ubuntu50) groovy; urgency=medium
 
   * etc/apport/crashdb.conf: Disable Launchpad crash reports for 20.10
 
=== modified file 'test/test_signal_crashes.py'
--- test/test_signal_crashes.py	2020-06-24 16:15:42 +0000
+++ test/test_signal_crashes.py	2020-11-04 18:59:12 +0000
@@ -626,6 +626,34 @@
             self.do_crash(False, command=myexe, expect_corefile=False, uid=8)
             self.assertEqual(apport.fileutils.get_all_reports(), [])
 
+    @unittest.skipIf(os.geteuid() != 0, 'this test needs to be run as root')
+    def test_crash_system_slice(self):
+        '''report generation for a protected process running in the system slice'''
+
+        self.create_test_process(command='/usr/bin/systemd-run',
+                                 args=['-t', '-q', '--slice=system.slice',
+                                       '-p', 'ProtectSystem=true',
+                                       '/usr/bin/yes'])
+        yes_pid = int(subprocess.check_output(['pidof',
+                                               '/usr/bin/yes']).strip())
+        os.kill(yes_pid, signal.SIGSEGV)
+
+        # wait max 10 seconds for apport to finish
+        timeout = 50
+        while timeout >= 0:
+            pidof = subprocess.Popen(['pidof', '-x', 'apport'],
+                                     stdout=subprocess.PIPE)
+            pidof.communicate()
+            if pidof.returncode != 0:
+                break
+            time.sleep(0.2)
+            timeout -= 1
+
+        # check crash report
+        reports = apport.fileutils.get_all_reports()
+        self.assertEqual(len(reports), 1)
+        self.assertEqual(reports[0], '/var/crash/_usr_bin_yes.0.crash')
+
     @unittest.skipUnless(os.path.exists('/bin/ping'), 'this test needs /bin/ping')
     @unittest.skipIf(os.geteuid() != 0, 'this test needs to be run as root')
     def test_crash_setuid_drop(self):