Merge pull request #7701 from freedomofpress/stg-7696-apparmor-api2

Fix staging tests: add missing apparmor config for  `api2` module files, add timeout for flaky apache restart

Author: legoktm

securedrop/journalist_app/api2/README.md renamed to API2.md

@@ -1,6 +1,6 @@
 # Journalist API v2
 
-This package implements and documents the synchronization strategy for the v2
+This package (in `securedrop/journalist_app/api2`) implements and documents the synchronization strategy for the v2
 Journalist API.
 
 | File                                  | Contents                             |

molecule/testinfra/app/test_smoke.py

@@ -3,6 +3,7 @@
 """
 
 import json
+import time
 from pathlib import Path
 
 import pytest
@@ -72,6 +73,8 @@ def test_weak_submission_key(host):
             # Install a weak key
             set_public_key(host, WEAK_KEY_CONTENTS)
             assert host.run("systemctl restart apache2").rc == 0
+            # give the interfaces a chance to come up - a TODO could be polling here
+            time.sleep(10)
             # Now try to hit the JI
             response = host.run("curl -Li http://localhost:8080/").stdout
             assert "HTTP/1.1 500 Internal Server Error" in response

securedrop/debian/app-code/etc/apparmor.d/usr.sbin.apache2

@@ -179,6 +179,11 @@
   /var/www/securedrop/journalist_app/__init__.py r,
   /var/www/securedrop/journalist_app/account.py r,
   /var/www/securedrop/journalist_app/admin.py r,
+  /var/www/securedrop/journalist_app/api2/ r,
+  /var/www/securedrop/journalist_app/api2/__init__.py r,
+  /var/www/securedrop/journalist_app/api2/events.py r,
+  /var/www/securedrop/journalist_app/api2/shared.py r,
+  /var/www/securedrop/journalist_app/api2/types.py r,
   /var/www/securedrop/journalist_app/api.py r,
   /var/www/securedrop/journalist_app/col.py r,
   /var/www/securedrop/journalist_app/decorators.py r,