fast-import: disallow "." and ".." path components

If a user specified e.g.
   M 100644 :1 ../some-file
then fast-import previously would happily create a git history where
there is a tree in the top-level directory named "..", and with a file
inside that directory named "some-file".  The top-level ".." directory
causes problems.  While git checkout will die with errors and fsck will
report hasDotdot problems, the user is going to have problems trying to
remove the problematic file.  Simply avoid creating this bad history in
the first place.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 1e7ab67f6e5f131c2e75c5acfd2eccd6d45d4d54..3e7ec1f11987d467574fc6081f0349470eca743a 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -1468,6 +1468,8 @@ static int tree_content_set(
                root->tree = t = grow_tree_content(t, t->entry_count);
        e = new_tree_entry();
        e->name = to_atom(p, n);
+       if (is_dot_or_dotdot(e->name->str_dat))
+               die("path %s contains invalid component", p);
        e->versions[0].mode = 0;
        oidclr(&e->versions[0].oid, the_repository->hash_algo);
        t->entries[t->entry_count++] = e;

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 3b3c371740a3922013e3be4c792eeb1d03e9699a..5a5127fffa7d82d1364697c545ea0a1f5ba2c9a3 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -522,6 +522,26 @@ test_expect_success 'B: fail on invalid committer (5)' '
        test_must_fail git fast-import <input
 '
 
+test_expect_success 'B: fail on invalid file path' '
+       cat >input <<-INPUT_END &&
+       blob
+       mark :1
+       data <<EOF
+       File contents
+       EOF
+
+       commit refs/heads/badpath
+       committer Name <email> $GIT_COMMITTER_DATE
+       data <<COMMIT
+       Commit Message
+       COMMIT
+       M 100644 :1 ../invalid-path
+       INPUT_END
+
+       test_when_finished "git update-ref -d refs/heads/badpath" &&
+       test_must_fail git fast-import <input
+'
+
 ###
 ### series C
 ###