Consider .. in src_paths

Author: qryxip

onlinejudge_verify/languages/rust.py

@@ -133,7 +133,7 @@ def from_dep_kind(cls, kind: str):
         depended_target = next(filter(_is_lib_or_proc_macro, depended_package['targets']), None)
         if depended_target:
             related_source_files = _related_source_files(basedir, _cargo_metadata_by_manifest_path(pathlib.Path(depended_package["manifest_path"])))
-            ret |= _source_files_in_same_targets(pathlib.Path(depended_target['src_path']), related_source_files)
+            ret |= _source_files_in_same_targets(pathlib.Path(depended_target['src_path']).resolve(strict=True), related_source_files)
     return sorted(ret)
 
 
@@ -186,15 +186,15 @@ def _related_source_files(basedir: pathlib.Path, metadata: Dict[str, Any]) -> Di
                             s = s.rstrip('\\')
                             s += ' '
                             s += next(it)
-                        path = pathlib.Path(metadata['workspace_root'], s)
+                        path = pathlib.Path(metadata['workspace_root'], s).resolve(strict=True)
                         # Ignores paths that don't start with the `basedir`. (e.g. `/dev/null`, `/usr/local/share/foo/bar`)
                         try:
                             # `PurePath.is_relative_to` is since Python 3.9.
                             _ = path.relative_to(basedir)
                             paths.append(path)
                         except ValueError:
                             pass
-                    if paths[:1] == [pathlib.Path(target['src_path'])]:
+                    if paths[:1] == [pathlib.Path(target['src_path']).resolve(strict=True)]:
                         ret[paths[0]] = frozenset(paths[1:])
                         break
             else:
@@ -289,7 +289,7 @@ def is_verification_file(self, path: pathlib.Path, *, basedir: pathlib.Path) ->
         if not package_and_target:
             return False
         _, target = package_and_target
-        return _is_bin_or_example_bin(target) and 'PROBLEM' in special_comments.list_special_comments(pathlib.Path(target['src_path']))
+        return _is_bin_or_example_bin(target) and 'PROBLEM' in special_comments.list_special_comments(path)
 
     def list_environments(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Sequence[RustLanguageEnvironment]:
         return [RustLanguageEnvironment()]
@@ -298,10 +298,10 @@ def list_environments(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Seq
 def _cargo_metadata(cwd: pathlib.Path) -> Dict[str, Any]:
     """Runs `cargo metadata` for a Cargo.toml file in `cwd` or its parent directories.
 
-    :raises ValueError: if `cwd` is not absolute
+    :raises ValueError: if `cwd` is not absolute or contains `..`
     """
-    if not cwd.is_absolute():
-        raise ValueError(f'the `cwd` parameter must be absolute: {cwd}')
+    if not cwd.is_absolute() or '..' in cwd.parts:
+        raise ValueError(f'the `cwd` parameter must be absolute and must not contain `..`: {cwd}')
 
     def find_root_manifest_for_wd() -> pathlib.Path:
         # https://docs.rs/cargo/0.48.0/cargo/util/important_paths/fn.find_root_manifest_for_wd.html
@@ -341,7 +341,8 @@ def _find_target(
 ) -> Optional[Tuple[Dict[str, Any], Dict[str, Any]]]:
     for package in metadata['packages']:
         for target in package['targets']:
-            if pathlib.Path(target['src_path']) == src_path:
+            # A `src_path` may contain `..`
+            if pathlib.Path(target['src_path']).resolve(strict=True) == src_path:
                 return package, target
     return None
 

tests/test_rust.py

@@ -222,16 +222,15 @@ def test_gathered_source_files(self) -> None:
         }
 
         with tests.utils.load_files_pathlib(files) as tempdir:
-            expected = [*[tempdir / 'crates' / 'manifests' / name / '..' / '..' / 'sourcefiles' / f'{name}.rs' for name in ['a', 'b', 'c']], tempdir / 'src' / 'lib.rs']
+            expected = [*[tempdir / 'crates' / 'sourcefiles' / f'{name}.rs' for name in ['a', 'b', 'c']], tempdir / 'src' / 'lib.rs']
             actual = sorted(RustLanguage(config=None).list_dependencies(tempdir / 'src' / 'lib.rs', basedir=tempdir))
             self.assertEqual(actual, expected)
 
-            # FIXME: should pass. something is wrong
-            # expected = [tempdir / 'crates' / 'manifests' / name / '..' / '..' / 'sourcefiles' / f'{name}.rs' for name in ['a', 'b', 'c']]
-            # actual = sorted(RustLanguage(config=None).list_dependencies(tempdir / 'crates' / 'sourcefiles' / 'a.rs', basedir=tempdir))
-            # self.assertEqual(actual, expected)
+            expected = [tempdir / 'crates' / 'sourcefiles' / f'{name}.rs' for name in ['a', 'b', 'c']]
+            actual = sorted(RustLanguage(config=None).list_dependencies(tempdir / 'crates' / 'sourcefiles' / 'a.rs', basedir=tempdir))
+            self.assertEqual(actual, expected)
 
-            expected = [tempdir / 'crates' / 'manifests' / 'a' / '..' / '..' / 'sourcefiles' / 'a.rs', tempdir / 'verification' / 'src' / 'bin' / 'aizu-online-judge-itp1-1-a.rs']
+            expected = [tempdir / 'crates' / 'sourcefiles' / 'a.rs', tempdir / 'verification' / 'src' / 'bin' / 'aizu-online-judge-itp1-1-a.rs']
             actual = sorted(RustLanguage(config=None).list_dependencies(tempdir / 'verification' / 'src' / 'bin' / 'aizu-online-judge-itp1-1-a.rs', basedir=tempdir))
             self.assertEqual(actual, expected)