mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-01-28 08:03:36 +00:00
b12d994760
It is confusing to combine the user's intent of wanting to have backports activated with whether they have actually been configured in the system. - Separate out checking for requested which is a key in the kvstore from enabled which is about checking system configuration for backports. - Implement convenience method for setting whether user requested backports. - Do not base the status display (in security and upgrades modules) on the configuration status and instead focus on user intent. - If user requested backports but they have not been enabled yet due to not being available, show as activated. System will keep trying the background and configure eventually. - If user requested backports but their configuration is outdated yet due to newer release, show as activated. System will keep trying in the background and configure latest settings eventually. - In all places where backports enabling is being checked, split the logic for 'can be activated' from 'already activated' and 'user requested activation' properly. Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org> Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
80 lines
2.5 KiB
Python
80 lines
2.5 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
"""
|
|
Views for security module
|
|
"""
|
|
|
|
from django.contrib import messages
|
|
from django.template.response import TemplateResponse
|
|
from django.utils.translation import ugettext as _
|
|
|
|
from plinth import action_utils, actions
|
|
from plinth.modules import security
|
|
from plinth.modules.upgrades import is_backports_requested
|
|
|
|
from .forms import SecurityForm
|
|
|
|
|
|
def index(request):
|
|
"""Serve the security configuration form"""
|
|
status = get_status(request)
|
|
|
|
form = None
|
|
|
|
if request.method == 'POST':
|
|
form = SecurityForm(request.POST, initial=status, prefix='security')
|
|
if form.is_valid():
|
|
_apply_changes(request, status, form.cleaned_data)
|
|
status = get_status(request)
|
|
form = SecurityForm(initial=status, prefix='security')
|
|
else:
|
|
form = SecurityForm(initial=status, prefix='security')
|
|
|
|
return TemplateResponse(
|
|
request, 'security.html', {
|
|
'app_info': security.app.info,
|
|
'form': form,
|
|
'is_backports_requested': is_backports_requested(),
|
|
})
|
|
|
|
|
|
def get_status(request):
|
|
"""Return the current status"""
|
|
return {
|
|
'restricted_access': security.get_restricted_access_enabled(),
|
|
'fail2ban_enabled': action_utils.service_is_enabled('fail2ban')
|
|
}
|
|
|
|
|
|
def _apply_changes(request, old_status, new_status):
|
|
"""Apply the form changes"""
|
|
if old_status['restricted_access'] != new_status['restricted_access']:
|
|
try:
|
|
security.set_restricted_access(new_status['restricted_access'])
|
|
except Exception as exception:
|
|
messages.error(
|
|
request,
|
|
_('Error setting restricted access: {exception}').format(
|
|
exception=exception))
|
|
else:
|
|
messages.success(request, _('Updated security configuration'))
|
|
|
|
if old_status['fail2ban_enabled'] != new_status['fail2ban_enabled']:
|
|
if new_status['fail2ban_enabled']:
|
|
actions.superuser_run('service', ['enable', 'fail2ban'])
|
|
else:
|
|
actions.superuser_run('service', ['disable', 'fail2ban'])
|
|
|
|
|
|
def report(request):
|
|
"""Serve the security report page"""
|
|
apps_report = security.get_apps_report()
|
|
return TemplateResponse(
|
|
request, 'security_report.html', {
|
|
'title':
|
|
_('Security Report'),
|
|
'freedombox_report':
|
|
apps_report.pop('freedombox'),
|
|
'apps_report':
|
|
sorted(apps_report.values(), key=lambda app: app['name']),
|
|
})
|