Skip to content

CleanPath: Allow slashes in path pattern for Windows to be able to handle partly normalized paths #40

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.

Sign up for GitHub

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

Merged
nibra merged 13 commits into from
Jan 30, 2021
Merged

CleanPath: Allow slashes in path pattern for Windows to be able to handle partly normalized paths #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6560833
Update InputFilterTest.php
zero-24 Jan 29, 2021
8b39d7a
Update Tests/InputFilterTest.php
zero-24 Jan 29, 2021
335d27f
Allow slashes in paths
richard67 Jan 29, 2021
16cead7
Merge remote-tracking branch 'zero-24/patch-1' into patch-1
richard67 Jan 29, 2021
9f9aab9
Fix for last folder level, too
richard67 Jan 29, 2021
58b3e44
Cover test for 2 times slash
richard67 Jan 29, 2021
872338c
Fix the test result
richard67 Jan 29, 2021
d1bb92b
Stabilise windows pattern
nibra Jan 29, 2021
979ae47
Fix regex and unit tests
richard67 Jan 30, 2021
317daf5
Fix Linux pattern to not match to relative Windows paths
richard67 Jan 30, 2021
39d8a28
Fix Windows and Linux pattern
richard67 Jan 30, 2021
005e65a
Revert Linux pattern changes and fix Windows pattern
richard67 Jan 30, 2021
bec7e91
Add more test cases for Windows paths
richard67 Jan 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions Tests/InputFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,36 @@ public function casesGeneric()
'C:\Documents\Newsletters\Summer2018.pdf',
'From generic cases'
),
'windows path with 2 times double separator' => array(
'path',
'C:\Documents\\Newsletters\\Summer2018.pdf',
'C:\Documents\Newsletters\Summer2018.pdf',
'From generic cases'
),
'windows path with 3 times double separator' => array(
'path',
'C:\\Documents\\Newsletters\\Summer2018.pdf',
'C:\Documents\Newsletters\Summer2018.pdf',
'From generic cases'
),
'windows path with /' => array(
'path',
'C:\\Documents\\Newsletters/tmp',
'C:\Documents\Newsletters\tmp',
'From generic cases'
),
'windows path with 2 times /' => array(
'path',
'C:\\Documents/Newsletters/tmp',
'C:\Documents\Newsletters\tmp',
'From generic cases'
),
'windows path with 3 times /' => array(
'path',
'C:/Documents/Newsletters/tmp',
'C:\Documents\Newsletters\tmp',
'From generic cases'
),
'user_01' => array(
'username',
'&<f>r%e\'d',
Expand Down
4 changes: 2 additions & 2 deletions src/InputFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,11 +1011,11 @@ private function cleanPath($source)
return preg_replace('~/+~', '/', $source);
}

$windowsPattern = '/^([A-Za-z]:\\\\)?[A-Za-z0-9_\/-]+[A-Za-z0-9_\.-]*(\\\\+[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/';
$windowsPattern = '/^([A-Za-z]:(\\\\|\/))?[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*((\\\\|\/)+[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/';

if (preg_match($windowsPattern, $source))
{
return preg_replace('~\\\\+~', '\\', $source);
return preg_replace('~(\\\\|\/)+~', '\\', $source);
}

return '';
Expand Down