public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
blob 96ed2bd0b55778e6069a4ea8addef09f19c61802 5821 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
 
#! /usr/bin/python3

# SPDX-License-Identifier: GPL-2.0-or-later
#
# tasst - Test A Simple Socket Transport
#         library of test helpers for passt & pasta
#
# tasst/nstool.py - Run commands in namespaces via 'nstool'
#
# Copyright Red Hat
# Author: David Gibson <david@gibson.dropbear.id.au>

import os
import sys
import tempfile

import avocado
from avocado.utils.process import CmdError

from tasst import Tasst
from tasst.site import BaseSiteTasst, Site, REAL_HOST

# FIXME: Can this be made more portable?
UNIX_PATH_MAX = 108


class NsToolSite(Site):
    NST_BIN = './test/nstool'

    def __init__(self, name, sockpath):
        super().__init__(name)

        if len(sockpath) > UNIX_PATH_MAX:
            raise ValueError('Unix domain socket path \"{}\" is too long'.format(sockpath))
        self.sockpath = sockpath
        self._pid = int(REAL_HOST.output('{} info -wp {}'.format(self.NST_BIN, sockpath), timeout=1))
        print('NsToolSite: sockpath={} PID={}'.format(sockpath, self.pid()), file=sys.stderr)

    # PID of the nstool hold process as seen by the test host
    def pid(self):
        return self._pid

    # PID of the nstool hold process as seen by another site
    # (important when using PID namespaces)
    def relative_pid(self, relative_to):
        cmd = '{} info -p {}'.format(self.NST_BIN, self.sockpath)
        return int(relative_to.output(cmd))

    def _nst_cmd(self, cmd, sudo=False):
        nst_args = self.sockpath
        if sudo:
            nst_args = '--keep-caps ' + nst_args
        return '{} exec {} -- {}'.format(self.NST_BIN, nst_args, cmd)

    def output(self, cmd, sudo=False, **kwargs):
        return REAL_HOST.output(self._nst_cmd(cmd, sudo), **kwargs)

    def fg(self, cmd, sudo=False, **kwargs):
        return REAL_HOST.fg(self._nst_cmd(cmd, sudo), **kwargs)

    def bg(self, cmd, sudo=False, **kwargs):
        return REAL_HOST.bg(self._nst_cmd(cmd, sudo), **kwargs)


# Create path for temporary nstool Unix socket
#
# The obvious choice would be to use Avocado's workdir, but that often
# gives paths that are too long for Unix sockets
def temp_sockpath(name):
    tmpd = tempfile.mkdtemp(suffix=name)
    return os.path.join(tmpd, 's')


class UnshareSite(NsToolSite):
    def __init__(self, name, unshare_opts, parent=REAL_HOST, sudo=False):
        sockpath = temp_sockpath(name)
        parent.require_cmds('unshare', self.NST_BIN)
        self.parent = parent
        holdcmd = 'unshare {} -- {} hold {}'.format(unshare_opts, self.NST_BIN, sockpath)
        self.holder = parent.bg(holdcmd, sudo=sudo)
        super().__init__(name, sockpath)

    def close(self):
        try:
            self.parent.fg('{} stop {}'.format(self.NST_BIN, self.sockpath))
        except CmdError:
            pass

        try:
            self.holder.stop()
        finally:
            try:
                os.remove(self.sockpath)
            except FileNotFoundError:
                pass

            os.rmdir(os.path.dirname(self.sockpath))
            super().close()


class IsolatedNetTasst(BaseSiteTasst):
    """
    Test a site with isolated network

    :avocado: disable
    :avocado: tags=meta
    """

    def subsetup(self, site):
        Tasst.subsetup(self, IsolatedNetTasst, site)
        BaseSiteTasst.subsetup(self, site)

    def test_isolated_net(self):
        site = self.get_subsetup(IsolatedNetTasst)
        self.assertEquals(site.ifs(), ['lo'])


class UserNetNsTasst(IsolatedNetTasst):
    """
    Test creating a userns+netns together

    :avocado: tags=meta
    """
    def setUp(self):
        super().setUp()
        self.ns = UnshareSite(type(self).__name__, '-Ucn')
        IsolatedNetTasst.subsetup(self, self.ns)

    def tearDown(self):
        self.ns.close()
        super().tearDown()

    def test_userns(self):
        REAL_HOST.require_cmds('capsh')
        self.ns.require_cmds('capsh')
        capcmd = 'capsh --has-p=CAP_SETUID'
        self.assertRaises(CmdError, REAL_HOST.fg, capcmd)
        self.ns.fg(capcmd, sudo=True)


class NestedNsTasst(IsolatedNetTasst):
    """
    Test creating userns with a netns nested within

    :avocado: tags=meta
    """
    def setUp(self):
        super().setUp()
        self.userns = UnshareSite(type(self).__name__ + '.userns', '-Uc')
        self.netns = UnshareSite(type(self).__name__ + '.netns', '-n',
                                 parent=self.userns, sudo=True)
        IsolatedNetTasst.subsetup(self, self.netns)

    def tearDown(self):
        self.netns.close()
        self.userns.close()
        super().tearDown() 


class PidNsTasst(IsolatedNetTasst):
    """
    Test unsing unshare -p  to create a pidns

    :avocado: tags=meta
    """
    def setUp(self):
        super().setUp()
        self.pidns = UnshareSite(type(self).__name__, '-Upfn')
        IsolatedNetTasst.subsetup(self, self.pidns)

    def tearDown(self):
        self.pidns.close()
        super().tearDown()

    def test_relative_pid(self):
        # The holder is init (pid 1) within its own pidns
        self.assertEquals(self.pidns.relative_pid(self.pidns), 1)


class ConnectNsToolTasst(BaseSiteTasst):
    """
    Test connecting to a pre-existing nstool

    :avocado: tags=meta
    """
    def setUp(self):
        super().setUp()
        self.sockpath = temp_sockpath(type(self).__name__)
        holdcmd = '{} hold {}'.format(NsToolSite.NST_BIN, self.sockpath)
        self.holder = REAL_HOST.bg(holdcmd)
        BaseSiteTasst.subsetup(self, NsToolSite("fake ns", self.sockpath))

    def tearDown(self):
        try:
            self.holder.stop()
        finally:
            try:
                os.remove(self.sockpath)
            except FileNotFoundError:
                pass

            os.rmdir(os.path.dirname(self.sockpath))
            super().tearDown()

debug log:

solving 96ed2bd ...
found 96ed2bd in https://archives.passt.top/passt-dev/20230516020135.1901256-11-david@gibson.dropbear.id.au/

applying [1/1] https://archives.passt.top/passt-dev/20230516020135.1901256-11-david@gibson.dropbear.id.au/
diff --git a/avocado/tasst/nstool.py b/avocado/tasst/nstool.py
new file mode 100644
index 0000000..96ed2bd

1:163: trailing whitespace.
        super().tearDown() 
Checking patch avocado/tasst/nstool.py...
Applied patch avocado/tasst/nstool.py cleanly.
warning: 1 line adds whitespace errors.

index at:
100644 96ed2bd0b55778e6069a4ea8addef09f19c61802	avocado/tasst/nstool.py

Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).