GH-107774: Add missing audit event for PEP 669 (GH-107775)

markshannon · web-flow · commit 494e3d443677 · 2023-08-10T12:29:06.000+01:00
diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py
@@ -514,6 +514,17 @@ def test_not_in_gc():
             assert hook not in o
 
 
+def test_sys_monitoring_register_callback():
+    import sys
+
+    def hook(event, args):
+        if event.startswith("sys.monitoring"):
+            print(event, args)
+
+    sys.addaudithook(hook)
+    sys.monitoring.register_callback(1, 1, None)
+
+
 if __name__ == "__main__":
     from test.support import suppress_msvcrt_asserts
 
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
@@ -257,5 +257,18 @@ def test_not_in_gc(self):
             self.fail(stderr)
 
 
+    def test_sys_monitoring_register_callback(self):
+        returncode, events, stderr = self.run_python("test_sys_monitoring_register_callback")
+        if returncode:
+            self.fail(stderr)
+
+        if support.verbose:
+            print(*events, sep='\n')
+        actual = [(ev[0], ev[2]) for ev in events]
+        expected = [("sys.monitoring.register_callback", "(None,)")]
+
+        self.assertEqual(actual, expected)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Security/2023-08-05-03-51-05.gh-issue-107774.VPjaTR.rst b/Misc/NEWS.d/next/Security/2023-08-05-03-51-05.gh-issue-107774.VPjaTR.rst
@@ -0,0 +1,3 @@
+PEP 669 specifies that ``sys.monitoring.register_callback`` will generate an
+audit event. Pre-releases of Python 3.12 did not generate the audit event.
+This is now fixed.
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -1851,6 +1851,9 @@ monitoring_register_callback_impl(PyObject *module, int tool_id, int event,
         PyErr_Format(PyExc_ValueError, "invalid event %d", event);
         return NULL;
     }
+    if (PySys_Audit("sys.monitoring.register_callback", "O", func) < 0) {
+        return NULL;
+    }
     if (func == Py_None) {
         func = NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+PEP 669 specifies that ``sys.monitoring.register_callback`` will generate an
	`2`	`+audit event. Pre-releases of Python 3.12 did not generate the audit event.`
	`3`	`+This is now fixed.`
Original file line number	Diff line number	Diff line change
`@@ -1851,6 +1851,9 @@ monitoring_register_callback_impl(PyObject *module, int tool_id, int event,`
`1851`	`1851`	`PyErr_Format(PyExc_ValueError, "invalid event %d", event);`
`1852`	`1852`	`return NULL;`
`1853`	`1853`	`}`
	`1854`	`+ if (PySys_Audit("sys.monitoring.register_callback", "O", func) < 0) {`
	`1855`	`+ return NULL;`
	`1856`	`+ }`
`1854`	`1857`	`if (func == Py_None) {`
`1855`	`1858`	`func = NULL;`
`1856`	`1859`	`}`