From: John Mulligan <jmulligan@redhat.com>
Date: Thu, 6 Jan 2022 21:36:32 +0000 (-0500)
Subject: cephadm: check if cephadm is root after cli is parsed
X-Git-Tag: v17.1.0~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f01977a68c3a2bba7bf2dfb7322728e7da96d0d;p=ceph.git

cephadm: check if cephadm is root after cli is parsed

Fixes: https://tracker.ceph.com/issues/53572

Perform a check if cephadm is root after the CLI arguments are parsed
but before logging is configured. This allows a user to get help on
cephadm without requiring to be root or use sudo, etc.
The root check must be done before logging is configured because the
logging set up function creates dirs and files in system dirs.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 2ea74ef1c01..0600e7bae2a 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -8512,13 +8512,14 @@ def cephadm_init_logging(ctx: CephadmContext, args: List[str]) -> None:
     logger.debug('%s\ncephadm %s' % ('-' * 80, args))
 
 
-def main() -> None:
-
-    # root?
+def cephadm_require_root() -> None:
+    """Exit if the process is not running as root."""
     if os.geteuid() != 0:
         sys.stderr.write('ERROR: cephadm should be run as root\n')
         sys.exit(1)
 
+
+def main() -> None:
     av: List[str] = []
     av = sys.argv[1:]
 
@@ -8527,6 +8528,7 @@ def main() -> None:
         sys.stderr.write('No command specified; pass -h or --help for usage\n')
         sys.exit(1)
 
+    cephadm_require_root()
     cephadm_init_logging(ctx, av)
     try:
         # podman or docker?