| |
| new file mode 100644 |
| |
| |
| |
| @@ -0,0 +1,5 @@ |
| +{ |
| + "type": "bugfix", |
| + "category": "s3", |
| + "description": "Fix false negative in parent-directory escape detection that allowed keys like ``/../foo`` to bypass warning during downloads" |
| +} |
| |
| |
| |
| |
| @@ -322,8 +322,10 @@ def _warn_parent_reference(self, fileinfo): |
| # normpath() will use the OS path separator so we |
| # need to take that into account when checking for a parent prefix. |
| parent_prefix = '..' + os.path.sep |
| - escapes_cwd = os.path.normpath(fileinfo.compare_key).startswith( |
| - parent_prefix) |
| + # Anchor compare_key against '.' (the destination directory root) |
| + # to avoid false negatives on paths like '/../foo' |
| + normalized = os.path.normpath('.' + os.path.sep + fileinfo.compare_key) |
| + escapes_cwd = normalized.startswith(parent_prefix) |
| if escapes_cwd: |
| warning = create_warning( |
| fileinfo.compare_key, "File references a parent directory.") |
| |
| |
| |
| |
| @@ -561,6 +561,27 @@ def test_allow_double_dots_that_dont_escape_cwd(self): |
| future = self.transfer_request_submitter.submit(fileinfo) |
| self.assertIsInstance(self.result_queue.get(), DryRunResult) |
| |
| + def test_warn_and_ignore_on_leading_slash_parent_reference(self): |
| + fileinfo = self.create_file_info('/../foo.txt') |
| + future = self.transfer_request_submitter.submit(fileinfo) |
| + warning_result = self.result_queue.get() |
| + self.assertIsInstance(warning_result, WarningResult) |
| + self.assert_no_downloads_happened() |
| + |
| + def test_warn_and_ignore_on_leading_slash_stacked_parent_reference(self): |
| + fileinfo = self.create_file_info('/../../../foo/bar.txt') |
| + future = self.transfer_request_submitter.submit(fileinfo) |
| + warning_result = self.result_queue.get() |
| + self.assertIsInstance(warning_result, WarningResult) |
| + self.assert_no_downloads_happened() |
| + |
| + def test_warn_and_ignore_on_double_leading_slash_parent_reference(self): |
| + fileinfo = self.create_file_info('//../foo') |
| + future = self.transfer_request_submitter.submit(fileinfo) |
| + warning_result = self.result_queue.get() |
| + self.assertIsInstance(warning_result, WarningResult) |
| + self.assert_no_downloads_happened() |
| + |
| def test_dry_run(self): |
| self.cli_params['dryrun'] = True |
| self.transfer_request_submitter = DownloadRequestSubmitter( |
|
|
