Merge pull request #156 from sricharanreddycheruku/batch7-no-follow-symlink-loops

Avoid following symlink targets when link traversal is disabled

Author: cpburnz

CHANGES.rst

@@ -34,6 +34,7 @@ Bug fixes:
 - `Issue #146`_: pattern_to_regex raises on three lines git accepts (bare '!', '! ', lone '\').
 - `Pull #147`_: Match directory entries with directory-only patterns. `PathSpec.match_entries()` and `.match_tree_entries()` will now match directory entries as directory paths (i.e., with a trailing `/`), instead of as file paths (no trailing `/`).
 - `Pull #149`_: Handle directory-open errors through on_error during tree walks.
+- `Pull #156`_: Avoid following symbolic link targets when checking file types in ``iter_tree_files(follow_links=False)``.
 
 
 .. _`Issue #116`: https://github.com/cpburnz/python-pathspec/issues/116
@@ -54,6 +55,7 @@ Bug fixes:
 .. _`Pull #147`: https://github.com/cpburnz/python-pathspec/pull/147
 .. _`Pull #149`: https://github.com/cpburnz/python-pathspec/pull/149
 .. _`Pull #150`: https://github.com/cpburnz/python-pathspec/pull/150
+.. _`Pull #150`: https://github.com/cpburnz/python-pathspec/pull/156
 
 
 1.1.1 (2026-04-26)

CHANGES_1.in.rst

@@ -31,6 +31,7 @@ Bug fixes:
 - `Issue #146`_: pattern_to_regex raises on three lines git accepts (bare '!', '! ', lone '\').
 - `Pull #147`_: Match directory entries with directory-only patterns. `PathSpec.match_entries()` and `.match_tree_entries()` will now match directory entries as directory paths (i.e., with a trailing `/`), instead of as file paths (no trailing `/`).
 - `Pull #149`_: Handle directory-open errors through on_error during tree walks.
+- `Pull #156`_: Avoid following symbolic link targets when checking file types in ``iter_tree_files(follow_links=False)``.
 
 
 .. _`Issue #116`: https://github.com/cpburnz/python-pathspec/issues/116
@@ -51,6 +52,7 @@ Bug fixes:
 .. _`Pull #147`: https://github.com/cpburnz/python-pathspec/pull/147
 .. _`Pull #149`: https://github.com/cpburnz/python-pathspec/pull/149
 .. _`Pull #150`: https://github.com/cpburnz/python-pathspec/pull/150
+.. _`Pull #150`: https://github.com/cpburnz/python-pathspec/pull/156
 
 
 1.1.1 (2026-04-26)

README-dist.rst

@@ -236,6 +236,8 @@ Major changes:
 
 Bug fixes:
 
+- Avoid following symbolic link targets when checking file types in ``iter_tree_files(follow_links=False)``.
+
 - `Pull #123`_: Ignore invalid gitignore bracket ranges for `GitIgnoreSpec`.
 
 

pathspec/util.py

@@ -476,7 +476,7 @@ def _iter_tree_files_next(
 				# files.
 				yield from _iter_tree_files_next(root_full, node_rel, memo, on_error, follow_links)
 
-			elif node_ent.is_file():
+			elif node_ent.is_file(follow_symlinks=follow_links):
 				# Child node is a file, yield it.
 				yield node_rel
 

tests/test_01_util.py

@@ -624,6 +624,31 @@ def test_02_link_8_no_follow_links_2_files(self):
 			'DirX',
 		])))
 
+	def test_02_link_9_no_follow_loop_links_2_files(self):
+		"""
+		Unfollowed links with cyclic targets are yielded without inspecting targets.
+		"""
+		self.require_symlink()
+		for case, links in [
+			('Self', [('Loop', 'Loop')]),
+			('Pair', [('First', 'Second'), ('Second', 'First')]),
+		]:
+			with self.subTest(case=case):
+				self.make_dirs([case, f'{case}/Dir'])
+				self.make_files([f'{case}/kept.txt', f'{case}/Dir/child.txt'])
+				self.make_links([
+					(f'{case}/{link}', f'{case}/{target}')
+					for link, target in links
+				])
+				errors = []
+				results = set(iter_tree_files(
+					self.temp_dir / case, follow_links=False, on_error=errors.append,
+				))
+				self.assertEqual(results, {
+					'kept.txt', ospath('Dir/child.txt'), *[link for link, _ in links],
+				})
+				self.assertEqual(errors, [])
+
 	def test_03_subdir_1_from_filesystem_root(self):
 		"""
 		raverse only the requested subtree when the root ends in a separator.