git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] config: preserve config file permissions on edits
@ 2014-05-05 21:58 Eric Wong
  2014-05-06  0:17 ` [PATCH v2] " Eric Wong
  0 siblings, 1 reply; 9+ messages in thread
From: Eric Wong @ 2014-05-05 21:58 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Users may already store sensitive data such as imap.pass in
.git/config; making the file world-readable when "git config"
is called to edit means their password would be compromised
on a shared system.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 config.c               | 7 +++++++
 t/t1300-repo-config.sh | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/config.c b/config.c
index a30cb5c..a0b6756 100644
--- a/config.c
+++ b/config.c
@@ -1636,6 +1636,13 @@ int git_config_set_multivar_in_file(const char *config_filename,
 			MAP_PRIVATE, in_fd, 0);
 		close(in_fd);
 
+		if (fchmod(fd, st.st_mode & 07777) < 0) {
+			error("fchmod on %s failed: %s",
+				lock->filename, strerror(errno));
+			ret = CONFIG_NO_WRITE;
+			goto out_free;
+		}
+
 		if (store.seen == 0)
 			store.seen = 1;
 
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 58cd543..d87693e 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1158,4 +1158,10 @@ test_expect_failure 'adding a key into an empty section reuses header' '
 	test_cmp expect .git/config
 '
 
+test_expect_success POSIXPERM,PERL 'preserves existing permissions' '
+	chmod 0600 .git/config &&
+	git config imap.pass Hunter2 &&
+	perl -e "die q(badperm) if ((stat(q(.git/config)))[2] & 07777) != 0600"
+'
+
 test_done
-- 
Eric Wong

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2014-05-19 19:21 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-05 21:58 [PATCH] config: preserve config file permissions on edits Eric Wong
2014-05-06  0:17 ` [PATCH v2] " Eric Wong
2014-05-06 22:02   ` Jeff King
2014-05-19  7:13   ` Johannes Sixt
2014-05-19  7:44     ` Erik Faye-Lund
2014-05-19  9:59       ` Erik Faye-Lund
2014-05-19 19:17         ` Thomas Braun
2014-05-19 19:21           ` Erik Faye-Lund
2014-05-19 15:59       ` Marius Storm-Olsen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).