[Python-checkins] bpo-43756: Add new audit event for new arguments added to glob.glob (GH-25239)

Wed Apr 21 18:43:04 EDT 2021

https://github.com/python/cpython/commit/a32f8fe7133aad4f3cf8946534e3b79a5f2659da
commit: a32f8fe7133aad4f3cf8946534e3b79a5f2659da
branch: master
author: Saiyang Gou <gousaiyang at 163.com>
committer: zooba <steve.dower at microsoft.com>
date: 2021年04月21日T23:42:55+01:00
summary:
bpo-43756: Add new audit event for new arguments added to glob.glob (GH-25239)
files:
A Misc/NEWS.d/next/Security/2021-04-06-18-07-48.bpo-43756.DLBNqQ.rst
M Doc/library/glob.rst
M Lib/glob.py

diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
index 3fdba6937c1de..215f60d328c76 100644
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -65,6 +65,7 @@ For example, ``'[?]'`` matches the character ``'?'``.
 match.
 
 .. audit-event:: glob.glob pathname,recursive glob.glob
+ .. audit-event:: glob.glob/2 pathname,recursive,root_dir,dir_fd glob.glob
 
 .. note::
 Using the "``**``" pattern in large directory trees may consume
@@ -83,6 +84,13 @@ For example, ``'[?]'`` matches the character ``'?'``.
 without actually storing them all simultaneously.
 
 .. audit-event:: glob.glob pathname,recursive glob.iglob
+ .. audit-event:: glob.glob/2 pathname,recursive,root_dir,dir_fd glob.iglob
+
+ .. versionchanged:: 3.5
+ Support for recursive globs using "``**``".
+
+ .. versionchanged:: 3.10
+ Added the *root_dir* and *dir_fd* parameters.
 
 
 .. function:: escape(pathname)
@@ -128,4 +136,3 @@ default. For example, consider a directory containing :file:`card.gif` and
 
 Module :mod:`fnmatch`
 Shell-style filename (not path) expansion
-
diff --git a/Lib/glob.py b/Lib/glob.py
index a491363f3f939..a6cff87350826 100644
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -34,6 +34,7 @@ def iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False):
 zero or more directories and subdirectories.
 """
 sys.audit("glob.glob", pathname, recursive)
+ sys.audit("glob.glob/2", pathname, recursive, root_dir, dir_fd)
 if root_dir is not None:
 root_dir = os.fspath(root_dir)
 else:
diff --git a/Misc/NEWS.d/next/Security/2021-04-06-18-07-48.bpo-43756.DLBNqQ.rst b/Misc/NEWS.d/next/Security/2021-04-06-18-07-48.bpo-43756.DLBNqQ.rst
new file mode 100644
index 0000000000000..e05fef2d5524f
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-04-06-18-07-48.bpo-43756.DLBNqQ.rst
@@ -0,0 +1,2 @@
+Add new audit event ``glob.glob/2`` to incorporate the new *root_dir* and
+*dir_fd* arguments added to :func:`glob.glob` and :func:`glob.iglob`.
