Skip to content

Commit

Permalink
chroot_scan: create result directory with appropriate permissions
Browse files Browse the repository at this point in the history
To make the fix possible, we needed to make the result directory
creation method public.

Fixes: #1467
  • Loading branch information
praiskup committed Sep 26, 2024
1 parent e69e6be commit aa9a5b0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
16 changes: 11 additions & 5 deletions mock/py/mockbuild/buildroot.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def wrapper(*args, **kwargs):


class Buildroot(object):
# pylint: disable=too-many-public-methods,too-many-instance-attributes
@traceLog()
def __init__(self, config, uid_manager, state, plugins, bootstrap_buildroot=None, is_bootstrap=False):
self.config = config
Expand Down Expand Up @@ -213,13 +214,18 @@ def _setup_basedir(self):
os.chmod(self.basedir, 0o775)

@traceLog()
def _setup_result_dir(self):
def create_resultdir(self):
"""
(re)create self.resultdir directory with appropriate permissions
"""
self._setup_basedir()
with self.uid_manager:
try:
file_util.mkdirIfAbsent(self.resultdir)
except Error:
raise ResultDirNotAccessible(ResultDirNotAccessible.__doc__ % self.resultdir)
except Error as err:
raise ResultDirNotAccessible(
ResultDirNotAccessible.__doc__ % self.resultdir
) from err


@traceLog()
Expand Down Expand Up @@ -300,7 +306,7 @@ def _init(self, prebuild):
# intentionally we do not call bootstrap hook here - it does not have sense
self._setup_nosync()
self.chroot_was_initialized = self.chroot_is_initialized()
self._setup_result_dir()
self.create_resultdir()
getLog().info("calling preinit hooks")
self.plugins.call_hooks('preinit')
# intentionally we do not call bootstrap hook here - it does not have sense
Expand Down Expand Up @@ -629,7 +635,7 @@ def resetLogging(self, force=False):
return
self.logging_initialized = True

self._setup_result_dir()
self.create_resultdir()

with self.uid_manager:
# attach logs to log files.
Expand Down
4 changes: 2 additions & 2 deletions mock/py/mockbuild/plugins/chroot_scan.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# our imports
from mockbuild.trace_decorator import getLog, traceLog
from mockbuild import file_util, util
from mockbuild import util

requires_api_version = "1.1"

Expand Down Expand Up @@ -56,7 +56,7 @@ def __scanChroot(self):
regexstr = "|".join(self.scan_opts['regexes'])
regex = re.compile(regexstr)
chroot = self.buildroot.make_chroot_path()
file_util.mkdirIfAbsent(self.resultdir)
self.buildroot.create_resultdir()
count = 0
logger = getLog()
logger.debug("chroot_scan: Starting scan of %s", chroot)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Several internal code locations attempt to ensure that the result directory
exists, creating it if necessary. However, these locations handled it
inconsistently, sometimes neglecting to [change the ownership][issue#1467] of
the result directory. Now, all locations use a single method dedicated to
result directory preparation.

0 comments on commit aa9a5b0

Please sign in to comment.