Page MenuHomeSoftware Heritage
Files F7343025

D8664.diff
No OneTemporary
Actions

D8664.diff
View Options

diff --git a/swh/deposit/api/common.py b/swh/deposit/api/common.py
--- a/swh/deposit/api/common.py
+++ b/swh/deposit/api/common.py
@@ -584,15 +584,24 @@
"in the multipart deposit",
)
- filehandler = data["application/zip"]
- if not filehandler:
- filehandler = data["application/x-tar"]
+ filehandler = data["application/zip"] or data["application/x-tar"]
+ if filehandler is None:
+ raise DepositError(
+ BAD_REQUEST,
+ "You must provide an archive, either as application/zip or "
+ "application/x-tar",
+ )
assert isinstance(filehandler, UploadedFile), filehandler
self._check_file_length(filehandler)
self._check_file_md5sum(filehandler, headers.content_md5sum)
+ if data["application/atom+xml"] is None:
+ raise DepositError(
+ BAD_REQUEST, "You must provide an application/atom+xml entry."
+ )
+
try:
raw_metadata, metadata_tree = self._read_metadata(
data["application/atom+xml"]
@@ -620,7 +629,6 @@
deposit, deposit_request_data, replace_metadata, replace_archives
)
- assert filehandler is not None
return Receipt(
deposit_id=deposit.id,
deposit_date=deposit.reception_date,
diff --git a/swh/deposit/tests/api/test_collection_post_multipart.py b/swh/deposit/tests/api/test_collection_post_multipart.py
--- a/swh/deposit/tests/api/test_collection_post_multipart.py
+++ b/swh/deposit/tests/api/test_collection_post_multipart.py
@@ -271,7 +271,7 @@
# FAILURE scenarios
-def test_post_deposit_multipart_only_archive_and_atom_entry(
+def test_post_deposit_multipart_only_one_archive_and_atom_entry(
authenticated_client, deposit_collection
):
"""Multipart deposit only accepts one archive and one atom+xml"""
@@ -391,3 +391,81 @@
with pytest.raises(Deposit.DoesNotExist):
Deposit.objects.get(external_id=external_id)
+
+
+def test_post_deposit_atom_400_multipart_no_atom(
+ authenticated_client, deposit_collection, atom_dataset, deposit_user, sample_archive
+):
+ """Posting without an atom body should return a 400 response"""
+ origin_url = "http://example.org/foo"
+
+ archive = InMemoryUploadedFile(
+ BytesIO(sample_archive["data"]),
+ field_name=sample_archive["name"],
+ name=sample_archive["name"],
+ content_type="application/x-tar",
+ size=sample_archive["length"],
+ charset=None,
+ )
+
+ atom_data = atom_dataset["entry-data0"] % origin_url
+
+ atom_entry = InMemoryUploadedFile(
+ BytesIO(atom_data.encode("utf-8")),
+ field_name="atom0",
+ name="atom0",
+ content_type="application/x-foobar", # should be application/atom+xml
+ size=len(atom_data),
+ charset="utf-8",
+ )
+
+ response = authenticated_client.post(
+ reverse(COL_IRI, args=[deposit_collection.name]),
+ format="multipart",
+ data={
+ "archive": archive,
+ "atom_entry": atom_entry,
+ },
+ )
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert "provide an application/atom+xml entry" in response.content.decode()
+
+
+def test_post_deposit_atom_400_multipart_no_archive(
+ authenticated_client, deposit_collection, atom_dataset, deposit_user, sample_archive
+):
+ """Posting without an atom body should return a 400 response"""
+ origin_url = "http://example.org/foo"
+
+ archive = InMemoryUploadedFile(
+ BytesIO(sample_archive["data"]),
+ field_name=sample_archive["name"],
+ name=sample_archive["name"],
+ content_type="application/x-foobar", # should be application/x-tar
+ size=sample_archive["length"],
+ charset=None,
+ )
+
+ atom_data = atom_dataset["entry-data0"] % origin_url
+
+ atom_entry = InMemoryUploadedFile(
+ BytesIO(atom_data.encode("utf-8")),
+ field_name="atom0",
+ name="atom0",
+ content_type="application/atom+xml",
+ size=len(atom_data),
+ charset="utf-8",
+ )
+
+ response = authenticated_client.post(
+ reverse(COL_IRI, args=[deposit_collection.name]),
+ format="multipart",
+ data={
+ "archive": archive,
+ "atom_entry": atom_entry,
+ },
+ )
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert "provide an archive" in response.content.decode()

File Metadata

Mime Type
text/plain
Expires
Mar 17 2025, 6:48 PM (7 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3214770

Event Timeline

About · Developer information · Legal