diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2020-02-12 10:11:34 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-12 10:11:34 (GMT) |
commit | f4f445b69306c68a2ba8ce8eb8c6cb3064db5fe7 (patch) | |
tree | ad5200e0984a2832e67870b7f95165998570f772 /Lib | |
parent | 95905ce0f41fd42eb1ef60ddb83f057401c3d52f (diff) | |
download | cpython-f4f445b69306c68a2ba8ce8eb8c6cb3064db5fe7.zip cpython-f4f445b69306c68a2ba8ce8eb8c6cb3064db5fe7.tar.gz cpython-f4f445b69306c68a2ba8ce8eb8c6cb3064db5fe7.tar.bz2 |
bpo-39567: Add audit for os.walk(), os.fwalk(), Path.glob() and Path.rglob(). (GH-18372)
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/os.py | 10 | ||||
-rw-r--r-- | Lib/pathlib.py | 2 |
2 files changed, 9 insertions, 3 deletions
@@ -336,7 +336,10 @@ def walk(top, topdown=True, onerror=None, followlinks=False): dirs.remove('CVS') # don't visit CVS directories """ - top = fspath(top) + sys.audit("os.walk", top, topdown, onerror, followlinks) + return _walk(fspath(top), topdown, onerror, followlinks) + +def _walk(top, topdown, onerror, followlinks): dirs = [] nondirs = [] walk_dirs = [] @@ -410,11 +413,11 @@ def walk(top, topdown=True, onerror=None, followlinks=False): # the caller can replace the directory entry during the "yield" # above. if followlinks or not islink(new_path): - yield from walk(new_path, topdown, onerror, followlinks) + yield from _walk(new_path, topdown, onerror, followlinks) else: # Recurse into sub-directories for new_path in walk_dirs: - yield from walk(new_path, topdown, onerror, followlinks) + yield from _walk(new_path, topdown, onerror, followlinks) # Yield after recursion if going bottom up yield top, dirs, nondirs @@ -455,6 +458,7 @@ if {open, stat} <= supports_dir_fd and {scandir, stat} <= supports_fd: if 'CVS' in dirs: dirs.remove('CVS') # don't visit CVS directories """ + sys.audit("os.fwalk", top, topdown, onerror, follow_symlinks, dir_fd) if not isinstance(top, int) or not hasattr(top, '__index__'): top = fspath(top) # Note: To guard against symlink races, we use the standard diff --git a/Lib/pathlib.py b/Lib/pathlib.py index a5f3313..cfa574a 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -1134,6 +1134,7 @@ class Path(PurePath): """Iterate over this subtree and yield all existing files (of any kind, including directories) matching the given relative pattern. """ + sys.audit("pathlib.Path.glob", self, pattern) if not pattern: raise ValueError("Unacceptable pattern: {!r}".format(pattern)) drv, root, pattern_parts = self._flavour.parse_parts((pattern,)) @@ -1148,6 +1149,7 @@ class Path(PurePath): directories) matching the given relative pattern, anywhere in this subtree. """ + sys.audit("pathlib.Path.rglob", self, pattern) drv, root, pattern_parts = self._flavour.parse_parts((pattern,)) if drv or root: raise NotImplementedError("Non-relative patterns are unsupported") |