From: Michael Fritch <mfritch@suse.com>
Date: Tue, 10 Nov 2020 01:07:15 +0000 (-0700)
Subject: cephadm: verify root privileges before log dir create
X-Git-Tag: v15.2.8~14^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c24304222b120045a44867676394a94014ff447;p=ceph.git

cephadm: verify root privileges before log dir create

root privileges need to be verified before creating the log dir

introduced by 81a7df0

Fixes: https://tracker.ceph.com/issues/48166
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3817c6e258f2368bdf31d4ce9eab86c682c11d6d)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index b770ca8b948..bca1ac21501 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -6016,6 +6016,11 @@ def _parse_args(av):
 
 if __name__ == "__main__":
 
+    # root?
+    if os.geteuid() != 0:
+        sys.stderr.write('ERROR: cephadm should be run as root\n')
+        sys.exit(1)
+
     # Logger configuration
     if not os.path.exists(LOG_DIR):
         os.makedirs(LOG_DIR)
@@ -6036,11 +6041,6 @@ if __name__ == "__main__":
           if handler.name == "console":
                handler.setLevel(logging.DEBUG)
 
-    # root?
-    if os.geteuid() != 0:
-        sys.stderr.write('ERROR: cephadm should be run as root\n')
-        sys.exit(1)
-
     if 'func' not in args:
         sys.stderr.write('No command specified; pass -h or --help for usage\n')
         sys.exit(1)