Merge ~jslarraz/review-tools:rock-container into review-tools:master

[Jorge Sancho Larraz]

rock function to container classes

[Evan Caville (evancaville)]

refactor looks good to me! Use of inheritance looks clean and follows similar pattern for both snaps and rocks. Thanks!

review: Approve

[Alex Murray (alexmurray)]

LGTM - thanks for the additional TarContainer tests as well!

review: Approve

diff --git a/reviewtools/available.py b/reviewtools/available.py
index 94bfbe1..90f6917 100755
--- a/reviewtools/available.py
+++ b/reviewtools/available.py
@@ -24,7 +24,6 @@ from reviewtools.common import (
     read_file_as_json_dict,
     MKDTEMP_PREFIX,
     _add_error,  # make a class
-    get_rock_manifest,
 )
 import reviewtools.email as email
 
@@ -35,6 +34,7 @@ from reviewtools.store import (
     get_faked_build_and_stage_packages,
 )
 from reviewtools.usn import read_usn_db
+from reviewtools.containers.rock_container import RockContainer
 from reviewtools.containers.snap_container import SnapContainer, ContainerException
 
 email_update_required_text = """A scan of this %s shows that it was built with packages from the Ubuntu
@@ -536,7 +536,8 @@ def scan_snap(secnot_db_fn, snap_fn, with_cves=False, ignore_pockets=list()):
 def scan_rock(secnot_db_fn, rock_fn, with_cves=False, ignore_pockets=list()):
     """Scan rock for packages with security notices"""
     out = ""
-    man = get_rock_manifest(rock_fn)
+    rock = RockContainer(rock_fn)
+    man = rock.get_rock_manifest()
     # Since ROCKs can be based on non LTS Ubuntu releases, secnot_db should
     # include them (otherwise the USN db is filtered by tracked LTS releases only
     # since that is the requirement for snaps)
diff --git a/reviewtools/common.py b/reviewtools/common.py
index 5de33ee..88c6e58 100644
--- a/reviewtools/common.py
+++ b/reviewtools/common.py
@@ -25,11 +25,9 @@ import os
 from pkg_resources import resource_filename
 import re
 import shutil
-import stat
 import subprocess
 import sys
 import tarfile
-import tempfile
 import time
 import types
 import yaml
@@ -486,16 +484,6 @@ def unsquashfs_lln_parse(lln_out):
     return hdr, entries
 
 
-def _calculate_rock_untar_uncompressed_size(rock_pkg):
-    """Calculate size of the uncompressed tar"""
-    size = 0
-    with tarfile.open(rock_pkg) as tar:
-        for tarinfo in tar:
-            size += tarinfo.size
-
-    return size
-
-
 def unsquashfs_supports_ignore_errors():
     """Detect if unsquashfs supports the -ignore-errors option"""
     (rc, out) = cmd(["unsquashfs", "-help"])
@@ -503,112 +491,6 @@ def unsquashfs_supports_ignore_errors():
     return "-ig[nore-errors]" in out
 
 
-def is_pkg_uncompressed_size_valid(pkg_max_size, size, pkg):
-    st = os.statvfs(pkg)
-    avail = st.f_bsize * st.f_bavail * 0.9  # 90% of available space
-    if size > pkg_max_size:
-        return (
-            False,
-            "uncompressed %s is too large (%dM > %dM)"
-            % (pkg, size / 1024 / 1024, pkg_max_size / 1024 / 1024),
-        )
-    elif size > avail * 0.9:
-        return (
-            False,
-            "uncompressed %s is too large for available space (%dM > %dM)"
-            % (pkg, size / 1024 / 1024, avail / 1024 / 1024),
-        )
-    else:
-        return True, ""
-
-
-def _unpack_rock_tar(rock_pkg, dest):
-    """Unpack a tar based rock package to dest"""
-    size = _calculate_rock_untar_uncompressed_size(rock_pkg)
-
-    # Assuming MAX_UNCOMPRESSED_SIZE for rocks is same as snaps
-    # MAX_UNCOMPRESSED_SIZE
-    rock_max_size = MAX_UNCOMPRESSED_SIZE * 1024 * 1024 * 1024
-
-    valid_size, error_msg = is_pkg_uncompressed_size_valid(
-        rock_max_size, size, rock_pkg
-    )
-    if valid_size:
-        global MKDTEMP_PREFIX
-        global MKDTEMP_DIR
-        d = tempfile.mkdtemp(prefix=MKDTEMP_PREFIX, dir=MKDTEMP_DIR)
-
-        try:
-            with tarfile.open(rock_pkg) as tar:
-                # Inspecting members before extracting, since it is possible that
-                # files are created outside of path, e.g. members that have
-                # absolute filenames starting with "/" or filenames with two dots
-                # ".."
-                # https://docs.python.org/3/library/tarfile.html#tarfile.TarFile.extractall
-                for name in tar.getnames():
-                    if name.startswith("..") or name.startswith("/"):
-                        logger.error(
-                            "Bad path %s while extracting archive at %s"
-                            % (name, rock_pkg)
-                        )
-
-                tar.extractall(path=d)
-        except Exception as e:
-            logger.error("Unexpected exception while unpacking rock %s" % e)
-            if os.path.isdir(d):
-                recursive_rm(d)
-
-        if dest is None:
-            dest = d
-        else:
-            # Recursively move extracted content to original dir,
-            # keeping permissions
-            move_dir_content(d, dest)
-
-        return dest
-    else:
-        logger.error(error_msg)
-
-
-def check_dir(dest):
-    if dest is not None and os.path.exists(dest):
-        logger.error("'%s' exists. Aborting." % dest)
-
-
-def check_fn(fn):
-    if not os.path.isfile(fn):
-        logger.error("Could not find '%s'" % fn)
-    pkg = fn
-    if not pkg.startswith("/"):
-        pkg = os.path.abspath(pkg)
-    return pkg
-
-
-def check_max_pkg_size(pkg):
-    size = os.stat(pkg)[stat.ST_SIZE]
-    max = MAX_COMPRESSED_SIZE * 1024 * 1024 * 1024
-    if size > max:
-        logger.error(
-            "compressed file is too large (%dM > %dM)"
-            % (size / 1024 / 1024, max / 1024 / 1024)
-        )
-
-
-def unpack_rock(fn, dest=None):
-    """Unpack rock"""
-    pkg = check_fn(fn)
-    check_dir(dest)
-
-    # Limit the maximimum size of the package
-    check_max_pkg_size(pkg)
-
-    # check if its a tar based rock
-    if tarfile.is_tarfile(pkg):
-        return _unpack_rock_tar(fn, dest)
-
-    logger.error("Unsupported package format (not tar)")
-
-
 def open_file_read(path):
     """Open specified file read-only"""
     try:
@@ -858,27 +740,6 @@ def read_file_as_json_dict(fn):
     return raw
 
 
-def get_rock_manifest(fn):
-    if "SNAP_USER_COMMON" in os.environ and os.path.exists(
-        os.environ["SNAP_USER_COMMON"]
-    ):
-        MKDTEMP_DIR = os.environ["SNAP_USER_COMMON"]
-    else:
-        MKDTEMP_DIR = tempfile.gettempdir()
-    unpack_tmp_dir = tempfile.mktemp(prefix=MKDTEMP_PREFIX, dir=MKDTEMP_DIR)
-
-    man_fn = "/usr/share/rocks/dpkg.query"
-    unpack_rock(fn, unpack_tmp_dir)
-
-    # since ROCK manifest is not available yet, we build a manifest using the
-    # information available in /usr/share/rocks/dpkg.query present inside the
-    # rock
-    man_yaml = build_manifest_from_rock_tar(man_fn, unpack_tmp_dir)
-    recursive_rm(unpack_tmp_dir)
-
-    return man_yaml
-
-
 def list_dir(path, dirs_only=False):
     """List directory items"""
     results = list(map(lambda x: os.path.join(path, x), os.listdir(path)))
diff --git a/reviewtools/containers/rock_container.py b/reviewtools/containers/rock_container.py
new file mode 100644
index 0000000..6a6e799
--- /dev/null
+++ b/reviewtools/containers/rock_container.py
@@ -0,0 +1,26 @@
+import yaml
+from reviewtools.containers.tar_container import (
+    TarContainer,
+    ContainerException,
+)
+from reviewtools.common import build_manifest_from_rock_tar
+
+
+class RockContainer(TarContainer):
+    # TODO: review-tools was not checking for it. We still have some snaps in
+    # "tests/" that doesn't fit this limit and will need to be regenerated before
+    # this check can be enforced.
+    # _min_packed_size = 16 * 1024
+    _max_packed_size = 5 * 1024 * 1024 * 1024
+    _max_unpacked_size = 25 * 1024 * 1024 * 1024
+
+
+    def get_rock_manifest(self):
+
+        man_fn = "/usr/share/rocks/dpkg.query"
+        # since ROCK manifest is not available yet, we build a manifest using the
+        # information available in /usr/share/rocks/dpkg.query present inside the
+        # rock
+        man_yaml = build_manifest_from_rock_tar(man_fn, self.unpack_dir)
+
+        return man_yaml
diff --git a/reviewtools/containers/tar_container.py b/reviewtools/containers/tar_container.py
new file mode 100644
index 0000000..674dd1b
--- /dev/null
+++ b/reviewtools/containers/tar_container.py
@@ -0,0 +1,96 @@
+import os
+import shutil
+import tarfile
+from reviewtools.common import (
+    recursive_rm,
+)
+from reviewtools.containers.base_container import BaseContainer, ContainerException
+
+
+class TarContainer(BaseContainer):
+    """
+    A container is a file that encapsulates a file system. This class extends
+    BaseContainer to handle functionality that is specific to Tar containers.
+    """
+
+    def check_container_format(self):
+        """
+        Checks that the container file has the expected format.
+
+        Raises:
+            ContainerException: This method will raise an exception if the
+            container file is not a tar container.
+        """
+        if not tarfile.is_tarfile(self.filename):
+            raise ContainerException("Unsupported package format (not tar)")
+
+
+    def calculate_unpacked_size(self) -> int:
+        """
+        Estimates the space that the unpacked directory will use by adding the
+        individual files size without extracting them.
+
+        Returns:
+            int: Estimated size in bytes of the unpacked directory
+        """
+        size = 0
+        with tarfile.open(self.filename) as tar:
+            for tarinfo in tar:
+                size += tarinfo.size
+        return size
+
+    def unpack(self, items: list = [], force: bool = False) -> str:
+        """
+        Extracts the content of the container file and returns the absolute path to
+        the newly unpacked directory.
+
+        Args:
+            force (bool, optional): If ``True``, the unpack_dir will be overwritten
+                if it already exists. Defaults to ``False``
+
+        Returns:
+            str: absolute path to the newly created unpack dir
+
+        Raises:
+            ContainerException: This method will raise an ContainerException if the
+                unpack_dir already exists and this method was called without the
+                force argument set to True
+            RuntimeError: This method will raise a RuntimeError if the extraction
+                fails for an unknown reason.
+        """
+        if self._unpack_dir is not None and not force:
+            raise ContainerException("'%s' exists. Aborting." % self._unpack_dir)
+
+        # Check disk space and space available in disk
+        self.check_unpacked_size()
+        self.check_disk_space()
+
+        # Unpack the container
+        stage_dir = os.path.join(self.tmp_dir, "stage")
+
+        with tarfile.open(self.filename) as tar:
+            # Inspecting members before extracting, since it is possible that
+            # files are created outside of path, e.g. members that have
+            # absolute filenames starting with "/" or filenames with two dots
+            # ".."
+            # https://docs.python.org/3/library/tarfile.html#tarfile.TarFile.extractall
+            for name in tar.getnames():
+                if name.startswith("..") or name.startswith("/"):
+                    raise ContainerException(
+                        "Bad path %s while extracting archive at %s"
+                        % (name, self.filename)
+                    )
+
+            try:
+                tar.extractall(path=stage_dir)
+            except Exception as e:
+                if os.path.isdir(stage_dir):
+                    recursive_rm(stage_dir)
+                raise RuntimeError("Unexpected exception while unpacking rock %s" % e)
+
+        # Update on success
+        if self._unpack_dir is not None and os.path.exists(self._unpack_dir):
+            recursive_rm(self._unpack_dir)
+        self._unpack_dir = ".".join(self.filename.split(".")[:-1])
+        shutil.move(stage_dir, self._unpack_dir)
+        return self._unpack_dir
diff --git a/reviewtools/tests/containers/test_rock_container.py b/reviewtools/tests/containers/test_rock_container.py
new file mode 100644
index 0000000..f59b2d9
--- /dev/null
+++ b/reviewtools/tests/containers/test_rock_container.py
@@ -0,0 +1,144 @@
+import unittest
+from tempfile import mkdtemp
+from reviewtools.common import ReviewException
+from reviewtools.containers.rock_container import (
+    RockContainer,
+    ContainerException,
+)
+
+
+class TestRockContainer(unittest.TestCase):
+    """Tests for reviewtools.containers.rock_container"""
+
+    def test_get_rock_manifest(self):
+        """Test get_rock_manifest()"""
+        valid_rock_fn = "./tests/test-rock-redis_5.0-20.04.tar"
+        expected_manifest_yaml = {
+            "manifest-version": "1",
+            "os-release-id": "ubuntu",
+            "os-release-version-id": "20.04",
+            "stage-packages": [
+                "adduser=3.118ubuntu2,adduser=3.118ubuntu2",
+                "apt=2.0.2ubuntu0.2,apt=2.0.2ubuntu0.2",
+                "base-files=11ubuntu5.2,base-files=11ubuntu5.2",
+                "base-passwd=3.5.47,base-passwd=3.5.47",
+                "bash=5.0-6ubuntu1.1,bash=5.0-6ubuntu1.1",
+                "bsdutils=1:2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
+                "bzip2=1.0.8-2,bzip2=1.0.8-2",
+                "coreutils=8.30-3ubuntu2," "coreutils=8.30-3ubuntu2",
+                "dash=0.5.10.2-6,dash=0.5.10.2-6",
+                "debconf=1.5.73,debconf=1.5.73",
+                "debianutils=4.9.1,debianutils=4.9.1",
+                "diffutils=1:3.7-3,diffutils=1:3.7-3",
+                "dpkg=1.19.7ubuntu3,dpkg=1.19.7ubuntu3",
+                "e2fsprogs=1.45.5-2ubuntu1," "e2fsprogs=1.45.5-2ubuntu1",
+                "fdisk=2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
+                "findutils=4.7.0-1ubuntu1," "findutils=4.7.0-1ubuntu1",
+                "gcc-10-base:amd64=10.2.0-5ubuntu1~20.04,"
+                "gcc-10=10.2.0-5ubuntu1~20.04",
+                "gpgv=2.2.19-3ubuntu2,gnupg2=2.2.19-3ubuntu2",
+                "grep=3.4-1,grep=3.4-1",
+                "gzip=1.10-0ubuntu4,gzip=1.10-0ubuntu4",
+                "hostname=3.23,hostname=3.23",
+                "init-system-helpers=1.57," "init-system-helpers=1.57",
+                "libacl1:amd64=2.2.53-6,acl=2.2.53-6",
+                "libapt-pkg6.0:amd64=2.0.2ubuntu0.2," "apt=2.0.2ubuntu0.2",
+                "libatomic1:amd64=10.2.0-5ubuntu1~20.04,"
+                "gcc-10=10.2.0-5ubuntu1~20.04",
+                "libattr1:amd64=1:2.4.48-5,attr=1:2.4.48-5",
+                "libaudit-common=1:2.8.5-2ubuntu6," "audit=1:2.8.5-2ubuntu6",
+                "libaudit1:amd64=1:2.8.5-2ubuntu6," "audit=1:2.8.5-2ubuntu6",
+                "libblkid1:amd64=2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
+                "libbz2-1.0:amd64=1.0.8-2,bzip2=1.0.8-2",
+                "libc-bin=2.31-0ubuntu9.1," "glibc=2.31-0ubuntu9.1",
+                "libc6:amd64=2.31-0ubuntu9.1," "glibc=2.31-0ubuntu9.1",
+                "libcap-ng0:amd64=0.7.9-2.1build1," "libcap-ng=0.7.9-2.1build1",
+                "libcom-err2:amd64=1.45.5-2ubuntu1," "e2fsprogs=1.45.5-2ubuntu1",
+                "libcrypt1:amd64=1:4.4.10-10ubuntu4," "libxcrypt=1:4.4.10-10ubuntu4",
+                "libdb5.3:amd64=5.3.28+dfsg1-0.6ubuntu2,"
+                "db5.3=5.3.28+dfsg1-0.6ubuntu2",
+                "libdebconfclient0:amd64=0.251ubuntu1," "cdebconf=0.251ubuntu1",
+                "libext2fs2:amd64=1.45.5-2ubuntu1," "e2fsprogs=1.45.5-2ubuntu1",
+                "libfdisk1:amd64=2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
+                "libffi7:amd64=3.3-4,libffi=3.3-4",
+                "libgcc-s1:amd64=10.2.0-5ubuntu1~20.04," "gcc-10=10.2.0-5ubuntu1~20.04",
+                "libgcrypt20:amd64=1.8.5-5ubuntu1," "libgcrypt20=1.8.5-5ubuntu1",
+                "libgmp10:amd64=2:6.2.0+dfsg-4," "gmp=2:6.2.0+dfsg-4",
+                "libgnutls30:amd64=3.6.13-2ubuntu1.3," "gnutls28=3.6.13-2ubuntu1.3",
+                "libgpg-error0:amd64=1.37-1," "libgpg-error=1.37-1",
+                "libhiredis0.14:amd64=0.14.0-6," "hiredis=0.14.0-6",
+                "libhogweed5:amd64=3.5.1+really3.5.1-2," "nettle=3.5.1+really3.5.1-2",
+                "libidn2-0:amd64=2.2.0-2,libidn2=2.2.0-2",
+                "libjemalloc2:amd64=5.2.1-1ubuntu1," "jemalloc=5.2.1-1ubuntu1",
+                "liblua5.1-0:amd64=5.1.5-8.1build4," "lua5.1=5.1.5-8.1build4",
+                "liblz4-1:amd64=1.9.2-2,lz4=1.9.2-2",
+                "liblzma5:amd64=5.2.4-1ubuntu1," "xz-utils=5.2.4-1ubuntu1",
+                "libmount1:amd64=2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
+                "libncurses6:amd64=6.2-0ubuntu2," "ncurses=6.2-0ubuntu2",
+                "libncursesw6:amd64=6.2-0ubuntu2," "ncurses=6.2-0ubuntu2",
+                "libnettle7:amd64=3.5.1+really3.5.1-2," "nettle=3.5.1+really3.5.1-2",
+                "libp11-kit0:amd64=0.23.20-1build1," "p11-kit=0.23.20-1build1",
+                "libpam-modules:amd64=1.3.1-5ubuntu4.1," "pam=1.3.1-5ubuntu4.1",
+                "libpam-modules-bin=1.3.1-5ubuntu4.1," "pam=1.3.1-5ubuntu4.1",
+                "libpam-runtime=1.3.1-5ubuntu4.1," "pam=1.3.1-5ubuntu4.1",
+                "libpam0g:amd64=1.3.1-5ubuntu4.1," "pam=1.3.1-5ubuntu4.1",
+                "libpcre2-8-0:amd64=10.34-7,pcre2=10.34-7",
+                "libpcre3:amd64=2:8.39-12build1," "pcre3=2:8.39-12build1",
+                "libprocps8:amd64=2:3.3.16-1ubuntu2," "procps=2:3.3.16-1ubuntu2",
+                "libseccomp2:amd64=2.4.3-1ubuntu3.20.04.3,"
+                "libseccomp=2.4.3-1ubuntu3.20.04.3",
+                "libselinux1:amd64=3.0-1build2,libselinux=3.0-1build2",
+                "libsemanage-common=3.0-1build2,libsemanage=3.0-1build2",
+                "libsemanage1:amd64=3.0-1build2,libsemanage=3.0-1build2",
+                "libsepol1:amd64=3.0-1,libsepol=3.0-1",
+                "libsmartcols1:amd64=2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1",
+                "libss2:amd64=1.45.5-2ubuntu1,e2fsprogs=1.45.5-2ubuntu1",
+                "libstdc++6:amd64=10.2.0-5ubuntu1~20.04,gcc-10=10.2.0-5ubuntu1~20.04",
+                "libsystemd0:amd64=245.4-4ubuntu3.3,systemd=245.4-4ubuntu3.3",
+                "libtasn1-6:amd64=4.16.0-2,libtasn1-6=4.16.0-2",
+                "libtinfo6:amd64=6.2-0ubuntu2,ncurses=6.2-0ubuntu2",
+                "libudev1:amd64=245.4-4ubuntu3.3,systemd=245.4-4ubuntu3.3",
+                "libunistring2:amd64=0.9.10-2,libunistring=0.9.10-2",
+                "libuuid1:amd64=2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1",
+                "libxcursor1=4.0.0-2,tiff=4.0.0-2",
+                "libzstd1:amd64=1.4.4+dfsg-3,libzstd=1.4.4+dfsg-3",
+                "login=1:4.8.1-1ubuntu5.20.04,shadow=1:4.8.1-1ubuntu5.20.04",
+                "logsave=1.45.5-2ubuntu1,e2fsprogs=1.45.5-2ubuntu1",
+                "lsb-base=11.1.0ubuntu2,lsb=11.1.0ubuntu2",
+                "lua-bitop:amd64=1.0.2-5,lua-bitop=1.0.2-5",
+                "lua-cjson:amd64=2.1.0+dfsg-2.1,lua-cjson=2.1.0+dfsg-2.1",
+                "mawk=1.3.4.20200120-2,mawk=1.3.4.20200120-2",
+                "mount=2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1",
+                "ncurses-base=6.2-0ubuntu2,ncurses=6.2-0ubuntu2",
+                "ncurses-bin=6.2-0ubuntu2,ncurses=6.2-0ubuntu2",
+                "passwd=1:4.8.1-1ubuntu5.20.04,shadow=1:4.8.1-1ubuntu5.20.04",
+                "perl-base=5.30.0-9ubuntu0.2,perl=5.30.0-9ubuntu0.2",
+                "procps=2:3.3.16-1ubuntu2,procps=2:3.3.16-1ubuntu2",
+                "pwgen=2.08-2,pwgen=2.08-2",
+                "redis-server=5:5.0.7-2,redis=5:5.0.7-2",
+                "redis-tools=5:5.0.7-2,redis=5:5.0.7-2",
+                "sed=4.7-1,sed=4.7-1",
+                "sensible-utils=0.0.12+nmu1,sensible-utils=0.0.12+nmu1",
+                "sysvinit-utils=2.96-2.1ubuntu1,sysvinit=2.96-2.1ubuntu1",
+                "tar=1.30+dfsg-7,tar=1.30+dfsg-7",
+                "tzdata=2020d-0ubuntu0.20.04,tzdata=2020d-0ubuntu0.20.04",
+                "ubuntu-keyring=2020.02.11.2,ubuntu-keyring=2020.02.11.2",
+                "util-linux=2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1",
+                "zlib1g:amd64=1:1.2.11.dfsg-2ubuntu1.2,zlib=1:1.2.11.dfsg-2ubuntu1.2",
+            ],
+        }
+        valid_rock = RockContainer(valid_rock_fn)
+        self.assertDictEqual(
+            expected_manifest_yaml, valid_rock.get_rock_manifest()
+        )
+
+    def test_get_rock_manifest_invalid_rock(self):
+        """Test get_rock_manifest() - invalid rock tar"""
+        invalid_rock_fn = "./tests/invalid_rock_multiple_layer_tar_archives.tar"
+        invalid_rock = RockContainer(invalid_rock_fn)
+        with self.assertRaises(ReviewException) as e:
+            invalid_rock.get_rock_manifest()
+        self.assertEqual(
+            e.exception.value,
+            "Unexpected number of layer tar archives inside layer directory: 2",
+        )
diff --git a/reviewtools/tests/containers/test_tar_container.py b/reviewtools/tests/containers/test_tar_container.py
new file mode 100644
index 0000000..153ef3f
--- /dev/null
+++ b/reviewtools/tests/containers/test_tar_container.py
@@ -0,0 +1,70 @@
+import os
+import unittest
+from tempfile import mkstemp, mkdtemp
+from reviewtools.containers.tar_container import (
+    TarContainer,
+    ContainerException,
+)
+
+
+class TestTarContainer(unittest.TestCase):
+    """Tests for reviewtools.containers.tar_container"""
+
+    @classmethod
+    def setUpClass(cls):
+        cls.tmp_dir = mkdtemp()
+        cls.fn = "./tests/test-rock-redis_5.0-20.04.tar"
+
+    #  Test initialization
+    def test_check_initialization__happy(self):
+        TarContainer(self.fn)
+
+    def test_check_initialization__invalid_format(self):
+        fd, plain_file = mkstemp(suffix=".tar")
+        with self.assertRaises(ContainerException) as context:
+            TarContainer(plain_file)
+        self.assertEqual(
+            "Unsupported package format (not tar)", context.exception.value
+        )
+        os.unlink(plain_file)
+
+    # Test calculate unpacked size
+    def test_calculate_unpacked_size__happy(self):
+        # unpacked size calculated is a bit smaller than actual size as it does not consider that
+        # folders require at least one complete block
+        container = TarContainer(self.fn)
+        size = container.calculate_unpacked_size()
+        self.assertTrue(isinstance(size, int))
+
+    # Test unpack
+    def test_unpack__happy(self):
+        container = TarContainer(self.fn)
+        container.unpack()
+
+    def test_unpack__force(self):
+        container = TarContainer(self.fn)
+        container.unpack()
+        container.unpack(force=True)
+
+    def test_unpack__no_force(self):
+        container = TarContainer(self.fn)
+        container.unpack()
+        with self.assertRaises(ContainerException) as context:
+            container.unpack()
+        self.assertTrue(" exists. Aborting." in context.exception.value)
+
+    def test_check_unpack__slash_file(self):
+        container = TarContainer("./tests/test-rock-invalid-1.tar")
+        with self.assertRaises(ContainerException) as context:
+            container.unpack()
+        self.assertTrue(
+            " while extracting archive at " in context.exception.value
+        )
+
+    def test_check_unpack__two_dots_file(self):
+        container = TarContainer("./tests/test-rock-invalid-2.tar")
+        with self.assertRaises(ContainerException) as context:
+            container.unpack()
+        self.assertTrue(
+            " while extracting archive at " in context.exception.value
+        )
diff --git a/reviewtools/tests/test_common.py b/reviewtools/tests/test_common.py
index 85504ca..953d2c0 100644
--- a/reviewtools/tests/test_common.py
+++ b/reviewtools/tests/test_common.py
@@ -19,7 +19,6 @@ import os
 import shutil
 import tempfile
 
-from reviewtools.sr_common import ReviewException
 import reviewtools.sr_tests as sr_tests
 import reviewtools.common
 from reviewtools.common import StatLLN
@@ -502,194 +501,3 @@ drwxr-xr-x 0/0                48 2020-03-24 09:11 squashfs-root/meta
                 continue
 
             raise Exception("parsed input should be invalid")
-
-    def test_check_pkg_uncompressed_size_ok(self):
-        """Test check_pkg_uncompressed_size() - rocks and snaps"""
-        pkgs = [
-            "./tests/test-rock-redis_5.0-20.04.tar",
-            "./tests/test-snapcraft-manifest-unittest_0_amd64.snap",
-        ]
-        max_size = 3 * 1024 * 1024
-        size = 1 * 1024 * 1024
-        for pkg in pkgs:
-            with self.subTest(pkg=pkg):
-                valid_size, _ = reviewtools.common.is_pkg_uncompressed_size_valid(
-                    max_size, size, pkg
-                )
-                self.assertTrue(valid_size)
-
-    def test_check_pkg_uncompressed_size_max_size_error(self):
-        """Test check_pkg_uncompressed_size() - rocks and snaps"""
-        pkgs = [
-            "./tests/test-rock-redis_5.0-20.04.tar",
-            "./tests/test-snapcraft-manifest-unittest_0_amd64.snap",
-        ]
-        max_size = 1024
-        size = 1 * 1024 * 1024
-        for pkg in pkgs:
-            with self.subTest(pkg=pkg):
-                valid_size, _ = reviewtools.common.is_pkg_uncompressed_size_valid(
-                    max_size, size, pkg
-                )
-                self.assertFalse(valid_size)
-
-    def test_unpack_rock_invalid_format(self):
-        """Test unpack_rock() - invalid rock format"""
-        invalid_rock = "./tests/test-snapcraft-manifest-unittest_0_amd64.snap"
-        with self.assertRaises(SystemExit) as e:
-            reviewtools.common.unpack_rock(invalid_rock)
-        self.assertEqual(e.exception.code, 1)
-
-    def test_unpack_rock_valid_format(self):
-        """Test unpack_rock() - valid rock format"""
-        # TODO: add further unit testing for tar unpacking functionality
-        valid_rock = "./tests/test-rock-redis_5.0-20.04.tar"
-        unpack_dir = reviewtools.common.unpack_rock(valid_rock)
-        self.assertIn("review-tools-", unpack_dir)
-
-    def test_unpack_rock_invalid_format_filename_starting_with_slash(self):
-        """Test unpack_rock() - invalid - filename starting with slash"""
-        # TODO: add further unit testing for tar unpacking functionality
-        invalid_rock = "./tests/test-rock-invalid-1.tar"
-        with self.assertRaises(SystemExit) as e:
-            reviewtools.common.unpack_rock(invalid_rock)
-        self.assertEqual(e.exception.code, 1)
-
-    def test_unpack_rock_invalid_format_filename_with_two_dots(self):
-        """Test unpack_rock() - invalid - filename with two dots"""
-        # TODO: add further unit testing for tar unpacking functionality
-        invalid_rock = "./tests/test-rock-invalid-2.tar"
-        with self.assertRaises(SystemExit) as e:
-            reviewtools.common.unpack_rock(invalid_rock)
-        self.assertEqual(e.exception.code, 1)
-
-    def test_get_rock_manifest(self):
-        """Test get_rock_manifest()"""
-        valid_rock_fn = "./tests/test-rock-redis_5.0-20.04.tar"
-        expected_manifest_yaml = {
-            "manifest-version": "1",
-            "os-release-id": "ubuntu",
-            "os-release-version-id": "20.04",
-            "stage-packages": [
-                "adduser=3.118ubuntu2,adduser=3.118ubuntu2",
-                "apt=2.0.2ubuntu0.2,apt=2.0.2ubuntu0.2",
-                "base-files=11ubuntu5.2,base-files=11ubuntu5.2",
-                "base-passwd=3.5.47,base-passwd=3.5.47",
-                "bash=5.0-6ubuntu1.1,bash=5.0-6ubuntu1.1",
-                "bsdutils=1:2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
-                "bzip2=1.0.8-2,bzip2=1.0.8-2",
-                "coreutils=8.30-3ubuntu2," "coreutils=8.30-3ubuntu2",
-                "dash=0.5.10.2-6,dash=0.5.10.2-6",
-                "debconf=1.5.73,debconf=1.5.73",
-                "debianutils=4.9.1,debianutils=4.9.1",
-                "diffutils=1:3.7-3,diffutils=1:3.7-3",
-                "dpkg=1.19.7ubuntu3,dpkg=1.19.7ubuntu3",
-                "e2fsprogs=1.45.5-2ubuntu1," "e2fsprogs=1.45.5-2ubuntu1",
-                "fdisk=2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
-                "findutils=4.7.0-1ubuntu1," "findutils=4.7.0-1ubuntu1",
-                "gcc-10-base:amd64=10.2.0-5ubuntu1~20.04,"
-                "gcc-10=10.2.0-5ubuntu1~20.04",
-                "gpgv=2.2.19-3ubuntu2,gnupg2=2.2.19-3ubuntu2",
-                "grep=3.4-1,grep=3.4-1",
-                "gzip=1.10-0ubuntu4,gzip=1.10-0ubuntu4",
-                "hostname=3.23,hostname=3.23",
-                "init-system-helpers=1.57," "init-system-helpers=1.57",
-                "libacl1:amd64=2.2.53-6,acl=2.2.53-6",
-                "libapt-pkg6.0:amd64=2.0.2ubuntu0.2," "apt=2.0.2ubuntu0.2",
-                "libatomic1:amd64=10.2.0-5ubuntu1~20.04,"
-                "gcc-10=10.2.0-5ubuntu1~20.04",
-                "libattr1:amd64=1:2.4.48-5,attr=1:2.4.48-5",
-                "libaudit-common=1:2.8.5-2ubuntu6," "audit=1:2.8.5-2ubuntu6",
-                "libaudit1:amd64=1:2.8.5-2ubuntu6," "audit=1:2.8.5-2ubuntu6",
-                "libblkid1:amd64=2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
-                "libbz2-1.0:amd64=1.0.8-2,bzip2=1.0.8-2",
-                "libc-bin=2.31-0ubuntu9.1," "glibc=2.31-0ubuntu9.1",
-                "libc6:amd64=2.31-0ubuntu9.1," "glibc=2.31-0ubuntu9.1",
-                "libcap-ng0:amd64=0.7.9-2.1build1," "libcap-ng=0.7.9-2.1build1",
-                "libcom-err2:amd64=1.45.5-2ubuntu1," "e2fsprogs=1.45.5-2ubuntu1",
-                "libcrypt1:amd64=1:4.4.10-10ubuntu4," "libxcrypt=1:4.4.10-10ubuntu4",
-                "libdb5.3:amd64=5.3.28+dfsg1-0.6ubuntu2,"
-                "db5.3=5.3.28+dfsg1-0.6ubuntu2",
-                "libdebconfclient0:amd64=0.251ubuntu1," "cdebconf=0.251ubuntu1",
-                "libext2fs2:amd64=1.45.5-2ubuntu1," "e2fsprogs=1.45.5-2ubuntu1",
-                "libfdisk1:amd64=2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
-                "libffi7:amd64=3.3-4,libffi=3.3-4",
-                "libgcc-s1:amd64=10.2.0-5ubuntu1~20.04," "gcc-10=10.2.0-5ubuntu1~20.04",
-                "libgcrypt20:amd64=1.8.5-5ubuntu1," "libgcrypt20=1.8.5-5ubuntu1",
-                "libgmp10:amd64=2:6.2.0+dfsg-4," "gmp=2:6.2.0+dfsg-4",
-                "libgnutls30:amd64=3.6.13-2ubuntu1.3," "gnutls28=3.6.13-2ubuntu1.3",
-                "libgpg-error0:amd64=1.37-1," "libgpg-error=1.37-1",
-                "libhiredis0.14:amd64=0.14.0-6," "hiredis=0.14.0-6",
-                "libhogweed5:amd64=3.5.1+really3.5.1-2," "nettle=3.5.1+really3.5.1-2",
-                "libidn2-0:amd64=2.2.0-2,libidn2=2.2.0-2",
-                "libjemalloc2:amd64=5.2.1-1ubuntu1," "jemalloc=5.2.1-1ubuntu1",
-                "liblua5.1-0:amd64=5.1.5-8.1build4," "lua5.1=5.1.5-8.1build4",
-                "liblz4-1:amd64=1.9.2-2,lz4=1.9.2-2",
-                "liblzma5:amd64=5.2.4-1ubuntu1," "xz-utils=5.2.4-1ubuntu1",
-                "libmount1:amd64=2.34-0.1ubuntu9.1," "util-linux=2.34-0.1ubuntu9.1",
-                "libncurses6:amd64=6.2-0ubuntu2," "ncurses=6.2-0ubuntu2",
-                "libncursesw6:amd64=6.2-0ubuntu2," "ncurses=6.2-0ubuntu2",
-                "libnettle7:amd64=3.5.1+really3.5.1-2," "nettle=3.5.1+really3.5.1-2",
-                "libp11-kit0:amd64=0.23.20-1build1," "p11-kit=0.23.20-1build1",
-                "libpam-modules:amd64=1.3.1-5ubuntu4.1," "pam=1.3.1-5ubuntu4.1",
-                "libpam-modules-bin=1.3.1-5ubuntu4.1," "pam=1.3.1-5ubuntu4.1",
-                "libpam-runtime=1.3.1-5ubuntu4.1," "pam=1.3.1-5ubuntu4.1",
-                "libpam0g:amd64=1.3.1-5ubuntu4.1," "pam=1.3.1-5ubuntu4.1",
-                "libpcre2-8-0:amd64=10.34-7,pcre2=10.34-7",
-                "libpcre3:amd64=2:8.39-12build1," "pcre3=2:8.39-12build1",
-                "libprocps8:amd64=2:3.3.16-1ubuntu2," "procps=2:3.3.16-1ubuntu2",
-                "libseccomp2:amd64=2.4.3-1ubuntu3.20.04.3,"
-                "libseccomp=2.4.3-1ubuntu3.20.04.3",
-                "libselinux1:amd64=3.0-1build2,libselinux=3.0-1build2",
-                "libsemanage-common=3.0-1build2,libsemanage=3.0-1build2",
-                "libsemanage1:amd64=3.0-1build2,libsemanage=3.0-1build2",
-                "libsepol1:amd64=3.0-1,libsepol=3.0-1",
-                "libsmartcols1:amd64=2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1",
-                "libss2:amd64=1.45.5-2ubuntu1,e2fsprogs=1.45.5-2ubuntu1",
-                "libstdc++6:amd64=10.2.0-5ubuntu1~20.04,gcc-10=10.2.0-5ubuntu1~20.04",
-                "libsystemd0:amd64=245.4-4ubuntu3.3,systemd=245.4-4ubuntu3.3",
-                "libtasn1-6:amd64=4.16.0-2,libtasn1-6=4.16.0-2",
-                "libtinfo6:amd64=6.2-0ubuntu2,ncurses=6.2-0ubuntu2",
-                "libudev1:amd64=245.4-4ubuntu3.3,systemd=245.4-4ubuntu3.3",
-                "libunistring2:amd64=0.9.10-2,libunistring=0.9.10-2",
-                "libuuid1:amd64=2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1",
-                "libxcursor1=4.0.0-2,tiff=4.0.0-2",
-                "libzstd1:amd64=1.4.4+dfsg-3,libzstd=1.4.4+dfsg-3",
-                "login=1:4.8.1-1ubuntu5.20.04,shadow=1:4.8.1-1ubuntu5.20.04",
-                "logsave=1.45.5-2ubuntu1,e2fsprogs=1.45.5-2ubuntu1",
-                "lsb-base=11.1.0ubuntu2,lsb=11.1.0ubuntu2",
-                "lua-bitop:amd64=1.0.2-5,lua-bitop=1.0.2-5",
-                "lua-cjson:amd64=2.1.0+dfsg-2.1,lua-cjson=2.1.0+dfsg-2.1",
-                "mawk=1.3.4.20200120-2,mawk=1.3.4.20200120-2",
-                "mount=2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1",
-                "ncurses-base=6.2-0ubuntu2,ncurses=6.2-0ubuntu2",
-                "ncurses-bin=6.2-0ubuntu2,ncurses=6.2-0ubuntu2",
-                "passwd=1:4.8.1-1ubuntu5.20.04,shadow=1:4.8.1-1ubuntu5.20.04",
-                "perl-base=5.30.0-9ubuntu0.2,perl=5.30.0-9ubuntu0.2",
-                "procps=2:3.3.16-1ubuntu2,procps=2:3.3.16-1ubuntu2",
-                "pwgen=2.08-2,pwgen=2.08-2",
-                "redis-server=5:5.0.7-2,redis=5:5.0.7-2",
-                "redis-tools=5:5.0.7-2,redis=5:5.0.7-2",
-                "sed=4.7-1,sed=4.7-1",
-                "sensible-utils=0.0.12+nmu1,sensible-utils=0.0.12+nmu1",
-                "sysvinit-utils=2.96-2.1ubuntu1,sysvinit=2.96-2.1ubuntu1",
-                "tar=1.30+dfsg-7,tar=1.30+dfsg-7",
-                "tzdata=2020d-0ubuntu0.20.04,tzdata=2020d-0ubuntu0.20.04",
-                "ubuntu-keyring=2020.02.11.2,ubuntu-keyring=2020.02.11.2",
-                "util-linux=2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1",
-                "zlib1g:amd64=1:1.2.11.dfsg-2ubuntu1.2,zlib=1:1.2.11.dfsg-2ubuntu1.2",
-            ],
-        }
-        self.assertDictEqual(
-            expected_manifest_yaml, reviewtools.common.get_rock_manifest(valid_rock_fn)
-        )
-
-    def test_get_rock_manifest_invalid_rock(self):
-        """Test get_rock_manifest() - invalid rock tar"""
-        invalid_rock_fn = "./tests/invalid_rock_multiple_layer_tar_archives.tar"
-        with self.assertRaises(ReviewException) as e:
-            reviewtools.common.get_rock_manifest(invalid_rock_fn)
-        self.assertEqual(
-            e.exception.value,
-            "Unexpected number of layer tar archives inside layer directory: 2",
-        )