nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-06-17 11:10:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

actions: Drop feature to run privileged action as another user

Browse Source 
- Used after migration gitweb and storage calls to using
action_utils.run_as_user.

Tests:

- Gitweb operations and directory validations works when privileged daemon is
running or not running.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Joseph Nuthalapati <njoseph@riseup.net>
This commit is contained in:
Sunil Mohan Adapa 2025-08-11 14:58:08 -07:00 committed by Joseph Nuthalapati
parent 773460dde9
commit 5ef639d23b
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plinth/actions.py
View File

@ -85,7 +85,7 @@ def _run_privileged_method(func, module_name, action_name, args, kwargs):
return _run_privileged_method_on_server(func, module_name, action_name,
list(args), dict(kwargs))
except (
NotImplementedError, # For raw_output and run_as_user flags
NotImplementedError, # For raw_output flag
FileNotFoundError, # When the .socket file is not present
ConnectionRefusedError, # When is daemon not running
ConnectionResetError # When daemon fails permission check
@ -127,15 +127,14 @@ def _request_to_server(request: dict) -> socket.socket:
def _run_privileged_method_on_server(func, module_name, action_name, args,
kwargs):
"""Execute a privileged method using a server."""
run_as_user = kwargs.pop('_run_as_user', None)
run_in_background = kwargs.pop('_run_in_background', False)
raw_output = kwargs.pop('_raw_output', False)
log_error = kwargs.pop('_log_error', True)
if raw_output or run_as_user:
if raw_output:
raise NotImplementedError('Not yet implemented')
_log_action(func, module_name, action_name, args, kwargs, run_as_user,
_log_action(func, module_name, action_name, args, kwargs,
run_in_background, is_server=True)
request = {
@ -205,7 +204,6 @@ def _wait_for_server_response(func, module_name, action_name, args, kwargs,
def _run_privileged_method_as_process(func, module_name, action_name, args,
kwargs):
"""Execute the privileged method in a sub-process with sudo."""
run_as_user = kwargs.pop('_run_as_user', None)
run_in_background = kwargs.pop('_run_in_background', False)
raw_output = kwargs.pop('_raw_output', False)
log_error = kwargs.pop('_log_error', True)
@ -215,8 +213,6 @@ def _run_privileged_method_as_process(func, module_name, action_name, args,
# Prepare the command
command = ['sudo', '--non-interactive', '--close-from', str(write_fd + 1)]
if run_as_user:
command += ['--user', run_as_user]
if cfg.develop:
command += [f'PYTHONPATH={cfg.file_root}']
@ -238,7 +234,7 @@ def _run_privileged_method_as_process(func, module_name, action_name, args,
# In development mode pass on local pythonpath to access Plinth
proc_kwargs['env'] = {'PYTHONPATH': cfg.file_root}
_log_action(func, module_name, action_name, args, kwargs, run_as_user,
_log_action(func, module_name, action_name, args, kwargs,
run_in_background, is_server=False)
proc = subprocess.Popen(command, **proc_kwargs)
@ -422,13 +418,13 @@ def _get_privileged_action_module_name(func):
return module_name.rpartition('.')[2]
def _log_action(func, module_name, action_name, args, kwargs, run_as_user,
def _log_action(func, module_name, action_name, args, kwargs,
run_in_background, is_server):
"""Log an action in a compact format."""
if is_server:
prompt = '»'
else:
prompt = f'({run_as_user})$' if run_as_user else '#'
prompt = '#'
suffix = '&' if run_in_background else ''
formatted_args = _format_args(func, args, kwargs)