Skip to content

RequireFilesExist should accept a file reached through .. (#977) - #1011

Open
AzazelSensei wants to merge 1 commit into
apache:masterfrom
AzazelSensei:fix/require-files-exist-dot-dot
Open

RequireFilesExist should accept a file reached through .. (#977)#1011
AzazelSensei wants to merge 1 commit into
apache:masterfrom
AzazelSensei:fix/require-files-exist-dot-dot

Conversation

@AzazelSensei

Copy link
Copy Markdown

Following this checklist to help us incorporate your
contribution quickly and easily:

  • Your pull request should address just one issue, without pulling in other changes.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Each commit in the pull request should have a meaningful subject line and body.
    Note that commits might be squashed by a maintainer on merge.
  • Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied.
    This may not always be possible but is a best-practice.
  • Run mvn verify to make sure basic checks pass.
    A more thorough check will be performed on your pull request automatically.
  • You have run the integration tests successfully (mvn -Prun-its verify).

If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.

To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

RequireFilesExist compared the configured path's URI to getCanonicalFile(). A path with .. never matches, so a file that exists is reported missing. I hit this on macOS with ${project.basedir}/../../../README.adoc.

I collapse .. first and then compare the file names. That keeps the Windows case check and also survives /var vs /private/var on macOS temp dirs.

TestRequireFilesExist.testFileExistsThroughDotDot fails on the old URI compare.

Fixes #977

The rule compared the configured path's URI to getCanonicalFile().
A path that still contains .. never matches, so a file that exists
is reported missing. I collapse those segments first and compare
the file names, which is what the Windows case check needs anyway.

Fixes apache#977
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RequireFilesExist falsely reports existing files as missing when path contains .. segments (macOS)

1 participant