From f0609429c05a70b6e6e7f131f56468e704be9640 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 27 Jul 2021 15:56:25 -0600 Subject: [PATCH] cephadm: validate fsid during ceph-volume command Signed-off-by: Michael Fritch --- src/cephadm/cephadm | 1 + src/cephadm/tests/test_cephadm.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index a515cb24c5454..a198cbcce59e2 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -4634,6 +4634,7 @@ def command_enter(ctx): @infer_fsid @infer_image +@validate_fsid def command_ceph_volume(ctx): # type: (CephadmContext) -> None cp = read_config(ctx.config) diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py index 9fe381c126092..a4ea384708a33 100644 --- a/src/cephadm/tests/test_cephadm.py +++ b/src/cephadm/tests/test_cephadm.py @@ -1545,6 +1545,14 @@ class TestCephVolume(object): cd.command_ceph_volume(ctx) assert ctx.fsid == fsid + cmd = self._get_cmd('--fsid', '00000000-0000-0000-0000-0000deadbeez') + with with_cephadm_ctx(cmd) as ctx: + err = 'not an fsid' + with pytest.raises(cd.Error, match=err): + retval = cd.command_shell(ctx) + assert retval == 1 + assert ctx.fsid == None + s = get_ceph_conf(fsid=fsid) f = cephadm_fs.create_file('ceph.conf', contents=s) -- 2.39.5