add more ability to control upload

tests/ahriman/core/upload/test_http_upload.py

@@ -47,7 +47,7 @@ def test_request(github: Github, mocker: MockerFixture) -> None:
     must call request method
     """
     response_mock = MagicMock()
-    request_mock = mocker.patch("requests.request", return_value=response_mock)
+    request_mock = mocker.patch("requests.Session.request", return_value=response_mock)
 
     github._request("GET", "url", arg="arg")
     request_mock.assert_called_once_with("GET", "url", auth=github.auth, timeout=github.timeout, arg="arg")
@@ -58,6 +58,6 @@ def test_request_exception(github: Github, mocker: MockerFixture) -> None:
     """
     must call request method and log HTTPError exception
     """
-    mocker.patch("requests.request", side_effect=requests.HTTPError())
+    mocker.patch("requests.Session.request", side_effect=requests.HTTPError())
     with pytest.raises(requests.HTTPError):
         github._request("GET", "url", arg="arg")

tests/ahriman/core/upload/test_remote_service.py

@@ -7,17 +7,26 @@ from ahriman.core.upload.remote_service import RemoteService
 from ahriman.models.package import Package
 
 
+def test_session(remote_service: RemoteService, mocker: MockerFixture) -> None:
+    """
+    must generate ahriman session
+    """
+    upload_mock = mocker.patch("ahriman.core.status.web_client.WebClient._create_session")
+    assert remote_service.session
+    upload_mock.assert_called_once_with(use_unix_socket=False)
+
+
 def test_package_upload(remote_service: RemoteService, package_ahriman: Package, mocker: MockerFixture) -> None:
     """
     must upload package to remote host
     """
     open_mock = mocker.patch("pathlib.Path.open")
-    upload_mock = mocker.patch("ahriman.core.status.web_client.WebClient.make_request")
+    upload_mock = mocker.patch("ahriman.core.upload.http_upload.HttpUpload._request")
     filename = package_ahriman.packages[package_ahriman.base].filename
 
     remote_service.sync(Path("local"), [package_ahriman])
     open_mock.assert_called_once_with("rb")
-    upload_mock.assert_called_once_with("POST", "/api/v1/service/upload", files={
+    upload_mock.assert_called_once_with("POST", f"{remote_service.client.address}/api/v1/service/upload", files={
         "archive": (filename, pytest.helpers.anyvar(int), "application/octet-stream", {})
     })
 

tests/ahriman/web/views/service/test_views_service_upload.py

@@ -20,9 +20,10 @@ async def test_get_permission() -> None:
 
 async def test_post(client: TestClient, mocker: MockerFixture) -> None:
     """
-    must call post request correctly for alias
+    must process file upload via http
     """
     open_mock = mocker.patch("pathlib.Path.open")
+    copy_mock = mocker.patch("shutil.copyfileobj")
     # no content validation here because it has invalid schema
 
     data = FormData()
@@ -31,61 +32,84 @@ async def test_post(client: TestClient, mocker: MockerFixture) -> None:
     response = await client.post("/api/v1/service/upload", data=data)
     assert response.ok
     open_mock.assert_called_once_with("wb")
+    copy_mock.assert_called_once_with(pytest.helpers.anyvar(int), pytest.helpers.anyvar(int))
+
+
+async def test_post_not_found(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must return 404 if request was disabled
+    """
+    mocker.patch("ahriman.core.configuration.Configuration.getboolean", return_value=False)
+    data = FormData()
+    data.add_field("archive", BytesIO(b"content"), filename="filename", content_type="application/octet-stream")
+    response_schema = pytest.helpers.schema_response(UploadView.post, code=404)
+
+    response = await client.post("/api/v1/service/upload", data=data)
+    assert response.status == 404
+    assert not response_schema.validate(await response.json())
 
 
 async def test_post_not_multipart(client: TestClient) -> None:
     """
     must return 400 on invalid payload
     """
+    response_schema = pytest.helpers.schema_response(UploadView.post, code=400)
+
     response = await client.post("/api/v1/service/upload")
     assert response.status == 400
+    assert not response_schema.validate(await response.json())
 
 
-async def test_post_not_bodypart(client: TestClient, mocker: MockerFixture) -> None:
+async def test_post_not_body_part(client: TestClient, mocker: MockerFixture) -> None:
     """
     must return 400 on invalid iterator in multipart
     """
+    response_schema = pytest.helpers.schema_response(UploadView.post, code=400)
     mocker.patch("aiohttp.MultipartReader.next", return_value=42)  # surprise, motherfucker
     data = FormData()
     data.add_field("archive", BytesIO(b"content"), filename="filename", content_type="application/octet-stream")
 
     response = await client.post("/api/v1/service/upload", data=data)
     assert response.status == 400
+    assert not response_schema.validate(await response.json())
 
 
 async def test_post_not_archive(client: TestClient) -> None:
     """
     must return 400 on invalid multipart key
     """
+    response_schema = pytest.helpers.schema_response(UploadView.post, code=400)
     data = FormData()
     data.add_field("random", BytesIO(b"content"), filename="filename", content_type="application/octet-stream")
 
     response = await client.post("/api/v1/service/upload", data=data)
     assert response.status == 400
-
-
-async def test_post_no_filename(client: TestClient, mocker: MockerFixture) -> None:
-    """
-    must return 400 if filename is not set
-    """
-    mocker.patch("aiohttp.BodyPartReader.filename", return_value=None)
-    data = FormData()
-    data.add_field("random", BytesIO(b"content"), filename="filename", content_type="application/octet-stream")
-
-    response = await client.post("/api/v1/service/upload", data=data)
-    assert response.status == 400
+    assert not response_schema.validate(await response.json())
 
 
 async def test_post_filename_invalid(client: TestClient) -> None:
     """
     must return 400 if filename is invalid
     """
+    response_schema = pytest.helpers.schema_response(UploadView.post, code=400)
+
     data = FormData()
     data.add_field("archive", BytesIO(b"content"), filename="..", content_type="application/octet-stream")
     response = await client.post("/api/v1/service/upload", data=data)
     assert response.status == 400
+    assert not response_schema.validate(await response.json())
 
+
+async def test_post_file_too_big(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must return 400 if file is too big
+    """
+    mocker.patch("pathlib.Path.open")
+    mocker.patch("ahriman.core.configuration.Configuration.getint", return_value=0)
     data = FormData()
-    data.add_field("archive", BytesIO(b"content"), filename="", content_type="application/octet-stream")
+    data.add_field("archive", BytesIO(b"content"), filename="filename", content_type="application/octet-stream")
+    response_schema = pytest.helpers.schema_response(UploadView.post, code=400)
+
     response = await client.post("/api/v1/service/upload", data=data)
     assert response.status == 400
+    assert not response_schema.validate(await response.json())

tests/testresources/core/ahriman.ini

@@ -112,6 +112,7 @@ username = arcan1s
 debug = no
 debug_check_host = no
 debug_allowed_hosts =
+enable_archive_upload = yes
 host = 127.0.0.1
 static_path = ../web/templates/static
 templates = ../web/templates