Fix for recursive symlink issue #4669

notebook/services/contents/filemanager.py

@@ -334,12 +334,18 @@ def _dir_model(self, path, content=True):
                     self.log.debug("%s not a regular file", os_path)
                     continue
 
-                if self.should_list(name):
-                    if self.allow_hidden or not is_file_hidden(os_path, stat_res=st):
-                        contents.append(
-                                self.get(path='%s/%s' % (path, name), content=False)
-                        )
-
+                try:
+                    if self.should_list(name):
+                        if self.allow_hidden or not is_file_hidden(os_path, stat_res=st):
+                            contents.append(
+                                    self.get(path='%s/%s' % (path, name), content=False)
+                            )
+                except OSError as e:
+                    # Ignore recursive links and move on
+                    if e.errno==62 or e.errno==40:
+                        continue
+                    else:
+                        raise e
             model['format'] = 'json'
 
         return model

notebook/services/contents/tests/test_manager.py

@@ -129,6 +129,26 @@ def test_bad_symlink(self):
             # broken symlinks should still be shown in the contents manager
             self.assertTrue('bad symlink' in contents)
 
+    @dec.skipif(sys.platform == 'win32' and sys.version_info[0] < 3)
+    def test_recursive_symlink(self):
+        with TemporaryDirectory() as td:
+            cm = FileContentsManager(root_dir=td)
+            path = 'test recursive symlink'
+            _make_dir(cm, path)
+            os_path = cm._get_os_path(path)
+            os.symlink("recursive", os.path.join(os_path, "recursive"))
+            file_model = cm.new_untitled(path=path, ext='.txt')
+
+            model = cm.get(path)
+
+            contents = {
+                content['name']: content for content in model['content']
+            }
+            self.assertTrue('untitled.txt' in contents)
+            self.assertEqual(contents['untitled.txt'], file_model)
+            # recusrive symlinks should not be shown in the contents manager
+            self.assertFalse('recusrive' in contents)
+
     @dec.skipif(sys.platform == 'win32' and sys.version_info[0] < 3)
     def test_good_symlink(self):
         with TemporaryDirectory() as td: