From 9a6148c5b4dfcb4eb837017c30bb9bfd45ea60f7 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 25 Jun 2025 14:02:18 +0200
Subject: [PATCH] deploy: do not leak username/hostname from machine pushing
 repo

Git will use the username/hostname to set the Author and Committer fields
if the config items user.name and user.email are not set.  This might
inadvertently leak info about the machine that is hosting the deploy
process.  So this changes it to be a hardcoded value, unless the repo
environment has explicitly set these values either in the Git config or in
environment variables.
---
 fdroidserver/deploy.py | 23 +++++++++++++++++++--
 tests/test_deploy.py   | 47 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/deploy.py b/fdroidserver/deploy.py
index 2c255514..01a83de0 100644
--- a/fdroidserver/deploy.py
+++ b/fdroidserver/deploy.py
@@ -532,6 +532,20 @@ def update_servergitmirrors(servergitmirrors, repo_section):
             progressbar.done()
 
 
+def _get_commit_author(git_repo):
+    """If the author is set locally, use it, otherwise use static info."""
+    ret = {'name': 'servergitmirrors', 'email': 'fdroid@deploy'}
+    with git_repo.config_reader() as cr:
+        for option in ('name', 'email'):
+            try:
+                value = cr.get_value('user', option)
+            except (configparser.NoSectionError, configparser.NoOptionError):
+                value = os.getenv(f'GITLAB_USER_{option.upper()}')
+            if value:
+                ret[option] = value
+    return git.Actor(ret['name'], ret['email'])
+
+
 def upload_to_servergitmirror(
     mirror_config: Dict[str, str],
     local_repo: Repo,
@@ -565,12 +579,17 @@ def upload_to_servergitmirror(
         )
         files_to_upload = _remove_missing_files(files_to_upload)
         local_repo.index.add(files_to_upload)
-        local_repo.index.commit("servergitmirrors: index-only in git-mirror")
+        local_repo.index.commit(
+            "servergitmirrors: index-only in git-mirror",
+            author=_get_commit_author(local_repo),
+        )
     else:
         # sadly index.add don't allow the --all parameter
         logging.debug(_('Adding all files to git mirror'))
         local_repo.git.add(all=True)
-        local_repo.index.commit("servergitmirrors: in git-mirror")
+        local_repo.index.commit(
+            "servergitmirrors: in git-mirror", author=_get_commit_author(local_repo)
+        )
 
     # only deploy to GitLab Artifacts if too big for GitLab Pages
     if (
diff --git a/tests/test_deploy.py b/tests/test_deploy.py
index db9cb50b..91798e51 100755
--- a/tests/test_deploy.py
+++ b/tests/test_deploy.py
@@ -786,6 +786,53 @@ class DeployTest(unittest.TestCase):
                 name, fdroidserver.deploy.REMOTE_HOSTNAME_REGEX.sub(r'\1', remote_url)
             )
 
+    @mock.patch.dict(os.environ, clear=True)
+    def test_get_commit_author_no_config(self):
+        os.environ['HOME'] = self.testdir
+        git_repo = git.Repo.init(self.testdir)
+        self.assertEqual(
+            git.Actor('servergitmirrors', 'fdroid@deploy'),
+            fdroidserver.deploy._get_commit_author(git_repo),
+        )
+
+    @mock.patch.dict(os.environ, clear=True)
+    def test_get_commit_author_repo_config(self):
+        os.environ['HOME'] = self.testdir
+        git_repo = git.Repo.init(self.testdir)
+        user_name = 'Foo Bar'
+        user_email = 'foo@bar.com'
+        with git_repo.config_writer() as cw:
+            cw.set_value('user', 'name', user_name)
+            cw.set_value('user', 'email', user_email)
+        self.assertEqual(
+            git.Actor(user_name, user_email),
+            fdroidserver.deploy._get_commit_author(git_repo),
+        )
+
+    @mock.patch.dict(os.environ, clear=True)
+    def test_get_commit_author_repo_config_name_only(self):
+        os.environ['HOME'] = self.testdir
+        git_repo = git.Repo.init(self.testdir)
+        user_name = 'Foo Bar'
+        with git_repo.config_writer() as cw:
+            cw.set_value('user', 'name', user_name)
+        self.assertEqual(
+            git.Actor(user_name, 'fdroid@deploy'),
+            fdroidserver.deploy._get_commit_author(git_repo),
+        )
+
+    @mock.patch.dict(os.environ, clear=True)
+    def test_get_commit_author_repo_config_email_only(self):
+        os.environ['HOME'] = self.testdir
+        git_repo = git.Repo.init(self.testdir)
+        user_email = 'foo@bar.com'
+        with git_repo.config_writer() as cw:
+            cw.set_value('user', 'email', user_email)
+        self.assertEqual(
+            git.Actor('servergitmirrors', user_email),
+            fdroidserver.deploy._get_commit_author(git_repo),
+        )
+
 
 class TestServerGitMirrors(unittest.TestCase):
     def setUp(self):