3.7.x: EntryFilter#filter symlink fix

lib/jekyll/entry_filter.rb

@@ -31,9 +31,9 @@ def relative_to_source(entry)
 
     def filter(entries)
       entries.reject do |e|
-        unless included?(e)
-          special?(e) || backup?(e) || excluded?(e) || symlink?(e)
-        end
+        next true if symlink?(e)
+        next false if included?(e)
+        special?(e) || backup?(e) || excluded?(e)
       end
     end
 

test/source/symlink-test/symlinked-file-outside-source

@@ -0,0 +1 @@
+/etc/passwd

test/test_entry_filter.rb

@@ -105,6 +105,17 @@ class TestEntryFilter < JekyllUnitTest
       refute_equal [], site.pages
       refute_equal [], site.static_files
     end
+
+    should "include only safe symlinks in safe mode even when included" do
+      # no support for symlinks on Windows
+      skip_if_windows "Jekyll does not currently support symlinks on Windows."
+
+      site = Site.new(site_configuration("safe" => true, "include" => ["symlinked-file-outside-source"]))
+      site.reader.read_directories("symlink-test")
+
+      assert_equal %w(main.scss symlinked-file).length, site.pages.length
+      refute_includes site.static_files.map(&:name), "symlinked-file-outside-source"
+    end
   end
 
   context "#glob_include?" do

test/test_layout_reader.rb

@@ -31,5 +31,46 @@ class TestLayoutReader < JekyllUnitTest
         assert_equal LayoutReader.new(@site).layout_directory, source_dir("blah/_layouts")
       end
     end
+
+    context "when a layout is a symlink" do
+      setup do
+        FileUtils.ln_sf("/etc/passwd", source_dir("_layouts", "symlink.html"))
+        @site.config = @site.config.merge({
+          "safe"    => true,
+          "include" => ["symlink.html"],
+        })
+      end
+
+      teardown do
+        FileUtils.rm(source_dir("_layouts", "symlink.html"))
+      end
+
+      should "only read the layouts which are in the site" do
+        layouts = LayoutReader.new(@site).read
+
+        refute layouts.keys.include?("symlink"), "Should not read the symlinked layout"
+      end
+    end
+
+    context "with a theme" do
+      setup do
+        FileUtils.ln_sf("/etc/passwd", theme_dir("_layouts", "theme-symlink.html"))
+        @site.config = @site.config.merge({
+          "include" => ["theme-symlink.html"],
+          "theme"   => "test-theme",
+          "safe"    => true,
+        })
+      end
+
+      teardown do
+        FileUtils.rm(theme_dir("_layouts", "theme-symlink.html"))
+      end
+
+      should "not read a symlink'd theme" do
+        layouts = LayoutReader.new(@site).read
+
+        refute layouts.keys.include?("theme-symlink"), "Should not read symlinked layout from theme"
+      end
+    end
   end
 end