Journalist Interface template files not included in apparmor config

[zenmonkeykstop]

Description

The files:

/var/www/securedrop/journalist_templates/error.html
/var/www/securedrop/journalist_templates/submission_preferences_saved_flash.html

are used by the JI, but are not in /etc/apparmor.d/usr.sbin.apache2. This causes apparmor DENIED events and 500 errors in the web application instead of the desired error statuses in the case of the first file.

Steps to Reproduce

• on a production system, log into the JI and attempt to update the submission preferences setting
• on a production system, log into the JI and cause a 404 (by replacing the url path part with, eg, /imapotato)

Expected Behavior

• submission prefs updated, with message
• 404 page

Actual Behavior

• submission prefs updated, generic 500 error
• generic 500 error