Refactor functional test fixtures in source timeout and metadata tests

Refactor source app warning tests using new fixtures

Refactor source app metadata test using new fixtures

securedrop/source_app/session_manager.py

@@ -4,7 +4,6 @@
 import sqlalchemy
 from flask import session
 
-from sdconfig import config
 from source_user import SourceUser, authenticate_source_user, InvalidPassphraseError
 
 if TYPE_CHECKING:
@@ -40,6 +39,9 @@ def log_user_in(
         db_session: sqlalchemy.orm.Session,
         supplied_passphrase: "DicewarePassphrase"
     ) -> SourceUser:
+        # Late import so the module can be used without a config.py in the parent folder
+        from sdconfig import config
+
         # Validate the passphrase; will raise an exception if it is not valid
         source_user = authenticate_source_user(
             db_session=db_session, supplied_passphrase=supplied_passphrase

securedrop/store.py

@@ -106,8 +106,7 @@ def __init__(self, storage_path: str, temp_dir: str) -> None:
 
         # where files and directories are sent to be securely deleted
         self.__shredder_path = os.path.abspath(os.path.join(self.__storage_path, "../shredder"))
-        if not os.path.exists(self.__shredder_path):
-            os.makedirs(self.__shredder_path, mode=0o700)
+        os.makedirs(self.__shredder_path, mode=0o700, exist_ok=True)
 
         # crash if we don't have a way to securely remove files
         if not rm.check_secure_delete_capability():

securedrop/tests/conftest.py

@@ -124,7 +124,7 @@ def setup_journalist_key_and_gpg_folder() -> Generator[Tuple[str, Path], None, N
     # This path matches the GPG_KEY_DIR defined in the config.py used for the tests
     # If they don't match, it can make the tests flaky and very hard to debug
     tmp_gpg_dir = Path("/tmp") / "securedrop" / "keys"
-    tmp_gpg_dir.mkdir(parents=True, exist_ok=True)
+    tmp_gpg_dir.mkdir(parents=True, exist_ok=True, mode=0o0700)
 
     try:
         # GPG 2.1+ requires gpg-agent, see #4013