[Python-checkins] GH-107774: Add missing audit event for PEP 669 (GH-107775)

[markshannon]

https://github.com/python/cpython/commit/494e3d4436774a5ac1a569a635b8c5c881ef1c0c
commit: 494e3d4436774a5ac1a569a635b8c5c881ef1c0c
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2023-08-10T12:29:06+01:00
summary:

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

files:
A Misc/NEWS.d/next/Security/2023-08-05-03-51-05.gh-issue-107774.VPjaTR.rst
M Lib/test/audit-tests.py
M Lib/test/test_audit.py
M Python/instrumentation.c

diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py
index 0edc9d9c47276..9504829e96f00 100644
--- 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
index 0b69864751d83..b12ffa5d872e8 100644
--- 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
new file mode 100644
index 0000000000000..b89b50c79f7e2
--- /dev/null
+++ 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
index 65ea7902a80a6..64684ad522f68 100644
--- 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;
     }