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

3.8.x: security: fix `include` bypass of `EntryFilter#filter` symlink check #7228

Merged
merged 2 commits into from Sep 18, 2018

Conversation

Projects
None yet
5 participants
@parkr
Member

parkr commented Sep 7, 2018

Backports #7226 for 3.8.x series of releases.

@parkr parkr requested a review from jekyll/core Sep 7, 2018

@DirtyF

DirtyF approved these changes Sep 7, 2018

@ashmaroli

This comment has been minimized.

Member

ashmaroli commented Sep 7, 2018

Why is the base branch for this master instead of 3.8-stable..?

@parkr parkr changed the base branch from master to 3.8-stable Sep 7, 2018

@oe

oe approved these changes Sep 7, 2018

@DirtyF

This comment has been minimized.

Member

DirtyF commented Sep 18, 2018

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit d9a2758 into 3.8-stable Sep 18, 2018

3 of 4 checks passed

codeclimate 1 issue to fix
Details
WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jekyllbot jekyllbot added bug fix labels Sep 18, 2018

@jekyllbot jekyllbot deleted the 3.8-stable-backport-7226 branch Sep 18, 2018

@ashmaroli ashmaroli added this to the v3.8.4 milestone Sep 18, 2018

holylance added a commit to holylance/jekyll that referenced this pull request Sep 19, 2018

Merge pull request #51 from holylance/rebase_jekyll
Update history to reflect merge of jekyll#7228 [ci skip]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment