nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

privileged: Don't log exception that are expected

Browse Source 
Fixes: #2551.

Tests:

- In a VM visit the storage page. Without the patch, an exception is logged when
there is no space to expand the partition. With the patch, the exception is not
logged.

- Raise an exception in the storage.usage_info() method and notice that the
exception is logged when visiting the Storage app page.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2025-11-30 10:03:08 +05:30 committed by James Valleroy
parent b66feb2cad
commit ef23ebedbc
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plinth/actions.py
View File

@ -130,6 +130,9 @@ def run_privileged_method(func, module_name, action_name, args, kwargs):
if raw_output: if raw_output:
request['raw_output'] = raw_output request['raw_output'] = raw_output
if not log_error:
request['log_error'] = False
client_socket = _request_to_server(request) client_socket = _request_to_server(request)
if raw_output: if raw_output:
@ -424,14 +427,19 @@ def privileged_handle_json_request(
bool): bool):
raise TypeError('Incorrect "raw_output" parameter') raise TypeError('Incorrect "raw_output" parameter')
if 'log_error' in request and not isinstance(request['log_error'],
bool):
raise TypeError('Incorrect "log_error" parameter')
return request return request
try: try:
request = _parse_request() request = _parse_request()
log_error = request.get('log_error', True)
arguments = {'args': request['args'], 'kwargs': request['kwargs']} arguments = {'args': request['args'], 'kwargs': request['kwargs']}
_setup_thread_storage() _setup_thread_storage()
return_value = _privileged_call(request['module'], request['action'], return_value = _privileged_call(request['module'], request['action'],
arguments) arguments, log_error)
if isinstance(return_value, io.BufferedReader): if isinstance(return_value, io.BufferedReader):
raw_output = request.get('raw_output', False) raw_output = request.get('raw_output', False)
@ -452,7 +460,7 @@ def privileged_handle_json_request(
return json.dumps(return_value, cls=JSONEncoder) return json.dumps(return_value, cls=JSONEncoder)
def _privileged_call(module_name, action_name, arguments): def _privileged_call(module_name, action_name, arguments, log_error=True):
"""Import the module and run action as superuser""" """Import the module and run action as superuser"""
if '.' in module_name: if '.' in module_name:
raise SyntaxError('Invalid module name') raise SyntaxError('Invalid module name')
@ -500,11 +508,12 @@ def _privileged_call(module_name, action_name, arguments):
return_value = {'result': 'success', 'return': return_values} return_value = {'result': 'success', 'return': return_values}
except Exception as exception: except Exception as exception:
return_value = get_return_value_from_exception(exception) return_value = get_return_value_from_exception(exception)
logger.exception( if log_error:
'Error running action: %s..%s(..): %s\nstdout:\n%s\nstderr:\n%s\n', logger.exception(
module_name, action_name, exception, 'Error running action: %s..%s(..): %s\nstdout:\n%s\n'
return_value['exception']['stdout'], 'stderr:\n%s\n', module_name, action_name, exception,
return_value['exception']['stderr']) return_value['exception']['stdout'],
return_value['exception']['stderr'])
return return_value return return_value