config: treat user and xdg config permission problems as errors

Git reads multiple configuration files: settings come first from the
system config file (typically /etc/gitconfig), then the xdg config
file (typically ~/.config/git/config), then the user's dotfile
(~/.gitconfig), then the repository configuration (.git/config).

Git has always used access(2) to decide whether to use each file; as
an unfortunate side effect, that means that if one of these files is
unreadable (e.g., EPERM or EIO), git skips it.  So if I use
~/.gitconfig to override some settings but make a mistake and give it
the wrong permissions then I am subject to the settings the sysadmin
chose for /etc/gitconfig.

Better to error out and ask the user to correct the problem.

This only affects the user and xdg config files, since the user
presumably has enough access to fix their permissions.  If the system
config file is unreadable, the best we can do is to warn about it so
the user knows to notify someone and get on with work in the meantime.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.c b/config.c
index 08e47e2e48a5bd310025752ee5ecdce81721b34d..e8875b8a57bfe6596370bc297155f3f58e624665 100644 (file)
--- a/config.c
+++ b/config.c
@@ -945,12 +945,12 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
                found += 1;
        }
 
                found += 1;
        }
 

-       if (xdg_config && !access_or_warn(xdg_config, R_OK)) {
+       if (xdg_config && !access_or_die(xdg_config, R_OK)) {

                ret += git_config_from_file(fn, xdg_config, data);
                found += 1;
        }
 
                ret += git_config_from_file(fn, xdg_config, data);
                found += 1;
        }
 

-       if (user_config && !access_or_warn(user_config, R_OK)) {
+       if (user_config && !access_or_die(user_config, R_OK)) {

                ret += git_config_from_file(fn, user_config, data);
                found += 1;
        }
                ret += git_config_from_file(fn, user_config, data);
                found += 1;
        }

diff --git a/git-compat-util.h b/git-compat-util.h
index dba87da496a3b1eb25f38a917ec5c5558be0a50f..cfbfaff43156b80e7cb61e6ab9f77b0434ee0bcb 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -609,6 +609,7 @@ int remove_or_warn(unsigned int mode, const char *path);
  * (ENOENT or ENOTDIR).
  */
 int access_or_warn(const char *path, int mode);
  * (ENOENT or ENOTDIR).
  */
 int access_or_warn(const char *path, int mode);

+int access_or_die(const char *path, int mode);

 
 /* Warn on an inaccessible file that ought to be accessible */
 void warn_on_inaccessible(const char *path);
 
 /* Warn on an inaccessible file that ought to be accessible */
 void warn_on_inaccessible(const char *path);

diff --git a/wrapper.c b/wrapper.c
index c1b919f335cecf50b27039f1b0f0dd3b18f12044..7cbe96a0cc5b60296d8ab28e7debb0220614b804 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -416,6 +416,14 @@ int access_or_warn(const char *path, int mode)
        return ret;
 }
 
        return ret;
 }
 

+int access_or_die(const char *path, int mode)
+{
+       int ret = access(path, mode);
+       if (ret && errno != ENOENT && errno != ENOTDIR)
+               die_errno(_("unable to access '%s'"), path);
+       return ret;
+}
+

 struct passwd *xgetpwuid_self(void)
 {
        struct passwd *pw;
 struct passwd *xgetpwuid_self(void)
 {
        struct passwd *pw;