Config option to set user/group for running GBP

Add new options to the configuration file to be able to set the
user/group under which git-buildpackage(-rpm) is being run.

Change-Id: Ife74047c08ca02177ce23ea4a3bbaf4d1b08c767
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/config/git-buildpackage b/config/git-buildpackage
index 31b9cfc4f7db428dd3ab71c34864864d1f9888e4..defb0f79b5e211ac45058fe2516572e9b4417f1e 100644 (file)
--- a/config/git-buildpackage
+++ b/config/git-buildpackage
@@ -8,3 +8,12 @@
 ## You probably need to define if the service is run on the client side as
 ## the default directory is likely not accessible by regular users.
 #repo-cache-dir = /var/cache/obs/git-buildpackage-repos/
+
+## User and group
+## The user and group under which git-buildpackage is run. The service itself
+## is run under whatever user/group the source service server is configured to
+## use - this user must have the privileges to set uid/gid if you configure
+## these settings. You can give the user and group as name or uid/gid number
+##directly.
+#gbp-user = gbpservice
+#gbp-group = gbpservice

diff --git a/obs_service_gbp/command.py b/obs_service_gbp/command.py
index ce9366a94fbf45b77e6b106fdcc09662af56d8f0..91b97de72f98be9c7c47988360e943d44f4ffb9f 100644 (file)
--- a/obs_service_gbp/command.py
+++ b/obs_service_gbp/command.py
@@ -20,6 +20,8 @@
 
 import os
 import argparse
+import shutil
+import tempfile
 from ConfigParser import SafeConfigParser
 
 from gbp.rpm import guess_spec, NoSpecError
@@ -27,7 +29,7 @@ from gbp.scripts.buildpackage import main as gbp_deb
 from gbp.scripts.buildpackage_rpm import main as gbp_rpm
 
 from obs_service_gbp import LOGGER, gbplog
-from obs_service_gbp_utils import GbpServiceError, fork_call
+from obs_service_gbp_utils import GbpServiceError, fork_call, sanitize_uid_gid
 from gbp_repocache import CachedRepo, CachedRepoError
 import gbp_repocache
 
@@ -40,15 +42,12 @@ def have_spec(directory):
             return False
     return True
 
-def construct_gbp_args(args):
+def construct_gbp_args(args, outdir):
     """Construct args list for git-buildpackage-rpm"""
     # Args common to deb and rpm
     argv_common = ['--git-ignore-branch',
-                   '--git-no-hooks']
-    if args.outdir:
-        argv_common.append('--git-export-dir=%s' % os.path.abspath(args.outdir))
-    else:
-        argv_common.append('--git-export-dir=%s' % os.path.abspath(os.curdir))
+                   '--git-no-hooks',
+                   '--git-export-dir=%s' % outdir]
     if args.revision:
         argv_common.append('--git-export=%s' % args.revision)
     if args.verbose == 'yes':
@@ -74,7 +73,9 @@ def construct_gbp_args(args):
 
 def read_config(filenames):
     '''Read configuration file(s)'''
-    defaults = {'repo-cache-dir': '/var/cache/obs/git-buildpackage-repos/'}
+    defaults = {'repo-cache-dir': '/var/cache/obs/git-buildpackage-repos/',
+                'gbp-user': None,
+                'gbp-group': None}
 
     filenames = [os.path.expanduser(fname) for fname in filenames]
     LOGGER.debug('Trying %s config files: %s' % (len(filenames), filenames))
@@ -95,9 +96,27 @@ def read_config(filenames):
     # We only use keys from one section, for now
     return dict(parser.items('general'))
 
-def gbp_export(repo, args):
+def gbp_export(repo, args, config):
     """Export sources with GBP"""
-    rpm_args, deb_args = construct_gbp_args(args)
+    # Create output directories
+    try:
+        if not os.path.exists(args.outdir):
+            os.makedirs(args.outdir)
+        tmp_out = tempfile.mkdtemp(dir=args.outdir)
+    except OSError as err:
+        LOGGER.error('Failed to create output directory: %s', err)
+        return 1
+    # Determine UID/GID
+    try:
+        uid, gid = sanitize_uid_gid(config['gbp-user'], config['gbp-group'])
+    except GbpServiceError as err:
+        LOGGER.error(err)
+        return 1
+    # Make temp outdir accessible to the GBP UID/GID
+    os.chown(tmp_out, uid, gid)
+
+    # Call GBP
+    rpm_args, deb_args = construct_gbp_args(args, tmp_out)
     orig_dir = os.path.abspath(os.curdir)
     try:
         os.chdir(repo.repodir)
@@ -105,7 +124,7 @@ def gbp_export(repo, args):
         if args.rpm == 'yes' or (args.rpm == 'auto' and specs_found):
             LOGGER.info('Exporting RPM packaging files with GBP')
             LOGGER.debug('git-buildpackage-rpm args: %s' % ' '.join(rpm_args))
-            ret = fork_call(None, None, gbp_rpm, rpm_args)
+            ret = fork_call(uid, gid, gbp_rpm, rpm_args)
             if ret:
                 LOGGER.error('Git-buildpackage-rpm failed, unable to export '
                              'RPM packaging files')
@@ -113,17 +132,21 @@ def gbp_export(repo, args):
         if args.deb == 'yes' or (args.deb== 'auto' and os.path.isdir('debian')):
             LOGGER.info('Exporting Debian source package with GBP')
             LOGGER.debug('git-buildpackage args: %s' % ' '.join(deb_args))
-            ret = fork_call(None, None, gbp_deb, deb_args)
+            ret = fork_call(uid, gid, gbp_deb, deb_args)
             if ret:
                 LOGGER.error('Git-buildpackage failed, unable to export Debian '
                              'sources package files')
                 return 3
+        for fname in os.listdir(tmp_out):
+            shutil.move(os.path.join(tmp_out, fname),
+                        os.path.join(args.outdir, fname))
     except GbpServiceError as err:
         LOGGER.error('Internal service error when trying to run GBP: %s' % err)
         LOGGER.error('This is most likely a configuration error (or a BUG)!')
         return 1
     finally:
         os.chdir(orig_dir)
+        shutil.rmtree(tmp_out)
     return 0
 
 def parse_args(argv):
@@ -133,7 +156,7 @@ def parse_args(argv):
 
     parser = argparse.ArgumentParser()
     parser.add_argument('--url', help='Remote repository URL', required=True)
-    parser.add_argument('--outdir', help='Output direcory')
+    parser.add_argument('--outdir', default='.', help='Output direcory')
     parser.add_argument('--revision', help='Remote repository URL',
                         default='HEAD')
     parser.add_argument('--rpm', choices=['auto', 'yes', 'no'], default='auto',
@@ -146,7 +169,9 @@ def parse_args(argv):
                                                'spec file')
     parser.add_argument('--config', default=default_configs, action='append',
                         help='Config file to use, can be given multiple times')
-    return parser.parse_args(argv)
+    args = parser.parse_args(argv)
+    args.outdir = os.path.abspath(args.outdir)
+    return args
 
 def main(argv=None):
     """Main function"""
@@ -170,4 +195,4 @@ def main(argv=None):
         return 1
 
     # Run GBP
-    return gbp_export(repo, args)
+    return gbp_export(repo, args, config)

diff --git a/tests/test_obs_service_gbp.py b/tests/test_obs_service_gbp.py
index 21de09b58f82ccba3a80c11d4a24a3fbd1ab7957..5110700454da3ec2f828de8783763ea7ff5d5f3f 100644 (file)
--- a/tests/test_obs_service_gbp.py
+++ b/tests/test_obs_service_gbp.py
@@ -18,7 +18,9 @@
 # MA 02110-1301, USA.
 """Tests for the git-buildpackage OBS source service"""
 
+import grp
 import os
+import stat
 from nose.tools import assert_raises # pylint: disable=E0611
 
 from obs_service_gbp.command import main as service
@@ -27,6 +29,7 @@ from tests import UnitTestsBase
 
 class TestService(UnitTestsBase):
     """Base class for unit tests"""
+    s_rwx = stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC
 
     def _check_files(self, files, directory=''):
         """Check that the tmpdir content matches expectations"""
@@ -71,14 +74,17 @@ class TestService(UnitTestsBase):
 
     def test_gbp_rpm_failure(self):
         """Test git-buildpackage-rpm failure"""
-        assert service(['--url', self.orig_repo.path, '--outdir=foo/bar']) == 2
+        os.mkdir('foo')
+        os.chmod('foo', 0)
+        try:
+            assert service(['--url', self.orig_repo.path, '--outdir=foo']) == 1
+        finally:
+            os.chmod('foo', self.s_rwx)
         assert service(['--url', self.orig_repo.path, '--rpm=yes',
                         '--revision=source']) == 2
 
     def test_gbp_deb_failure(self):
         """Test git-buildpackage (deb) failure"""
-        assert service(['--url', self.orig_repo.path, '--rpm=no',
-                        '--outdir=foo/bar']) == 3
         assert service(['--url', self.orig_repo.path, '--deb=yes',
                         '--revision=source']) == 3
 
@@ -125,3 +131,19 @@ class TestService(UnitTestsBase):
         assert not os.path.exists(default_cache), os.listdir('.')
         assert os.path.exists('my-repo-cache'), os.listdir('.')
 
+    def test_user_group_config(self):
+        """Test setting the user and group under which gbp is run"""
+        # Changing to current user/group should succeed
+        os.environ['OBS_GIT_BUILDPACKAGE_GBP_USER'] = str(os.getuid())
+        os.environ['OBS_GIT_BUILDPACKAGE_GBP_GROUP'] = \
+                grp.getgrgid(os.getgid()).gr_name
+        assert service(['--url', self.orig_repo.path, '--revision=rpm']) == 0
+
+        # Changing to non-existent user should fail
+        os.environ['OBS_GIT_BUILDPACKAGE_GBP_USER'] = '_non_existent_user'
+        del os.environ['OBS_GIT_BUILDPACKAGE_GBP_GROUP']
+        assert service(['--url', self.orig_repo.path, '--revision=rpm']) == 1
+
+        # Return env
+        del os.environ['OBS_GIT_BUILDPACKAGE_GBP_USER']
+