Commit 6442f1f17d6fce8006141968c2e8a246b4673250
2018-04-30T13:03:44
submodule: add a failing test for a submodule escaping .git/modules We should pretend such submdules do not exist as it can lead to RCE.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/tests/submodule/escape.c b/tests/submodule/escape.c
new file mode 100644
index 0000000..18d238f
--- /dev/null
+++ b/tests/submodule/escape.c
@@ -0,0 +1,60 @@
+#include "clar_libgit2.h"
+#include "posix.h"
+#include "path.h"
+#include "submodule_helpers.h"
+#include "fileops.h"
+#include "repository.h"
+
+static git_repository *g_repo = NULL;
+
+void test_submodule_escape__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+#define EVIL_SM_NAME "../../modules/evil"
+
+static int find_evil(git_submodule *sm, const char *name, void *payload)
+{
+ int *foundit = (int *) payload;
+
+ GIT_UNUSED(sm);
+
+ if (!git__strcmp(EVIL_SM_NAME, name))
+ *foundit = true;
+
+ return 0;
+}
+
+void test_submodule_escape__from_gitdir(void)
+{
+ int foundit;
+ git_config *cfg;
+ git_submodule *sm;
+ git_buf buf = GIT_BUF_INIT;
+
+ g_repo = setup_fixture_submodule_simple();
+
+ cl_git_pass(git_buf_joinpath(&buf, git_repository_workdir(g_repo), ".gitmodules"));
+ cl_git_pass(git_config_open_ondisk(&cfg, git_buf_cstr(&buf)));
+
+ /* We don't have a function to rename a subsection so we do it manually */
+ cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo"));
+ cl_git_pass(git_config_set_string(cfg, "submodule." EVIL_SM_NAME ".path", git_submodule_path(sm)));
+ cl_git_pass(git_config_set_string(cfg, "submodule." EVIL_SM_NAME ".url", git_submodule_url(sm)));
+ cl_git_pass(git_config_delete_entry(cfg, "submodule.testrepo.path"));
+ cl_git_pass(git_config_delete_entry(cfg, "submodule.testrepo.url"));
+ git_config_free(cfg);
+
+ /* We also need to update the value in the config */
+ cl_git_pass(git_repository_config__weakptr(&cfg, g_repo));
+ cl_git_pass(git_config_set_string(cfg, "submodule." EVIL_SM_NAME ".url", git_submodule_url(sm)));
+ cfg = NULL;
+
+ /* Find it all the different ways we know about it */
+ cl_git_fail_with(GIT_ENOTFOUND, git_submodule_lookup(&sm, g_repo, EVIL_SM_NAME));
+ cl_git_fail_with(GIT_ENOTFOUND, git_submodule_lookup(&sm, g_repo, "testrepo"));
+ foundit = 0;
+ cl_git_pass(git_submodule_foreach(g_repo, find_evil, &foundit));
+ cl_assert_equal_i(0, foundit);
+}