From 99d8be9d2a3006352e1c7bc5a8e3e59b07d58835 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Wed, 6 Jul 2022 15:05:37 -0700
Subject: [PATCH] cockpit: Use decorator for privileged actions

Tests:

- Login to Cockpit on a freshly setup container.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/modules/cockpit/__init__.py            |  5 ++-
 .../modules/cockpit/privileged.py             | 33 +++----------------
 2 files changed, 6 insertions(+), 32 deletions(-)
 rename actions/cockpit => plinth/modules/cockpit/privileged.py (53%)
 mode change 100755 => 100644

diff --git a/plinth/modules/cockpit/__init__.py b/plinth/modules/cockpit/__init__.py
index f565a8a8c..f00b55af5 100644
--- a/plinth/modules/cockpit/__init__.py
+++ b/plinth/modules/cockpit/__init__.py
@@ -6,7 +6,6 @@ FreedomBox app to configure Cockpit.
 from django.urls import reverse_lazy
 from django.utils.translation import gettext_lazy as _
 
-from plinth import actions
 from plinth import app as app_module
 from plinth import cfg, frontpage, menu
 from plinth.daemon import Daemon
@@ -16,7 +15,7 @@ from plinth.modules.firewall.components import Firewall
 from plinth.package import Packages
 from plinth.utils import format_lazy
 
-from . import manifest
+from . import manifest, privileged
 
 _description = [
     format_lazy(
@@ -94,6 +93,6 @@ class CockpitApp(app_module.App):
 def setup(helper, old_version=None):
     """Install and configure the module."""
     app.setup(old_version)
-    helper.call('post', actions.superuser_run, 'cockpit', ['setup'])
+    helper.call('post', privileged.setup)
     if not old_version:
         helper.call('post', app.enable)
diff --git a/actions/cockpit b/plinth/modules/cockpit/privileged.py
old mode 100755
new mode 100644
similarity index 53%
rename from actions/cockpit
rename to plinth/modules/cockpit/privileged.py
index e3ff78d41..e7cfdfaec
--- a/actions/cockpit
+++ b/plinth/modules/cockpit/privileged.py
@@ -1,29 +1,16 @@
-#!/usr/bin/python3
 # SPDX-License-Identifier: AGPL-3.0-or-later
 """
-Configuration helper for Cockpit.
+Configure Cockpit.
 """
 
-import argparse
-
 import augeas
 
 from plinth import action_utils
+from plinth.actions import privileged
 
 CONFIG_FILE = '/etc/cockpit/cockpit.conf'
 
 
-def parse_arguments():
-    """Return parsed command line arguments as dictionary."""
-    parser = argparse.ArgumentParser()
-    subparsers = parser.add_subparsers(dest='subcommand', help='Sub command')
-
-    subparsers.add_parser('setup', help='Setup Cockpit configuration')
-
-    subparsers.required = True
-    return parser.parse_args()
-
-
 def _load_augeas():
     """Initialize Augeas."""
     aug = augeas.Augeas(flags=augeas.Augeas.NO_LOAD +
@@ -34,7 +21,8 @@ def _load_augeas():
     return aug
 
 
-def subcommand_setup(arguments):
+@privileged
+def setup():
     """Setup Cockpit configuration."""
     aug = _load_augeas()
     aug.set('/files' + CONFIG_FILE + '/WebService/UrlRoot', '/_cockpit/')
@@ -43,16 +31,3 @@ def subcommand_setup(arguments):
     action_utils.service_restart('cockpit.socket')
     # Accommodate changes in Apache configuration file from v1 to v2.
     action_utils.service_reload('apache2')
-
-
-def main():
-    """Parse arguments and perform all duties."""
-    arguments = parse_arguments()
-
-    subcommand = arguments.subcommand.replace('-', '_')
-    subcommand_method = globals()['subcommand_' + subcommand]
-    subcommand_method(arguments)
-
-
-if __name__ == '__main__':
-    main()