nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

shadowsocks: Mark secret strings in privileged actions

Browse Source 
Tests:

- Run affected privileged actions through UI and notice that secret strings are
not logged.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2024-08-04 11:01:34 -07:00 committed by James Valleroy
parent bec5e593b3
commit 4c352619a5
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plinth/modules/shadowsocks/privileged.py
View File

@ -9,7 +9,7 @@ import string
from shutil import move from shutil import move
from plinth import action_utils from plinth import action_utils
from plinth.actions import privileged from plinth.actions import privileged, secret_str
SHADOWSOCKS_CONFIG_SYMLINK = '/etc/shadowsocks-libev/freedombox.json' SHADOWSOCKS_CONFIG_SYMLINK = '/etc/shadowsocks-libev/freedombox.json'
SHADOWSOCKS_CONFIG_ACTUAL = \ SHADOWSOCKS_CONFIG_ACTUAL = \
@ -85,8 +85,9 @@ def _merge_config(config):
@privileged @privileged
def merge_config(config: dict[str, int | str]): def merge_config(config: dict[str, int | str], password: secret_str):
"""Configure Shadowsocks Client.""" """Configure Shadowsocks Client."""
config['password'] = password
_merge_config(config) _merge_config(config)
# Don't try_restart because initial configuration may not be valid so # Don't try_restart because initial configuration may not be valid so

3
plinth/modules/shadowsocks/views.py
View File

@ -45,11 +45,10 @@ class ShadowsocksAppView(views.AppView):
'local_port': 1080, 'local_port': 1080,
'server': new_status['server'], 'server': new_status['server'],
'server_port': new_status['server_port'], 'server_port': new_status['server_port'],
'password': new_status['password'],
'method': new_status['method'], 'method': new_status['method'],
} }
privileged.merge_config(new_config) privileged.merge_config(new_config, new_status['password'])
messages.success(self.request, _('Configuration updated')) messages.success(self.request, _('Configuration updated'))
return super().form_valid(form) return super().form_valid(form)