1
diff --git a/curtin/util.py b/curtin/util.py
2
index 8be6d20..58ee7e1 100644
3
--- a/curtin/util.py
4
+++ b/curtin/util.py
5
@@ -784,8 +784,10 @@ class ChrootableTarget(object):
6
784
        ischroot_mount_path = paths.target_path(self.target,
784
        ischroot_mount_path = paths.target_path(self.target,
7
785
                                                '/usr/bin/ischroot')
785
                                                '/usr/bin/ischroot')
8
786
        true_exists = os.path.isfile(true_mount_path)
786
        true_exists = os.path.isfile(true_mount_path)
11
787
        if true_exists and do_mount(true_mount_path, ischroot_mount_path,
787
        ischroot_exists = os.path.isfile(ischroot_mount_path)
12
788
                                    opts='--bind'):
788
        both_exist = true_exists and ischroot_exists
13
789
        if both_exist and do_mount(true_mount_path, ischroot_mount_path,
14
790
                                   opts='--bind'):
15
789
            self.umounts.append(ischroot_mount_path)
791
            self.umounts.append(ischroot_mount_path)
16
790
792
17
791
        return self
793
        return self
18
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
19
index 5dcef36..2dd63a7 100644
20
--- a/tests/unittests/test_util.py
21
+++ b/tests/unittests/test_util.py
22
@@ -642,6 +642,7 @@ class TestChrootableTargetIsChrootBehavior(CiTestCase):
23
642
        Assumptions:
642
        Assumptions:
24
643
        - /usr/bin/true exists inside the target. (If it does not,
643
        - /usr/bin/true exists inside the target. (If it does not,
25
644
        util.py does not attempt this bind mount)
644
        util.py does not attempt this bind mount)
26
645
        - /usr/bin/ischroot exists inside the target.
27
645
646
28
646
        Notes:
647
        Notes:
29
647
        - This test ignores any attempts to bind-mount anything other
648
        - This test ignores any attempts to bind-mount anything other
30
@@ -694,6 +695,53 @@ class TestChrootableTargetIsChrootBehavior(CiTestCase):
31
694
            self.assertEqual(self.true_content, target_ischroot_file)
695
            self.assertEqual(self.true_content, target_ischroot_file)
32
695
696
33
696
697
34
698
class TestChrootableTargetIsChrootBehaviorMissingFiles(CiTestCase):
35
699
    """Test ChrootableTargets do *not* mount ischroot if ischroot or
36
700
    true do not exist
37
701
38
702
    The test checks to make sure that, in a ChrootableTarget that is
39
703
    missing /usr/bin/ischroot or /usr/bin/true:
40
704
        The ischroot->true bind mount is not attempted
41
705
42
706
        Notes:
43
707
        - This test ignores any attempts to bind-mount anything other
44
708
        than files, as such mounts are out-of-scope for this test.
45
709
        """
46
710
47
711
    def setUp(self):
48
712
        super(TestChrootableTargetIsChrootBehaviorMissingFiles, self).setUp()
49
713
        self.target = self.tmp_dir()
50
714
        self.truebin = os.path.join(self.target, 'usr/bin/true')
51
715
        self.ischrootbin = os.path.join(self.target, 'usr/bin/ischroot')
52
716
        os.makedirs(os.path.dirname(self.truebin))
53
717
        self.add_patch('curtin.util.do_mount', 'm_do_mount')
54
718
        # Patching subp is necessary here since subp calls are attempted
55
719
        # in ChrootableTarget.__exit__(), which will fail since
56
720
        # self.allowed_subp=False
57
721
        self.add_patch('curtin.util.subp', 'm_subp')
58
722
        self.umounts = []
59
723
60
724
    def mymount(self, src, dst, opts):
61
725
        print('mymount(src=%s dst=%s, opts=%s)' % (src, dst, opts))
62
726
        if dst not in self.umounts:
63
727
            self.umounts.append(dst)
64
728
        else:
65
729
            return False
66
730
67
731
        if os.path.isfile(src):
68
732
            util.write_file(dst, util.load_file(src))
69
733
        else:
70
734
            print("Ignoring non-file bind mounts for this test")
71
735
        return True
72
736
73
737
    def test_chrootable_target_does_not_bind_if_files_missing(self):
74
738
        target_ischroot = os.path.join(self.target, 'usr/bin/ischroot')
75
739
76
740
        self.m_do_mount.side_effect = self.mymount
77
741
        with util.ChrootableTarget(self.target) as chroot:
78
742
            self.assertFalse(target_ischroot in chroot.umounts)
79
743
80
744
81
697
class TestChrootableTargetResolvConf(CiTestCase):
745
class TestChrootableTargetResolvConf(CiTestCase):
82
698
    """Test ChrootableTargets handles target /etc/resolv.conf gracefully"""
746
    """Test ChrootableTargets handles target /etc/resolv.conf gracefully"""
83
699
747
Status:	Merged
Approved by:	Dan Bungert on 2024-03-04
Approved revision:	935c59ff250d1b61d4e092f2fc0c06bcfd9ad991
Merge reported by:	Server Team CI bot
Merged at revision:	not available
Proposed branch:	~mitchellaugustin/curtin/+git/curtin-1:missing-ischroot-mitigation
Merge into:	curtin:master
Diff against target:	82 lines (+52/-2) 2 files modified curtin/util.py (+4/-2) tests/unittests/test_util.py (+48/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Dan Bungert		2024-03-04	Approve on 2024-03-04
Server Team CI bot	continuous-integration		Approve on 2024-03-04
Review via email: mp+461730@code.launchpad.net