From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 19/19] Guard unallowed access to repository when it's not set up Date: Sun, 21 Mar 2010 17:30:46 +0700 Message-ID: <1269167446-7799-20-git-send-email-pclouds@gmail.com> References: <1269167446-7799-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Mar 21 11:36:37 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NtIWK-0003rh-Qr for gcvg-git-2@lo.gmane.org; Sun, 21 Mar 2010 11:36:37 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753294Ab0CUKgZ convert rfc822-to-quoted-printable (ORCPT ); Sun, 21 Mar 2010 06:36:25 -0400 Received: from mail-gx0-f217.google.com ([209.85.217.217]:49541 "EHLO mail-gx0-f217.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753293Ab0CUKgY (ORCPT ); Sun, 21 Mar 2010 06:36:24 -0400 Received: by gxk9 with SMTP id 9so2777529gxk.8 for ; Sun, 21 Mar 2010 03:36:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=GzCigGTQG53RvzO0vRNYLiYNdMweuEaX1DJU3bVDejw=; b=VXNCuwqu6xM6RneOP8IhrIqN4TC5Otf/vSJE5yECTdqC32jqzRN8Ajk6AKS9LpXWYK aeSMutqD+ppjFgQ7TgykPoggGs6yrGeucAsvkj8iagxa5y7zEpj3Z3rZ1V/E/oYRpO47 MZqFGXNRpg1SZoCSIXm7EVGfQoUH5/vBbge58= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=SoWTLVGAEQxZKqFMitd+ZHj6OzvepnANucnCSJmTey75eGBakDWOpRC286JqNf35Gj zPXMkU9xNsI1FiXwF0Yjfj1ucTWLw9u46mpeZSENIHN07cN8rT++aDoFV6rUd9+qERnR 8F5HH0ob3fqtqy9LkkFbe603cO1Ee+xSVlE2g= Received: by 10.100.56.19 with SMTP id e19mr11456517ana.202.1269167783296; Sun, 21 Mar 2010 03:36:23 -0700 (PDT) Received: from pclouds@gmail.com ([115.73.230.17]) by mx.google.com with ESMTPS id 22sm1865069iwn.12.2010.03.21.03.36.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 21 Mar 2010 03:36:22 -0700 (PDT) Received: by pclouds@gmail.com (sSMTP sendmail emulation); Sun, 21 Mar 2010 17:32:43 +0700 X-Mailer: git-send-email 1.7.0.2.425.gb99f1 In-Reply-To: <1269167446-7799-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Many code path will skip repo access if startup_info->have_repository is false. This may be a fault if startup_info->have_repository has not been properly initialized. So the rule is one of the following commands must be run before any repo access. And none of them can be called twice. - setup_git_directory* - enter_repo - init_db Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- builtin/init-db.c | 1 + cache.h | 1 + config.c | 2 ++ environment.c | 13 +++++++++++-- git.c | 3 +++ setup.c | 13 +++++++++++++ 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/builtin/init-db.c b/builtin/init-db.c index 064b919..d4c415c 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -302,6 +302,7 @@ int init_db(const char *git_dir, const char *templa= te_dir, unsigned int flags) =20 set_git_dir(make_absolute_path(git_dir)); startup_info->have_repository =3D 1; + startup_info->have_run_setup_gitdir =3D 1; =20 safe_create_dir(get_git_dir(), 0); =20 diff --git a/cache.h b/cache.h index b1ed150..417a744 100644 --- a/cache.h +++ b/cache.h @@ -1060,6 +1060,7 @@ int split_cmdline(char *cmdline, const char ***ar= gv); /* git.c */ struct startup_info { const char *prefix; + int have_run_setup_gitdir; int have_repository; int help; }; diff --git a/config.c b/config.c index 07d854a..9981b09 100644 --- a/config.c +++ b/config.c @@ -737,6 +737,8 @@ int git_config(config_fn_t fn, void *data) char *repo_config =3D NULL; int ret; =20 + if (startup_info && !startup_info->have_run_setup_gitdir) + die("internal error: access to .git/config without repo setup"); if (!startup_info || startup_info->have_repository) repo_config =3D git_pathdup("config"); ret =3D git_config_early(fn, data, repo_config); diff --git a/environment.c b/environment.c index 6127025..17f0cbe 100644 --- a/environment.c +++ b/environment.c @@ -98,9 +98,18 @@ void unset_git_env(void) =20 static void setup_git_env(void) { + if (startup_info && startup_info->have_run_setup_gitdir) + die("internal error: setup_git_env can't be called twice"); git_dir =3D getenv(GIT_DIR_ENVIRONMENT); - if (!git_dir) - git_dir =3D read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT); + if (!git_dir) { + /* + * Repo detection should be done by setup_git_directory* + * or enter_repo, not by this function + */ + if (startup_info) + die("internal error: $GIT_DIR is empty"); + git_dir =3D read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT); + } if (!git_dir) git_dir =3D DEFAULT_GIT_DIR_ENVIRONMENT; git_object_dir =3D getenv(DB_ENVIRONMENT); diff --git a/git.c b/git.c index 88aaf13..5f7f410 100644 --- a/git.c +++ b/git.c @@ -260,6 +260,9 @@ static int run_builtin(struct cmd_struct *p, int ar= gc, const char **argv) use_pager =3D 1; } } + else + /* Stop git_config() from complaining that no repository found. */ + startup_info->have_run_setup_gitdir =3D 1; commit_pager_choice(); =20 if (!startup_info->help && p->option & NEED_WORK_TREE) diff --git a/setup.c b/setup.c index 1808ebe..d9bb616 100644 --- a/setup.c +++ b/setup.c @@ -237,7 +237,17 @@ void setup_work_tree(void) git_dir =3D make_absolute_path(git_dir); if (!work_tree || chdir(work_tree)) die("This operation must be run in a work tree"); + + /* + * have_run_setup_gitdir is unset in order to avoid die()ing + * inside set_git_env(). We don't actually initialize + * repo twice, we're just relative-izing gitdir + */ + if (startup_info) + startup_info->have_run_setup_gitdir =3D 0; set_git_dir(make_relative_path(git_dir, work_tree)); + if (startup_info) + startup_info->have_run_setup_gitdir =3D 1; initialized =3D 1; } =20 @@ -340,6 +350,7 @@ void unset_git_directory(const char *prefix) unset_git_env(); startup_info->prefix =3D NULL; startup_info->have_repository =3D 0; + startup_info->have_run_setup_gitdir =3D 0; } =20 /* Initialized in setup_git_directory_gently_1() */ @@ -506,6 +517,7 @@ const char *setup_git_directory_gently(int *nongit_= ok) prefix =3D setup_git_directory_gently_1(nongit_ok); if (startup_info) { startup_info->prefix =3D prefix; + startup_info->have_run_setup_gitdir =3D 1; startup_info->have_repository =3D !nongit_ok || !*nongit_ok; } return prefix; @@ -600,6 +612,7 @@ char *enter_repo(char *path, int strict) set_git_dir("."); if (startup_info) { startup_info->prefix =3D NULL; + startup_info->have_run_setup_gitdir =3D 1; startup_info->have_repository =3D 1; } return path; --=20 1.7.0.2.425.gb99f1