From a52fb991face72791fba1135eba158773028a34c Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Fri, 23 Feb 2018 00:02:20 +0100 Subject: [PATCH 1/2] app: sort apparmor template lists to facilitate maintenance --- .../files/usr.sbin.apache2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 index 3507731fe1..135c60bc6d 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 @@ -147,10 +147,9 @@ /var/www/securedrop/journalist_app/utils.py r, /var/www/securedrop/journalist_app/utils.pyc rw, /var/www/securedrop/journalist_app/__pycache__/** rw, - /var/www/securedrop/journalist_templates/_source_row.html r, - /var/www/securedrop/journalist_templates/admin.html r, /var/www/securedrop/journalist_templates/admin_add_user.html r, /var/www/securedrop/journalist_templates/admin_edit_hotp_secret.html r, + /var/www/securedrop/journalist_templates/admin.html r, /var/www/securedrop/journalist_templates/admin_new_user_two_factor.html r, /var/www/securedrop/journalist_templates/base.html r, /var/www/securedrop/journalist_templates/col.html r, @@ -163,6 +162,7 @@ /var/www/securedrop/journalist_templates/js-strings.html r, /var/www/securedrop/journalist_templates/locales.html r, /var/www/securedrop/journalist_templates/login.html r, + /var/www/securedrop/journalist_templates/_source_row.html r, /var/www/securedrop/models.py r, /var/www/securedrop/models.pyc rw, /var/www/securedrop/request_that_secures_file_uploads.py r, @@ -193,17 +193,17 @@ /var/www/securedrop/source_templates/banner_warning_flashed.html r, /var/www/securedrop/source_templates/base.html r, /var/www/securedrop/source_templates/error.html r, - /var/www/securedrop/source_templates/flashed.html r, /var/www/securedrop/source_templates/first_submission_flashed_message.html r, + /var/www/securedrop/source_templates/flashed.html r, /var/www/securedrop/source_templates/generate.html r, /var/www/securedrop/source_templates/index.html r, + /var/www/securedrop/source_templates/locales.html r, /var/www/securedrop/source_templates/login.html r, /var/www/securedrop/source_templates/logout_flashed_message.html r, - /var/www/securedrop/source_templates/locales.html r, /var/www/securedrop/source_templates/lookup.html r, - /var/www/securedrop/source_templates/session_timeout.html r, /var/www/securedrop/source_templates/next_submission_flashed_message.html r, /var/www/securedrop/source_templates/notfound.html r, + /var/www/securedrop/source_templates/session_timeout.html r, /var/www/securedrop/source_templates/tor2web-warning.html r, /var/www/securedrop/source_templates/use-tor-browser.html r, /var/www/securedrop/source_templates/why-journalist-key.html r, From f85acbc3c94f1e068e460d406881ab231348e1ca Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Fri, 23 Feb 2018 00:05:01 +0100 Subject: [PATCH 2/2] app: add missing journalist templates in apparmor --- .../build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 index 135c60bc6d..5cb92a1dff 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 @@ -147,6 +147,8 @@ /var/www/securedrop/journalist_app/utils.py r, /var/www/securedrop/journalist_app/utils.pyc rw, /var/www/securedrop/journalist_app/__pycache__/** rw, + /var/www/securedrop/journalist_templates/account_edit_hotp_secret.html r, + /var/www/securedrop/journalist_templates/account_new_two_factor.html r, /var/www/securedrop/journalist_templates/admin_add_user.html r, /var/www/securedrop/journalist_templates/admin_edit_hotp_secret.html r, /var/www/securedrop/journalist_templates/admin.html r, @@ -154,6 +156,7 @@ /var/www/securedrop/journalist_templates/base.html r, /var/www/securedrop/journalist_templates/col.html r, /var/www/securedrop/journalist_templates/config.html r, + /var/www/securedrop/journalist_templates/_confirmation_modal.html r, /var/www/securedrop/journalist_templates/delete.html r, /var/www/securedrop/journalist_templates/edit_account.html r, /var/www/securedrop/journalist_templates/flag.html r, @@ -162,6 +165,7 @@ /var/www/securedrop/journalist_templates/js-strings.html r, /var/www/securedrop/journalist_templates/locales.html r, /var/www/securedrop/journalist_templates/login.html r, + /var/www/securedrop/journalist_templates/logo_upload_flashed.html r, /var/www/securedrop/journalist_templates/_source_row.html r, /var/www/securedrop/models.py r, /var/www/securedrop/models.pyc rw,