manifest: relax include name rules for user-specified path
Allow the user to specify relative or absolute or any other funky
path that they want when using `repo init` or `repo sync`. Our
goal is to restrict the paths in the remote manifest git repo we
cloned from the network, not protect the user from themselves.
Bug: https://crbug.com/gerrit/14156
Change-Id: I1ccfb2a6bd1dce2bd765e261bef0bbf0f8a9beb6
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/298823
Reviewed-by: Jonathan Nieder <jrn@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
diff --git a/tests/test_manifest_xml.py b/tests/test_manifest_xml.py
index f69e9cf..6977b41 100644
--- a/tests/test_manifest_xml.py
+++ b/tests/test_manifest_xml.py
@@ -298,8 +298,8 @@
# Check level2 proj group not removed.
self.assertIn('l2g1', proj.groups)
- def test_bad_name_checks(self):
- """Check handling of bad name attribute."""
+ def test_allow_bad_name_from_user(self):
+ """Check handling of bad name attribute from the user's input."""
def parse(name):
manifest = self.getXmlManifest(f"""
<manifest>
@@ -311,6 +311,34 @@
# Force the manifest to be parsed.
manifest.ToXml()
+ # Setup target of the include.
+ target = os.path.join(self.tempdir, 'target.xml')
+ with open(target, 'w') as fp:
+ fp.write('<manifest></manifest>')
+
+ # Include with absolute path.
+ parse(os.path.abspath(target))
+
+ # Include with relative path.
+ parse(os.path.relpath(target, self.manifest_dir))
+
+ def test_bad_name_checks(self):
+ """Check handling of bad name attribute."""
+ def parse(name):
+ # Setup target of the include.
+ with open(os.path.join(self.manifest_dir, 'target.xml'), 'w') as fp:
+ fp.write(f'<manifest><include name="{name}"/></manifest>')
+
+ manifest = self.getXmlManifest("""
+<manifest>
+ <remote name="default-remote" fetch="http://localhost" />
+ <default remote="default-remote" revision="refs/heads/main" />
+ <include name="target.xml" />
+</manifest>
+""")
+ # Force the manifest to be parsed.
+ manifest.ToXml()
+
# Handle empty name explicitly because a different codepath rejects it.
with self.assertRaises(error.ManifestParseError):
parse('')