Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions apicore/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import environ
import requests
from django.core.cache import cache
from django.core.files.base import ContentFile
from django.db import models
from django.utils import timezone
from requests.adapters import HTTPAdapter
Expand Down Expand Up @@ -175,18 +176,14 @@ def perform_update(self, serializer):
logger.warning("Rejected upload: file too large (%d bytes)", file.size)
return

file.name = user_id + ".lua"
with file.open("r+") as f:
content = f.read().decode("utf-8")
content = file.read().decode("utf-8")

if "FazzToolsScraperDB" not in content[0:25]:
logger.warning("Rejected upload: invalid file header")
return
if "FazzToolsScraperDB" not in content[0:25]:
logger.warning("Rejected upload: invalid file header")
return

normalised = re.sub(r'(\r\n|\r|\n)(?=(?:[^"]*"[^"]*")*[^"]*$)', r"\n", content)
f.seek(0)
f.write(normalised.encode())
f.truncate()
normalised = re.sub(r'(\r\n|\r|\n)(?=(?:[^"]*"[^"]*")*[^"]*$)', r"\n", content)
normalised_file = ContentFile(normalised.encode(), name=user_id + ".lua")

user_obj = ProfileUser.objects.get(user_id=user_id)
update_date = user_obj.user_last_update
Expand All @@ -197,7 +194,7 @@ def perform_update(self, serializer):
except OSError as exc:
logger.warning("Could not remove old file: %s", exc)

serializer.save(user_id=user_id, user_file=file, user_last_update=update_date)
serializer.save(user_id=user_id, user_file=normalised_file, user_last_update=update_date)
cache.delete(f"userfile:{user_id}")

def list(self, request):
Expand Down
32 changes: 32 additions & 0 deletions tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
"""

import pytest
from django.core.files.uploadedfile import SimpleUploadedFile
from django.test import Client
from django.test.client import BOUNDARY, MULTIPART_CONTENT, encode_multipart
from django.utils import timezone

from apicore.libs.expansion_order import tier_sort_key
from apicore.models import ProfileUser

# ---------------------------------------------------------------------------
# Pure helper: tier_sort_key
Expand Down Expand Up @@ -124,6 +128,34 @@ def test_header_page_for_unknown_user_returns_empty(self):
assert resp.status_code == 200
assert resp.json() == []

def test_upload_does_not_500(self):
"""Regression test: uploads used to crash perform_update with 'I/O operation
on closed file' because a `with file.open("r+")` block closed the upload
stream's underlying BytesIO before it was handed to the storage backend —
Django's InMemoryUploadedFile doesn't override File.close()."""
user_id = "u1"
ProfileUser.objects.create(user_id=user_id, user_file="", user_last_update=timezone.now())
c = self._authed_client(user_id)

body = "FazzToolsScraperDB = {\n}\n"
upload = SimpleUploadedFile(
"FazzToolsScraper.lua", body.encode(), content_type="text/plain"
)

resp = c.put(
f"/api/profile/users/{user_id}/",
data=encode_multipart(
BOUNDARY,
{
"user_id": user_id,
"user_file": upload,
"user_last_update": timezone.now().isoformat(),
},
),
content_type=MULTIPART_CONTENT,
)
assert resp.status_code == 200


# ---------------------------------------------------------------------------
# ProfileAltView — IsSessionUser enforcement
Expand Down
Loading