New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collections with dots #2552

Merged
merged 3 commits into from Jun 28, 2014

Conversation

Projects
None yet
3 participants
@parkr
Member

parkr commented Jun 28, 2014

Fixes #2548.

  • Don't try to read in directories as documents
  • Allow collection labels to have dots
@@ -17,15 +17,15 @@ def fixture_site(overrides = {})
end
should "sanitize the label name" do
assert_equal @collection.label, "etcpassword"
assert_equal @collection.label, "....etcpassword"

This comment has been minimized.

@parkr

parkr Jun 28, 2014

Member

@gregose If a collection label allows "." but not "/", is it still safe?

This comment has been minimized.

@gregose

gregose Jun 30, 2014

Should be fine. Where ever this is used, the full canonicalized path should still be checked before file access.

@parkr parkr merged commit 7eb5e07 into master Jun 28, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

@parkr parkr deleted the collections-with-dots branch Jun 28, 2014

parkr added a commit that referenced this pull request Jun 28, 2014

@parkr parkr added this to the 2.1 milestone Jun 28, 2014

@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.