From 35309d13d04178452f8a0b897f9cacb7b106a7b8 Mon Sep 17 00:00:00 2001 From: anyushevai Date: Sun, 21 Oct 2018 23:55:47 +0300 Subject: [PATCH 1/4] add warning & abort if tljh-config is called as non-root user --- tljh/config.py | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/tljh/config.py b/tljh/config.py index a09bda1..69b1c97 100644 --- a/tljh/config.py +++ b/tljh/config.py @@ -223,7 +223,11 @@ def main(argv=None): argv = sys.argv[1:] from .log import init_logging - init_logging() + try: + init_logging() + except Exception as e: + print(str(e)) + print("Perhaps you didn't use `sudo -E`?") argparser = argparse.ArgumentParser() argparser.add_argument( @@ -291,18 +295,22 @@ def main(argv=None): args = argparser.parse_args(argv) - if args.action == 'show': - show_config(args.config_path) - elif args.action == 'set': - set_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'add-item': - add_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'remove-item': - remove_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'reload': - reload_component(args.component) - else: - argparser.print_help() + try: + if args.action == 'show': + show_config(args.config_path) + elif args.action == 'set': + set_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'add-item': + add_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'remove-item': + remove_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'reload': + reload_component(args.component) + else: + argparser.print_help() + except Exception as e: + print(str(e)) + print("Perhaps you didn't use `sudo -E`?") if __name__ == '__main__': From 12aaf382aae9f95267ba345616eeffe673e4e171 Mon Sep 17 00:00:00 2001 From: anyushevai Date: Tue, 23 Oct 2018 23:45:33 +0300 Subject: [PATCH 2/4] early check if it was called as non-root user --- tljh/config.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tljh/config.py b/tljh/config.py index 69b1c97..21a89d0 100644 --- a/tljh/config.py +++ b/tljh/config.py @@ -219,6 +219,10 @@ def _is_list(item): def main(argv=None): + if os.geteuid() != 0: + print("Perhaps you didn't use `sudo -E`?") + raise(SystemExit) + if argv is None: argv = sys.argv[1:] @@ -295,22 +299,18 @@ def main(argv=None): args = argparser.parse_args(argv) - try: - if args.action == 'show': - show_config(args.config_path) - elif args.action == 'set': - set_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'add-item': - add_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'remove-item': - remove_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'reload': - reload_component(args.component) - else: - argparser.print_help() - except Exception as e: - print(str(e)) - print("Perhaps you didn't use `sudo -E`?") + if args.action == 'show': + show_config(args.config_path) + elif args.action == 'set': + set_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'add-item': + add_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'remove-item': + remove_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'reload': + reload_component(args.component) + else: + argparser.print_help() if __name__ == '__main__': From ac06f6422403aaa747a84e2a1ca4dfdd902ebf5a Mon Sep 17 00:00:00 2001 From: Chris Holdgraf Date: Wed, 24 Oct 2018 12:56:47 +0300 Subject: [PATCH 3/4] Update tljh/config.py Co-Authored-By: anyushevai --- tljh/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tljh/config.py b/tljh/config.py index 21a89d0..b010297 100644 --- a/tljh/config.py +++ b/tljh/config.py @@ -220,7 +220,7 @@ def _is_list(item): def main(argv=None): if os.geteuid() != 0: - print("Perhaps you didn't use `sudo -E`?") + print("It looks like this command wasn't run with root privileges. Perhaps you didn't use `sudo -E`?") raise(SystemExit) if argv is None: From 60ab68d2994e187231d4681ca2d81b18cfdb609f Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 24 Oct 2018 18:13:03 +0300 Subject: [PATCH 4/4] Update tljh/config.py Co-Authored-By: anyushevai --- tljh/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tljh/config.py b/tljh/config.py index b010297..090b916 100644 --- a/tljh/config.py +++ b/tljh/config.py @@ -221,7 +221,6 @@ def _is_list(item): def main(argv=None): if os.geteuid() != 0: print("It looks like this command wasn't run with root privileges. Perhaps you didn't use `sudo -E`?") - raise(SystemExit) if argv is None: argv = sys.argv[1:]