From 3223dd469a7423222b0b0e2b8e324972cf761595 Mon Sep 17 00:00:00 2001 From: AndrewNikkk Date: Fri, 30 Oct 2026 21:09:56 +0300 Subject: [PATCH 1/2] lab4 --- .env.example | 24 +- .github/pull_request_template.md | 56 +- .gitignore | 5 +- CMakeLists.txt | 114 + CMakePresets.json | 26 + Dockerfile | 113 + REPORT.md | 186 +- cmake/ImportMinioDeps.cmake | 55 + compose.presign.yaml | 11 + compose.yaml | 240 + docker-entrypoint.sh | 19 + evidence/load_uploads.json | 23 + evidence/resilience_grade4.txt | 23 + infra/mc/Dockerfile | 19 + infra/minio/Dockerfile | 22 + infra/minio/policy-attachments.json | 29 + lb/nginx.conf.template | 44 + migrations/001_init.sql | 33 + migrations/002_sessions.sql | 6 + migrations/003_idempotency.sql | 11 + migrations/004_attachments.sql | 22 + migrations/005_message_attachments.sql | 12 + migrations/006_direct_uploads.sql | 26 + scripts/load_uploads.sh | 254 + scripts/restart.sh | 39 + scripts/stop-one.sh | 24 + secrets/minio_root_password.example | 1 + secrets/minio_root_user.example | 1 + secrets/s3_access_key_id.example | 1 + secrets/s3_secret_access_key.example | 1 + src/attachment_repo.cpp | 125 + src/attachment_repo.hpp | 25 + src/auth.cpp | 39 + src/auth.hpp | 7 + src/chat_repo.cpp | 186 + src/chat_repo.hpp | 23 + src/cursor.hpp | 47 + src/db.cpp | 360 + src/db.hpp | 62 + src/direct_upload_repo.cpp | 167 + src/direct_upload_repo.hpp | 33 + src/errors.hpp | 11 + src/image_util.cpp | 90 + src/image_util.hpp | 41 + src/main.cpp | 2312 +++++ src/message_repo.cpp | 374 + src/message_repo.hpp | 38 + src/models.hpp | 81 + src/pg_session_repo.cpp | 66 + src/pg_session_repo.hpp | 18 + src/redis_pool.cpp | 216 + src/redis_pool.hpp | 59 + src/s3_client.cpp | 238 + src/s3_client.hpp | 63 + src/session_repo.cpp | 87 + src/session_repo.hpp | 18 + src/session_repo_base.hpp | 22 + src/user_repo.cpp | 100 + src/user_repo.hpp | 22 + student-tests/lib.sh | 100 + student-tests/run_grade3.sh | 23 + student-tests/run_grade4.sh | 20 + student-tests/run_grade5_track1.sh | 15 + student-tests/test_attachment_corrupted.sh | 19 + student-tests/test_attachment_foreign.sh | 32 + .../test_attachment_limited_creds.sh | 55 + student-tests/test_attachment_mime_spoof.sh | 17 + student-tests/test_attachment_persistence.sh | 46 + student-tests/test_attachment_too_large.sh | 21 + student-tests/test_attachment_upload_ok.sh | 48 + student-tests/test_attachment_wrong_chat.sh | 37 + student-tests/test_direct_upload_negatives.sh | 101 + student-tests/test_direct_upload_ok.sh | 53 + student-tests/test_graceful_drain.sh | 50 + tests/check_bucket_private.sh | 35 + third_party/stb/README.md | 5 + third_party/stb/VERSION | 1 + third_party/stb/stb_image.h | 7988 +++++++++++++++++ tools/exp_direct_vs_proxy.sh | 154 + tools/fixtures/320x200.png | Bin 0 -> 502 bytes tools/fixtures/small.jpg | Bin 0 -> 644 bytes tools/fixtures/tiny.jpg | Bin 0 -> 633 bytes tools/fixtures/tiny.png | Bin 0 -> 69 bytes tools/gc_direct_uploads.sh | 61 + tools/gc_orphans.sh | 111 + tools/image_smoke.cpp | 111 + tools/s3_smoke.cpp | 35 + 87 files changed, 15475 insertions(+), 33 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 CMakePresets.json create mode 100644 Dockerfile create mode 100644 cmake/ImportMinioDeps.cmake create mode 100644 compose.presign.yaml create mode 100644 compose.yaml create mode 100644 docker-entrypoint.sh create mode 100644 evidence/load_uploads.json create mode 100644 evidence/resilience_grade4.txt create mode 100644 infra/mc/Dockerfile create mode 100644 infra/minio/Dockerfile create mode 100644 infra/minio/policy-attachments.json create mode 100644 lb/nginx.conf.template create mode 100644 migrations/001_init.sql create mode 100644 migrations/002_sessions.sql create mode 100644 migrations/003_idempotency.sql create mode 100644 migrations/004_attachments.sql create mode 100644 migrations/005_message_attachments.sql create mode 100644 migrations/006_direct_uploads.sql create mode 100755 scripts/load_uploads.sh create mode 100755 scripts/restart.sh create mode 100755 scripts/stop-one.sh create mode 100644 secrets/minio_root_password.example create mode 100644 secrets/minio_root_user.example create mode 100644 secrets/s3_access_key_id.example create mode 100644 secrets/s3_secret_access_key.example create mode 100644 src/attachment_repo.cpp create mode 100644 src/attachment_repo.hpp create mode 100644 src/auth.cpp create mode 100644 src/auth.hpp create mode 100644 src/chat_repo.cpp create mode 100644 src/chat_repo.hpp create mode 100644 src/cursor.hpp create mode 100644 src/db.cpp create mode 100644 src/db.hpp create mode 100644 src/direct_upload_repo.cpp create mode 100644 src/direct_upload_repo.hpp create mode 100644 src/errors.hpp create mode 100644 src/image_util.cpp create mode 100644 src/image_util.hpp create mode 100644 src/main.cpp create mode 100644 src/message_repo.cpp create mode 100644 src/message_repo.hpp create mode 100644 src/models.hpp create mode 100644 src/pg_session_repo.cpp create mode 100644 src/pg_session_repo.hpp create mode 100644 src/redis_pool.cpp create mode 100644 src/redis_pool.hpp create mode 100644 src/s3_client.cpp create mode 100644 src/s3_client.hpp create mode 100644 src/session_repo.cpp create mode 100644 src/session_repo.hpp create mode 100644 src/session_repo_base.hpp create mode 100644 src/user_repo.cpp create mode 100644 src/user_repo.hpp create mode 100755 student-tests/lib.sh create mode 100755 student-tests/run_grade3.sh create mode 100755 student-tests/run_grade4.sh create mode 100755 student-tests/run_grade5_track1.sh create mode 100755 student-tests/test_attachment_corrupted.sh create mode 100755 student-tests/test_attachment_foreign.sh create mode 100755 student-tests/test_attachment_limited_creds.sh create mode 100755 student-tests/test_attachment_mime_spoof.sh create mode 100755 student-tests/test_attachment_persistence.sh create mode 100755 student-tests/test_attachment_too_large.sh create mode 100755 student-tests/test_attachment_upload_ok.sh create mode 100755 student-tests/test_attachment_wrong_chat.sh create mode 100755 student-tests/test_direct_upload_negatives.sh create mode 100755 student-tests/test_direct_upload_ok.sh create mode 100755 student-tests/test_graceful_drain.sh create mode 100755 tests/check_bucket_private.sh create mode 100644 third_party/stb/README.md create mode 100644 third_party/stb/VERSION create mode 100644 third_party/stb/stb_image.h create mode 100755 tools/exp_direct_vs_proxy.sh create mode 100644 tools/fixtures/320x200.png create mode 100644 tools/fixtures/small.jpg create mode 100644 tools/fixtures/tiny.jpg create mode 100644 tools/fixtures/tiny.png create mode 100755 tools/gc_direct_uploads.sh create mode 100755 tools/gc_orphans.sh create mode 100644 tools/image_smoke.cpp create mode 100644 tools/s3_smoke.cpp diff --git a/.env.example b/.env.example index d99d26a2..465b3e45 100644 --- a/.env.example +++ b/.env.example @@ -7,14 +7,34 @@ SESSION_TTL_SECONDS=3600 # Choose credentials locally. File paths contain no secret values. DATABASE_URL_FILE=/run/secrets/database_url # Optional on 3, required use on 4 in lab2; Redis OR Valkey: -SESSION_STORE=postgres +SESSION_STORE=redis CACHE_URL_FILE=/run/secrets/cache_url API_REPLICAS=2 IDEMPOTENCY_TTL_SECONDS=86400 -S3_ENDPOINT=http://s3:9000 + +# PostgreSQL (compose service `db`) +POSTGRES_USER=messenger +POSTGRES_PASSWORD=change_me_locally +POSTGRES_DB=messenger + +# MinIO root (bootstrap / admin only; API must NOT use these) +MINIO_ROOT_USER=minioadmin +MINIO_ROOT_PASSWORD=change_me_minio_root_locally + +# Limited S3 user created by minio-user-init (copy same values into secrets/) +MINIO_USER_ACCESS_KEY=messenger-s3 +MINIO_USER_SECRET_KEY=change_me_s3_user_locally + +# S3 / attachments (API reads limited credentials from secret files only) +S3_ENDPOINT=http://minio:9000 +# Optional Track 1: host-reachable endpoint for presigned PUT (needs published +# MinIO via compose.presign.yaml). Empty → sign with S3_ENDPOINT (docker net). +# S3_PRESIGN_ENDPOINT=http://127.0.0.1:9000 S3_REGION=us-east-1 S3_BUCKET=messenger-attachments S3_ACCESS_KEY_ID_FILE=/run/secrets/s3_access_key_id S3_SECRET_ACCESS_KEY_FILE=/run/secrets/s3_secret_access_key MAX_UPLOAD_BYTES=10485760 MAX_IMAGE_PIXELS=40000000 +MAX_CONCURRENT_UPLOADS=3 +DIRECT_UPLOAD_TTL_SECONDS=300 diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1bec5472..66ccb657 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,18 +1,46 @@ ## Лабораторная 4 -Автор / группа: TODO -Целевая оценка (3/4/5): TODO -Трек 5, если заявлен: TODO +Автор / группа: Никитин Андрей Александрович / БВТ2301 +Целевая оценка (3/4/5): **5** +Трек 5, если заявлен: **трек 1 — прямой (presigned) upload** -Что реализовано и что перенесено: TODO -Команды запуска из чистого clone: TODO -Результаты проверок и ссылка на REPORT.md: TODO -Ограничения / известные ошибки: TODO -Источники и использование ИИ: TODO +Что реализовано и что перенесено: +- Lab3 → lab4: пользователи/чаты/сообщения, Redis-сессии, Idempotency-Key, LB ×2 API, graceful drain. +- Оценка 4: private MinIO, limited S3 creds, proxy `POST /attachments` (magic + stb_image), компенсация Put→PG / DeleteObject, `gc_orphans`, persistence/failover hooks, лимит concurrent uploads (RSS). +- Оценка 5 / трек 1: `direct_uploads` + presigned PUT (`minio-cpp` SigV4), complete (size/sha256/image), abort, GC незавершённых; proxy endpoint сохранён; сравнение RAM/трафика proxy vs direct (≥2 размера). -- [ ] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами. -- [ ] Контракт и публичные тесты не ослаблены. -- [ ] make check и make test выполнены; приложен реальный вывод. -- [ ] Сценарии отказов/безопасности своего уровня воспроизведены. -- [ ] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens. -- [ ] README задания сохранён, REPORT.md содержит инструкцию именно моего решения. +Команды запуска из чистого clone: +```sh +cp .env.example .env # локальные POSTGRES_*/MINIO_*/S3_BUCKET +mkdir -p secrets && # database_url, cache_url, s3_* (см. REPORT.md) +docker compose --env-file .env up -d --build +curl -fsS http://127.0.0.1:8080/health/ready +make check && make test BASE_URL=http://127.0.0.1:8080 +sh student-tests/run_grade3.sh +sh student-tests/run_grade4.sh +sh student-tests/run_grade5_track1.sh +make test-persistence ACTION_SCRIPT=scripts/restart.sh +make test-failover ACTION_SCRIPT=scripts/stop-one.sh +``` + +Результаты проверок и ссылка на REPORT.md: +- Подробности, таблицы доказательств и эксперимент трека 1: [`REPORT.md`](../REPORT.md). +- Student-tests grade3/4/5 track1 — PASS на локальном стенде. +- Evidence: `evidence/load_uploads.json`, `evidence/resilience_grade4.txt`, `artifacts/track1/results.tsv`. +- Ветка решения: `solution/nikitin-bvt2301`. + +Ограничения / известные ошибки: +- Без `compose.presign.yaml` PUT к MinIO — с контейнера на сети compose (порты 9000/9001 на хост не публикуются). +- Complete direct-upload кратковременно GetObject'ит объект для verify (фаза отдельно от transfer). +- Нет HA БД/MinIO; нет thumbnail/вариантов (lab5); openapi расширений трека 1 нет (факультативный API). + +Источники и использование ИИ: +- Контракт/тесты курса; PostgreSQL 16, Valkey, Nginx, MinIO, libpqxx 7.10.0, libsodium, hiredis, nlohmann/json, minio-cpp v0.3.0, stb_image. +- Помощь ИИ: Cursor (реализация, отладка, отчёт). + +- [x] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами. +- [x] Контракт и публичные тесты не ослаблены. +- [x] make check и make test выполнены; приложен реальный вывод. +- [x] Сценарии отказов/безопасности своего уровня воспроизведены. +- [x] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens. +- [x] README задания сохранён, REPORT.md содержит инструкцию именно моего решения. diff --git a/.gitignore b/.gitignore index b5a71896..0e1b5c72 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,9 @@ .env .env.* !.env.example -secrets/ +secrets/* +!secrets/*.example + certs/private/ *.key *.p12 @@ -14,6 +16,7 @@ volumes/ data/ backups/ # Runtime/build artifacts +artifacts/ .venv/ __pycache__/ *.py[cod] diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..ff5456ff --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,114 @@ +cmake_minimum_required(VERSION 3.16) +project(mtusi_messenger CXX) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +# Official MinIO C++ SDK (S3-compatible). Pinned tag; not a hand-rolled SigV4. +set(MTUSI_MINIO_CPP_VERSION "v0.3.0" CACHE STRING "minio-cpp git tag") + +find_package(Threads REQUIRED) +find_package(PkgConfig REQUIRED) + +pkg_check_modules(PQXX REQUIRED IMPORTED_TARGET libpqxx>=7.8) +pkg_check_modules(HIREDIS REQUIRED IMPORTED_TARGET hiredis) +pkg_check_modules(SODIUM REQUIRED IMPORTED_TARGET libsodium) + +include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ImportMinioDeps.cmake") + +include(FetchContent) +set(MINIO_CPP_TEST OFF CACHE BOOL "" FORCE) +set(MINIO_CPP_MAKE_DOC OFF CACHE BOOL "" FORCE) +FetchContent_Declare( + miniocpp + GIT_REPOSITORY https://github.com/minio/minio-cpp.git + GIT_TAG ${MTUSI_MINIO_CPP_VERSION} + GIT_SHALLOW TRUE +) +# Inject find_package stubs before miniocpp configures. +function(_mtusi_provide_minio_find_packages) + # miniocpp calls find_package(unofficial-curlpp CONFIG) etc. + # We already created ALIAS targets; create tiny config files in a prefix. + set(_cfg_dir "${CMAKE_CURRENT_BINARY_DIR}/mtusi-minio-deps") + file(MAKE_DIRECTORY "${_cfg_dir}") + file(WRITE "${_cfg_dir}/unofficial-curlpp-config.cmake" "") + file(WRITE "${_cfg_dir}/unofficial-inih-config.cmake" "") + list(PREPEND CMAKE_PREFIX_PATH "${_cfg_dir}") + set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}" PARENT_SCOPE) +endfunction() +_mtusi_provide_minio_find_packages() + +FetchContent_GetProperties(miniocpp) +if(NOT miniocpp_POPULATED) + FetchContent_Populate(miniocpp) + # Neutralize CONFIG find_package calls by providing empty configs + targets. + set(CMAKE_FIND_PACKAGE_REDIRECTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/mtusi-find-redirects") + file(MAKE_DIRECTORY "${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}") + # CMake 3.24+ redirects; for older, patch via policy: set variables that + # make find_package(CONFIG) succeed when targets already exist. + set(unofficial-curlpp_DIR "${CMAKE_CURRENT_BINARY_DIR}/mtusi-minio-deps" CACHE PATH "" FORCE) + set(unofficial-inih_DIR "${CMAKE_CURRENT_BINARY_DIR}/mtusi-minio-deps" CACHE PATH "" FORCE) + # Provide package config bodies that are no-ops (targets already defined). + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/mtusi-minio-deps/unofficial-curlpp-config.cmake" + "# provided by ImportMinioDeps.cmake\n") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/mtusi-minio-deps/unofficial-inih-config.cmake" + "# provided by ImportMinioDeps.cmake\n") + # Skip miniocpp install(EXPORT) — our INTERFACE system deps are not exportable. + set(CMAKE_SKIP_INSTALL_RULES ON) + add_subdirectory(${miniocpp_SOURCE_DIR} ${miniocpp_BINARY_DIR}) + set(CMAKE_SKIP_INSTALL_RULES OFF) +endif() + +add_executable(messenger + src/main.cpp + src/db.cpp + src/auth.cpp + src/user_repo.cpp + src/chat_repo.cpp + src/message_repo.cpp + src/redis_pool.cpp + src/session_repo.cpp + src/pg_session_repo.cpp + src/s3_client.cpp + src/image_util.cpp + src/attachment_repo.cpp + src/direct_upload_repo.cpp +) + +target_include_directories(messenger PRIVATE + src + ${CMAKE_CURRENT_SOURCE_DIR}/third_party/stb +) +target_compile_definitions(messenger PRIVATE + MTUSI_MINIO_CPP_VERSION="${MTUSI_MINIO_CPP_VERSION}" +) + +target_link_libraries(messenger PRIVATE + Threads::Threads + PkgConfig::PQXX + PkgConfig::HIREDIS + PkgConfig::SODIUM + miniocpp::miniocpp +) + +add_executable(s3_smoke + tools/s3_smoke.cpp + src/s3_client.cpp +) +target_include_directories(s3_smoke PRIVATE src) +target_link_libraries(s3_smoke PRIVATE + Threads::Threads + miniocpp::miniocpp +) + +add_executable(image_smoke + tools/image_smoke.cpp + src/image_util.cpp +) +target_include_directories(image_smoke PRIVATE + src + ${CMAKE_CURRENT_SOURCE_DIR}/third_party/stb +) +target_compile_definitions(image_smoke PRIVATE + IMAGE_SMOKE_FIXTURES="${CMAKE_SOURCE_DIR}/tools/fixtures" +) diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 00000000..b8f98853 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,26 @@ +{ + "version": 6, + "cmakeMinimumRequired": { + "major": 3, + "minor": 16, + "patch": 0 + }, + "configurePresets": [ + { + "name": "release", + "displayName": "Release with minio-cpp", + "generator": "Unix Makefiles", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "MTUSI_MINIO_CPP_VERSION": "v0.3.0" + } + } + ], + "buildPresets": [ + { + "name": "release", + "configurePreset": "release" + } + ] +} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..52fc6ce3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,113 @@ +# Clean-clone build: Ubuntu 24.04 + libpqxx from a pinned git tag. +# S3 client: official minio-cpp v0.3.0 via FetchContent (library SigV4). +# No dependency on mtusi2026lab3-api or other prior-lab images. + +ARG PQXX_VERSION=7.10.0 +ARG MTUSI_MINIO_CPP_VERSION=v0.3.0 + +# --------------------------------------------------------------------------- +# Stage: build libpqxx into /opt/libpqxx +# --------------------------------------------------------------------------- +FROM ubuntu:24.04 AS pqxx +ARG PQXX_VERSION +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ + build-essential cmake git ca-certificates pkg-config \ + libpq-dev \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /tmp +RUN git clone --depth 1 --branch "${PQXX_VERSION}" \ + https://github.com/jtv/libpqxx.git libpqxx-src \ + && cmake -S libpqxx-src -B libpqxx-build \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/opt/libpqxx \ + -DBUILD_SHARED_LIBS=ON \ + -DSKIP_BUILD_TEST=ON \ + && cmake --build libpqxx-build -j"$(nproc)" \ + && cmake --install libpqxx-build \ + && rm -rf /tmp/libpqxx-src /tmp/libpqxx-build + +# --------------------------------------------------------------------------- +# Stage: build messenger + smokes +# --------------------------------------------------------------------------- +FROM ubuntu:24.04 AS builder +ARG MTUSI_MINIO_CPP_VERSION +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ + build-essential cmake pkg-config git ca-certificates \ + libpq-dev \ + libhiredis-dev \ + libsodium-dev \ + nlohmann-json3-dev \ + libcurl4-openssl-dev libssl-dev zlib1g-dev \ + libpugixml-dev \ + libcurlpp-dev \ + libinih-dev \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=pqxx /opt/libpqxx /opt/libpqxx +ENV PKG_CONFIG_PATH=/opt/libpqxx/lib/pkgconfig:/opt/libpqxx/lib/x86_64-linux-gnu/pkgconfig +ENV LD_LIBRARY_PATH=/opt/libpqxx/lib:/opt/libpqxx/lib/x86_64-linux-gnu +ENV CMAKE_PREFIX_PATH=/opt/libpqxx + +WORKDIR /src +COPY CMakeLists.txt CMakePresets.json ./ +COPY cmake ./cmake +COPY src ./src +COPY tools ./tools +COPY migrations ./migrations +COPY third_party ./third_party + +RUN cmake -S . -B build -DCMAKE_BUILD_TYPE=Release \ + -DMTUSI_MINIO_CPP_VERSION=${MTUSI_MINIO_CPP_VERSION} \ + && cmake --build build -j"$(nproc)" + +# --------------------------------------------------------------------------- +# Runtime +# --------------------------------------------------------------------------- +FROM ubuntu:24.04 +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl \ + libpq5 \ + libhiredis1.1.0 \ + libsodium23 \ + libssl3t64 \ + libcurl4t64 \ + zlib1g \ + libpugixml1v5 \ + libcurlpp0t64 \ + libinih1 \ + libinireader0 \ + util-linux \ + && rm -rf /var/lib/apt/lists/* \ + && groupadd --gid 10001 app \ + && useradd --uid 10001 --gid app --shell /usr/sbin/nologin --no-create-home app + +COPY --from=pqxx /opt/libpqxx /opt/libpqxx +ENV LD_LIBRARY_PATH=/opt/libpqxx/lib:/opt/libpqxx/lib/x86_64-linux-gnu + +WORKDIR /app +COPY --from=builder /src/build/messenger /app/messenger +COPY --from=builder /src/build/s3_smoke /app/s3_smoke +COPY --from=builder /src/build/image_smoke /app/image_smoke +COPY --from=builder /src/migrations /app/migrations +COPY tools/fixtures /app/fixtures +COPY docker-entrypoint.sh /docker-entrypoint.sh + +RUN chmod 0755 /docker-entrypoint.sh \ + && chown -R app:app /app + +# Entrypoint starts as root to stage S3 secret files for uid 10001, then drops. +USER root +ENV APP_HOST=0.0.0.0 +ENV APP_PORT=8080 + +EXPOSE 8080 + +HEALTHCHECK --interval=5s --timeout=3s --start-period=20s --retries=3 \ + CMD curl -fsS http://127.0.0.1:8080/health/live || exit 1 + +ENTRYPOINT ["/docker-entrypoint.sh"] +CMD ["/app/messenger"] diff --git a/REPORT.md b/REPORT.md index 9ad2b84f..14aae345 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,191 @@ # Отчёт — лабораторная 4 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO -- Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +- Автор, группа: Никитин Андрей Александрович, группа БВТ2301 +- Целевая оценка: 5 (трек 1 — прямой/presigned upload) +- Commit/PR: ветка `solution/nikitin-bvt2301` → MR в `main` (шаблон `.github/pull_request_template.md`); remote `gitea.privcloud.tech/AndrewNikkk/mtusi2026lab4` +- Источники и помощь: контракт и публичные тесты курса; PostgreSQL 16, Valkey, Nginx, MinIO, libpqxx 7.10.0, libsodium, hiredis, nlohmann/json, minio-cpp v0.3.0 (официальный SigV4), stb_image. Помощь ИИ: Cursor. ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +Хост прогона: 12th Gen Intel Core i5-12450H, 12 потоков, 14 GiB RAM. + +Образы (закреплены в `compose.yaml` / локальных Dockerfile): + +| Сервис | Образ | +| --- | --- | +| db | `postgres:16.15-alpine` | +| cache | `valkey/valkey:8.1.10-alpine` | +| lb | `nginx:1.28.0-alpine` | +| api | `mtusi2026lab4-api:local` (multi-stage `ubuntu:24.04`; libpqxx **7.10.0** собран из git-тега `https://github.com/jtv/libpqxx.git`, prefix `/opt/libpqxx`; minio-cpp `v0.3.0` FetchContent) | +| minio | `mtusi2026lab4-minio:RELEASE.2025-04-22T22-12-26Z` (бинарник с GitHub; Docker Hub в среде мог быть недоступен) | +| mc (init) | `mtusi2026lab4-mc:RELEASE.2025-04-16T18-13-26Z` | + +Лимиты compose: db 1 CPU / 512 MiB; cache 0.5 / 256 MiB; api ×2 по 0.5 CPU / 256 MiB; lb 0.25 / 128 MiB; minio 0.5 / 512 MiB. + +Prerequisites: Docker Compose v2, Python 3.9+, `curl`, `jq`, `sha256sum`. Для `make validate` — venv из `requirements-dev.txt`. + +```sh +cp .env.example .env +# Задать POSTGRES_*, MINIO_ROOT_*, MINIO_USER_*, S3_BUCKET (без коммита .env) + +mkdir -p secrets +printf 'postgresql://USER:PASSWORD@db:5432/DB\n' > secrets/database_url +printf 'redis://cache:6379/0\n' > secrets/cache_url +# Те же значения, что MINIO_USER_* в .env (не root): +printf 'ACCESS_KEY\n' > secrets/s3_access_key_id +printf 'SECRET_KEY\n' > secrets/s3_secret_access_key +chmod 600 secrets/* + +# Чистый clone: Dockerfile сам тянет ubuntu:24.04 и собирает libpqxx 7.10.0. +docker compose --env-file .env config --quiet +docker compose --env-file .env up -d --build +# Эквивалент без compose: +# docker build -t mtusi2026lab4-api:local . +# Дождаться healthy у lb, затем: +curl -fsS http://127.0.0.1:8080/health/ready + +make check +make test BASE_URL=http://127.0.0.1:8080 +sh student-tests/run_grade3.sh +sh student-tests/run_grade4.sh +sh student-tests/run_grade5_track1.sh +# Опционально: сравнение RAM proxy vs direct (≥2 размера) +# sh tools/exp_direct_vs_proxy.sh +make test-persistence ACTION_SCRIPT=scripts/restart.sh +make test-failover ACTION_SCRIPT=scripts/stop-one.sh + +# Безопасная остановка (volumes сохраняются): +docker compose --env-file .env stop +# Намеренное удаление учебных данных: +# docker compose --env-file .env down -v +``` + +Хосты в секретах — имена сервисов Compose (`db`, `cache`, `minio`), не loopback. Порты MinIO **не** публикуются по умолчанию; снаружи только LB `:8080`. Для host-side PUT к presigned URL — опционально `compose.presign.yaml` + `S3_PRESIGN_ENDPOINT=http://127.0.0.1:9000` (loopback). Иначе PUT идёт из контейнера на сети compose (`http://minio:9000/...`). Миграции 001–006 применяет API при старте под `pg_advisory_lock`. + +Соответствие `.env.example` → compose: `S3_ENDPOINT`/`S3_BUCKET`/`S3_REGION`, `S3_*_FILE` → docker secrets, `MAX_UPLOAD_BYTES`/`MAX_IMAGE_PIXELS`, `DIRECT_UPLOAD_TTL_SECONDS`, `DRAIN_SECONDS`, `API_REPLICAS`, `SESSION_STORE=redis`. Root MinIO только у `minio` / init-job'ов; API видит лишь limited `*_FILE`. ## Архитектура и решения -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab3, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +``` +Proxy: Клиент → lb → api (buffer body) → MinIO PutObject → PG attachments +Direct: Клиент → lb → api (JSON init) → presigned URL + Клиент ─────────────── PUT ──────→ MinIO + Клиент → lb → api complete (Stat+Get+sha256+image) → PG attachments +``` + +**Источник истины:** метаданные вложений и связь message↔attachment — PostgreSQL; байты — объект в MinIO с ключом `attachments/{chat_id}/{uuid}` (filename только для отображения). Pending direct sessions — таблица `direct_uploads` (миграция 006). + +**Порядок записи (proxy, компенсация):** S3 `PutObject` → `INSERT attachments` → COMMIT. Если INSERT/COMMIT упал — best-effort `DeleteObject`, ответ 500. Строка в PG без объекта недопустима. Orphan'ы: `tools/gc_orphans.sh` (учитывает `direct_uploads.status=pending`). + +**Трек 1 (direct):** `POST /api/v1/chats/{id}/direct-uploads` → короткая SigV4 PUT URL (`minio-cpp GetPresignedObjectUrl` / PresignV4, TTL=`DIRECT_UPLOAD_TTL_SECONDS`; в ответе рекомендованный `Content-Type` для метаданных объекта) → клиентский PUT → `POST .../complete` (владелец, Stat size, sha256, magic/image) → `attachments` ready с тем же id. `DELETE .../direct-uploads/{id}` — abort + DeleteObject. Просроченные pending: `tools/gc_direct_uploads.sh`. Обязательный proxy `POST .../attachments` **сохранён**. + +**ACL:** метаданные и `/content` только участнику чата; чужой → 404; без Bearer → 401. Unsigned GET на `http://minio:9000/$BUCKET/$KEY` → 403. + +**Валидация изображения:** magic (JPEG `FFD8FF` / PNG `89504E47`) → `stbi_info` (пиксели ≤40e6) → `stbi_load` (целостность) → сравнение с `Content-Type`. Spoof MIME → 415. Тело ≤10 485 760; ранний отказ по `Content-Length` с drain, чтобы nginx не отдавал 502. LB: `client_max_body_size 12m`. + +**Message.attachment_ids:** 0..10 уникальных UUID того же чата со `status=ready`; пустой/`blank` text без вложений → 400; с вложениями пустой text допустим. Идемпотентность хеширует `text` + список id. + +**Из lab3:** пользователи/чаты/сообщения, Redis-сессии, Idempotency-Key, LB×2 API, drain по SIGTERM (`DRAIN_SECONDS`, ready=503). + +**S3-клиент:** minio-cpp `v0.3.0` через FetchContent (не самописный SigV4). aws-sdk-cpp отвергнут из‑за тяжёлой сборки aws-lc в этой среде. ## Доказательства критериев -| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | +| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл | | --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | +| Контракт offline | `make check` | PASS: offline skeleton structure… | вывод команды | +| OpenAPI 3.1 | `make validate PYTHON=.venv/bin/python` | PASS: full OpenAPI 3.1 and JSON Schema validation | вывод команды | +| Публичный smoke | `make test BASE_URL=http://127.0.0.1:8080` | PASS (lab4 smoke) | вывод команды | +| MinIO в стенде, private bucket, volume `miniodata` | `docker compose ps`; `sh tests/check_bucket_private.sh` | minio healthy; unsigned GET → **403**; host `:9000`/`:9001` closed | `evidence/resilience_grade4.txt` | +| POST attachment → 201 ready; download = sha256 | `sh student-tests/test_attachment_upload_ok.sh` | 201, `status=ready`, variants=`[]`, bob скачал тот же SHA-256 | вывод теста | +| Message + `attachment_ids`, empty text ok | тот же + wrong_chat | empty+att 201; blank без att → 400; чужой chat → 404 | `student-tests/` | +| Лимиты / MIME / corrupt / foreign | too_large, corrupted, mime_spoof, foreign | 413 / 415 / 415 / 404 (не 500) | `student-tests/run_grade3.sh` | +| Persistence (метаданные + байты) | `make test-persistence ACTION_SCRIPT=scripts/restart.sh` | PASS; hook рестартит db, cache, minio, api, lb; volumes на месте | `evidence/resilience_grade4.txt` | +| Failover: upload на одной → download с другой | `make test-failover ACTION_SCRIPT=scripts/stop-one.sh` | PASS; 2 instance до отказа; 115 успехов; 1 ошибка; first_recovery ≈5.3 с; attachment bytes совпали | `evidence/resilience_grade4.txt` | +| Limited S3 creds, не root | `sh student-tests/test_attachment_limited_creds.sh` | API только `S3_*_FILE`; key ≠ root; `mc rb` limited → deny; upload 201 | тот же evidence | +| Компенсация / GC | код upload + `tools/gc_orphans.sh` | dry-run: orphans=0 при согласованном стенде; grace skip свежих | вывод `gc_orphans` | +| ≥10 параллельных загрузок ~5 MiB | `sh scripts/load_uploads.sh` | 10×201; **delta < naive** (см. JSON); `MAX_CONCURRENT_UPLOADS=3`; слот до буферизации body | `evidence/load_uploads.json` | +| Graceful drain | `sh student-tests/test_graceful_drain.sh` | SIGTERM → ready 503/stop; стенд восстановлен | вывод теста | +| Идемпотентный bootstrap bucket/user | `minio-init`, `minio-user-init` | повторный up без ошибки; `mc mb --ignore-existing`; anonymous none | логи init | +| Трек 1: init→PUT→complete; proxy жив | `sh student-tests/run_grade5_track1.sh` | PASS (ok + negatives + gc dry-run) | `student-tests/` | +| Трек 1: RAM/трафик ≥2 размеров | `sh tools/exp_direct_vs_proxy.sh` | transfer: direct ≪ proxy по RSS и api_body | `artifacts/track1/results.tsv` | -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +Перезапускаемые процессы при persistence hook: **db, cache, minio, api (все реплики), lb**. Volumes `pgdata`, `valkeydata`, `miniodata` **не** удаляются. Failover hook останавливает **только** одну API-реплику по `X-Instance-Id` ≡ `Config.Hostname`. ## Эксперименты и отказы -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +**Гипотеза (нагрузка upload):** пик RSS не должен расти как N×размер файла. Ограничение — семафор `MAX_CONCURRENT_UPLOADS` (по умолчанию **3**) на процесс API: слот берётся **до** буферизации body (>256 KiB), независимо от `HTTP_WORKERS=8`. После каждого upload — `malloc_trim(0)`, чтобы docker-stats RSS отражал concurrent footprint, а не рост арен. Тело ≤10 MiB; `stbi_load` освобождает raster; `MemBuf` без лишней копии. -| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | +Пик RSS ограничен формулой +`rss_peak ≤ baseline + MAX_CONCURRENT_UPLOADS × (max_body + decoded_raster)`. +При `MAX_CONCURRENT_UPLOADS=3` delta < `naive_full_buffer_mib`. +См. `evidence/load_uploads.json`. + +**Профиль:** closed-loop, concurrency=10, fixture ≈5 881 918 байт (валидный PNG 1400×1400), один прогон. Клиент — `urllib` в N процессах. Baseline RSS — медиана нескольких `docker stats` после прогрева; peak — max MemUsage api во время окна. Ограничение измерения: coordinated omission / closed-loop; RPS отражает длительную валидацию+PUT. + +Сырой summary без токенов: `evidence/load_uploads.json`. + +| Метрика | Значение | +| --- | --- | +| success / codes | 10 / `{201: 10}` | +| wall / latency / RPS | см. JSON | +| API RSS baseline → peak (delta) | **51.96 → 68.4 (+16.44) MiB** | +| naive N×fixture | ≈56.09 MiB | +| `MAX_CONCURRENT_UPLOADS` | 3 (слот до body >256 KiB; `malloc_trim` после upload) | + +Критерий защиты: **api_rss_delta_mib (16.44) < naive_full_buffer_mib (56.09)**. + +| Воздействие | Ожидание | Наблюдение | Восстановление / данные | | --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +| `restart.sh` (db+cache+minio+api+lb) | сессия и attachment живы | `test-persistence` PASS | hook <90 с; volumes целы | +| `stop-one.sh` одной api | ≥2 id до отказа; запись ≤10 с; файл тот же | 2 id; 115 ok / 1 fail; recovery 5.338 с | attachment SHA совпал; реплика затем `up -d` | +| unsigned S3 GET | не 200 | 403 | — | +| host :9000/:9001 | connection fail | fail | — | +| 11 MiB upload | 413 JSON | 413 `payload_too_large` (после drain CL) | — | +| JPEG + `Content-Type: image/png` | 415 | 415 | — | +| truncate PNG | 415 | 415 | — | +| eve → чужой attachment | 404 | 404 meta и content | — | +| SIGTERM api | ready 503, затем exit | drain PASS | compose up api | ## Ограничения и следующие шаги -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +**Выдерживается:** отказ одной API-реплики при живых LB/БД/MinIO; полный restart с сохранением volumes; private bucket; limited IAM-подобные creds; негативные upload без 500; идемпотентные сообщения с `attachment_ids`. + +**Не выдерживается / не обещается:** падение единственной PostgreSQL или MinIO; потеря volume; HA брокера; сетевой partition между API и S3 без ручного GC; точный open-loop RPS. + +**Учебные упрощения:** proxy-тело буферизуется до `MAX_UPLOAD_BYTES`; complete direct-upload кратковременно читает объект для sha256/image check (байты PUT при этом не идут через API); нет thumbnail/вариантов (lab5); один Docker-host, один LB, одна БД, один MinIO; console MinIO `:9001` внутри сети compose. + +**Подтверждено измерением (grade 4):** 10 параллельных ~5.6 MiB proxy-загрузок → 201; delta RSS < naive; private bucket; persistence/failover. + +## Трек 1 — прямой upload (оценка 5) + +**Гипотеза:** при одинаковом размере файла пиковый RSS API и объём трафика через LB/API на этапе передачи байт ниже для direct (клиент→MinIO), чем для proxy (клиент→API→MinIO); complete добавляет короткий GetObject на API. + +**API (расширение, openapi не менялся):** + +| Метод | Путь | Назначение | +| --- | --- | --- | +| POST | `/api/v1/chats/{id}/direct-uploads` | JSON: filename, content_type, size_bytes, sha256 → `upload_url` + TTL | +| PUT | presigned URL | байты напрямую в MinIO (Content-Type из ответа) | +| POST | `/api/v1/direct-uploads/{id}/complete` | Stat/size/sha256/image → attachment `ready` | +| DELETE | `/api/v1/direct-uploads/{id}` | abort + DeleteObject | +| POST | `/api/v1/chats/{id}/attachments` | обязательный proxy — без изменений | + +**Негативные:** complete без PUT → 400; checksum mismatch → 400 + abort; чужой complete → 404; abort → 204, повторный complete → 409; expired → 410 (`gc_direct_uploads` / expire_stale). + +**Проверка:** `sh student-tests/run_grade5_track1.sh` → PASS. Эксперимент: `sh tools/exp_direct_vs_proxy.sh` → `artifacts/track1/results.tsv`. + +Методика: closed-loop; concurrency 3 (1 MiB) / 4 (4 MiB); RSS = сумма `VmRSS` процессов `messenger` по репликам api; фаза `transfer` — только передача байт (для direct — параллельные PUT на MinIO); `complete` — отдельно (GetObject+sha256+image на API). `api_body_bytes_approx` — оценка объёма тел через API (proxy = N×size; direct transfer = 0). + +| size_mb | mode / phase | rss_delta_kb | api_body_bytes_approx | +| --- | --- | --- | --- | +| 1 | proxy / transfer | **1112** | 3 145 752 | +| 1 | direct / transfer | **4** | 0 | +| 1 | direct / complete | 4104 | (GetObject на API) | +| 4 | proxy / transfer | **3320** | 16 777 248 | +| 4 | direct / transfer | **0** | 0 | +| 4 | direct / complete | 15592 | (GetObject на API) | + +**Вывод:** на этапе передачи байт direct почти не двигает RSS API и не гонит payload через LB/API; proxy платит и трафиком, и пиком RSS. Complete у direct кратковременно читает объект (учебный verify) — это отдельная фаза, не отменяет выигрыш на upload path. + +**Ограничение:** без `compose.presign.yaml` PUT выполняется с контейнера на сети compose (порты MinIO на хост не открыты). Подпись — `minio-cpp` PresignV4 (не самописный SigV4). diff --git a/cmake/ImportMinioDeps.cmake b/cmake/ImportMinioDeps.cmake new file mode 100644 index 00000000..7128a484 --- /dev/null +++ b/cmake/ImportMinioDeps.cmake @@ -0,0 +1,55 @@ +# Provide the imported target names expected by minio-cpp's CMakeLists +# (unofficial-curlpp / unofficial-inih) using system packages from apt. + +find_package(OpenSSL REQUIRED) +find_package(ZLIB REQUIRED) +find_package(CURL REQUIRED) + +# nlohmann_json (header-only; Ubuntu ships /usr/include/nlohmann/json.hpp) +if(NOT TARGET nlohmann_json::nlohmann_json) + find_package(nlohmann_json QUIET CONFIG) +endif() +if(NOT TARGET nlohmann_json::nlohmann_json) + add_library(nlohmann_json INTERFACE) + add_library(nlohmann_json::nlohmann_json ALIAS nlohmann_json) + find_path(NLOHMANN_JSON_INCLUDE_DIR nlohmann/json.hpp) + if(NOT NLOHMANN_JSON_INCLUDE_DIR) + message(FATAL_ERROR "nlohmann/json.hpp not found (install nlohmann-json3-dev)") + endif() + target_include_directories(nlohmann_json INTERFACE "${NLOHMANN_JSON_INCLUDE_DIR}") +endif() + +# pugixml +if(NOT TARGET pugixml) + find_package(pugixml QUIET CONFIG) +endif() +if(NOT TARGET pugixml AND NOT TARGET pugixml::pugixml) + pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml) + add_library(pugixml INTERFACE) + target_link_libraries(pugixml INTERFACE PkgConfig::PUGIXML) +endif() +if(TARGET pugixml::pugixml AND NOT TARGET pugixml) + add_library(pugixml ALIAS pugixml::pugixml) +endif() + +# curlpp → unofficial::curlpp::curlpp +if(NOT TARGET unofficial::curlpp::curlpp) + find_library(CURLPP_LIBRARY NAMES curlpp REQUIRED) + find_path(CURLPP_INCLUDE_DIR curlpp/cURLpp.hpp REQUIRED) + add_library(unofficial_curlpp INTERFACE) + target_include_directories(unofficial_curlpp INTERFACE "${CURLPP_INCLUDE_DIR}") + target_link_libraries(unofficial_curlpp INTERFACE "${CURLPP_LIBRARY}" CURL::libcurl) + add_library(unofficial::curlpp::curlpp ALIAS unofficial_curlpp) +endif() + +# inih INIReader → unofficial::inih::inireader +if(NOT TARGET unofficial::inih::inireader) + find_library(INIREADER_LIBRARY NAMES INIReader REQUIRED) + find_library(INIH_LIBRARY NAMES inih REQUIRED) + find_path(INIREADER_INCLUDE_DIR INIReader.h REQUIRED) + add_library(unofficial_inih_inireader INTERFACE) + target_include_directories(unofficial_inih_inireader INTERFACE "${INIREADER_INCLUDE_DIR}") + target_link_libraries(unofficial_inih_inireader INTERFACE + "${INIREADER_LIBRARY}" "${INIH_LIBRARY}") + add_library(unofficial::inih::inireader ALIAS unofficial_inih_inireader) +endif() diff --git a/compose.presign.yaml b/compose.presign.yaml new file mode 100644 index 00000000..2defb6f2 --- /dev/null +++ b/compose.presign.yaml @@ -0,0 +1,11 @@ +# Optional Track 1 overlay: publish MinIO API on loopback so a host client can +# PUT to presigned URLs. Default compose keeps 9000/9001 unpublished. +# +# S3_PRESIGN_ENDPOINT=http://127.0.0.1:9000 \ +# docker compose -f compose.yaml -f compose.presign.yaml up -d --build +# +# Tear down / return to private MinIO by restarting without this file. +services: + minio: + ports: + - "127.0.0.1:9000:9000" diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..8939e7a4 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,240 @@ +services: + db: + image: postgres:16.15-alpine + command: postgres -c max_connections=200 -c shared_buffers=256MB -c synchronous_commit=off + environment: + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${POSTGRES_DB} + volumes: + - pgdata:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] + interval: 5s + timeout: 3s + retries: 20 + start_period: 10s + cpus: ${DB_CPU_LIMIT:-1.0} + mem_limit: 512m + stop_grace_period: 20s + + cache: + image: valkey/valkey:8.1.10-alpine + command: ["valkey-server", "--appendonly", "yes", "--appendfsync", "everysec"] + volumes: + - valkeydata:/data + healthcheck: + test: ["CMD", "valkey-cli", "ping"] + interval: 5s + timeout: 3s + retries: 20 + start_period: 5s + cpus: "0.50" + mem_limit: 256m + stop_grace_period: 15s + + api: + build: . + image: mtusi2026lab4-api:local + depends_on: + db: + condition: service_healthy + cache: + condition: service_healthy + minio: + condition: service_healthy + minio-user-init: + condition: service_completed_successfully + environment: + APP_HOST: 0.0.0.0 + APP_PORT: "8080" + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600} + SESSION_STORE: ${SESSION_STORE:-redis} + DATABASE_URL_FILE: /run/secrets/database_url + CACHE_URL_FILE: /run/secrets/cache_url + IDEMPOTENCY_TTL_SECONDS: ${IDEMPOTENCY_TTL_SECONDS:-86400} + DRAIN_SECONDS: ${DRAIN_SECONDS:-2} + HTTP_WORKERS: ${HTTP_WORKERS:-8} + DB_POOL_SIZE: ${DB_POOL_SIZE:-8} + S3_ENDPOINT: ${S3_ENDPOINT:-http://minio:9000} + S3_REGION: ${S3_REGION:-us-east-1} + S3_BUCKET: ${S3_BUCKET} + S3_ACCESS_KEY_ID_FILE: /run/secrets/s3_access_key_id + S3_SECRET_ACCESS_KEY_FILE: /run/secrets/s3_secret_access_key + MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760} + MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000} + MAX_CONCURRENT_UPLOADS: ${MAX_CONCURRENT_UPLOADS:-3} + DIRECT_UPLOAD_TTL_SECONDS: ${DIRECT_UPLOAD_TTL_SECONDS:-300} + # Optional: sign URLs for a host-reachable MinIO (compose.presign.yaml). + S3_PRESIGN_ENDPOINT: ${S3_PRESIGN_ENDPOINT:-} + secrets: + - database_url + - cache_url + - s3_access_key_id + - s3_secret_access_key + healthcheck: + test: ["CMD", "curl", "-fsS", "http://127.0.0.1:8080/health/ready"] + interval: 5s + timeout: 3s + retries: 12 + start_period: 20s + deploy: + replicas: ${API_REPLICAS:-2} + resources: + limits: + cpus: ${API_CPU_LIMIT:-0.50} + memory: ${API_MEM_LIMIT:-256m} + cpus: ${API_CPU_LIMIT:-0.50} # для совместимости с docker compose up + mem_limit: ${API_MEM_LIMIT:-256m} + stop_grace_period: 15s + + lb: + image: nginx:1.28.0-alpine + depends_on: + api: + condition: service_healthy + ports: + - "8080:8080" + environment: + NGINX_WORKERS: ${NGINX_WORKERS:-1} + NGINX_ENVSUBST_TEMPLATE_DIR: /etc/nginx/templates + NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx + NGINX_ENVSUBST_FILTER: "^NGINX_" + volumes: + - ./lb/nginx.conf.template:/etc/nginx/templates/nginx.conf.template:ro + healthcheck: + test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://127.0.0.1:8080/health/ready"] + interval: 5s + timeout: 3s + retries: 12 + start_period: 10s + cpus: ${LB_CPU_LIMIT:-0.25} + mem_limit: 128m + stop_grace_period: 10s + + # Private S3-compatible store. Ports 9000/9001 are NOT published to the host. + # Image: pinned MinIO RELEASE.2025-04-22T22-12-26Z via local Dockerfile + # (official binary from GitHub; docker.io hub may be unreachable). + minio: + build: + context: ./infra/minio + args: + MINIO_VERSION: RELEASE.2025-04-22T22-12-26Z + image: mtusi2026lab4-minio:RELEASE.2025-04-22T22-12-26Z + command: ["server", "/data", "--console-address", ":9001"] + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} + volumes: + - miniodata:/data + healthcheck: + test: ["CMD", "curl", "-f", "http://127.0.0.1:9000/minio/health/live"] + interval: 5s + timeout: 5s + retries: 20 + start_period: 15s + cpus: ${MINIO_CPU_LIMIT:-0.50} + mem_limit: ${MINIO_MEM_LIMIT:-512m} + stop_grace_period: 15s + + # Idempotent bucket bootstrap: create if missing, force private ACL. + minio-init: + build: + context: ./infra/mc + args: + MC_VERSION: RELEASE.2025-04-16T18-13-26Z + image: mtusi2026lab4-mc:RELEASE.2025-04-16T18-13-26Z + depends_on: + minio: + condition: service_healthy + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} + S3_BUCKET: ${S3_BUCKET} + S3_ENDPOINT: ${S3_ENDPOINT:-http://minio:9000} + entrypoint: ["/bin/sh", "-c"] + command: + - | + set -eu + echo "minio-init: waiting for endpoint $$S3_ENDPOINT" + i=0 + until mc alias set local "$$S3_ENDPOINT" "$$MINIO_ROOT_USER" "$$MINIO_ROOT_PASSWORD" >/dev/null 2>&1; do + i=$$((i + 1)) + if [ "$$i" -ge 30 ]; then + echo "minio-init: cannot reach MinIO" >&2 + exit 1 + fi + sleep 1 + done + mc mb --ignore-existing "local/$$S3_BUCKET" + mc anonymous set none "local/$$S3_BUCKET" + echo "minio-init: bucket listing:" + mc ls "local/$$S3_BUCKET" || true + echo "minio-init: bucket $$S3_BUCKET ready (anonymous=none)" + restart: "no" + + # Idempotent limited S3 user for the API (not MinIO root). + minio-user-init: + image: mtusi2026lab4-mc:RELEASE.2025-04-16T18-13-26Z + depends_on: + minio: + condition: service_healthy + minio-init: + condition: service_completed_successfully + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} + MINIO_USER_ACCESS_KEY: ${MINIO_USER_ACCESS_KEY} + MINIO_USER_SECRET_KEY: ${MINIO_USER_SECRET_KEY} + S3_BUCKET: ${S3_BUCKET} + S3_ENDPOINT: ${S3_ENDPOINT:-http://minio:9000} + POLICY_NAME: messenger-attachments-rw + volumes: + - ./infra/minio/policy-attachments.json:/policy.template.json:ro + entrypoint: ["/bin/sh", "-c"] + command: + - | + set -eu + echo "minio-user-init: alias $$S3_ENDPOINT" + i=0 + until mc alias set local "$$S3_ENDPOINT" "$$MINIO_ROOT_USER" "$$MINIO_ROOT_PASSWORD" >/dev/null 2>&1; do + i=$$((i + 1)) + if [ "$$i" -ge 30 ]; then + echo "minio-user-init: cannot reach MinIO" >&2 + exit 1 + fi + sleep 1 + done + + sed "s/__S3_BUCKET__/$$S3_BUCKET/g" /policy.template.json > /tmp/policy.json + + if mc admin policy info local "$$POLICY_NAME" >/dev/null 2>&1; then + mc admin policy remove local "$$POLICY_NAME" >/dev/null 2>&1 || true + fi + mc admin policy create local "$$POLICY_NAME" /tmp/policy.json + + if mc admin user info local "$$MINIO_USER_ACCESS_KEY" >/dev/null 2>&1; then + echo "minio-user-init: user $$MINIO_USER_ACCESS_KEY already exists" + else + mc admin user add local "$$MINIO_USER_ACCESS_KEY" "$$MINIO_USER_SECRET_KEY" + echo "minio-user-init: user $$MINIO_USER_ACCESS_KEY created" + fi + + mc admin policy attach local "$$POLICY_NAME" --user "$$MINIO_USER_ACCESS_KEY" >/dev/null 2>&1 || true + echo "minio-user-init: policy $$POLICY_NAME attached to $$MINIO_USER_ACCESS_KEY" + restart: "no" + +secrets: + database_url: + file: ./secrets/database_url + cache_url: + file: ./secrets/cache_url + s3_access_key_id: + file: ./secrets/s3_access_key_id + s3_secret_access_key: + file: ./secrets/s3_secret_access_key + +volumes: + pgdata: {} + valkeydata: {} + miniodata: {} diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100644 index 00000000..55567ef2 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,19 @@ +#!/bin/sh +set -eu +# Docker Compose file-secrets keep host mode bits; app runs as uid 10001. +# Copy S3 credentials into an app-owned path before dropping privileges. +if [ "$(id -u)" = "0" ]; then + mkdir -p /tmp/app-secrets + if [ -r /run/secrets/s3_access_key_id ]; then + cp /run/secrets/s3_access_key_id /tmp/app-secrets/s3_access_key_id + fi + if [ -r /run/secrets/s3_secret_access_key ]; then + cp /run/secrets/s3_secret_access_key /tmp/app-secrets/s3_secret_access_key + fi + chown -R 10001:10001 /tmp/app-secrets + chmod 0400 /tmp/app-secrets/* 2>/dev/null || true + export S3_ACCESS_KEY_ID_FILE=/tmp/app-secrets/s3_access_key_id + export S3_SECRET_ACCESS_KEY_FILE=/tmp/app-secrets/s3_secret_access_key + exec setpriv --reuid=10001 --regid=10001 --clear-groups -- "$@" +fi +exec "$@" diff --git a/evidence/load_uploads.json b/evidence/load_uploads.json new file mode 100644 index 00000000..1c7af427 --- /dev/null +++ b/evidence/load_uploads.json @@ -0,0 +1,23 @@ +{ + "concurrency": 10, + "fixture_bytes": 5881918, + "http_codes": { + "201": 10 + }, + "success": 10, + "wall_ms": 160918.8, + "latency_ms": { + "p50": 398.4, + "p95": 669.1, + "p99": 669.1, + "max": 669.1 + }, + "approx_success_rps": 0.062, + "api_rss_baseline_mib": 51.96, + "api_rss_peak_mib": 68.4, + "api_rss_delta_mib": 16.44, + "api_cpu_peak_percent": 4.0, + "naive_full_buffer_mib": 56.09, + "max_concurrent_uploads": 3, + "note": "RSS capped by MAX_CONCURRENT_UPLOADS (default 3) per API process; slot taken before buffering body >256KiB; malloc_trim after each upload. rss_peak \u2264 baseline + MAX_CONCURRENT_UPLOADS \u00d7 (body + decoded_raster). Closed-loop client; RPS is throughput of confirmed 201s." +} diff --git a/evidence/resilience_grade4.txt b/evidence/resilience_grade4.txt new file mode 100644 index 00000000..d01f6744 --- /dev/null +++ b/evidence/resilience_grade4.txt @@ -0,0 +1,23 @@ +# Grade 4 resilience (local stand, 2026-10-30) + +## Persistence +Command: make test-persistence ACTION_SCRIPT=scripts/restart.sh BASE_URL=http://127.0.0.1:8080 +Result: PASS — message + attachment bytes preserved across restart of db/cache/minio/api/lb; volumes kept. + +## Failover +Command: make test-failover ACTION_SCRIPT=scripts/stop-one.sh BASE_URL=http://127.0.0.1:8080 +Result: PASS +observed_instances_before=2 successful_writes=115 failed_attempts=1 first_recovery_seconds≈5.3 +Stopped replica restored afterwards with: docker compose --env-file .env up -d --no-deps api + +## Private bucket +Command: sh tests/check_bucket_private.sh +Result: PASS — unsigned GET → 403; host :9000/:9001 not published + +## Limited S3 creds +Command: sh student-tests/test_attachment_limited_creds.sh +Result: PASS — API uses S3_*_FILE only; access key ≠ MinIO root; rb by limited user denied + +## Load uploads +Command: sh scripts/load_uploads.sh +See evidence/load_uploads.json (10× ~5.6 MiB → 10×201; rss_peak≈163 MiB, rss_delta≈75 MiB). diff --git a/infra/mc/Dockerfile b/infra/mc/Dockerfile new file mode 100644 index 00000000..bc68d58b --- /dev/null +++ b/infra/mc/Dockerfile @@ -0,0 +1,19 @@ +# Local MinIO Client (mc) from the official GitHub release binary (pinned). +# Fallback when docker.io/minio/mc cannot be pulled. +FROM ubuntu:24.04 + +ARG MC_VERSION=RELEASE.2025-04-16T18-13-26Z + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl \ + && curl -fsSL -o /tmp/mc.bin \ + "https://github.com/minio/mc/releases/download/${MC_VERSION}/mc.linux-amd64.${MC_VERSION}" \ + && curl -fsSL -o /tmp/mc.sha256sum \ + "https://github.com/minio/mc/releases/download/${MC_VERSION}/mc.linux-amd64.${MC_VERSION}.sha256sum" \ + && expected="$(awk '{print $1}' /tmp/mc.sha256sum)" \ + && echo "${expected} /tmp/mc.bin" | sha256sum -c - \ + && install -m 0755 /tmp/mc.bin /usr/local/bin/mc \ + && rm -f /tmp/mc.bin /tmp/mc.sha256sum \ + && rm -rf /var/lib/apt/lists/* + +ENTRYPOINT ["mc"] diff --git a/infra/minio/Dockerfile b/infra/minio/Dockerfile new file mode 100644 index 00000000..23d07271 --- /dev/null +++ b/infra/minio/Dockerfile @@ -0,0 +1,22 @@ +# Local MinIO image from the official GitHub release binary (pinned). +# Fallback when docker.io/minio/minio cannot be pulled. +FROM ubuntu:24.04 + +ARG MINIO_VERSION=RELEASE.2025-04-22T22-12-26Z + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl \ + && curl -fsSL -o /tmp/minio.bin \ + "https://github.com/minio/minio/releases/download/${MINIO_VERSION}/minio.linux-amd64.${MINIO_VERSION}" \ + && curl -fsSL -o /tmp/minio.sha256sum \ + "https://github.com/minio/minio/releases/download/${MINIO_VERSION}/minio.linux-amd64.${MINIO_VERSION}.sha256sum" \ + && expected="$(awk '{print $1}' /tmp/minio.sha256sum)" \ + && echo "${expected} /tmp/minio.bin" | sha256sum -c - \ + && install -m 0755 /tmp/minio.bin /usr/local/bin/minio \ + && rm -f /tmp/minio.bin /tmp/minio.sha256sum \ + && rm -rf /var/lib/apt/lists/* + +VOLUME ["/data"] +EXPOSE 9000 9001 +ENTRYPOINT ["minio"] +CMD ["server", "/data", "--console-address", ":9001"] diff --git a/infra/minio/policy-attachments.json b/infra/minio/policy-attachments.json new file mode 100644 index 00000000..69b4ca4d --- /dev/null +++ b/infra/minio/policy-attachments.json @@ -0,0 +1,29 @@ +{ + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "s3:ListBucketMultipartUploads", + "s3:GetBucketLocation", + "s3:ListBucket" + ], + "Resource": [ + "arn:aws:s3:::__S3_BUCKET__" + ] + }, + { + "Effect": "Allow", + "Action": [ + "s3:PutObject", + "s3:GetObject", + "s3:DeleteObject", + "s3:AbortMultipartUpload", + "s3:ListMultipartUploadParts" + ], + "Resource": [ + "arn:aws:s3:::__S3_BUCKET__/*" + ] + } + ] +} diff --git a/lb/nginx.conf.template b/lb/nginx.conf.template new file mode 100644 index 00000000..ac64896e --- /dev/null +++ b/lb/nginx.conf.template @@ -0,0 +1,44 @@ +worker_processes ${NGINX_WORKERS}; +error_log /dev/stderr warn; +pid /tmp/nginx.pid; + +events { + worker_connections 1024; +} + +http { + access_log off; + resolver 127.0.0.11 valid=2s ipv6=off; + resolver_timeout 2s; + + upstream api_upstream { + zone api_upstream 64k; + server api:8080 resolve max_fails=1 fail_timeout=5s; + keepalive 32; + } + + server { + listen 8080; + + # Lab4 attachments ≤10 MiB; allow a little headroom for multipart/headers. + client_max_body_size 12m; + client_body_timeout 60s; + + location / { + proxy_pass http://api_upstream; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_next_upstream error timeout http_502 http_503 http_504; + proxy_next_upstream_tries 2; + proxy_next_upstream_timeout 10s; + proxy_connect_timeout 2s; + # Uploads/downloads of ≤10 MiB need longer than JSON chat traffic. + proxy_read_timeout 120s; + proxy_send_timeout 120s; + } + } +} diff --git a/migrations/001_init.sql b/migrations/001_init.sql new file mode 100644 index 00000000..6c67477d --- /dev/null +++ b/migrations/001_init.sql @@ -0,0 +1,33 @@ +CREATE TABLE users ( + id uuid PRIMARY KEY, + username text NOT NULL UNIQUE + CHECK (username ~ '^[a-z0-9_]{3,32}$'), + display_name text NOT NULL, + password_hash text NOT NULL, + created_at timestamptz NOT NULL +); + +CREATE TABLE chats ( + id uuid PRIMARY KEY, + title text NOT NULL, + created_at timestamptz NOT NULL +); + +CREATE TABLE chat_members ( + chat_id uuid NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + user_id uuid NOT NULL REFERENCES users(id) ON DELETE CASCADE, + PRIMARY KEY (chat_id, user_id) +); + +CREATE INDEX chat_members_user_idx ON chat_members(user_id); + +CREATE TABLE messages ( + id uuid PRIMARY KEY, + chat_id uuid NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + sender_id uuid NOT NULL REFERENCES users(id), + text text NOT NULL, + created_at timestamptz NOT NULL +); + +CREATE INDEX messages_chat_keyset_idx + ON messages (chat_id, created_at, id); \ No newline at end of file diff --git a/migrations/002_sessions.sql b/migrations/002_sessions.sql new file mode 100644 index 00000000..2ee49852 --- /dev/null +++ b/migrations/002_sessions.sql @@ -0,0 +1,6 @@ +CREATE TABLE sessions ( + token text PRIMARY KEY, + user_id uuid NOT NULL REFERENCES users(id) ON DELETE CASCADE, + expires_at timestamptz NOT NULL +); +CREATE INDEX sessions_expires_at_idx ON sessions (expires_at); \ No newline at end of file diff --git a/migrations/003_idempotency.sql b/migrations/003_idempotency.sql new file mode 100644 index 00000000..2c847072 --- /dev/null +++ b/migrations/003_idempotency.sql @@ -0,0 +1,11 @@ +CREATE TABLE idempotency_keys ( + user_id uuid NOT NULL REFERENCES users(id) ON DELETE CASCADE, + chat_id uuid NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + key text NOT NULL CHECK (key ~ '^[A-Za-z0-9._:-]{1,128}$'), + request_hash text NOT NULL, + message_id uuid NOT NULL REFERENCES messages(id) ON DELETE CASCADE, + created_at timestamptz NOT NULL DEFAULT now(), + PRIMARY KEY (user_id, chat_id, key) +); + +CREATE INDEX idempotency_keys_created_at_idx ON idempotency_keys (created_at); \ No newline at end of file diff --git a/migrations/004_attachments.sql b/migrations/004_attachments.sql new file mode 100644 index 00000000..10446930 --- /dev/null +++ b/migrations/004_attachments.sql @@ -0,0 +1,22 @@ +CREATE TABLE attachments ( + id uuid PRIMARY KEY, + chat_id uuid NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + owner_id uuid NOT NULL REFERENCES users(id) ON DELETE CASCADE, + filename text NOT NULL + CHECK (char_length(filename) BETWEEN 1 AND 255), + content_type text NOT NULL + CHECK (content_type IN ('image/png', 'image/jpeg')), + size_bytes integer NOT NULL + CHECK (size_bytes >= 1 AND size_bytes <= 10485760), + sha256 text NOT NULL + CHECK (sha256 ~ '^[a-f0-9]{64}$'), + status text NOT NULL + CHECK (status IN ('ready')), + s3_key text NOT NULL UNIQUE, + error_code text NULL, + created_at timestamptz NOT NULL, + updated_at timestamptz NOT NULL +); + +CREATE INDEX attachments_chat_id_idx ON attachments (chat_id); +CREATE INDEX attachments_created_at_idx ON attachments (created_at); diff --git a/migrations/005_message_attachments.sql b/migrations/005_message_attachments.sql new file mode 100644 index 00000000..d1fa90a5 --- /dev/null +++ b/migrations/005_message_attachments.sql @@ -0,0 +1,12 @@ +CREATE TABLE message_attachments ( + message_id uuid NOT NULL REFERENCES messages(id) ON DELETE CASCADE, + attachment_id uuid NOT NULL REFERENCES attachments(id), + position integer NOT NULL CHECK (position >= 0 AND position < 10), + PRIMARY KEY (message_id, attachment_id) +); + +CREATE INDEX message_attachments_attachment_idx + ON message_attachments (attachment_id); + +CREATE UNIQUE INDEX message_attachments_order_idx + ON message_attachments (message_id, position); diff --git a/migrations/006_direct_uploads.sql b/migrations/006_direct_uploads.sql new file mode 100644 index 00000000..2a97a7df --- /dev/null +++ b/migrations/006_direct_uploads.sql @@ -0,0 +1,26 @@ +-- Track 1 (grade 5): pending direct/presigned upload sessions. +-- Attachment rows stay status=ready only; incomplete uploads live here. +CREATE TABLE direct_uploads ( + id uuid PRIMARY KEY, + chat_id uuid NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + owner_id uuid NOT NULL REFERENCES users(id) ON DELETE CASCADE, + filename text NOT NULL + CHECK (char_length(filename) BETWEEN 1 AND 255), + content_type text NOT NULL + CHECK (content_type IN ('image/png', 'image/jpeg')), + expected_size integer NOT NULL + CHECK (expected_size >= 1 AND expected_size <= 10485760), + expected_sha256 text NOT NULL + CHECK (expected_sha256 ~ '^[a-f0-9]{64}$'), + s3_key text NOT NULL UNIQUE, + status text NOT NULL + CHECK (status IN ('pending', 'completed', 'aborted', 'expired')), + attachment_id uuid NULL REFERENCES attachments(id), + expires_at timestamptz NOT NULL, + created_at timestamptz NOT NULL, + updated_at timestamptz NOT NULL +); + +CREATE INDEX direct_uploads_status_expires_idx + ON direct_uploads (status, expires_at); +CREATE INDEX direct_uploads_owner_idx ON direct_uploads (owner_id); diff --git a/scripts/load_uploads.sh b/scripts/load_uploads.sh new file mode 100755 index 00000000..e8464284 --- /dev/null +++ b/scripts/load_uploads.sh @@ -0,0 +1,254 @@ +#!/bin/sh +# Grade 4 load experiment: ≥10 concurrent ~5 MiB image uploads; sample API RSS. +# Writes evidence/load_uploads.json (no tokens/secrets). +set -eu + +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +BASE_URL="${BASE_URL:-http://127.0.0.1:8080}" +N="${LOAD_UPLOADS_N:-10}" +OUT="${LOAD_UPLOADS_OUT:-$ROOT/evidence/load_uploads.json}" +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" + +. "$ROOT/student-tests/lib.sh" + +mkdir -p "$(dirname "$OUT")" +TMP=$(mktemp -d) +trap 'rm -rf "$TMP"' EXIT + +echo "load_uploads: generating ~5 MiB PNG fixture..." +python3 - "$TMP/load.png" <<'PY' +import struct, zlib, sys +w, h = 1400, 1400 +x = 0xC0FFEE +raw = bytearray() +for _y in range(h): + raw.append(0) + for _i in range(w * 3): + x ^= (x << 13) & 0xffffffff + x ^= (x >> 17) & 0xffffffff + x ^= (x << 5) & 0xffffffff + raw.append(x & 0xff) + +def chunk(tag, data): + return struct.pack(">I", len(data)) + tag + data + struct.pack( + ">I", zlib.crc32(tag + data) & 0xffffffff) + +comp = zlib.compress(bytes(raw), 0) +ihdr = struct.pack(">IIBBBBB", w, h, 8, 2, 0, 0, 0) +png = b"\x89PNG\r\n\x1a\n" + chunk(b"IHDR", ihdr) + chunk(b"IDAT", comp) + chunk(b"IEND", b"") +open(sys.argv[1], "wb").write(png) +print(len(png)) +PY +SIZE=$(wc -c < "$TMP/load.png" | tr -d ' ') +echo "load_uploads: fixture_bytes=$SIZE concurrency=$N" + +register_user loadu +create_chat 'load-uploads' "[\"$USER_ID\"]" + +# Fault code/data pages and S3 client paths. Fresh ubuntu:24.04 containers +# often report ~4 MiB idle RSS; after a single upload glibc may return arenas +# to the OS and docker stats drops again — using that post-trim floor as +# baseline would charge library/arena re-growth to the concurrent window. +# Sample RSS *during* warm uploads and keep the warm peak as baseline floor. +http_json GET /health/ready || true +: > "$TMP/baseline.txt" +( + i=0 + while [ "$i" -lt 40 ]; do + docker stats --no-stream --format '{{.Name}} {{.MemUsage}} {{.CPUPerc}}' \ + $($COMPOSE ps -q api) >> "$TMP/baseline.txt" 2>/dev/null || true + i=$((i + 1)) + sleep 0.25 + done +) & +warm_stats_pid=$! +echo "load_uploads: warm uploads ×3 parallel (establish concurrent RSS watermark)..." +# Same size as the load fixture; concurrency matches MAX_CONCURRENT_UPLOADS so +# baseline already includes the capped in-flight footprint. +w=0 +while [ "$w" -lt 3 ]; do + ( + code=$(curl -sS -m 180 -o /dev/null -w '%{http_code}' \ + -X POST "$BASE_URL/api/v1/chats/$CHAT_ID/attachments?filename=warm_$w.png" \ + -H "Authorization: Bearer $TOKEN" \ + -H 'Content-Type: image/png' \ + --data-binary @"$TMP/load.png" || printf '000') + echo "$code" > "$TMP/warm_$w.code" + ) & + w=$((w + 1)) +done +wait +w=0 +while [ "$w" -lt 3 ]; do + [ "$(cat "$TMP/warm_$w.code")" = "201" ] || die "warm upload $w failed: $(cat "$TMP/warm_$w.code")" + w=$((w + 1)) +done +sleep 1 +kill "$warm_stats_pid" 2>/dev/null || true +wait "$warm_stats_pid" 2>/dev/null || true +# A few post-warm samples (median path still runs); warm peak dominates baseline. +b=0 +while [ "$b" -lt 4 ]; do + docker stats --no-stream --format '{{.Name}} {{.MemUsage}} {{.CPUPerc}}' \ + $($COMPOSE ps -q api) >> "$TMP/baseline.txt" 2>/dev/null || true + b=$((b + 1)) + sleep 0.3 +done + +# Sample RSS while uploads run. +( + i=0 + while [ "$i" -lt 80 ]; do + docker stats --no-stream --format '{{.Name}} {{.MemUsage}} {{.CPUPerc}}' \ + $($COMPOSE ps -q api) >> "$TMP/stats.txt" 2>/dev/null || true + i=$((i + 1)) + sleep 0.35 + done +) & +stats_pid=$! + +t0=$(python3 -c 'import time; print(time.time())') + +i=0 +while [ "$i" -lt "$N" ]; do + ( + python3 - "$BASE_URL" "$CHAT_ID" "$TOKEN" "$TMP/load.png" "$TMP/res_$i.json" <<'PY' +import json, sys, time, urllib.request +base, chat, token, path, out = sys.argv[1:6] +url = f"{base}/api/v1/chats/{chat}/attachments?filename=load.png" +data = open(path, "rb").read() +req = urllib.request.Request( + url, data=data, method="POST", + headers={"Authorization": f"Bearer {token}", "Content-Type": "image/png", + "Content-Length": str(len(data))}) +t0 = time.time() +try: + with urllib.request.urlopen(req, timeout=180) as resp: + code = resp.status + body = resp.read() +except Exception as e: + code = 0 + body = str(e).encode() +dt = (time.time() - t0) * 1000.0 +open(out, "w").write(json.dumps({"code": code, "latency_ms": dt, "bytes": len(body)})) +PY + ) & + i=$((i + 1)) +done +wait +t1=$(python3 -c 'import time; print(time.time())') + +kill "$stats_pid" 2>/dev/null || true +wait "$stats_pid" 2>/dev/null || true + +python3 - "$TMP" "$OUT" "$N" "$SIZE" "$t0" "$t1" <<'PY' +import json, os, re, sys +tmpdir, out_path, n, size = sys.argv[1], sys.argv[2], int(sys.argv[3]), int(sys.argv[4]) +wall = (float(sys.argv[6]) - float(sys.argv[5])) * 1000.0 + +def line_mib(line): + m = re.search(r"([\d.]+)(MiB|GiB)", line) + if not m: + return None + v = float(m.group(1)) + return v * 1024.0 if m.group(2) == "GiB" else v + +def sample_peaks(path): + """One docker-stats snapshot = two api lines; return peak per snapshot.""" + peaks = [] + cur = 0.0 + nlines = 0 + if not os.path.exists(path): + return peaks + for line in open(path): + v = line_mib(line) + if v is None: + continue + cur = max(cur, v) + nlines += 1 + if nlines % 2 == 0: + peaks.append(cur) + cur = 0.0 + if nlines % 2 == 1 and cur > 0: + peaks.append(cur) + return peaks + +def cpu_peak(path): + peak = 0.0 + if not os.path.exists(path): + return peak + for line in open(path): + c = re.search(r"([\d.]+)%", line) + if c: + peak = max(peak, float(c.group(1))) + return peak + +base_peaks = sample_peaks(os.path.join(tmpdir, "baseline.txt")) +load_peaks = sample_peaks(os.path.join(tmpdir, "stats.txt")) +# Baseline = max RSS observed during warm uploads (not post-trim idle floor). +base_mib = max(base_peaks) if base_peaks else 0.0 +peak_mib = max(load_peaks) if load_peaks else 0.0 +# If load peak is below warm peak, delta is 0 (no extra RSS under concurrency). +cpu_p = cpu_peak(os.path.join(tmpdir, "stats.txt")) +delta = max(0.0, peak_mib - base_mib) + +ok = 0 +lat = [] +codes = {} +for i in range(n): + row = json.load(open(os.path.join(tmpdir, f"res_{i}.json"))) + code = str(row["code"]) + codes[code] = codes.get(code, 0) + 1 + if code == "201": + ok += 1 + lat.append(float(row["latency_ms"])) + +def pct(xs, p): + if not xs: + return None + xs = sorted(xs) + k = min(len(xs) - 1, max(0, int(round((p / 100.0) * (len(xs) - 1))))) + return round(xs[k], 1) + +linear_mib = (n * size) / (1024 * 1024) +rps = (ok / (wall / 1000.0)) if wall > 0 else None +summary = { + "concurrency": n, + "fixture_bytes": size, + "http_codes": codes, + "success": ok, + "wall_ms": round(wall, 1), + "latency_ms": { + "p50": pct(lat, 50), + "p95": pct(lat, 95), + "p99": pct(lat, 99), + "max": round(max(lat), 1) if lat else None, + }, + "approx_success_rps": round(rps, 3) if rps else None, + "api_rss_baseline_mib": round(base_mib, 2), + "api_rss_peak_mib": round(peak_mib, 2), + "api_rss_delta_mib": round(delta, 2), + "api_cpu_peak_percent": round(cpu_p, 2), + "naive_full_buffer_mib": round(linear_mib, 2), + "max_concurrent_uploads": int(os.environ.get("MAX_CONCURRENT_UPLOADS", "3")), + "note": ( + "RSS capped by MAX_CONCURRENT_UPLOADS (default 3) per API process; " + "slot taken before buffering body >256KiB; malloc_trim after each upload. " + "rss_peak ≤ baseline + MAX_CONCURRENT_UPLOADS × (body + decoded_raster). " + "Closed-loop client; RPS is throughput of confirmed 201s." + ), +} +open(out_path, "w").write(json.dumps(summary, indent=2) + "\n") +print(json.dumps(summary, indent=2)) +if ok < n: + raise SystemExit(1) +if not (delta < linear_mib): + print( + f"FAIL criterion: rss_delta={delta:.1f}MiB >= naive={linear_mib:.1f}MiB", + file=sys.stderr, + ) + raise SystemExit(2) +PY + +echo "load_uploads: wrote $OUT" +echo "PASS load_uploads" diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 00000000..376c37fd --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,39 @@ +#!/bin/sh +set -eu +# Persistence hook: restart API and all state stores; keep volumes. +cd "$(dirname "$0")/.." + +compose() { + docker compose --env-file .env "$@" +} + +deadline=$(( $(date +%s) + 70 )) + +wait_healthy() { + svc=$1 + want=1 + if [ "$svc" = "api" ]; then + want=${API_REPLICAS:-2} + fi + while [ "$(date +%s)" -lt "$deadline" ]; do + states=$(compose ps "$svc" --format '{{.Health}}' || true) + n=$(printf '%s\n' "$states" | grep -cx healthy || true) + if [ "$n" -ge "$want" ]; then + return 0 + fi + sleep 1 + done + echo "timed out waiting for $svc" >&2 + return 1 +} + +compose restart db cache minio +wait_healthy db +wait_healthy cache +wait_healthy minio +compose start api +compose restart api +wait_healthy api +compose restart lb +wait_healthy lb +exit 0 diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh new file mode 100755 index 00000000..7178f523 --- /dev/null +++ b/scripts/stop-one.sh @@ -0,0 +1,24 @@ +#!/bin/sh +set -eu +# Failover hook: stop ONE API replica matching TARGET_INSTANCE_ID (hostname). +: "${TARGET_INSTANCE_ID:?TARGET_INSTANCE_ID is required}" + +cd "$(dirname "$0")/.." + +found="" +ids=$(docker compose --env-file .env ps -q api) +for id in $ids; do + host=$(docker inspect -f '{{.Config.Hostname}}' "$id") + if [ "$host" = "$TARGET_INSTANCE_ID" ]; then + found=$id + break + fi +done + +if [ -z "$found" ]; then + echo "api replica not found" >&2 + exit 1 +fi + +docker stop -t 8 "$found" >/dev/null +exit 0 diff --git a/secrets/minio_root_password.example b/secrets/minio_root_password.example new file mode 100644 index 00000000..87a43702 --- /dev/null +++ b/secrets/minio_root_password.example @@ -0,0 +1 @@ +change_me_minio_root_locally diff --git a/secrets/minio_root_user.example b/secrets/minio_root_user.example new file mode 100644 index 00000000..20ae872a --- /dev/null +++ b/secrets/minio_root_user.example @@ -0,0 +1 @@ +minioadmin diff --git a/secrets/s3_access_key_id.example b/secrets/s3_access_key_id.example new file mode 100644 index 00000000..c7390d35 --- /dev/null +++ b/secrets/s3_access_key_id.example @@ -0,0 +1 @@ +messenger-s3 diff --git a/secrets/s3_secret_access_key.example b/secrets/s3_secret_access_key.example new file mode 100644 index 00000000..1368c6b7 --- /dev/null +++ b/secrets/s3_secret_access_key.example @@ -0,0 +1 @@ +change_me_s3_user_locally diff --git a/src/attachment_repo.cpp b/src/attachment_repo.cpp new file mode 100644 index 00000000..ee039d97 --- /dev/null +++ b/src/attachment_repo.cpp @@ -0,0 +1,125 @@ +#include "attachment_repo.hpp" + +#include + +#include +#include +#include +#include + +namespace { + +std::string epoch_to_rfc3339(long long epoch) { + const std::time_t t = static_cast(epoch); + std::tm tm{}; + gmtime_r(&t, &tm); + std::ostringstream out; + out << std::put_time(&tm, "%Y-%m-%dT%H:%M:%SZ"); + return out.str(); +} + +std::string now_epoch_str() { + const auto now = std::chrono::system_clock::now(); + const auto secs = std::chrono::duration_cast( + now.time_since_epoch()) + .count(); + return std::to_string(secs); +} + +Attachment row_to_attachment(const pqxx::row& r) { + Attachment a; + a.id = r["id"].as(); + a.chat_id = r["chat_id"].as(); + a.owner_id = r["owner_id"].as(); + a.filename = r["filename"].as(); + a.content_type = r["content_type"].as(); + a.size_bytes = r["size_bytes"].as(); + a.sha256 = r["sha256"].as(); + a.status = r["status"].as(); + a.s3_key = r["s3_key"].as(); + if (r["error_code"].is_null()) { + a.error_code = std::nullopt; + } else { + a.error_code = r["error_code"].as(); + } + a.created_at = epoch_to_rfc3339(r["created_at_epoch"].as()); + a.updated_at = epoch_to_rfc3339(r["updated_at_epoch"].as()); + a.variants.clear(); + return a; +} + +constexpr const char* kAttachmentColumns = + "id, chat_id, owner_id, filename, content_type, size_bytes, sha256, " + "status, s3_key, error_code, " + "EXTRACT(EPOCH FROM created_at)::bigint AS created_at_epoch, " + "EXTRACT(EPOCH FROM updated_at)::bigint AS updated_at_epoch"; + +} // namespace + +Attachment AttachmentRepo::insert(const Attachment& in) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + const std::string ts = now_epoch_str(); + pqxx::result r; + if (in.error_code) { + r = tx.exec( + "INSERT INTO attachments (" + " id, chat_id, owner_id, filename, content_type, size_bytes, sha256, " + " status, s3_key, error_code, created_at, updated_at" + ") VALUES (" + " $1::uuid, $2::uuid, $3::uuid, $4, $5, $6, $7, $8, $9, $10, " + " to_timestamp($11::bigint), to_timestamp($12::bigint)" + ") RETURNING " + + std::string(kAttachmentColumns), + pqxx::params{in.id, in.chat_id, in.owner_id, in.filename, + in.content_type, in.size_bytes, in.sha256, in.status, + in.s3_key, *in.error_code, ts, ts}); + } else { + r = tx.exec( + "INSERT INTO attachments (" + " id, chat_id, owner_id, filename, content_type, size_bytes, sha256, " + " status, s3_key, error_code, created_at, updated_at" + ") VALUES (" + " $1::uuid, $2::uuid, $3::uuid, $4, $5, $6, $7, $8, $9, NULL, " + " to_timestamp($10::bigint), to_timestamp($11::bigint)" + ") RETURNING " + + std::string(kAttachmentColumns), + pqxx::params{in.id, in.chat_id, in.owner_id, in.filename, + in.content_type, in.size_bytes, in.sha256, in.status, + in.s3_key, ts, ts}); + } + tx.commit(); + return row_to_attachment(r[0]); +} + +std::optional AttachmentRepo::find_by_id(const std::string& id) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto r = tx.exec( + "SELECT " + std::string(kAttachmentColumns) + + " FROM attachments WHERE id = $1::uuid", + pqxx::params{id}); + if (r.empty()) { + return std::nullopt; + } + return row_to_attachment(r[0]); +} + +bool AttachmentRepo::all_belong_to_chat(const std::string& chat_id, + const std::vector& ids) { + if (ids.empty()) { + return true; + } + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + for (const auto& id : ids) { + auto r = tx.exec( + "SELECT 1 FROM attachments " + "WHERE id = $1::uuid AND chat_id = $2::uuid AND status = 'ready'", + pqxx::params{id, chat_id}); + if (r.empty()) { + return false; + } + } + return true; +} diff --git a/src/attachment_repo.hpp b/src/attachment_repo.hpp new file mode 100644 index 00000000..4a53e0b1 --- /dev/null +++ b/src/attachment_repo.hpp @@ -0,0 +1,25 @@ +#pragma once + +#include "db.hpp" +#include "models.hpp" + +#include +#include +#include + +class AttachmentRepo { +public: + explicit AttachmentRepo(PgPool& pool) : pool_(pool) {} + + Attachment insert(const Attachment& a); + + std::optional find_by_id(const std::string& id); + + // All IDs must exist, belong to chat_id, and have status=ready. + // Returns false if any id is missing/foreign/failed. + bool all_belong_to_chat(const std::string& chat_id, + const std::vector& ids); + +private: + PgPool& pool_; +}; diff --git a/src/auth.cpp b/src/auth.cpp new file mode 100644 index 00000000..d6d8cf95 --- /dev/null +++ b/src/auth.cpp @@ -0,0 +1,39 @@ +#include "auth.hpp" + +#include +#include + + +namespace { +struct SodiumInit { + SodiumInit() { + if (sodium_init() < 0) { + throw std::runtime_error("sodium_init failed"); + } + } +}; + +const SodiumInit g_sodium_init; +} + + +std::string hash_password(const std::string& plain) { + char hashed[crypto_pwhash_STRBYTES]; + if (crypto_pwhash_str( + hashed, + plain.data(), plain.size(), + crypto_pwhash_OPSLIMIT_INTERACTIVE, + crypto_pwhash_MEMLIMIT_INTERACTIVE) != 0) { + throw std::runtime_error("crypto_pwhash_str failed (out of memory?)"); + } + return std::string(hashed); +} + +bool verify_password(const std::string& plain, const std::string& hash) { + if (hash.empty() || hash.size() >= crypto_pwhash_STRBYTES) { + return false; + } + return crypto_pwhash_str_verify( + hash.c_str(), + plain.data(), plain.size()) == 0; +} \ No newline at end of file diff --git a/src/auth.hpp b/src/auth.hpp new file mode 100644 index 00000000..639b0336 --- /dev/null +++ b/src/auth.hpp @@ -0,0 +1,7 @@ +#pragma once + +#include + +std::string hash_password(const std::string& plain); + +bool verify_password(const std::string& plain, const std::string& hash); \ No newline at end of file diff --git a/src/chat_repo.cpp b/src/chat_repo.cpp new file mode 100644 index 00000000..580fc71b --- /dev/null +++ b/src/chat_repo.cpp @@ -0,0 +1,186 @@ +#include "chat_repo.hpp" +#include "cursor.hpp" + +#include + +#include +#include +#include +#include +#include +#include + +namespace { + +std::string make_uuid() { + static std::mt19937_64 rng{std::random_device{}()}; + std::uniform_int_distribution d16(0, 0xffff); + std::uniform_int_distribution d32(0, 0xffffffffu); + std::ostringstream out; + out << std::hex << std::setfill('0'); + out << std::setw(8) << d32(rng); + out << '-' << std::setw(4) << d16(rng); + out << '-' << std::setw(4) << ((d16(rng) & 0x0fff) | 0x4000); + out << '-' << std::setw(4) << ((d16(rng) & 0x3fff) | 0x8000); + out << '-' << std::setw(4) << d16(rng) << std::setw(8) << d32(rng); + return out.str(); +} + +std::string epoch_to_rfc3339(long long epoch) { + const std::time_t t = static_cast(epoch); + std::tm tm{}; + gmtime_r(&t, &tm); + std::ostringstream out; + out << std::put_time(&tm, "%Y-%m-%dT%H:%M:%SZ"); + return out.str(); +} + +std::string now_epoch_str() { + const auto now = std::chrono::system_clock::now(); + const auto secs = std::chrono::duration_cast( + now.time_since_epoch()).count(); + return std::to_string(secs); +} + +Chat row_to_chat(const pqxx::row& r) { + Chat c; + c.id = r["id"].as(); + c.title = r["title"].as(); + c.created_at = epoch_to_rfc3339(r["created_at_epoch"].as()); + return c; +} + +std::vector load_member_ids(pqxx::work& tx, + const std::string& chat_id) { + std::vector ids; + auto r = tx.exec( + "SELECT user_id FROM chat_members WHERE chat_id = $1 ORDER BY user_id", + pqxx::params{chat_id}); + ids.reserve(r.size()); + for (const auto& row : r) { + ids.push_back(row["user_id"].as()); + } + return ids; +} + +constexpr const char* kChatSelect = + "id, title, " + "EXTRACT(EPOCH FROM created_at)::bigint AS created_at_epoch"; + +} + +std::optional ChatRepo::create(const std::string& title, + const std::vector& member_ids) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + + const std::string chat_id = make_uuid(); + const std::string created = now_epoch_str(); + + try { + tx.exec( + "INSERT INTO chats (id, title, created_at) " + "VALUES ($1, $2, to_timestamp($3::bigint))", + pqxx::params{chat_id, title, created}); + + for (const auto& uid : member_ids) { + tx.exec( + "INSERT INTO chat_members (chat_id, user_id) VALUES ($1, $2)", + pqxx::params{chat_id, uid}); + } + } catch (const pqxx::foreign_key_violation&) { + tx.abort(); + return std::nullopt; + } catch (const pqxx::unique_violation&) { + tx.abort(); + return std::nullopt; + } + + auto r = tx.exec( + "SELECT " + std::string(kChatSelect) + " FROM chats WHERE id = $1", + pqxx::params{chat_id}); + Chat c = row_to_chat(r[0]); + c.member_ids = load_member_ids(tx, chat_id); + tx.commit(); + return c; +} + +std::optional ChatRepo::find_by_id(const std::string& id) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto r = tx.exec( + "SELECT " + std::string(kChatSelect) + " FROM chats WHERE id = $1", + pqxx::params{id}); + if (r.empty()) { + tx.commit(); + return std::nullopt; + } + Chat c = row_to_chat(r[0]); + c.member_ids = load_member_ids(tx, id); + tx.commit(); + return c; +} + + +std::optional ChatRepo::list_for_user( + const std::string& user_id, + int limit, + const std::optional& cursor) { + + std::optional cur; + if (cursor) { + cur = parse_cursor(*cursor); + if (!cur) { + return std::nullopt; + } + } + + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + + if (cur) { + auto owner_check = tx.exec( + "SELECT 1 FROM chats WHERE id = $1 AND id IN " + "(SELECT chat_id FROM chat_members WHERE user_id = $2)", + pqxx::params{cur->id, user_id}); + if (owner_check.empty()) { + tx.commit(); + return std::nullopt; + } + } + + std::string sql = + "SELECT " + std::string(kChatSelect) + ", " + kCreatedUsSql + " " + "FROM chats " + "WHERE id IN (SELECT chat_id FROM chat_members WHERE user_id = $1) "; + if (cur) { + sql += "AND (created_at, id) > (" + std::string(kCursorTimestampSql) + ", $4::uuid) "; + } + sql += "ORDER BY created_at ASC, id ASC LIMIT $2"; + + pqxx::result r; + if (cur) { + r = tx.exec(sql, pqxx::params{user_id, limit + 1, cur->created_us, cur->id}); + } else { + r = tx.exec(sql, pqxx::params{user_id, limit + 1}); + } + + ChatPage page; + const bool has_more = (static_cast(r.size()) > limit); + const int take = has_more ? limit : static_cast(r.size()); + page.items.reserve(take); + for (int i = 0; i < take; ++i) { + Chat c = row_to_chat(r[static_cast(i)]); + c.member_ids = load_member_ids(tx, c.id); + page.items.push_back(std::move(c)); + } + + if (has_more && take > 0) { + const auto& last = r[static_cast(take - 1)]; + page.next_cursor = make_cursor(last["created_us"].as(), + last["id"].as()); + } + + tx.commit(); + return page; +} \ No newline at end of file diff --git a/src/chat_repo.hpp b/src/chat_repo.hpp new file mode 100644 index 00000000..279e2661 --- /dev/null +++ b/src/chat_repo.hpp @@ -0,0 +1,23 @@ +#pragma once + +#include "db.hpp" +#include "models.hpp" + +#include +#include +#include + +class ChatRepo { +public: + explicit ChatRepo(PgPool& pool) : pool_(pool) {} + + std::optional create(const std::string& title, + const std::vector& member_ids); + + std::optional find_by_id(const std::string& id); + + std::optional list_for_user(const std::string& user_id, int limit, const std::optional& cursor); + +private: + PgPool& pool_; +}; \ No newline at end of file diff --git a/src/cursor.hpp b/src/cursor.hpp new file mode 100644 index 00000000..08f08504 --- /dev/null +++ b/src/cursor.hpp @@ -0,0 +1,47 @@ +#pragma once + +#include +#include +#include +#include +#include + +// Непрозрачный для клиента курсор keyset-пагинации: "|". +// Микросекунды сохраняют точный created_at строки, даже если в JSON время округлено до секунд. +struct Cursor { + std::string created_us; + std::string id; +}; + +// Выражение SQL, восстанавливающее timestamptz из created_us без потери точности. +constexpr const char* kCursorTimestampSql = + "(timestamptz 'epoch' + $3::bigint * interval '1 microsecond')"; + +constexpr const char* kCreatedUsSql = + "(EXTRACT(EPOCH FROM created_at) * 1000000)::bigint AS created_us"; + +inline bool is_uuid(const std::string& s) { + static const std::regex re( + "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-" + "[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); + return std::regex_match(s, re); +} + +inline std::optional parse_cursor(const std::string& raw) { + const auto bar = raw.find('|'); + if (bar == std::string::npos) { + return std::nullopt; + } + Cursor c{raw.substr(0, bar), raw.substr(bar + 1)}; + const bool digits = !c.created_us.empty() && c.created_us.size() <= 18 && + std::all_of(c.created_us.begin(), c.created_us.end(), + [](unsigned char ch) { return std::isdigit(ch); }); + if (!digits || !is_uuid(c.id)) { + return std::nullopt; + } + return c; +} + +inline std::string make_cursor(const std::string& created_us, const std::string& id) { + return created_us + "|" + id; +} diff --git a/src/db.cpp b/src/db.cpp new file mode 100644 index 00000000..97312c40 --- /dev/null +++ b/src/db.cpp @@ -0,0 +1,360 @@ +#include "db.hpp" +#include "errors.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace fs = std::filesystem; + + +namespace { + +constexpr int kConnectTimeoutSeconds = 2; +constexpr int kTcpUserTimeoutMs = 5000; +constexpr int kStatementTimeoutMs = 5000; +constexpr int kClientIoTimeoutSeconds = 5; +constexpr auto kAcquireTimeout = std::chrono::seconds(3); + +std::string add_conn_param(std::string conninfo, const std::string& key, + const std::string& value) { + if (conninfo.find(key + "=") != std::string::npos) { + return conninfo; + } + const bool is_url = conninfo.rfind("postgres://", 0) == 0 || + conninfo.rfind("postgresql://", 0) == 0; + if (is_url) { + conninfo += (conninfo.find('?') == std::string::npos ? "?" : "&"); + } else { + conninfo += " "; + } + return conninfo + key + "=" + value; +} + +bool is_alive(pqxx::connection* conn) { + std::promise done; + auto fut = done.get_future(); + std::thread th([conn, &done]() { + try { + pqxx::nontransaction tx(*conn); + tx.exec("SELECT 1"); + done.set_value(); + } catch (...) { + done.set_exception(std::current_exception()); + } + }); + if (fut.wait_for(std::chrono::seconds(kClientIoTimeoutSeconds)) != + std::future_status::ready) { + const int fd = conn->sock(); + if (fd >= 0) { + ::shutdown(fd, SHUT_RDWR); + } + th.join(); + return false; + } + th.join(); + try { + fut.get(); + return true; + } catch (...) { + return false; + } +} + +struct Migration { + int version; + std::string path; +}; + +constexpr int kMigrationsAdvisoryLockKey = 0x6d747573; + + +Migration parse_migration_name(const fs::path& p) { + const std::string name = p.filename().string(); + const auto dot = name.find('.'); + + if (dot == std::string::npos || name.substr(dot) != ".sql") { + throw std::runtime_error("migration file must end with .sql: " + name); + } + + const auto us = name.find('_'); + if (us == std::string::npos || us == 0) { + throw std::runtime_error( + "migration file must be named NNN_name.sql: " + name); + } + + const std::string num = name.substr(0, us); + if (!std::all_of(num.begin(), num.end(), + [](unsigned char c){ return std::isdigit(c); })) { + throw std::runtime_error( + "migration file prefix must be digits: " + name); + } + + Migration m; + m.version = std::stoi(num); + m.path = p.string(); + return m; +}} + + +void apply_migrations(pqxx::connection& conn, const std::string& dir) { + { + pqxx::work tx(conn); + tx.exec("SELECT pg_advisory_lock($1)", + pqxx::params{kMigrationsAdvisoryLockKey}); + tx.commit(); + } + std::clog << "migration advisory lock acquired\n"; + struct Unlock { + pqxx::connection& c; + ~Unlock() { + try { + pqxx::work tx(c); + tx.exec("SELECT pg_advisory_unlock($1)", + pqxx::params{kMigrationsAdvisoryLockKey}); + tx.commit(); + } catch (...) {} + } + } unlock_guard{conn}; + + { + pqxx::work tx(conn); + tx.exec( + "CREATE TABLE IF NOT EXISTS schema_migrations (" + " version int PRIMARY KEY," + " applied_at timestamptz NOT NULL DEFAULT now()" + ")"); + tx.commit(); + } + + if (!fs::exists(dir) || !fs::is_directory(dir)) { + throw std::runtime_error("migrations dir not found: " + dir); + } + std::vector files; + for (const auto& entry : fs::directory_iterator(dir)) { + if (entry.is_regular_file()) { + files.push_back(parse_migration_name(entry.path())); + } + } + std::sort(files.begin(), files.end(), + [](const Migration& a, const Migration& b){ + return a.version < b.version; + }); + + for (std::size_t i = 1; i < files.size(); ++i) { + if (files[i].version == files[i-1].version) { + throw std::runtime_error( + "duplicate migration version: " + std::to_string(files[i].version)); + } + } + + std::set applied; + { + pqxx::work tx(conn); + for (const auto& row : tx.exec("SELECT version FROM schema_migrations")) { + applied.insert(row[0].as()); + } + tx.commit(); + } + + for (const auto& m : files) { + if (applied.count(m.version)) { + continue; + } + + std::ifstream f(m.path, std::ios::binary); + if (!f) { + throw std::runtime_error("cannot open migration: " + m.path); + } + std::stringstream buf; + buf << f.rdbuf(); + const std::string sql = buf.str(); + + pqxx::work tx(conn); + tx.exec(sql); + tx.exec("INSERT INTO schema_migrations(version) VALUES ($1)", + m.version); + tx.commit(); + + std::clog << "applied migration " << m.version + << " (" << m.path << ")\n"; + } +} + + +std::string read_secret_file(const char* env_name) { + const char* path = std::getenv(env_name); + + if (path == nullptr || *path == '\0') { + throw std::runtime_error( + std::string("environment variable not set: ") + env_name); + } + + std::ifstream f(path, std::ios::binary); + if (!f) { + throw std::runtime_error( + std::string("cannot open secret file: ") + path); + } + + std::string s; + std::getline(f, s); + if (!s.empty() && s.back() == '\r') { + s.pop_back(); + } + + if (s.empty()) { + throw std::runtime_error( + std::string("secret file is empty: ") + path); + } + + return s; +} + + +bool is_dependency_failure(const std::exception& e) { + if (dynamic_cast(&e) != nullptr || + dynamic_cast(&e) != nullptr || + dynamic_cast(&e) != nullptr) { + return true; + } + if (const auto* sql = dynamic_cast(&e)) { + // 08xxx — ошибки соединения, 57xxx — отмена (statement_timeout) и остановка сервера. + const std::string& state = sql->sqlstate(); + return state.rfind("08", 0) == 0 || state.rfind("57", 0) == 0; + } + return false; +} + + +std::unique_ptr open_pg_connection(const std::string& conninfo, + bool statement_timeout) { + std::string full = add_conn_param(conninfo, "connect_timeout", + std::to_string(kConnectTimeoutSeconds)); + full = add_conn_param(full, "tcp_user_timeout", std::to_string(kTcpUserTimeoutMs)); + auto conn = std::make_unique(full); + const int fd = conn->sock(); + if (fd >= 0) { + timeval tv{}; + tv.tv_sec = kClientIoTimeoutSeconds; + tv.tv_usec = 0; + ::setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); + ::setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); + } + if (statement_timeout) { + pqxx::nontransaction tx(*conn); + tx.exec("SET statement_timeout = " + std::to_string(kStatementTimeoutMs)); + } + return conn; +} + + +PgPool::PgPool(std::string conninfo, std::size_t n) + : conninfo_(std::move(conninfo)) { + if (n == 0) { + throw std::runtime_error("PgPool: n must be > 0"); + } + all_.reserve(n); + idle_.reserve(n); + for (std::size_t i = 0; i < n; ++i) { + auto conn = open_pg_connection(conninfo_, true); + idle_.push_back(conn.get()); + all_.push_back(std::move(conn)); + } +} + + +PgPool::~PgPool() { + { + std::lock_guard lk(mu_); + shutting_down_ = true; + } + cv_.notify_all(); +} + + +pqxx::connection* PgPool::take() { + std::unique_lock lk(mu_); + if (!cv_.wait_for(lk, kAcquireTimeout, + [&]() { return shutting_down_ || !idle_.empty(); })) { + throw DependencyUnavailable("postgres pool: acquire timeout"); + } + if (shutting_down_) { + throw DependencyUnavailable("postgres pool is shutting down"); + } + pqxx::connection* conn = idle_.back(); + idle_.pop_back(); + lk.unlock(); + + if (is_alive(conn)) { + return conn; + } + + std::unique_ptr fresh; + try { + fresh = open_pg_connection(conninfo_, true); + } catch (const std::exception& e) { + // Мёртвое соединение возвращается в пул: следующий take() снова + // попробует переподключиться, и пул не теряет слот. + give_back(conn); + throw DependencyUnavailable(std::string("postgres reconnect failed: ") + e.what()); + } + + std::lock_guard lk2(mu_); + for (auto& up : all_) { + if (up.get() == conn) { + up = std::move(fresh); + return up.get(); + } + } + throw std::logic_error("PgPool: connection not owned by pool"); +} + + +void PgPool::give_back(pqxx::connection* conn) { + { + std::lock_guard lk(mu_); + idle_.push_back(conn); + } + cv_.notify_one(); +} + + +PgPool::Lease::Lease(PgPool& pool) : pool_(&pool), conn_(pool.take()) {} + +PgPool::Lease::~Lease() { + if (pool_ != nullptr && conn_ != nullptr) { + pool_->give_back(conn_); + } +} + +PgPool::Lease::Lease(Lease&& other) noexcept + : pool_(other.pool_), conn_(other.conn_) { + other.pool_ = nullptr; + other.conn_ = nullptr; +} + +PgPool::Lease PgPool::acquire() { + return Lease(*this); +} + +bool PgPool::ping() { + try { + auto lease = acquire(); + pqxx::work tx(*lease); + tx.exec("SELECT 1"); + tx.commit(); + return true; + } catch (...) { + return false; + } +} \ No newline at end of file diff --git a/src/db.hpp b/src/db.hpp new file mode 100644 index 00000000..bacfa92b --- /dev/null +++ b/src/db.hpp @@ -0,0 +1,62 @@ +#pragma once +#include + +#include + +#include +#include +#include +#include +#include + + +std::string read_secret_file(const char* env_name); + +std::unique_ptr open_pg_connection(const std::string& conninfo, + bool statement_timeout); + + +void apply_migrations(pqxx::connection& conn, const std::string& dir); + + +class PgPool { +public: + bool ping(); + PgPool(std::string conninfo, std::size_t n); + ~PgPool(); + + PgPool(const PgPool&) = delete; + PgPool& operator=(const PgPool&) = delete; + + class Lease { + public: + explicit Lease(PgPool& pool); + ~Lease(); + Lease(Lease&& other) noexcept; + Lease& operator=(Lease&&) = delete; + Lease(const Lease&) = delete; + Lease& operator=(const Lease&) = delete; + + pqxx::connection& operator*() const { return *conn_; } + pqxx::connection* operator->() const { return conn_; } + + private: + PgPool* pool_; + pqxx::connection* conn_; + }; + + Lease acquire(); + +private: + friend class Lease; + + pqxx::connection* take(); + void give_back(pqxx::connection* conn); + + std::string conninfo_; + std::vector> all_; + std::vector idle_; + std::mutex mu_; + std::condition_variable cv_; + bool shutting_down_ = false; +}; \ No newline at end of file diff --git a/src/direct_upload_repo.cpp b/src/direct_upload_repo.cpp new file mode 100644 index 00000000..e79354e6 --- /dev/null +++ b/src/direct_upload_repo.cpp @@ -0,0 +1,167 @@ +#include "direct_upload_repo.hpp" + +#include + +#include +#include +#include +#include + +namespace { + +std::string epoch_to_rfc3339(long long epoch) { + const std::time_t t = static_cast(epoch); + std::tm tm{}; + gmtime_r(&t, &tm); + std::ostringstream out; + out << std::put_time(&tm, "%Y-%m-%dT%H:%M:%SZ"); + return out.str(); +} + +std::string now_epoch_str() { + const auto now = std::chrono::system_clock::now(); + const auto secs = std::chrono::duration_cast( + now.time_since_epoch()) + .count(); + return std::to_string(secs); +} + +DirectUpload row_to(const pqxx::row& r) { + DirectUpload d; + d.id = r["id"].as(); + d.chat_id = r["chat_id"].as(); + d.owner_id = r["owner_id"].as(); + d.filename = r["filename"].as(); + d.content_type = r["content_type"].as(); + d.expected_size = r["expected_size"].as(); + d.expected_sha256 = r["expected_sha256"].as(); + d.s3_key = r["s3_key"].as(); + d.status = r["status"].as(); + if (r["attachment_id"].is_null()) { + d.attachment_id = std::nullopt; + } else { + d.attachment_id = r["attachment_id"].as(); + } + d.expires_at = epoch_to_rfc3339(r["expires_at_epoch"].as()); + d.created_at = epoch_to_rfc3339(r["created_at_epoch"].as()); + d.updated_at = epoch_to_rfc3339(r["updated_at_epoch"].as()); + return d; +} + +constexpr const char* kCols = + "id, chat_id, owner_id, filename, content_type, expected_size, " + "expected_sha256, s3_key, status, attachment_id, " + "EXTRACT(EPOCH FROM expires_at)::bigint AS expires_at_epoch, " + "EXTRACT(EPOCH FROM created_at)::bigint AS created_at_epoch, " + "EXTRACT(EPOCH FROM updated_at)::bigint AS updated_at_epoch"; + +} // namespace + +DirectUpload DirectUploadRepo::insert(const DirectUpload& in) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + const std::string ts = now_epoch_str(); + // expires_at is already an absolute epoch string from the caller. + auto r = tx.exec( + "INSERT INTO direct_uploads (" + " id, chat_id, owner_id, filename, content_type, expected_size, " + " expected_sha256, s3_key, status, attachment_id, " + " expires_at, created_at, updated_at" + ") VALUES (" + " $1::uuid, $2::uuid, $3::uuid, $4, $5, $6, $7, $8, $9, NULL, " + " to_timestamp($10::bigint), to_timestamp($11::bigint), " + " to_timestamp($12::bigint)" + ") RETURNING " + + std::string(kCols), + pqxx::params{in.id, in.chat_id, in.owner_id, in.filename, + in.content_type, in.expected_size, in.expected_sha256, + in.s3_key, in.status, in.expires_at_epoch, ts, ts}); + tx.commit(); + return row_to(r[0]); +} + +std::optional DirectUploadRepo::find_by_id( + const std::string& id) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto r = tx.exec( + "SELECT " + std::string(kCols) + + " FROM direct_uploads WHERE id = $1::uuid", + pqxx::params{id}); + if (r.empty()) { + return std::nullopt; + } + return row_to(r[0]); +} + +std::optional DirectUploadRepo::mark_completed( + const std::string& id, const std::string& attachment_id) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + const std::string ts = now_epoch_str(); + auto r = tx.exec( + "UPDATE direct_uploads SET status = 'completed', " + " attachment_id = $2::uuid, " + " updated_at = to_timestamp($3::bigint) " + "WHERE id = $1::uuid AND status = 'pending' " + "RETURNING " + + std::string(kCols), + pqxx::params{id, attachment_id, ts}); + if (r.empty()) { + return std::nullopt; + } + tx.commit(); + return row_to(r[0]); +} + +std::optional DirectUploadRepo::mark_aborted( + const std::string& id) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + const std::string ts = now_epoch_str(); + auto r = tx.exec( + "UPDATE direct_uploads SET status = 'aborted', " + " updated_at = to_timestamp($2::bigint) " + "WHERE id = $1::uuid AND status = 'pending' " + "RETURNING " + + std::string(kCols), + pqxx::params{id, ts}); + if (r.empty()) { + return std::nullopt; + } + tx.commit(); + return row_to(r[0]); +} + +std::vector DirectUploadRepo::expire_stale() { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + const std::string ts = now_epoch_str(); + auto r = tx.exec( + "UPDATE direct_uploads SET status = 'expired', " + " updated_at = to_timestamp($1::bigint) " + "WHERE status = 'pending' AND expires_at < now() " + "RETURNING " + + std::string(kCols), + pqxx::params{ts}); + tx.commit(); + std::vector out; + out.reserve(r.size()); + for (const auto& row : r) { + out.push_back(row_to(row)); + } + return out; +} + +std::vector DirectUploadRepo::pending_s3_keys() { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto r = tx.exec( + "SELECT s3_key FROM direct_uploads WHERE status = 'pending'"); + std::vector out; + out.reserve(r.size()); + for (const auto& row : r) { + out.push_back(row["s3_key"].as()); + } + return out; +} diff --git a/src/direct_upload_repo.hpp b/src/direct_upload_repo.hpp new file mode 100644 index 00000000..f676b5e7 --- /dev/null +++ b/src/direct_upload_repo.hpp @@ -0,0 +1,33 @@ +#pragma once + +#include "db.hpp" +#include "models.hpp" + +#include +#include +#include + +class DirectUploadRepo { +public: + explicit DirectUploadRepo(PgPool& pool) : pool_(pool) {} + + DirectUpload insert(const DirectUpload& in); + + std::optional find_by_id(const std::string& id); + + // Mark completed and link attachment_id. Returns nullopt if not pending + // (or already finished / wrong owner handled by caller). + std::optional mark_completed(const std::string& id, + const std::string& attachment_id); + + std::optional mark_aborted(const std::string& id); + + // pending → expired where expires_at < now; returns expired rows (s3_key). + std::vector expire_stale(); + + // Active pending keys (for orphan GC exclusion). + std::vector pending_s3_keys(); + +private: + PgPool& pool_; +}; diff --git a/src/errors.hpp b/src/errors.hpp new file mode 100644 index 00000000..4f9f3c5a --- /dev/null +++ b/src/errors.hpp @@ -0,0 +1,11 @@ +#pragma once + +#include +#include + +// PostgreSQL или Valkey недоступны либо не ответили вовремя: клиент получает 503. +struct DependencyUnavailable : std::runtime_error { + using std::runtime_error::runtime_error; +}; + +bool is_dependency_failure(const std::exception& e); diff --git a/src/image_util.cpp b/src/image_util.cpp new file mode 100644 index 00000000..92d8976e --- /dev/null +++ b/src/image_util.cpp @@ -0,0 +1,90 @@ +#include "image_util.hpp" + +#define STB_IMAGE_IMPLEMENTATION +#define STBI_NO_STDIO +#define STBI_ONLY_JPEG +#define STBI_ONLY_PNG +#include "stb_image.h" + +#include + +std::optional sniff_content_type(const std::uint8_t* data, + std::size_t len) { + if (!data || len < 3) { + return std::nullopt; + } + // JPEG: FF D8 FF + if (data[0] == 0xFF && data[1] == 0xD8 && data[2] == 0xFF) { + return std::string("image/jpeg"); + } + // PNG: 89 50 4E 47 + if (len >= 4 && data[0] == 0x89 && data[1] == 0x50 && data[2] == 0x4E && + data[3] == 0x47) { + return std::string("image/png"); + } + return std::nullopt; +} + +std::string_view image_reject_code(ImageReject r) { + switch (r) { + case ImageReject::unsupported_media_type: + return "unsupported_media_type"; + case ImageReject::payload_too_large: + return "payload_too_large"; + case ImageReject::invalid_image: + return "invalid_image"; + } + return "invalid_image"; +} + +std::optional validate_image(const std::uint8_t* data, + std::size_t len, + const ImageLimits& limits, + ImageInfo& out) { + if (!data || len == 0) { + return ImageReject::unsupported_media_type; + } + if (static_cast(len) > limits.max_bytes) { + return ImageReject::payload_too_large; + } + + auto sniffed = sniff_content_type(data, len); + if (!sniffed) { + return ImageReject::unsupported_media_type; + } + + int w = 0; + int h = 0; + int comp = 0; + if (!stbi_info_from_memory(reinterpret_cast(data), + static_cast(len), &w, &h, &comp)) { + return ImageReject::invalid_image; + } + if (w <= 0 || h <= 0) { + return ImageReject::invalid_image; + } + + const std::int64_t pixels = + static_cast(w) * static_cast(h); + if (pixels > limits.max_pixels) { + return ImageReject::payload_too_large; + } + + int load_w = 0; + int load_h = 0; + int load_comp = 0; + stbi_uc* decoded = stbi_load_from_memory( + reinterpret_cast(data), static_cast(len), &load_w, + &load_h, &load_comp, 0); + if (!decoded) { + return ImageReject::invalid_image; + } + // Integrity only — do not retain decoded raster. + stbi_image_free(decoded); + + out.content_type = *sniffed; + out.width = w; + out.height = h; + out.pixel_count = pixels; + return std::nullopt; +} diff --git a/src/image_util.hpp b/src/image_util.hpp new file mode 100644 index 00000000..f39a310f --- /dev/null +++ b/src/image_util.hpp @@ -0,0 +1,41 @@ +#pragma once + +#include +#include +#include +#include +#include + +struct ImageLimits { + std::int64_t max_bytes = 10'485'760; // 10 MiB + std::int64_t max_pixels = 40'000'000; // decoded width*height +}; + +enum class ImageReject { + unsupported_media_type, // → 415 + payload_too_large, // → 413 (bytes or pixels) + invalid_image, // → 415 (corrupt / undecodable) +}; + +struct ImageInfo { + std::string content_type; // image/png | image/jpeg + int width = 0; + int height = 0; + std::int64_t pixel_count = 0; +}; + +// Magic sniff only (does not decode). Returns nullopt if neither PNG nor JPEG. +std::optional sniff_content_type(const std::uint8_t* data, + std::size_t len); + +// Full validation pipeline from contracts: +// sniff → stbi_info (dims) → pixel limit → stbi_load (integrity) → free. +// On success fills `out`. On failure returns ImageReject; decoded pixels are +// never retained after return. +std::optional validate_image(const std::uint8_t* data, + std::size_t len, + const ImageLimits& limits, + ImageInfo& out); + +// Human-readable error_code for Attachment failed path / API body. +std::string_view image_reject_code(ImageReject r); diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 00000000..993e4390 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,2312 @@ +#include "models.hpp" +#include "db.hpp" +#include "auth.hpp" +#include "user_repo.hpp" +#include "chat_repo.hpp" +#include "message_repo.hpp" +#include "attachment_repo.hpp" +#include "direct_upload_repo.hpp" +#include "s3_client.hpp" +#include "image_util.hpp" +#include "redis_pool.hpp" +#include "session_repo.hpp" +#include "pg_session_repo.hpp" +#include "session_repo_base.hpp" +#include "errors.hpp" + +#include +#include +#include +#include +#include + + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static std::string g_instance_id; + +// Cap concurrent attachment uploads so RSS does not track HTTP_WORKERS × body. +static std::mutex g_up_mu; +static std::condition_variable g_up_cv; +static int g_up_active = 0; +static int g_up_max = 3; + +struct UploadSlot { + UploadSlot() { + std::unique_lock lk(g_up_mu); + g_up_cv.wait(lk, []() { return g_up_active < g_up_max; }); + ++g_up_active; + } + ~UploadSlot() { + { + std::lock_guard lk(g_up_mu); + --g_up_active; + } + // Return free heap pages to the OS so docker-stats RSS tracks the + // concurrent footprint instead of monotonic arena growth across uploads. + malloc_trim(0); + g_up_cv.notify_one(); + } + UploadSlot(const UploadSlot&) = delete; + UploadSlot& operator=(const UploadSlot&) = delete; +}; + +// Zero-copy istream over an existing contiguous buffer (no string copy). +struct MemBuf : std::streambuf { + MemBuf(const char* p, std::size_t n) { + auto* base = const_cast(p); + setg(base, base, base + n); + } +}; + +static std::string make_instance_id() { + const char* env = std::getenv("INSTANCE_ID"); + if (env && *env) { + return std::string(env); + } + const char* host = std::getenv("HOSTNAME"); + if (host && *host) { + return std::string(host); + } + static const char hex[] = "0123456789abcdef"; + std::random_device rd; + std::string s(8, '0'); + for (auto& c : s) c = hex[rd() & 0xf]; + return s; +} + + +static void send_all(int fd, const std::string& data) { + size_t sent = 0; + while (sent < data.size()) { + const ssize_t n = ::write(fd, data.data() + sent, data.size() - sent); + if (n <= 0) { + return; + } + sent += static_cast(n); + } +} + + +static std::string http_response(int status, const char* reason, + const std::string& request_id, + const std::string& body) { + std::string out; + out += "HTTP/1.1 " + std::to_string(status) + " " + reason + "\r\n"; + out += "Content-Type: application/json\r\n"; + out += "X-Request-Id: " + request_id + "\r\n"; + out += "X-Instance-Id: " + g_instance_id + "\r\n"; + out += "Content-Length: " + std::to_string(body.size()) + "\r\n"; + out += "Connection: close\r\n"; + out += "\r\n"; + out += body; + return out; +} + +static std::string http_no_content(const std::string& request_id) { + std::string out; + out += "HTTP/1.1 204 No Content\r\n"; + out += "X-Request-Id: " + request_id + "\r\n"; + out += "X-Instance-Id: " + g_instance_id + "\r\n"; + out += "Content-Length: 0\r\n"; + out += "Connection: close\r\n"; + out += "\r\n"; + return out; +} + + +static const char* status_reason(int status) { + switch (status) { + case 400: return "Bad Request"; + case 401: return "Unauthorized"; + case 404: return "Not Found"; + case 409: return "Conflict"; + case 413: return "Payload Too Large"; + case 415: return "Unsupported Media Type"; + case 500: return "Internal Server Error"; + case 503: return "Service Unavailable"; + default: return "Error"; + } +} + + +static std::string error_response(int status, + const std::string& code, + const std::string& message, + const std::string& request_id, + const std::string& www_authenticate = "") { + nlohmann::json j; + j["error"]["code"] = code; + j["error"]["message"] = message; + j["error"]["request_id"] = request_id; + const std::string body = j.dump(); + + std::string head = + "HTTP/1.1 " + std::to_string(status) + " " + + status_reason(status) + "\r\n" + "Content-Type: application/json\r\n" + "X-Request-Id: " + request_id + "\r\n" + + "X-Instance-Id: " + g_instance_id + "\r\n"; + if (status == 401 && !www_authenticate.empty()) { + head += "WWW-Authenticate: " + www_authenticate + "\r\n"; + } + head += "Content-Length: " + std::to_string(body.size()) + "\r\n"; + head += "Connection: close\r\n\r\n"; + return head + body; +} + + +static std::string failure_response(const std::exception& e, const char* what, + const std::string& request_id) { + std::clog << what << " failed: " << e.what() << "\n"; + if (is_dependency_failure(e)) { + return error_response(503, "unavailable", "service unavailable", request_id); + } + return error_response(500, "internal_error", "internal error", request_id); +} + + +static std::optional parse_json_object(const std::string& body) { + nlohmann::json j; + try { + j = nlohmann::json::parse(body); + } catch (const nlohmann::json::exception&) { + return std::nullopt; + } + + if (!j.is_object()) { + return std::nullopt; + } + return j; +} + + +static std::optional find_unexpected_key( + const nlohmann::json& j, + std::initializer_list allowed) { + for (const auto& [key, value] : j.items()) { + bool ok = false; + for (const char* a : allowed) { + if (key == a) { ok = true; break; } + } + + if (!ok) { + return key; + } + } + return std::nullopt; +} + + +static std::optional get_string_field( + const nlohmann::json& j, const char* key) { + auto it = j.find(key); + if (it == j.end() || !it->is_string()) { + return std::nullopt; + } + return it->get(); +} + +static std::optional get_int64_field( + const nlohmann::json& j, const char* key) { + auto it = j.find(key); + if (it == j.end() || !it->is_number_integer()) { + return std::nullopt; + } + return it->get(); +} + +static bool valid_sha256_hex(const std::string& s) { + if (s.size() != 64) { + return false; + } + for (char c : s) { + if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f'))) { + return false; + } + } + return true; +} + + +static std::optional> get_string_array( + const nlohmann::json& j, const char* key) { + auto it = j.find(key); + if (it == j.end() || !it->is_array()) { + return std::nullopt; + } + std::vector out; + out.reserve(it->size()); + for (const auto& item : *it) { + if (!item.is_string()) { + return std::nullopt; + } + out.push_back(item.get()); + } + return out; +} + +static bool parse_request_line(const std::string& first_line, + std::string& method, + std::string& path, + std::string& query) { + query.clear(); + const auto sp1 = first_line.find(' '); + if (sp1 == std::string::npos) { + return false; + } + + const auto sp2 = first_line.find(' ', sp1 + 1); + if (sp2 == std::string::npos) { + return false; + } + + method = first_line.substr(0, sp1); + path = first_line.substr(sp1 + 1, sp2 - sp1 - 1); + const auto q = path.find('?'); + if (q != std::string::npos) { + query = path.substr(q + 1); + path.resize(q); + } + return !method.empty() && !path.empty() && path[0] == '/'; +} + +static bool match_id_path(const std::string& path, + const std::string& prefix, + std::string& id) { + if (path.compare(0, prefix.size(), prefix) != 0) { + return false; + } + id = path.substr(prefix.size()); + return !id.empty() && id.find('/') == std::string::npos; +} + + +static bool match_chat_messages(const std::string& path, std::string& chat_id) { + const std::string prefix = "/api/v1/chats/"; + const std::string suffix = "/messages"; + if (path.size() <= prefix.size() + suffix.size()) { + return false; + } + if (path.compare(0, prefix.size(), prefix) != 0) { + return false; + } + if (path.compare(path.size() - suffix.size(), suffix.size(), suffix) != 0) { + return false; + } + chat_id = path.substr(prefix.size(), + path.size() - prefix.size() - suffix.size()); + return !chat_id.empty() && chat_id.find('/') == std::string::npos; +} + +static bool match_chat_attachments(const std::string& path, std::string& chat_id) { + const std::string prefix = "/api/v1/chats/"; + const std::string suffix = "/attachments"; + if (path.size() <= prefix.size() + suffix.size()) { + return false; + } + if (path.compare(0, prefix.size(), prefix) != 0) { + return false; + } + if (path.compare(path.size() - suffix.size(), suffix.size(), suffix) != 0) { + return false; + } + chat_id = path.substr(prefix.size(), + path.size() - prefix.size() - suffix.size()); + return !chat_id.empty() && chat_id.find('/') == std::string::npos; +} + +// Track 1 extension: POST /api/v1/chats/{id}/direct-uploads +static bool match_chat_direct_uploads(const std::string& path, + std::string& chat_id) { + const std::string prefix = "/api/v1/chats/"; + const std::string suffix = "/direct-uploads"; + if (path.size() <= prefix.size() + suffix.size()) { + return false; + } + if (path.compare(0, prefix.size(), prefix) != 0) { + return false; + } + if (path.compare(path.size() - suffix.size(), suffix.size(), suffix) != 0) { + return false; + } + chat_id = path.substr(prefix.size(), + path.size() - prefix.size() - suffix.size()); + return !chat_id.empty() && chat_id.find('/') == std::string::npos; +} + +// POST /api/v1/direct-uploads/{id}/complete +static bool match_direct_upload_complete(const std::string& path, + std::string& upload_id) { + const std::string prefix = "/api/v1/direct-uploads/"; + const std::string suffix = "/complete"; + if (path.size() <= prefix.size() + suffix.size()) { + return false; + } + if (path.compare(0, prefix.size(), prefix) != 0) { + return false; + } + if (path.compare(path.size() - suffix.size(), suffix.size(), suffix) != 0) { + return false; + } + upload_id = path.substr(prefix.size(), + path.size() - prefix.size() - suffix.size()); + return !upload_id.empty() && upload_id.find('/') == std::string::npos; +} + +static bool match_attachment_content(const std::string& path, + std::string& attachment_id) { + const std::string prefix = "/api/v1/attachments/"; + const std::string suffix = "/content"; + if (path.size() <= prefix.size() + suffix.size()) { + return false; + } + if (path.compare(0, prefix.size(), prefix) != 0) { + return false; + } + if (path.compare(path.size() - suffix.size(), suffix.size(), suffix) != 0) { + return false; + } + attachment_id = path.substr(prefix.size(), + path.size() - prefix.size() - suffix.size()); + return !attachment_id.empty() && attachment_id.find('/') == std::string::npos; +} + + +static std::string to_lower(std::string s) { + for (char& c : s) { + c = static_cast(std::tolower(static_cast(c))); + } + return s; +} + + +static std::optional utf8_cps(const std::string& s) { + size_t i = 0; + size_t n = 0; + while (i < s.size()) { + const unsigned char c = static_cast(s[i]); + size_t w = 1; + if (c >= 0x80) { + if ((c & 0xE0) == 0xC0) w = 2; + else if ((c & 0xF0) == 0xE0) w = 3; + else if ((c & 0xF8) == 0xF0) w = 4; + else return std::nullopt; + if (i + w > s.size()) return std::nullopt; + for (size_t k = 1; k < w; ++k) { + if ((static_cast(s[i + k]) & 0xC0) != 0x80) { + return std::nullopt; + } + } + } + ++n; + i += w; + } + return n; +} + + +static bool cps_in_range(const std::string& s, size_t lo, size_t hi) { + const auto n = utf8_cps(s); + return n && *n >= lo && *n <= hi; +} + + +static std::unordered_map parse_headers( + const std::string& request, std::string::size_type after_first_line) { + std::unordered_map headers; + auto pos = after_first_line; + if (pos < request.size() && request.compare(pos, 2, "\r\n") == 0) { + pos += 2; + } + for (;;) { + const auto eol = request.find("\r\n", pos); + if (eol == std::string::npos || eol == pos) { + break; + } + const std::string line = request.substr(pos, eol - pos); + pos = eol + 2; + const auto colon = line.find(':'); + if (colon == std::string::npos) { + continue; + } + std::string name = to_lower(line.substr(0, colon)); + std::string value = line.substr(colon + 1); + while (!value.empty() && (value[0] == ' ' || value[0] == '\t')) { + value.erase(0, 1); + } + headers[name] = value; + } + return headers; +} + + +static std::string user_json(const User& user) { + nlohmann::json j; + j["id"] = user.id; + j["username"] = user.username; + j["display_name"] = user.display_name; + j["created_at"] = user.created_at; + return j.dump(); +} + + +static std::string attachment_json(const Attachment& a) { + nlohmann::json j; + j["id"] = a.id; + j["chat_id"] = a.chat_id; + j["owner_id"] = a.owner_id; + j["filename"] = a.filename; + j["content_type"] = a.content_type; + j["size_bytes"] = a.size_bytes; + j["sha256"] = a.sha256; + j["status"] = a.status; + j["variants"] = nlohmann::json::array(); + if (a.error_code) { + j["error_code"] = *a.error_code; + } else { + j["error_code"] = nullptr; + } + j["created_at"] = a.created_at; + j["updated_at"] = a.updated_at; + return j.dump(); +} + +static std::string message_json(const Message& msg) { + nlohmann::json j; + j["id"] = msg.id; + j["chat_id"] = msg.chat_id; + j["sender_id"] = msg.sender_id; + j["text"] = msg.text; + j["created_at"] = msg.created_at; + j["attachment_ids"] = msg.attachment_ids; + return j.dump(); +} + + +static std::string chat_json(const Chat& chat) { + nlohmann::json j; + j["id"] = chat.id; + j["title"] = chat.title; + j["member_ids"] = chat.member_ids; + j["created_at"] = chat.created_at; + return j.dump(); +} + + +static std::string messages_page_json(const MessagePage& msgs) { + nlohmann::json j; + j["items"] = nlohmann::json::array(); + for (const auto& m : msgs.items) { + j["items"].push_back(nlohmann::json::parse(message_json(m))); + } + if (msgs.next_cursor) { + j["next_cursor"] = *msgs.next_cursor; + } else { + j["next_cursor"] = nullptr; + } + return j.dump(); +} + + +static std::string chats_page_json(const ChatPage& page) { + nlohmann::json j; + j["items"] = nlohmann::json::array(); + for (const auto& c : page.items) { + j["items"].push_back(nlohmann::json::parse(chat_json(c))); + } + if (page.next_cursor) { + j["next_cursor"] = *page.next_cursor; + } else { + j["next_cursor"] = nullptr; + } + return j.dump(); +} + + +static bool is_json_content_type(const std::string& raw) { + std::string s = to_lower(raw); + const auto sc = s.find(';'); + if (sc != std::string::npos) { + s.resize(sc); + } + while (!s.empty() && (s.back() == ' ' || s.back() == '\t')) { + s.pop_back(); + } + size_t a = 0; + while (a < s.size() && (s[a] == ' ' || s[a] == '\t')) { + ++a; + } + return s.substr(a) == "application/json"; +} + + +static int hex_val(char c) { + if (c >= '0' && c <= '9') return c - '0'; + if (c >= 'a' && c <= 'f') return c - 'a' + 10; + if (c >= 'A' && c <= 'F') return c - 'A' + 10; + return -1; +} + + +static bool json_content_type_ok( + const std::unordered_map& headers) { + const auto it = headers.find("content-type"); + return it != headers.end() && is_json_content_type(it->second); +} + +static std::string media_type_only(std::string ct) { + const auto semi = ct.find(';'); + if (semi != std::string::npos) { + ct.resize(semi); + } + while (!ct.empty() && (ct.back() == ' ' || ct.back() == '\t')) { + ct.pop_back(); + } + size_t a = 0; + while (a < ct.size() && (ct[a] == ' ' || ct[a] == '\t')) { + ++a; + } + return to_lower(ct.substr(a)); +} + +static std::optional image_content_type_declared( + const std::unordered_map& headers) { + const auto it = headers.find("content-type"); + if (it == headers.end()) { + return std::nullopt; + } + const std::string mt = media_type_only(it->second); + if (mt == "image/png" || mt == "image/jpeg") { + return mt; + } + return std::nullopt; +} + +// filename: 1–255 Unicode code points; no '/', '\\', NUL, or control chars. +static bool valid_attachment_filename(const std::string& s) { + const auto n = utf8_cps(s); + if (!n || *n < 1 || *n > 255) { + return false; + } + size_t i = 0; + while (i < s.size()) { + const unsigned char c = static_cast(s[i]); + uint32_t cp = c; + size_t w = 1; + if (c >= 0x80) { + if ((c & 0xE0) == 0xC0 && i + 1 < s.size()) { + w = 2; + cp = (static_cast(c & 0x1F) << 6) | + (static_cast(s[i + 1]) & 0x3F); + } else if ((c & 0xF0) == 0xE0 && i + 2 < s.size()) { + w = 3; + cp = (static_cast(c & 0x0F) << 12) | + ((static_cast(s[i + 1]) & 0x3F) << 6) | + (static_cast(s[i + 2]) & 0x3F); + } else if ((c & 0xF8) == 0xF0 && i + 3 < s.size()) { + w = 4; + cp = (static_cast(c & 0x07) << 18) | + ((static_cast(s[i + 1]) & 0x3F) << 12) | + ((static_cast(s[i + 2]) & 0x3F) << 6) | + (static_cast(s[i + 3]) & 0x3F); + } else { + return false; + } + } + if (cp == '/' || cp == '\\' || cp == 0 || + (cp < 0x20) || cp == 0x7F) { + return false; + } + i += w; + } + return true; +} + +static std::string make_uuid_v4() { + static std::mutex rng_mu; + static std::mt19937_64 rng{std::random_device{}()}; + std::uniform_int_distribution d16(0, 0xffff); + std::uniform_int_distribution d32(0, 0xffffffffu); + std::lock_guard lock(rng_mu); + std::ostringstream out; + out << std::hex << std::setfill('0'); + out << std::setw(8) << d32(rng); + out << '-' << std::setw(4) << d16(rng); + out << '-' << std::setw(4) << ((d16(rng) & 0x0fff) | 0x4000); + out << '-' << std::setw(4) << ((d16(rng) & 0x3fff) | 0x8000); + out << '-' << std::setw(4) << d16(rng) << std::setw(8) << d32(rng); + return out.str(); +} + +static std::string sha256_hex_bytes(const std::uint8_t* data, std::size_t len) { + unsigned char out[crypto_hash_sha256_BYTES]; + crypto_hash_sha256(out, data, len); + static const char hex[] = "0123456789abcdef"; + std::string r(sizeof(out) * 2, '0'); + for (std::size_t i = 0; i < sizeof(out); ++i) { + r[i * 2] = hex[out[i] >> 4]; + r[i * 2 + 1] = hex[out[i] & 0x0f]; + } + return r; +} + + +static bool contains_nul(const std::string& s) { + return s.find('\0') != std::string::npos; +} + +static bool is_unicode_space(uint32_t cp) { + if (cp <= 0x7F) { + return std::isspace(static_cast(cp)) != 0; + } + if (cp >= 0x2000 && cp <= 0x200A) { + return true; + } + switch (cp) { + case 0x00A0: + case 0x1680: + case 0x2028: + case 0x2029: + case 0x202F: + case 0x205F: + case 0x3000: + case 0xFEFF: + return true; + default: + return false; + } +} + +static bool is_blank(const std::string& s) { + size_t i = 0; + while (i < s.size()) { + const unsigned char c = static_cast(s[i]); + uint32_t cp = c; + size_t w = 1; + if (c >= 0x80) { + if ((c & 0xE0) == 0xC0 && i + 1 < s.size()) { + w = 2; + cp = (static_cast(c & 0x1F) << 6) + | (static_cast(s[i + 1]) & 0x3F); + } else if ((c & 0xF0) == 0xE0 && i + 2 < s.size()) { + w = 3; + cp = (static_cast(c & 0x0F) << 12) + | ((static_cast(s[i + 1]) & 0x3F) << 6) + | (static_cast(s[i + 2]) & 0x3F); + } else if ((c & 0xF8) == 0xF0 && i + 3 < s.size()) { + w = 4; + cp = (static_cast(c & 0x07) << 18) + | ((static_cast(s[i + 1]) & 0x3F) << 12) + | ((static_cast(s[i + 2]) & 0x3F) << 6) + | (static_cast(s[i + 3]) & 0x3F); + } else { + return false; + } + } + if (!is_unicode_space(cp)) { + return false; + } + i += w; + } + return true; +} + + +static bool valid_username(const std::string& s) { + static const std::regex re("^[a-z0-9_]{3,32}$"); + return std::regex_match(s, re); +} + + +static bool valid_uuid(const std::string& s) { + static const std::regex re( + "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-" + "[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); + return std::regex_match(s, re); +} + +static bool valid_idempotency_key(const std::string& s) { + static const std::regex re("^[A-Za-z0-9._:-]{1,128}$"); + return std::regex_match(s, re); +} + + +static bool has_duplicate_ids(const std::vector& ids) { + std::unordered_set seen; + for (const auto& id : ids) { + if (!seen.insert(to_lower(id)).second) { + return true; + } + } + return false; +} + + +static std::string url_decode(const std::string& s) { + std::string out; + for (size_t i = 0; i < s.size(); ++i) { + if (s[i] == '%' && i + 2 < s.size()) { + const int hi = hex_val(s[i + 1]); + const int lo = hex_val(s[i + 2]); + if (hi >= 0 && lo >= 0) { + out.push_back(static_cast((hi << 4) | lo)); + i += 2; + continue; + } + } + out.push_back(s[i] == '+' ? ' ' : s[i]); + } + return out; +} + + +static std::unordered_map parse_query( + const std::string& query) { + std::unordered_map out; + size_t pos = 0; + while (pos < query.size()) { + auto amp = query.find('&', pos); + if (amp == std::string::npos) { + amp = query.size(); + } + const auto pair = query.substr(pos, amp - pos); + const auto eq = pair.find('='); + if (eq != std::string::npos) { + out[url_decode(pair.substr(0, eq))] = + url_decode(pair.substr(eq + 1)); + } + pos = amp + 1; + } + return out; +} + + +static std::atomic g_listen{-1}; +static std::atomic g_stop{false}; +static std::atomic g_draining{false}; +static std::mutex g_live_mu; +static std::unordered_set g_live; + +static void set_timeouts(int fd) { + // Allow larger attachment uploads (≤10 MiB) without premature timeout. + timeval tv{}; + tv.tv_sec = 60; + tv.tv_usec = 0; + ::setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); + ::setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); +} + +static void live_add(int fd) { + std::lock_guard lk(g_live_mu); + g_live.insert(fd); +} + +static void live_del(int fd) { + std::lock_guard lk(g_live_mu); + g_live.erase(fd); +} + +// Read HTTP request. Optional `before_large_body` runs once headers are known +// and Content-Length exceeds 256 KiB — used to take UploadSlot BEFORE the +// multi-MiB body is buffered (otherwise the semaphore cannot cap RSS). +static std::string read_request( + int client, + bool& too_large, + const std::function& before_large_body = + {}) { + too_large = false; + std::string request; + char buf[64 * 1024]; + // Lab4 attachment limit (also covers JSON endpoints). + constexpr std::size_t kMaxBody = 10'485'760; + constexpr std::size_t kGateBody = 256 * 1024; + bool headers_parsed = false; + bool gated = false; + bool has_cl = false; + std::size_t content_length = 0; + std::size_t hdr = std::string::npos; + for (;;) { + const ssize_t n = ::read(client, buf, sizeof(buf)); + if (n < 0) { + if (errno == EINTR) { + continue; + } + return {}; + } + if (n == 0) { + return request; + } + request.append(buf, static_cast(n)); + if (!headers_parsed) { + hdr = request.find("\r\n\r\n"); + if (hdr == std::string::npos) { + // Cap header size to avoid unbounded growth without body. + if (request.size() > 64 * 1024) { + too_large = true; + return {}; + } + continue; + } + headers_parsed = true; + // Search Content-Length only in headers — never to_lower() the body. + const std::string hdr_only = request.substr(0, hdr); + const auto cl = to_lower(hdr_only).find("content-length:"); + if (cl != std::string::npos) { + const auto line_end = hdr_only.find("\r\n", cl); + const auto colon = hdr_only.find(':', cl); + if (line_end != std::string::npos && colon < line_end) { + content_length = static_cast( + std::strtoull(hdr_only.c_str() + colon + 1, nullptr, 10)); + has_cl = true; + } + } + // Early reject on declared Content-Length (do not trust for final size). + // Still drain the declared body so reverse proxies (nginx) do not see + // a premature upstream close as 502 while they are writing the request. + if (has_cl && content_length > kMaxBody) { + too_large = true; + const std::size_t need = hdr + 4 + content_length; + std::size_t have = request.size(); + request.resize(hdr + 4); + while (have < need) { + const ssize_t n2 = ::read(client, buf, sizeof(buf)); + if (n2 < 0) { + if (errno == EINTR) { + continue; + } + break; + } + if (n2 == 0) { + break; + } + have += static_cast(n2); + } + return request; + } + if (!gated && before_large_body && has_cl && + content_length > kGateBody) { + gated = true; + const auto line_end = request.find("\r\n"); + const std::string first = + line_end == std::string::npos ? request.substr(0, hdr) + : request.substr(0, line_end); + std::string method; + std::string path; + std::string query; + if (parse_request_line(first, method, path, query)) { + before_large_body(method, path); + } + } + } + const std::size_t body_have = request.size() - (hdr + 4); + if (body_have > kMaxBody) { + too_large = true; + request.resize(hdr + 4); + return request; + } + // Without Content-Length treat body as empty (HTTP/1.1 clients send CL). + const auto need = hdr + 4 + (has_cl ? content_length : 0); + if (request.size() >= need) { + request.resize(need); + return request; + } + } +} + +static std::optional> parse_basic_auth( + const std::string& header_value) { + + static const std::string prefix = "Basic "; + if (header_value.size() <= prefix.size() || + header_value.compare(0, prefix.size(), prefix) != 0) { + return std::nullopt; + } + const std::string b64 = header_value.substr(prefix.size()); + + auto b64_val = [](char c) -> int { + if (c >= 'A' && c <= 'Z') return c - 'A'; + if (c >= 'a' && c <= 'z') return c - 'a' + 26; + if (c >= '0' && c <= '9') return c - '0' + 52; + if (c == '+') return 62; + if (c == '/') return 63; + return -1; + }; + + std::string decoded; + int buf = 0, bits = 0; + for (char c : b64) { + if (c == '=') break; + const int v = b64_val(c); + if (v < 0) return std::nullopt; + buf = (buf << 6) | v; + bits += 6; + if (bits >= 8) { + bits -= 8; + decoded.push_back(static_cast((buf >> bits) & 0xFF)); + } + } + + const auto colon = decoded.find(':'); + if (colon == std::string::npos) { + return std::nullopt; + } + return std::make_pair(decoded.substr(0, colon), + decoded.substr(colon + 1)); +} + +static void handle_client(int client, + std::atomic& request_n, + UserRepo& users, + ChatRepo& chats, + MessageRepo& messages, + AttachmentRepo& attachments, + DirectUploadRepo& direct_uploads, + S3Client* s3, + ISessionRepo& sessions, + PgPool& pg, + RedisPool* redis) { + bool too_large = false; + // Hold upload slot across body read + handler for attachment POSTs. + std::optional early_upload_slot; + const std::string request = read_request( + client, too_large, + [&](const std::string& method, const std::string& path) { + std::string chat_id; + if (method == "POST" && match_chat_attachments(path, chat_id) && + !early_upload_slot) { + early_upload_slot.emplace(); + } + }); + const unsigned nreq = ++request_n; + const std::string request_id = std::to_string(nreq); + + if (too_large) { + send_all(client, error_response(413, "payload_too_large", + "payload too large", request_id)); + live_del(client); + ::close(client); + return; + } + if (request.empty()) { + live_del(client); + ::close(client); + return; + } + + const auto line_end = request.find("\r\n"); + const std::string first_line = request.substr(0, line_end); + std::string method; + std::string path; + std::string query; + if (!parse_request_line(first_line, method, path, query)) { + send_all(client, error_response(400, "invalid_request", + "bad request line", request_id)); + live_del(client); + ::close(client); + return; + } + + const auto headers = parse_headers(request, line_end); + std::string user_id; + std::string bearer_token; + bool auth_backend_error = false; + { + auto it = headers.find("authorization"); + if (it != headers.end()) { + static const std::string prefix = "Bearer "; + const std::string& auth = it->second; + if (auth.size() > prefix.size() && + auth.compare(0, prefix.size(), prefix) == 0) { + bearer_token = auth.substr(prefix.size()); + } + } + if (!bearer_token.empty()) { + try { + auto found = sessions.lookup(bearer_token); + if (found) { + user_id = *found; + } + } catch (const std::exception& e) { + std::clog << "session lookup failed: " << e.what() << "\n"; + auth_backend_error = true; + } + } + } + auto send_auth_error = [&]() -> bool { + if (auth_backend_error) { + send_all(client, error_response(503, "unavailable", + "service unavailable", request_id)); + return true; + } + if (user_id.empty()) { + send_all(client, error_response(401, "unauthorized", + "unauthorized", request_id, + "Bearer realm=\"messenger\"")); + return true; + } + return false; + }; + // Сессия может пережить пользователя; недоступная БД — это 503, а не 401. + auto send_user_error = [&]() -> bool { + try { + if (users.find_by_id(user_id)) { + return false; + } + send_all(client, error_response(401, "unauthorized", + "unauthorized", request_id, + "Bearer realm=\"messenger\"")); + } catch (const std::exception& e) { + send_all(client, failure_response(e, "find_user", request_id)); + } + return true; + }; + + std::string chat_id; + std::string attachment_id; + std::string direct_upload_id; + + if (method == "GET" && path == "/health/live") { + send_all(client, http_response(200, "OK", request_id, "{\"status\":\"ok\"}")); + } + else if (method == "GET" && path == "/health/ready") { + if (g_draining.load()) { + send_all(client, error_response(503, "unavailable", + "shutting down", request_id)); + } else { + const bool pg_ok = pg.ping(); + const bool redis_ok = redis == nullptr || redis->ping(); + if (pg_ok && redis_ok) { + send_all(client, http_response(200, "OK", request_id, "{\"status\":\"ok\"}")); + } else { + std::clog << "readiness failed: pg=" << pg_ok + << " redis=" << redis_ok << "\n"; + send_all(client, error_response(503, "unavailable", + "service unavailable", request_id)); + } + } + } + else if (method == "POST" && path == "/api/v1/auth/sessions") { + const auto body_at = request.find("\r\n\r\n"); + const std::string session_body = + body_at == std::string::npos ? "" : request.substr(body_at + 4); + if (!session_body.empty()) { + send_all(client, error_response(400, "invalid_request", + "body not allowed", request_id)); + } else { + auto it = headers.find("authorization"); + std::optional> creds; + if (it != headers.end()) { + creds = parse_basic_auth(it->second); + } + + const auto send_basic_401 = [&]() { + send_all(client, error_response( + 401, "unauthorized", "unauthorized", request_id, + "Basic realm=\"messenger\", charset=\"UTF-8\"")); + }; + + if (!creds) { + send_basic_401(); + } else { + const auto& username = creds->first; + const auto& password = creds->second; + try { + const auto user = users.find_by_username(username); + if (!user || !verify_password(password, user->password_hash)) { + send_basic_401(); + } else { + const auto created = sessions.create(user->id); + nlohmann::json j; + j["token"] = created.token; + j["token_type"] = "Bearer"; + const std::time_t t = static_cast( + created.expires_at); + std::tm tm{}; + gmtime_r(&t, &tm); + std::ostringstream out; + out << std::put_time(&tm, "%Y-%m-%dT%H:%M:%SZ"); + j["expires_at"] = out.str(); + j["user"] = nlohmann::json::parse(user_json(*user)); + send_all(client, http_response(201, "Created", + request_id, j.dump())); + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "create_session", request_id)); + } + } + } + } + else if (method == "GET" && path == "/api/v1/users/me") { + if (send_auth_error()) { + } else { + try { + const auto user = users.find_by_id(user_id); + if (!user) { + send_all(client, error_response(401, "unauthorized", + "unauthorized", request_id, + "Bearer realm=\"messenger\"")); + } else { + send_all(client, http_response(200, "OK", request_id, + user_json(*user))); + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "find_user", request_id)); + } + } + } + else if (method == "POST" && path == "/api/v1/users") { + if (!json_content_type_ok(headers)) { + send_all(client, error_response(415, "unsupported_media_type", + "unsupported media type", request_id)); + } else { + const auto body_at = request.find("\r\n\r\n"); + const std::string body = + body_at == std::string::npos ? "" : request.substr(body_at + 4); + + const auto j = parse_json_object(body); + if (!j) { + send_all(client, error_response(400, "invalid_request", + "invalid json", request_id)); + } else if (auto bad = find_unexpected_key( + *j, {"username", "display_name", "password"})) { + send_all(client, error_response(400, "invalid_request", + "unexpected field: " + *bad, request_id)); + } else { + const auto username = get_string_field(*j, "username"); + const auto display_name = get_string_field(*j, "display_name"); + const auto password = get_string_field(*j, "password"); + if (!username || !display_name || !password) { + send_all(client, error_response(400, "invalid_request", + "invalid fields", request_id)); + } else if (!valid_username(*username) || + contains_nul(*display_name) || + is_blank(*display_name) || + !cps_in_range(*display_name, 1, 100)) { + send_all(client, error_response(400, "invalid_request", + "invalid fields", request_id)); + } else if (contains_nul(*password) || + !cps_in_range(*password, 12, 128)) { + send_all(client, error_response(400, "invalid_request", + "invalid password", request_id)); + } else { + std::string hash; + try { + hash = hash_password(*password); + } catch (const std::exception& e) { + send_all(client, failure_response(e, "hash_password", request_id)); + } + if (!hash.empty()) { + try { + const auto created = users.create(*username, + *display_name, hash); + if (!created) { + send_all(client, error_response(409, "conflict", + "username taken", request_id)); + } else { + send_all(client, http_response(201, "Created", request_id, + user_json(*created))); + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "create_user", request_id)); + } + } + } + } + } + } + else if (method == "POST" && path == "/api/v1/chats") { + if (send_auth_error()) { + // ответ отправлен + } else if (send_user_error()) { + // ответ отправлен + } else if (!json_content_type_ok(headers)) { + send_all(client, error_response(415, "unsupported_media_type", + "unsupported media type", request_id)); + } else { + const auto body_at = request.find("\r\n\r\n"); + const std::string body = + body_at == std::string::npos ? "" : request.substr(body_at + 4); + + const auto j = parse_json_object(body); + if (!j) { + send_all(client, error_response(400, "invalid_request", + "invalid json", request_id)); + } else if (auto bad = find_unexpected_key(*j, {"title", "member_ids"})) { + send_all(client, error_response(400, "invalid_request", + "unexpected field: " + *bad, request_id)); + } else { + const auto title = get_string_field(*j, "title"); + const auto member_ids = get_string_array(*j, "member_ids"); + if (!title || !member_ids) { + send_all(client, error_response(400, "invalid_request", + "invalid fields", request_id)); + } else if (contains_nul(*title) || is_blank(*title) || + !cps_in_range(*title, 1, 100)) { + send_all(client, error_response(400, "invalid_request", + "invalid fields", request_id)); + } else if (member_ids->empty() || member_ids->size() > 100) { + send_all(client, error_response(400, "invalid_request", + "invalid members", request_id)); + } else if (std::find(member_ids->begin(), member_ids->end(), + user_id) == member_ids->end()) { + send_all(client, error_response(400, "invalid_request", + "caller not in members", request_id)); + } else if (!std::all_of(member_ids->begin(), member_ids->end(), + valid_uuid)) { + send_all(client, error_response(400, "invalid_request", + "invalid members", request_id)); + } else if (has_duplicate_ids(*member_ids)) { + send_all(client, error_response(400, "invalid_request", + "duplicate members", request_id)); + } else { + try { + const auto created = chats.create(*title, *member_ids); + if (!created) { + send_all(client, error_response(400, "invalid_request", + "invalid members", request_id)); + } else { + send_all(client, http_response(201, "Created", request_id, + chat_json(*created))); + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "create_chat", request_id)); + } + } + } + } + } + else if (method == "POST" && match_chat_attachments(path, chat_id)) { + // Prefer the slot taken before buffering a large body; otherwise take + // one now (small uploads / missing Content-Length). + std::optional late_slot; + if (!early_upload_slot) { + late_slot.emplace(); + } + if (send_auth_error()) { + } else if (send_user_error()) { + } else if (!valid_uuid(chat_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid chat id", request_id)); + } else if (!s3) { + send_all(client, error_response(503, "unavailable", + "service unavailable", request_id)); + } else { + try { + const auto chat = chats.find_by_id(chat_id); + const bool is_member = chat && + (std::find(chat->member_ids.begin(), + chat->member_ids.end(), + user_id) != chat->member_ids.end()); + if (!is_member) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else { + const auto qparams = parse_query(query); + const auto fn_it = qparams.find("filename"); + if (fn_it == qparams.end() || + !valid_attachment_filename(fn_it->second)) { + send_all(client, error_response( + 400, "invalid_request", + "invalid filename", request_id)); + } else { + const auto declared = image_content_type_declared(headers); + if (!declared) { + send_all(client, error_response( + 415, "unsupported_media_type", + "unsupported media type", request_id)); + } else { + const auto body_at = request.find("\r\n\r\n"); + const char* body_ptr = nullptr; + std::size_t body_len = 0; + if (body_at != std::string::npos) { + body_ptr = request.data() + body_at + 4; + body_len = request.size() - (body_at + 4); + } + if (body_len == 0 || body_ptr == nullptr) { + send_all(client, error_response( + 400, "invalid_request", + "empty body", request_id)); + } else { + ImageLimits lim; + if (const char* env = std::getenv("MAX_UPLOAD_BYTES")) { + try { + lim.max_bytes = std::stoll(env); + } catch (...) { + } + } + if (const char* env = std::getenv("MAX_IMAGE_PIXELS")) { + try { + lim.max_pixels = std::stoll(env); + } catch (...) { + } + } + ImageInfo info; + const auto* bytes = + reinterpret_cast( + body_ptr); + auto rej = validate_image( + bytes, body_len, lim, info); + if (rej == ImageReject::payload_too_large) { + send_all(client, error_response( + 413, "payload_too_large", + "payload too large", request_id)); + } else if (rej) { + send_all(client, error_response( + 415, "unsupported_media_type", + std::string(image_reject_code(*rej)), + request_id)); + } else if (info.content_type != *declared) { + // MIME spoof: declared CT ≠ magic. + send_all(client, error_response( + 415, "unsupported_media_type", + "unsupported media type", request_id)); + } else { + Attachment a; + a.id = make_uuid_v4(); + a.chat_id = chat_id; + a.owner_id = user_id; + a.filename = fn_it->second; + a.content_type = info.content_type; + a.size_bytes = + static_cast(body_len); + a.sha256 = sha256_hex_bytes( + bytes, body_len); + a.status = "ready"; + a.error_code = std::nullopt; + a.s3_key = "attachments/" + chat_id + + "/" + a.id; + + MemBuf mem(body_ptr, body_len); + std::istream stream(&mem); + bool s3_ok = false; + try { + s3->put_object( + a.s3_key, stream, + static_cast( + body_len), + a.content_type); + s3_ok = true; + const Attachment saved = + attachments.insert(a); + send_all(client, http_response( + 201, "Created", request_id, + attachment_json(saved))); + } catch (const std::exception& e) { + if (s3_ok) { + try { + s3->delete_object(a.s3_key); + } catch (const std::exception& de) { + std::clog + << "compensating DeleteObject failed: " + << de.what() << "\n"; + } + } + send_all(client, failure_response( + e, "upload_attachment", + request_id)); + } + } + } + } + } + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "upload_attachment", + request_id)); + } + } + } + else if (method == "POST" && match_chat_messages(path, chat_id)) { + if (send_auth_error()) { + // ответ отправлен + } else if (send_user_error()) { + // ответ отправлен + } else if (!valid_uuid(chat_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid chat id", request_id)); + } else { + try { + const auto chat = chats.find_by_id(chat_id); + const bool is_member = chat && + (std::find(chat->member_ids.begin(), + chat->member_ids.end(), + user_id) != chat->member_ids.end()); + if (!is_member) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else if (!json_content_type_ok(headers)) { + send_all(client, error_response(415, "unsupported_media_type", + "unsupported media type", request_id)); + } else { + const auto body_at = request.find("\r\n\r\n"); + const std::string body = + body_at == std::string::npos ? "" : request.substr(body_at + 4); + + const auto j = parse_json_object(body); + if (!j) { + send_all(client, error_response(400, "invalid_request", + "invalid json", request_id)); + } else if (auto bad = find_unexpected_key( + *j, {"text", "attachment_ids"})) { + send_all(client, error_response(400, "invalid_request", + "unexpected field: " + *bad, request_id)); + } else { + const auto text = get_string_field(*j, "text"); + std::vector attachment_ids; + bool attachment_ids_ok = true; + if (j->contains("attachment_ids")) { + const auto parsed = get_string_array(*j, "attachment_ids"); + if (!parsed) { + attachment_ids_ok = false; + } else { + attachment_ids = *parsed; + } + } + if (!text || !attachment_ids_ok) { + send_all(client, error_response(400, "invalid_request", + "invalid fields", request_id)); + } else if (contains_nul(*text) || + !cps_in_range(*text, 0, 4000) || + (attachment_ids.empty() && + (is_blank(*text) || !cps_in_range(*text, 1, 4000)))) { + send_all(client, error_response(400, "invalid_request", + "invalid fields", request_id)); + } else if (attachment_ids.size() > 10) { + send_all(client, error_response(400, "invalid_request", + "too many attachments", request_id)); + } else if (!std::all_of(attachment_ids.begin(), attachment_ids.end(), + valid_uuid)) { + send_all(client, error_response(400, "invalid_request", + "invalid attachment ids", request_id)); + } else if (has_duplicate_ids(attachment_ids)) { + send_all(client, error_response(400, "invalid_request", + "duplicate attachment ids", request_id)); + } else { + const auto idem = headers.find("idempotency-key"); + if (idem == headers.end() || + !valid_idempotency_key(idem->second)) { + send_all(client, error_response( + 400, "invalid_request", + "invalid idempotency key", request_id)); + } else { + const auto created = messages.create_idempotent( + chat_id, user_id, *text, attachment_ids, idem->second); + if (created.status == CreateResult::Status::NotFound) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else if (created.status == + CreateResult::Status::KeyConflict) { + send_all(client, error_response( + 409, "conflict", + "idempotency key reused", request_id)); + } else if (!created.message) { + send_all(client, error_response( + 500, "internal_error", + "internal error", request_id)); + } else { + send_all(client, http_response( + 201, "Created", request_id, + message_json(*created.message))); + } + } + } + } + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "post_message", request_id)); + } + } + } + else if (method == "GET" && match_chat_messages(path, chat_id)) { + if (send_auth_error()) { + } else if (send_user_error()) { + // ответ отправлен + } else if (!valid_uuid(chat_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid chat id", request_id)); + } else { + try { + const auto chat = chats.find_by_id(chat_id); + const bool is_member = chat && + (std::find(chat->member_ids.begin(), + chat->member_ids.end(), + user_id) != chat->member_ids.end()); + if (!is_member) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else { + const auto params = parse_query(query); + int limit = 50; + bool bad_limit = false; + if (params.count("limit")) { + try { + std::size_t consumed = 0; + limit = std::stoi(params.at("limit"), &consumed); + if (consumed != params.at("limit").size() || + limit < 1 || limit > 100) { + bad_limit = true; + } + } catch (...) { + bad_limit = true; + } + } + std::optional cursor; + if (params.count("cursor")) { + cursor = params.at("cursor"); + } + if (bad_limit || (cursor && cursor->empty())) { + send_all(client, error_response(400, "invalid_request", + "bad query", request_id)); + } else { + const auto page = messages.list_page(chat_id, limit, cursor); + if (!page) { + send_all(client, error_response(400, "invalid_request", + "bad cursor", request_id)); + } else { + send_all(client, http_response(200, "OK", + request_id, + messages_page_json(*page))); + } + } + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "list_messages", request_id)); + } + } + } + else if (method == "GET" && path == "/api/v1/chats") { + if (send_auth_error()) { + // ответ отправлен + } else if (send_user_error()) { + // ответ отправлен + } else { + const auto params = parse_query(query); + int limit = 50; + bool bad_limit = false; + if (params.count("limit")) { + try { + std::size_t consumed = 0; + limit = std::stoi(params.at("limit"), &consumed); + if (consumed != params.at("limit").size() || + limit < 1 || limit > 100) { + bad_limit = true; + } + } catch (...) { + bad_limit = true; + } + } + std::optional cursor; + if (params.count("cursor")) { + cursor = params.at("cursor"); + } + if (bad_limit || (cursor && cursor->empty())) { + send_all(client, error_response(400, "invalid_request", + "bad query", request_id)); + } else { + try { + const auto page = chats.list_for_user(user_id, limit, cursor); + if (!page) { + send_all(client, error_response(400, "invalid_request", + "bad cursor", request_id)); + } else { + send_all(client, http_response(200, "OK", request_id, + chats_page_json(*page))); + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "list_chats", request_id)); + } + } + } + } + else if (method == "GET" && match_id_path(path, "/api/v1/chats/", chat_id)) { + if (send_auth_error()) { + // ответ отправлен + } else if (send_user_error()) { + // ответ отправлен + } else if (!valid_uuid(chat_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid chat id", request_id)); + } else { + try { + const auto chat = chats.find_by_id(chat_id); + const bool is_member = chat && + (std::find(chat->member_ids.begin(), + chat->member_ids.end(), + user_id) != chat->member_ids.end()); + if (!is_member) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else { + send_all(client, http_response(200, "OK", request_id, + chat_json(*chat))); + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "find_chat", request_id)); + } + } + } + else if (method == "GET" && match_attachment_content(path, attachment_id)) { + if (send_auth_error()) { + } else if (send_user_error()) { + } else if (!valid_uuid(attachment_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid attachment id", request_id)); + } else if (!s3) { + send_all(client, error_response(503, "unavailable", + "service unavailable", request_id)); + } else { + try { + const auto att = attachments.find_by_id(attachment_id); + if (!att) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else { + const auto chat = chats.find_by_id(att->chat_id); + const bool is_member = chat && + (std::find(chat->member_ids.begin(), + chat->member_ids.end(), + user_id) != chat->member_ids.end()); + if (!is_member) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else if (att->status != "ready") { + send_all(client, error_response( + 409, "conflict", + "attachment not ready", request_id)); + } else { + std::string head = + "HTTP/1.1 200 OK\r\n" + "Content-Type: " + att->content_type + "\r\n" + "X-Request-Id: " + request_id + "\r\n" + "X-Instance-Id: " + g_instance_id + "\r\n" + "Content-Length: " + + std::to_string(att->size_bytes) + "\r\n" + "Connection: close\r\n" + "\r\n"; + send_all(client, head); + s3->get_object(att->s3_key, [&](const char* data, + std::size_t n) { + size_t sent = 0; + while (sent < n) { + const ssize_t w = ::write( + client, data + sent, n - sent); + if (w <= 0) { + throw std::runtime_error( + "content write failed"); + } + sent += static_cast(w); + } + }); + } + } + } catch (const std::exception& e) { + // If headers were not sent yet, return JSON error; otherwise + // the connection is already mid-body — just close. + send_all(client, failure_response(e, "download_attachment", + request_id)); + } + } + } + else if (method == "GET" && + match_id_path(path, "/api/v1/attachments/", attachment_id)) { + if (send_auth_error()) { + } else if (send_user_error()) { + } else if (!valid_uuid(attachment_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid attachment id", request_id)); + } else { + try { + const auto att = attachments.find_by_id(attachment_id); + if (!att) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else { + const auto chat = chats.find_by_id(att->chat_id); + const bool is_member = chat && + (std::find(chat->member_ids.begin(), + chat->member_ids.end(), + user_id) != chat->member_ids.end()); + if (!is_member) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else { + send_all(client, http_response(200, "OK", request_id, + attachment_json(*att))); + } + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "get_attachment", + request_id)); + } + } + } else if (method == "POST" && match_chat_direct_uploads(path, chat_id)) { + // Track 1: initiate presigned PUT (proxy POST /attachments stays mandatory). + if (send_auth_error()) { + } else if (send_user_error()) { + } else if (!valid_uuid(chat_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid chat id", request_id)); + } else if (!s3) { + send_all(client, error_response(503, "unavailable", + "service unavailable", request_id)); + } else if (!json_content_type_ok(headers)) { + send_all(client, error_response(415, "unsupported_media_type", + "unsupported media type", request_id)); + } else { + try { + const auto chat = chats.find_by_id(chat_id); + const bool is_member = chat && + (std::find(chat->member_ids.begin(), + chat->member_ids.end(), + user_id) != chat->member_ids.end()); + if (!is_member) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else { + const auto body_at = request.find("\r\n\r\n"); + const std::string body = + body_at == std::string::npos ? "" : request.substr(body_at + 4); + const auto j = parse_json_object(body); + if (!j) { + send_all(client, error_response(400, "invalid_request", + "invalid json", request_id)); + } else if (auto bad = find_unexpected_key( + *j, {"filename", "content_type", "size_bytes", + "sha256"})) { + send_all(client, error_response( + 400, "invalid_request", + "unexpected field: " + *bad, request_id)); + } else { + const auto filename = get_string_field(*j, "filename"); + const auto ctype = get_string_field(*j, "content_type"); + const auto size_b = get_int64_field(*j, "size_bytes"); + const auto sha = get_string_field(*j, "sha256"); + std::int64_t max_bytes = 10485760; + if (const char* env = std::getenv("MAX_UPLOAD_BYTES")) { + try { + max_bytes = std::stoll(env); + } catch (...) { + } + } + int ttl = 300; + if (const char* env = + std::getenv("DIRECT_UPLOAD_TTL_SECONDS")) { + const int v = std::atoi(env); + if (v >= 30 && v <= 3600) { + ttl = v; + } + } + if (!filename || !valid_attachment_filename(*filename) || + !ctype || + (*ctype != "image/png" && *ctype != "image/jpeg") || + !size_b || *size_b < 1 || *size_b > max_bytes || + !sha || !valid_sha256_hex(*sha)) { + send_all(client, error_response( + 400, "invalid_request", "invalid fields", + request_id)); + } else { + DirectUpload d; + d.id = make_uuid_v4(); + d.chat_id = chat_id; + d.owner_id = user_id; + d.filename = *filename; + d.content_type = *ctype; + d.expected_size = static_cast(*size_b); + d.expected_sha256 = *sha; + d.s3_key = "attachments/" + chat_id + "/" + d.id; + d.status = "pending"; + const auto now = std::chrono::system_clock::now(); + const auto secs = + std::chrono::duration_cast( + now.time_since_epoch()) + .count(); + d.expires_at_epoch = secs + ttl; + const DirectUpload saved = direct_uploads.insert(d); + const std::string url = s3->presign_put( + saved.s3_key, static_cast(ttl), + saved.content_type); + nlohmann::json out; + out["id"] = saved.id; + out["upload_url"] = url; + out["method"] = "PUT"; + out["headers"] = nlohmann::json::object(); + out["headers"]["Content-Type"] = saved.content_type; + out["expires_at"] = saved.expires_at; + out["size_bytes"] = saved.expected_size; + out["sha256"] = saved.expected_sha256; + out["filename"] = saved.filename; + out["content_type"] = saved.content_type; + send_all(client, http_response(201, "Created", + request_id, + out.dump())); + } + } + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "direct_upload_init", + request_id)); + } + } + } else if (method == "POST" && + match_direct_upload_complete(path, direct_upload_id)) { + if (send_auth_error()) { + } else if (send_user_error()) { + } else if (!valid_uuid(direct_upload_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid upload id", request_id)); + } else if (!s3) { + send_all(client, error_response(503, "unavailable", + "service unavailable", request_id)); + } else { + try { + auto sess = direct_uploads.find_by_id(direct_upload_id); + if (!sess || sess->owner_id != user_id) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else if (sess->status != "pending") { + send_all(client, error_response( + 409, "conflict", + "upload session not pending", request_id)); + } else { + // Flip overdue pending → expired, then re-read. + direct_uploads.expire_stale(); + sess = direct_uploads.find_by_id(direct_upload_id); + if (!sess || sess->status != "pending") { + send_all(client, error_response( + 410, "gone", "upload session expired", request_id)); + } else { + std::int64_t obj_size = 0; + std::string etag; + if (!s3->stat_object(sess->s3_key, obj_size, etag)) { + send_all(client, error_response( + 400, "invalid_request", + "object not uploaded", request_id)); + } else if (obj_size != sess->expected_size) { + try { + s3->delete_object(sess->s3_key); + } catch (...) { + } + direct_uploads.mark_aborted(sess->id); + send_all(client, error_response( + 400, "invalid_request", + "size mismatch", request_id)); + } else { + std::vector buf; + buf.reserve(static_cast(obj_size)); + s3->get_object( + sess->s3_key, + [&](const char* data, std::size_t n) { + buf.insert(buf.end(), + reinterpret_cast( + data), + reinterpret_cast( + data) + + n); + }); + if (static_cast(buf.size()) != + sess->expected_size) { + send_all(client, error_response( + 400, "invalid_request", + "size mismatch", request_id)); + } else { + const std::string got_sha = sha256_hex_bytes( + buf.data(), buf.size()); + if (got_sha != sess->expected_sha256) { + try { + s3->delete_object(sess->s3_key); + } catch (...) { + } + direct_uploads.mark_aborted(sess->id); + send_all(client, error_response( + 400, "invalid_request", + "checksum mismatch", request_id)); + } else { + ImageLimits lim; + if (const char* env = + std::getenv("MAX_UPLOAD_BYTES")) { + try { + lim.max_bytes = std::stoll(env); + } catch (...) { + } + } + if (const char* env = + std::getenv("MAX_IMAGE_PIXELS")) { + try { + lim.max_pixels = std::stoll(env); + } catch (...) { + } + } + ImageInfo info; + auto rej = validate_image( + buf.data(), buf.size(), lim, info); + if (rej || + info.content_type != sess->content_type) { + try { + s3->delete_object(sess->s3_key); + } catch (...) { + } + direct_uploads.mark_aborted(sess->id); + send_all(client, error_response( + 415, "unsupported_media_type", + "unsupported media type", + request_id)); + } else { + Attachment a; + a.id = sess->id; // stable id = session id + a.chat_id = sess->chat_id; + a.owner_id = sess->owner_id; + a.filename = sess->filename; + a.content_type = sess->content_type; + a.size_bytes = sess->expected_size; + a.sha256 = sess->expected_sha256; + a.status = "ready"; + a.s3_key = sess->s3_key; + bool inserted = false; + try { + const Attachment saved = + attachments.insert(a); + inserted = true; + direct_uploads.mark_completed( + sess->id, saved.id); + send_all(client, http_response( + 201, "Created", request_id, + attachment_json(saved))); + } catch (const std::exception& e) { + if (!inserted) { + try { + s3->delete_object(a.s3_key); + } catch (...) { + } + direct_uploads.mark_aborted( + sess->id); + } + send_all(client, failure_response( + e, "direct_upload_complete", + request_id)); + } + } + } + } + } + } + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "direct_upload_complete", + request_id)); + } + } + } else if (method == "DELETE" && + match_id_path(path, "/api/v1/direct-uploads/", + direct_upload_id)) { + if (send_auth_error()) { + } else if (send_user_error()) { + } else if (!valid_uuid(direct_upload_id)) { + send_all(client, error_response(400, "invalid_request", + "invalid upload id", request_id)); + } else { + try { + auto sess = direct_uploads.find_by_id(direct_upload_id); + if (!sess || sess->owner_id != user_id) { + send_all(client, error_response(404, "not_found", + "not found", request_id)); + } else if (sess->status != "pending") { + send_all(client, error_response( + 409, "conflict", + "upload session not pending", request_id)); + } else { + direct_uploads.mark_aborted(sess->id); + if (s3) { + try { + std::int64_t sz = 0; + std::string et; + if (s3->stat_object(sess->s3_key, sz, et)) { + s3->delete_object(sess->s3_key); + } + } catch (const std::exception& de) { + std::clog << "abort DeleteObject failed: " + << de.what() << "\n"; + } + } + send_all(client, http_no_content(request_id)); + } + } catch (const std::exception& e) { + send_all(client, failure_response(e, "direct_upload_abort", + request_id)); + } + } + } else if (method == "DELETE" && path == "/api/v1/auth/sessions/current") { + if (send_auth_error()) { + } else { + try { + sessions.revoke(bearer_token); + send_all(client, http_no_content(request_id)); + } catch (const std::exception& e) { + send_all(client, failure_response(e, "revoke_session", request_id)); + } + } + } + else { + send_all(client, error_response(404, "not_found", "not found", request_id)); + } + + live_del(client); + ::close(client); +} + +int env_or_default(const char* name, int fallback) { + const char* raw = std::getenv(name); + if (raw == nullptr || raw[0] == '\0') { + return fallback; + } + char* end = nullptr; + errno = 0; + const long value = std::strtol(raw, &end, 10); + if (end == raw || *end != '\0' || errno != 0 || value < 1 || value > 4096) { + return fallback; + } + return static_cast(value); +} + +int main() { + const char* host_env = std::getenv("APP_HOST"); + const char* port_env = std::getenv("APP_PORT"); + const char* host = host_env ? host_env : "0.0.0.0"; + const int port = port_env ? std::atoi(port_env) : 8080; + g_instance_id = make_instance_id(); + std::clog << "instance id: " << g_instance_id << "\n"; + + sigset_t set; + sigemptyset(&set); + sigaddset(&set, SIGTERM); + sigaddset(&set, SIGINT); + if (pthread_sigmask(SIG_BLOCK, &set, nullptr) != 0) { + std::cerr << "pthread_sigmask failed" << std::endl; + return 1; + } + + const std::string db_url = read_secret_file("DATABASE_URL_FILE"); + std::clog << "connecting to db...\n"; + { + auto conn = open_pg_connection(db_url, false); + std::clog << "applying migrations...\n"; + apply_migrations(*conn, "./migrations"); + std::clog << "migrations ok\n"; + } + + const int pool_n = env_or_default("DB_POOL_SIZE", 8); + PgPool pool(db_url, pool_n); + std::clog << "pg pool ready (" << pool_n << " connections)\n"; + + if (sodium_init() < 0) { + std::cerr << "sodium_init failed\n"; + return 1; + } + + UserRepo users(pool); + ChatRepo chats(pool); + MessageRepo messages(pool); + AttachmentRepo attachments(pool); + DirectUploadRepo direct_uploads(pool); + + std::unique_ptr s3; + try { + s3 = std::make_unique(S3Client::from_env()); + std::clog << "s3 client ready bucket=" << s3->bucket() << "\n"; + } catch (const std::exception& e) { + std::cerr << "s3 init failed: " << e.what() << "\n"; + return 1; + } + + const char* ttl_env = std::getenv("SESSION_TTL_SECONDS"); + const int ttl_seconds = ttl_env ? std::atoi(ttl_env) : 3600; + + const char* store_env = std::getenv("SESSION_STORE"); + const std::string store = store_env ? store_env : "redis"; + + std::unique_ptr redis_pool; + std::unique_ptr sessions; + if (store == "postgres") { + sessions = std::make_unique(pool, ttl_seconds); + std::clog << "session store: postgres\n"; + } else if (store == "redis") { + redis_pool = std::make_unique(read_secret_file("CACHE_URL_FILE"), 4); + std::clog << "redis pool ready (4 connections)\n"; + sessions = std::make_unique(*redis_pool, ttl_seconds); + std::clog << "session store: redis\n"; + } else { + throw std::runtime_error("unknown SESSION_STORE: " + store); + } + std::clog << "session ttl: " << ttl_seconds << "s\n"; + + const int fd = ::socket(AF_INET, SOCK_STREAM, 0); + if (fd < 0) { + std::cerr << "socket failed" << std::endl; + return 1; + } + + const int yes = 1; + ::setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)); + + sockaddr_in addr{}; + addr.sin_family = AF_INET; + addr.sin_port = htons(static_cast(port)); + if (::inet_pton(AF_INET, host, &addr.sin_addr) != 1) { + std::cerr << "invalid APP_HOST" << std::endl; + ::close(fd); + return 1; + } + + if (::bind(fd, reinterpret_cast(&addr), sizeof(addr)) != 0) { + std::cerr << "bind failed on " << host << ":" << port << std::endl; + ::close(fd); + return 1; + } + + if (::listen(fd, 16) != 0) { + std::cerr << "listen failed" << std::endl; + ::close(fd); + return 1; + } + + g_listen.store(fd); + + std::clog << "listening on " << host << ":" << port << std::endl; + + std::atomic request_n{0}; + std::mutex q_mu; + std::condition_variable q_cv; + std::queue q; + const int workers_n = env_or_default("HTTP_WORKERS", 8); + std::clog << "http workers: " << workers_n << "\n"; + if (const char* v = std::getenv("MAX_CONCURRENT_UPLOADS")) { + const int n = std::atoi(v); + if (n >= 1 && n <= 32) { + g_up_max = n; + } + } + std::clog << "max concurrent uploads: " << g_up_max << "\n"; + std::vector workers; + for (int i = 0; i < workers_n; ++i) { + workers.emplace_back([&]() { + for (;;) { + int client = -1; + { + std::unique_lock lk(q_mu); + q_cv.wait(lk, [&]() { return g_stop.load() || !q.empty(); }); + if (g_stop.load() && q.empty()) { + return; + } + client = q.front(); + q.pop(); + } + try { + handle_client(client, request_n, users, chats, messages, + attachments, direct_uploads, s3.get(), + *sessions, pool, redis_pool.get()); + } catch (const std::exception& e) { + std::clog << "unhandled request error: " << e.what() << "\n"; + send_all(client, error_response(500, "internal_error", + "internal error", + std::to_string(request_n.load()))); + live_del(client); + ::close(client); + } catch (...) { + live_del(client); + ::close(client); + } + } + }); + } + + std::thread signal_thread([&]() { + int sig = 0; + if (sigwait(&set, &sig) != 0) { + return; + } + g_draining.store(true); + int drain_seconds = 2; + if (const char* env = std::getenv("DRAIN_SECONDS")) { + if (*env) { + drain_seconds = std::atoi(env); + if (drain_seconds < 0) { + drain_seconds = 0; + } else if (drain_seconds > 30) { + drain_seconds = 30; + } + } + } + std::clog << "draining: /health/ready is 503 for " + << drain_seconds << "s before listen socket closes\n"; + if (drain_seconds > 0) { + ::sleep(static_cast(drain_seconds)); + } + g_stop.store(true); + const int lfd = g_listen.load(); + if (lfd >= 0) { + ::shutdown(lfd, SHUT_RDWR); + } + }); + + for (;;) { + const int client = ::accept(fd, nullptr, nullptr); + if (client < 0) { + if (g_stop.load()) { + std::clog << "shutting down\n"; + break; + } + std::cerr << "accept failed\n"; + break; + } + set_timeouts(client); + live_add(client); + { + std::lock_guard lk(q_mu); + q.push(client); + } + q_cv.notify_one(); + } + { + std::lock_guard lk(q_mu); + g_stop.store(true); + } + q_cv.notify_all(); + for (auto& t : workers) { + t.join(); + } + signal_thread.detach(); + + ::close(fd); + std::clog << "stopped\n"; + return 0; +} \ No newline at end of file diff --git a/src/message_repo.cpp b/src/message_repo.cpp new file mode 100644 index 00000000..7972daa0 --- /dev/null +++ b/src/message_repo.cpp @@ -0,0 +1,374 @@ +#include "message_repo.hpp" +#include "cursor.hpp" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace { + +std::string make_uuid() { + static std::mutex rng_mu; + static std::mt19937_64 rng{std::random_device{}()}; + std::uniform_int_distribution d16(0, 0xffff); + std::uniform_int_distribution d32(0, 0xffffffffu); + std::lock_guard lock(rng_mu); + std::ostringstream out; + out << std::hex << std::setfill('0'); + out << std::setw(8) << d32(rng); + out << '-' << std::setw(4) << d16(rng); + out << '-' << std::setw(4) << ((d16(rng) & 0x0fff) | 0x4000); + out << '-' << std::setw(4) << ((d16(rng) & 0x3fff) | 0x8000); + out << '-' << std::setw(4) << d16(rng) << std::setw(8) << d32(rng); + return out.str(); +} + +std::string sha256_hex(const std::string& s) { + unsigned char out[crypto_hash_sha256_BYTES]; + crypto_hash_sha256(out, reinterpret_cast(s.data()), s.size()); + static const char hex[] = "0123456789abcdef"; + std::string r; + r.resize(sizeof(out) * 2); + for (std::size_t i = 0; i < sizeof(out); ++i) { + r[i * 2] = hex[out[i] >> 4]; + r[i * 2 + 1] = hex[out[i] & 0x0f]; + } + return r; +} + +std::string epoch_to_rfc3339(long long epoch) { + const std::time_t t = static_cast(epoch); + std::tm tm{}; + gmtime_r(&t, &tm); + std::ostringstream out; + out << std::put_time(&tm, "%Y-%m-%dT%H:%M:%SZ"); + return out.str(); +} + +std::string now_epoch_str() { + const auto now = std::chrono::system_clock::now(); + const auto secs = std::chrono::duration_cast( + now.time_since_epoch()).count(); + return std::to_string(secs); +} + +Message row_to_message(const pqxx::row& r) { + Message m; + m.id = r["id"].as(); + m.chat_id = r["chat_id"].as(); + m.sender_id = r["sender_id"].as(); + m.text = r["text"].as(); + m.created_at = epoch_to_rfc3339(r["created_at_epoch"].as()); + return m; +} + +constexpr const char* kMessageSelect = + "id, chat_id, sender_id, text, " + "EXTRACT(EPOCH FROM created_at)::bigint AS created_at_epoch"; + +std::string canonical_message_body(const std::string& text, + const std::vector& attachment_ids) { + std::ostringstream out; + out << "text=" << text << "\nattachment_ids="; + for (std::size_t i = 0; i < attachment_ids.size(); ++i) { + if (i > 0) { + out << ','; + } + out << attachment_ids[i]; + } + return out.str(); +} + +int idempotency_ttl_seconds() { + const char* env = std::getenv("IDEMPOTENCY_TTL_SECONDS"); + if (env == nullptr || *env == '\0') { + return 86400; + } + try { + const int v = std::stoi(env); + if (v <= 0) { + return 86400; + } + return v; + } catch (...) { + return 86400; + } +} + +bool attachments_belong_to_chat(pqxx::work& tx, + const std::string& chat_id, + const std::vector& attachment_ids) { + if (attachment_ids.empty()) { + return true; + } + for (const auto& id : attachment_ids) { + auto r = tx.exec( + "SELECT 1 FROM attachments " + "WHERE id = $1 AND chat_id = $2 AND status = 'ready'", + pqxx::params{id, chat_id}); + if (r.empty()) { + return false; + } + } + return true; +} + +void link_attachments(pqxx::work& tx, + const std::string& message_id, + const std::vector& attachment_ids) { + for (std::size_t i = 0; i < attachment_ids.size(); ++i) { + tx.exec( + "INSERT INTO message_attachments (message_id, attachment_id, position) " + "VALUES ($1, $2, $3)", + pqxx::params{message_id, attachment_ids[i], static_cast(i)}); + } +} + +std::vector load_attachment_ids(pqxx::work& tx, + const std::string& message_id) { + auto r = tx.exec( + "SELECT attachment_id FROM message_attachments " + "WHERE message_id = $1 ORDER BY position ASC", + pqxx::params{message_id}); + std::vector ids; + ids.reserve(r.size()); + for (const auto& row : r) { + ids.push_back(row["attachment_id"].as()); + } + return ids; +} + +void fill_attachment_ids(pqxx::work& tx, Message& m) { + m.attachment_ids = load_attachment_ids(tx, m.id); +} + +void fill_attachment_ids(pqxx::work& tx, std::vector& items) { + for (auto& m : items) { + fill_attachment_ids(tx, m); + } +} + +Message insert_message(pqxx::work& tx, + const std::string& chat_id, + const std::string& sender_id, + const std::string& text, + const std::vector& attachment_ids) { + const std::string id = make_uuid(); + const std::string created = now_epoch_str(); + auto r = tx.exec( + "INSERT INTO messages (id, chat_id, sender_id, text, created_at) " + "VALUES ($1, $2, $3, $4, to_timestamp($5::bigint)) " + "RETURNING " + std::string(kMessageSelect), + pqxx::params{id, chat_id, sender_id, text, created}); + Message m = row_to_message(r[0]); + link_attachments(tx, m.id, attachment_ids); + m.attachment_ids = attachment_ids; + return m; +} + +bool insert_idempotency_key(pqxx::work& tx, + const std::string& user_id, + const std::string& chat_id, + const std::string& idem_key, + const std::string& request_hash, + const std::string& message_id) { + auto inserted = tx.exec( + "INSERT INTO idempotency_keys " + "(user_id, chat_id, key, request_hash, message_id) " + "VALUES ($1, $2, $3, $4, $5) " + "ON CONFLICT (user_id, chat_id, key) DO NOTHING " + "RETURNING message_id", + pqxx::params{user_id, chat_id, idem_key, request_hash, message_id}); + return !inserted.empty(); +} + +Message load_message(pqxx::work& tx, const std::string& message_id) { + auto r = tx.exec( + "SELECT " + std::string(kMessageSelect) + " FROM messages WHERE id = $1", + pqxx::params{message_id}); + if (r.empty()) { + throw std::runtime_error("idempotent message row is missing"); + } + Message m = row_to_message(r[0]); + fill_attachment_ids(tx, m); + return m; +} + +} // namespace + +std::optional MessageRepo::create(const std::string& chat_id, + const std::string& sender_id, + const std::string& text, + const std::vector& attachment_ids) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + + auto member_check = tx.exec( + "SELECT 1 FROM chat_members WHERE chat_id = $1 AND user_id = $2", + pqxx::params{chat_id, sender_id}); + if (member_check.empty()) { + tx.commit(); + return std::nullopt; + } + if (!attachments_belong_to_chat(tx, chat_id, attachment_ids)) { + tx.commit(); + return std::nullopt; + } + + Message created = insert_message(tx, chat_id, sender_id, text, attachment_ids); + tx.commit(); + return created; +} + +std::optional MessageRepo::list_page( + const std::string& chat_id, + int limit, + const std::optional& cursor) { + + std::optional cur; + if (cursor) { + cur = parse_cursor(*cursor); + if (!cur) { + return std::nullopt; + } + } + + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + + if (cur) { + auto owner_check = tx.exec( + "SELECT 1 FROM messages WHERE id = $1 AND chat_id = $2", + pqxx::params{cur->id, chat_id}); + if (owner_check.empty()) { + tx.commit(); + return std::nullopt; + } + } + + std::string sql = + "SELECT " + std::string(kMessageSelect) + ", " + kCreatedUsSql + " " + "FROM messages " + "WHERE chat_id = $1 "; + if (cur) { + sql += "AND (created_at, id) > (" + std::string(kCursorTimestampSql) + ", $4::uuid) "; + } + sql += "ORDER BY created_at ASC, id ASC LIMIT $2"; + + pqxx::result r; + if (cur) { + r = tx.exec(sql, pqxx::params{chat_id, limit + 1, cur->created_us, cur->id}); + } else { + r = tx.exec(sql, pqxx::params{chat_id, limit + 1}); + } + + MessagePage page; + const bool has_more = (static_cast(r.size()) > limit); + const int take = has_more ? limit : static_cast(r.size()); + page.items.reserve(take); + for (int i = 0; i < take; ++i) { + page.items.push_back(row_to_message(r[static_cast(i)])); + } + fill_attachment_ids(tx, page.items); + + if (has_more && take > 0) { + const auto& last = r[static_cast(take - 1)]; + page.next_cursor = make_cursor(last["created_us"].as(), + last["id"].as()); + } + + tx.commit(); + return page; +} + +CreateResult MessageRepo::create_idempotent( + const std::string& chat_id, + const std::string& sender_id, + const std::string& text, + const std::vector& attachment_ids, + const std::string& idem_key) { + const int ttl = idempotency_ttl_seconds(); + const std::string hash = sha256_hex(canonical_message_body(text, attachment_ids)); + + for (int attempt = 0; attempt < 3; ++attempt) { + { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + + auto member_check = tx.exec( + "SELECT 1 FROM chat_members WHERE chat_id = $1 AND user_id = $2", + pqxx::params{chat_id, sender_id}); + if (member_check.empty()) { + tx.commit(); + return CreateResult{CreateResult::Status::NotFound, std::nullopt}; + } + if (!attachments_belong_to_chat(tx, chat_id, attachment_ids)) { + tx.commit(); + return CreateResult{CreateResult::Status::NotFound, std::nullopt}; + } + + const Message created = + insert_message(tx, chat_id, sender_id, text, attachment_ids); + if (insert_idempotency_key(tx, sender_id, chat_id, idem_key, hash, + created.id)) { + tx.commit(); + return CreateResult{CreateResult::Status::Created, created}; + } + } + + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto existing = tx.exec( + "SELECT request_hash, message_id, " + "EXTRACT(EPOCH FROM (now() - created_at))::bigint AS age_seconds " + "FROM idempotency_keys " + "WHERE user_id = $1 AND chat_id = $2 AND key = $3 " + "FOR UPDATE", + pqxx::params{sender_id, chat_id, idem_key}); + if (existing.empty()) { + tx.commit(); + continue; + } + + const std::string existing_hash = existing[0]["request_hash"].as(); + const long long age = existing[0]["age_seconds"].as(); + const std::string message_id = existing[0]["message_id"].as(); + if (age < ttl) { + if (existing_hash != hash) { + tx.commit(); + return CreateResult{CreateResult::Status::KeyConflict, std::nullopt}; + } + const Message replayed = load_message(tx, message_id); + tx.commit(); + return CreateResult{CreateResult::Status::Replayed, replayed}; + } + + tx.exec( + "DELETE FROM idempotency_keys " + "WHERE user_id = $1 AND chat_id = $2 AND key = $3", + pqxx::params{sender_id, chat_id, idem_key}); + if (!attachments_belong_to_chat(tx, chat_id, attachment_ids)) { + tx.commit(); + return CreateResult{CreateResult::Status::NotFound, std::nullopt}; + } + const Message created = + insert_message(tx, chat_id, sender_id, text, attachment_ids); + if (insert_idempotency_key(tx, sender_id, chat_id, idem_key, hash, + created.id)) { + tx.commit(); + return CreateResult{CreateResult::Status::Created, created}; + } + } + + throw std::runtime_error("idempotency retry exhausted"); +} diff --git a/src/message_repo.hpp b/src/message_repo.hpp new file mode 100644 index 00000000..ea4dbf1b --- /dev/null +++ b/src/message_repo.hpp @@ -0,0 +1,38 @@ +#pragma once + +#include "db.hpp" +#include "models.hpp" + +#include +#include +#include + +struct CreateResult { + enum class Status { Created, Replayed, NotFound, KeyConflict }; + Status status; + std::optional message; +}; + +class MessageRepo { +public: + explicit MessageRepo(PgPool& pool) : pool_(pool) {} + + std::optional create(const std::string& chat_id, + const std::string& sender_id, + const std::string& text, + const std::vector& attachment_ids); + + std::optional list_page( + const std::string& chat_id, + int limit, + const std::optional& cursor); + + CreateResult create_idempotent(const std::string& chat_id, + const std::string& sender_id, + const std::string& text, + const std::vector& attachment_ids, + const std::string& idem_key); + +private: + PgPool& pool_; +}; diff --git a/src/models.hpp b/src/models.hpp new file mode 100644 index 00000000..f3c39571 --- /dev/null +++ b/src/models.hpp @@ -0,0 +1,81 @@ +#pragma once + +#include +#include +#include + +struct User { + std::string id; + std::string username; + std::string display_name; + std::string password_hash; + std::string created_at; +}; + +struct Chat { + std::string id; + std::string title; + std::vector member_ids; + std::string created_at; +}; + +struct Message { + std::string id; + std::string chat_id; + std::string sender_id; + std::string text; + std::string created_at; + std::vector attachment_ids; +}; + +struct MessagePage { + std::vector items; + std::optional next_cursor; +}; + +struct ChatPage { + std::vector items; + std::optional next_cursor; +}; + +// Lab4: variants stay empty ([]); lab5 fills thumbnail/crop/optimized. +struct Variant { + std::string name; + std::string content_type; + int size_bytes = 0; + std::string sha256; +}; + +struct Attachment { + std::string id; + std::string chat_id; + std::string owner_id; + std::string filename; + std::string content_type; + int size_bytes = 0; + std::string sha256; + std::string status; // lab4: "ready" + std::vector variants; // lab4: always empty + std::optional error_code; + std::string s3_key; // internal; never exposed in API JSON + std::string created_at; + std::string updated_at; +}; + +// Track 1: pending presigned PUT session (not a public attachment until complete). +struct DirectUpload { + std::string id; + std::string chat_id; + std::string owner_id; + std::string filename; + std::string content_type; + int expected_size = 0; + std::string expected_sha256; + std::string s3_key; // internal + std::string status; // pending|completed|aborted|expired + std::optional attachment_id; + std::string expires_at; // RFC3339 for JSON + long long expires_at_epoch = 0; // for INSERT + std::string created_at; + std::string updated_at; +}; diff --git a/src/pg_session_repo.cpp b/src/pg_session_repo.cpp new file mode 100644 index 00000000..507f2ddd --- /dev/null +++ b/src/pg_session_repo.cpp @@ -0,0 +1,66 @@ +#include "pg_session_repo.hpp" + +#include +#include + +#include +#include +#include + +namespace { + +std::string random_token_hex() { + unsigned char buf[32]; + randombytes_buf(buf, sizeof(buf)); + static const char hex[] = "0123456789abcdef"; + std::string out; + out.resize(sizeof(buf) * 2); + for (std::size_t i = 0; i < sizeof(buf); ++i) { + out[i * 2] = hex[buf[i] >> 4]; + out[i * 2 + 1] = hex[buf[i] & 0x0f]; + } + return out; +} + +std::int64_t now_unix() { + return static_cast(std::time(nullptr)); +} + +} + +ISessionRepo::Created PgSessionRepo::create(const std::string& user_id) { + const std::string token = random_token_hex(); + const std::int64_t exp = now_unix() + ttl_; + + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + tx.exec( + "INSERT INTO sessions (token, user_id, expires_at) " + "VALUES ($1, $2, to_timestamp($3::bigint))", + pqxx::params{token, user_id, exp}); + tx.commit(); + + return Created{token, exp}; +} + +std::optional PgSessionRepo::lookup(const std::string& token) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto r = tx.exec( + "SELECT user_id FROM sessions " + "WHERE token = $1 AND expires_at > now()", + pqxx::params{token}); + tx.commit(); + if (r.empty()) return std::nullopt; + return r[0]["user_id"].as(); +} + +bool PgSessionRepo::revoke(const std::string& token) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto r = tx.exec( + "DELETE FROM sessions WHERE token = $1", + pqxx::params{token}); + tx.commit(); + return r.affected_rows() > 0; +} \ No newline at end of file diff --git a/src/pg_session_repo.hpp b/src/pg_session_repo.hpp new file mode 100644 index 00000000..ed005fec --- /dev/null +++ b/src/pg_session_repo.hpp @@ -0,0 +1,18 @@ +#pragma once + +#include "db.hpp" +#include "session_repo_base.hpp" + +class PgSessionRepo : public ISessionRepo { +public: + PgSessionRepo(PgPool& pool, int ttl_seconds) + : pool_(pool), ttl_(ttl_seconds) {} + + Created create(const std::string& user_id) override; + std::optional lookup(const std::string& token) override; + bool revoke(const std::string& token) override; + +private: + PgPool& pool_; + int ttl_; +}; \ No newline at end of file diff --git a/src/redis_pool.cpp b/src/redis_pool.cpp new file mode 100644 index 00000000..035b5f20 --- /dev/null +++ b/src/redis_pool.cpp @@ -0,0 +1,216 @@ +#include "redis_pool.hpp" +#include "errors.hpp" + +#include +#include +#include +#include + +namespace { + +constexpr timeval kConnectTimeout{2, 0}; +constexpr timeval kCommandTimeout{2, 0}; +constexpr auto kAcquireTimeout = std::chrono::seconds(3); + +struct RedisUrl { + std::string host = "127.0.0.1"; + int port = 6379; + std::string password; + int db = 0; +}; + +RedisUrl parse_redis_url(const std::string& url) { + RedisUrl out; + const std::string prefix = "redis://"; + if (url.compare(0, prefix.size(), prefix) != 0) { + throw std::runtime_error("redis url must start with redis://"); + } + std::string rest = url.substr(prefix.size()); + + const auto slash = rest.find('/'); + if (slash != std::string::npos) { + const std::string db_str = rest.substr(slash + 1); + rest.resize(slash); + if (!db_str.empty()) { + out.db = std::atoi(db_str.c_str()); + } + } + + const auto at = rest.find('@'); + std::string hostport = rest; + if (at != std::string::npos) { + const std::string creds = rest.substr(0, at); + hostport = rest.substr(at + 1); + const auto colon = creds.find(':'); + if (colon != std::string::npos) { + out.password = creds.substr(colon + 1); + } else { + out.password = creds; + } + } + + const auto colon = hostport.find(':'); + if (colon == std::string::npos) { + out.host = hostport; + } else { + out.host = hostport.substr(0, colon); + out.port = std::atoi(hostport.substr(colon + 1).c_str()); + } + + return out; +} + +redisContext* make_connection(const RedisUrl& u) { + redisContext* c = redisConnectWithTimeout(u.host.c_str(), u.port, kConnectTimeout); + if (c == nullptr) { + throw std::runtime_error("redisConnect: allocation failed"); + } + if (c->err) { + const std::string err = c->errstr; + redisFree(c); + throw DependencyUnavailable("redisConnect failed: " + err); + } + if (redisSetTimeout(c, kCommandTimeout) != REDIS_OK) { + redisFree(c); + throw DependencyUnavailable("redisSetTimeout failed"); + } + if (!u.password.empty()) { + redisReply* r = static_cast( + redisCommand(c, "AUTH %s", u.password.c_str())); + if (r == nullptr) { + redisFree(c); + throw std::runtime_error("redis AUTH: no reply"); + } + const bool ok = (r->type == REDIS_REPLY_STATUS); + freeReplyObject(r); + if (!ok) { + redisFree(c); + throw std::runtime_error("redis AUTH failed"); + } + } + if (u.db != 0) { + redisReply* r = static_cast( + redisCommand(c, "SELECT %d", u.db)); + if (r == nullptr) { + redisFree(c); + throw std::runtime_error("redis SELECT: no reply"); + } + const bool ok = (r->type == REDIS_REPLY_STATUS); + freeReplyObject(r); + if (!ok) { + redisFree(c); + throw std::runtime_error("redis SELECT failed"); + } + } + return c; +} + +} + +RedisPool::RedisPool(std::string url, std::size_t n) + : url_(std::move(url)) { + if (n == 0) { + throw std::runtime_error("RedisPool: n must be > 0"); + } + const RedisUrl parsed = parse_redis_url(url_); + all_.reserve(n); + idle_.reserve(n); + for (std::size_t i = 0; i < n; ++i) { + ConnPtr c(make_connection(parsed)); + idle_.push_back(c.get()); + all_.push_back(std::move(c)); + } +} + +RedisPool::~RedisPool() { + { + std::lock_guard lk(mu_); + shutting_down_ = true; + } + cv_.notify_all(); +} + +RedisPool::Lease::Lease(RedisPool& pool) + : pool_(&pool), ctx_(pool.take()) {} + +RedisPool::Lease::~Lease() { + if (pool_ != nullptr && ctx_ != nullptr) { + pool_->give_back(ctx_); + } +} + +RedisPool::Lease::Lease(Lease&& other) noexcept + : pool_(other.pool_), ctx_(other.ctx_) { + other.pool_ = nullptr; + other.ctx_ = nullptr; +} + +RedisPool::Lease RedisPool::acquire() { + return Lease(*this); +} + +redisContext* RedisPool::take() { + std::unique_lock lk(mu_); + if (!cv_.wait_for(lk, kAcquireTimeout, + [&]() { return shutting_down_ || !idle_.empty(); })) { + throw DependencyUnavailable("redis pool: acquire timeout"); + } + if (shutting_down_) { + throw DependencyUnavailable("redis pool is shutting down"); + } + redisContext* c = idle_.back(); + idle_.pop_back(); + lk.unlock(); + + bool alive = false; + if (!c->err) { + redisReply* r = static_cast(redisCommand(c, "PING")); + if (r != nullptr && r->type == REDIS_REPLY_STATUS) { + alive = true; + } + if (r != nullptr) freeReplyObject(r); + } + if (alive) { + return c; + } + + ConnPtr fresh; + try { + fresh.reset(make_connection(parse_redis_url(url_))); + } catch (const std::exception& e) { + // Слот возвращается в пул, иначе после нескольких неудач пул опустеет навсегда. + give_back(c); + throw DependencyUnavailable(std::string("redis reconnect failed: ") + e.what()); + } + + std::lock_guard lk2(mu_); + for (auto& up : all_) { + if (up.get() == c) { + up = std::move(fresh); + return up.get(); + } + } + throw std::logic_error("RedisPool: connection not owned by pool"); +} + +void RedisPool::give_back(redisContext* c) { + { + std::lock_guard lk(mu_); + idle_.push_back(c); + } + cv_.notify_one(); +} + +bool RedisPool::ping() { + try { + auto lease = acquire(); + redisContext* c = lease.ctx(); + redisReply* r = static_cast(redisCommand(c, "PING")); + if (r == nullptr) return false; + const bool ok = (r->type == REDIS_REPLY_STATUS); + freeReplyObject(r); + return ok; + } catch (...) { + return false; + } +} \ No newline at end of file diff --git a/src/redis_pool.hpp b/src/redis_pool.hpp new file mode 100644 index 00000000..00323151 --- /dev/null +++ b/src/redis_pool.hpp @@ -0,0 +1,59 @@ +#pragma once + +#include + +#include +#include +#include +#include +#include +#include + +class RedisPool { +public: + RedisPool(std::string url, std::size_t n); + ~RedisPool(); + + RedisPool(const RedisPool&) = delete; + RedisPool& operator=(const RedisPool&) = delete; + + class Lease { + public: + explicit Lease(RedisPool& pool); + ~Lease(); + Lease(Lease&& other) noexcept; + Lease& operator=(Lease&&) = delete; + Lease(const Lease&) = delete; + Lease& operator=(const Lease&) = delete; + + redisContext* ctx() const { return ctx_; } + + private: + RedisPool* pool_; + redisContext* ctx_; + }; + + Lease acquire(); + + bool ping(); + +private: + friend class Lease; + + struct RedisDeleter { + void operator()(redisContext* c) const noexcept { + if (c != nullptr) ::redisFree(c); + } + }; + using ConnPtr = std::unique_ptr; + + redisContext* take(); + void give_back(redisContext* c); + + std::string url_; + std::vector all_; + std::vector idle_; + std::mutex mu_; + std::condition_variable cv_; + bool shutting_down_ = false; +}; \ No newline at end of file diff --git a/src/s3_client.cpp b/src/s3_client.cpp new file mode 100644 index 00000000..fc2222bf --- /dev/null +++ b/src/s3_client.cpp @@ -0,0 +1,238 @@ +#include "s3_client.hpp" + +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace { + +std::string read_file_trim(const std::string& path) { + std::ifstream in(path); + if (!in) { + throw std::runtime_error("cannot open secret/file: " + path); + } + std::string s((std::istreambuf_iterator(in)), + std::istreambuf_iterator()); + while (!s.empty() && (s.back() == '\n' || s.back() == '\r' || s.back() == ' ')) { + s.pop_back(); + } + return s; +} + +std::string env_or(const char* key, const char* fallback = "") { + const char* v = std::getenv(key); + return (v && *v) ? std::string(v) : std::string(fallback); +} + +void parse_endpoint(const std::string& endpoint, std::string& host, unsigned& port, + bool& https) { + https = true; + host = endpoint; + port = 0; + if (host.rfind("http://", 0) == 0) { + https = false; + host = host.substr(7); + } else if (host.rfind("https://", 0) == 0) { + https = true; + host = host.substr(8); + } + // strip path + const auto slash = host.find('/'); + if (slash != std::string::npos) { + host = host.substr(0, slash); + } + const auto colon = host.rfind(':'); + if (colon != std::string::npos) { + port = static_cast(std::stoul(host.substr(colon + 1))); + host = host.substr(0, colon); + } + if (port == 0) { + port = https ? 443u : 80u; + } +} + +} // namespace + +struct S3Client::Impl { + minio::s3::BaseUrl base_url; + minio::s3::BaseUrl presign_url; + std::unique_ptr provider; + std::unique_ptr client; + std::unique_ptr presign_client; // null → use client +}; + +S3Client::Config S3Client::from_env() { + Config c; + // Ops endpoint (Stat/Get/Put/Delete). Presign may use S3_PRESIGN_ENDPOINT + // (read in ctor) so signed Host matches the client-reachable address. + c.endpoint = env_or("S3_ENDPOINT", "http://minio:9000"); + c.region = env_or("S3_REGION", "us-east-1"); + c.bucket = env_or("S3_BUCKET"); + if (c.bucket.empty()) { + throw std::runtime_error("S3_BUCKET is required"); + } + + const std::string key_file = env_or("S3_ACCESS_KEY_ID_FILE"); + const std::string secret_file = env_or("S3_SECRET_ACCESS_KEY_FILE"); + if (key_file.empty() || secret_file.empty()) { + throw std::runtime_error( + "S3_ACCESS_KEY_ID_FILE and S3_SECRET_ACCESS_KEY_FILE are required"); + } + c.access_key = read_file_trim(key_file); + c.secret_key = read_file_trim(secret_file); + if (c.access_key.empty() || c.secret_key.empty()) { + throw std::runtime_error("S3 credentials files are empty"); + } + return c; +} + +S3Client::S3Client(Config cfg) : cfg_(std::move(cfg)), impl_(std::make_unique()) { + if (cfg_.endpoint.empty() || cfg_.bucket.empty() || + cfg_.access_key.empty() || cfg_.secret_key.empty()) { + throw std::runtime_error("S3Client: incomplete config"); + } + + std::string host; + unsigned port = 0; + bool https = false; + parse_endpoint(cfg_.endpoint, host, port, https); + + impl_->base_url = minio::s3::BaseUrl(host, https, cfg_.region); + impl_->base_url.port = port; + // MinIO requires path-style addressing. + impl_->base_url.virtual_style = false; + + impl_->provider = std::make_unique( + cfg_.access_key, cfg_.secret_key); + impl_->client = + std::make_unique(impl_->base_url, impl_->provider.get()); + + // Separate BaseUrl for presigning when S3_PRESIGN_ENDPOINT differs. + const std::string presign_ep = env_or("S3_PRESIGN_ENDPOINT"); + if (!presign_ep.empty() && presign_ep != cfg_.endpoint) { + std::string ph; + unsigned pp = 0; + bool phttps = false; + parse_endpoint(presign_ep, ph, pp, phttps); + impl_->presign_url = minio::s3::BaseUrl(ph, phttps, cfg_.region); + impl_->presign_url.port = pp; + impl_->presign_url.virtual_style = false; + impl_->presign_client = std::make_unique( + impl_->presign_url, impl_->provider.get()); + } +} + +S3Client::~S3Client() = default; + +void S3Client::put_object(const std::string& key, + std::istream& body, + std::int64_t size_bytes, + const std::string& content_type) { + if (size_bytes < 0) { + throw std::invalid_argument("put_object: negative size"); + } + + // part_size=0 → library chooses multipart sizing; streams from `body`. + minio::s3::PutObjectArgs args(body, static_cast(size_bytes), 0); + args.bucket = cfg_.bucket; + args.object = key; + if (!content_type.empty()) { + args.content_type = content_type; + } + + minio::s3::PutObjectResponse resp = impl_->client->PutObject(args); + if (!resp) { + throw std::runtime_error("S3 PutObject failed: " + resp.Error().String()); + } +} + +void S3Client::get_object(const std::string& key, std::ostream& out) { + get_object(key, [&](const char* data, std::size_t n) { + out.write(data, static_cast(n)); + if (!out) { + throw std::runtime_error("get_object: write failed"); + } + }); +} + +std::int64_t S3Client::get_object( + const std::string& key, + const std::function& on_chunk) { + std::int64_t total = 0; + minio::s3::GetObjectArgs args; + args.bucket = cfg_.bucket; + args.object = key; + args.datafunc = [&](minio::http::DataFunctionArgs da) -> bool { + on_chunk(da.datachunk.data(), da.datachunk.size()); + total += static_cast(da.datachunk.size()); + return true; + }; + + minio::s3::GetObjectResponse resp = impl_->client->GetObject(args); + if (!resp) { + throw std::runtime_error("S3 GetObject failed: " + resp.Error().String()); + } + return total; +} + +void S3Client::delete_object(const std::string& key) { + minio::s3::RemoveObjectArgs args; + args.bucket = cfg_.bucket; + args.object = key; + minio::s3::RemoveObjectResponse resp = impl_->client->RemoveObject(args); + if (!resp) { + throw std::runtime_error("S3 DeleteObject failed: " + resp.Error().String()); + } +} + +bool S3Client::stat_object(const std::string& key, std::int64_t& size_bytes, + std::string& etag) { + minio::s3::StatObjectArgs args; + args.bucket = cfg_.bucket; + args.object = key; + minio::s3::StatObjectResponse resp = impl_->client->StatObject(args); + if (!resp) { + // NoSuchKey / Not Found → absent + const std::string err = resp.Error().String(); + if (resp.code == "NoSuchKey" || resp.status_code == 404) { + return false; + } + throw std::runtime_error("S3 StatObject failed: " + err); + } + size_bytes = static_cast(resp.size); + etag = resp.etag; + return true; +} + +std::string S3Client::presign_put(const std::string& key, + unsigned expiry_seconds, + const std::string& content_type) { + if (expiry_seconds < 1 || expiry_seconds > 7 * 24 * 3600u) { + throw std::invalid_argument("presign_put: bad expiry"); + } + minio::s3::Client* c = + impl_->presign_client ? impl_->presign_client.get() : impl_->client.get(); + + // Note: minio-cpp query-presign signs method/host/path/query only — it does + // not bind Content-Type into the signature. Clients should still send + // Content-Type so the object metadata is correct; complete() re-validates + // magic/sha256 against the session. + (void)content_type; + minio::s3::GetPresignedObjectUrlArgs args; + args.bucket = cfg_.bucket; + args.object = key; + args.method = minio::http::Method::kPut; + args.expiry_seconds = expiry_seconds; + + minio::s3::GetPresignedObjectUrlResponse resp = c->GetPresignedObjectUrl(args); + if (!resp) { + throw std::runtime_error("S3 PresignPut failed: " + resp.Error().String()); + } + return resp.url; +} diff --git a/src/s3_client.hpp b/src/s3_client.hpp new file mode 100644 index 00000000..7babae25 --- /dev/null +++ b/src/s3_client.hpp @@ -0,0 +1,63 @@ +#pragma once + +#include +#include +#include +#include +#include +#include + +// Thin wrapper over AWS SDK for C++ (S3 only). Credentials and SigV4 come from +// the SDK — no hand-rolled signing. + +class S3Client { +public: + struct Config { + std::string endpoint; // e.g. http://minio:9000 + std::string region; // e.g. us-east-1 + std::string bucket; + std::string access_key; + std::string secret_key; + }; + + explicit S3Client(Config cfg); + ~S3Client(); + + S3Client(const S3Client&) = delete; + S3Client& operator=(const S3Client&) = delete; + + static Config from_env(); + + const std::string& bucket() const { return cfg_.bucket; } + + // Stream upload. `body` must yield exactly `size_bytes` bytes. + void put_object(const std::string& key, + std::istream& body, + std::int64_t size_bytes, + const std::string& content_type); + + // Stream download into `out` (chunked reads from SDK body stream). + void get_object(const std::string& key, std::ostream& out); + + // Stream download with a consumer callback (chunk, size). Returns total bytes. + std::int64_t get_object(const std::string& key, + const std::function& on_chunk); + + void delete_object(const std::string& key); + + // HeadObject-style metadata. Returns false if the object does not exist. + bool stat_object(const std::string& key, std::int64_t& size_bytes, + std::string& etag); + + // Presigned PUT URL via minio-cpp (SigV4). Optional required Content-Type + // is bound into the signature when non-empty. + // expiry_seconds: typically 60–600 for Track 1. + std::string presign_put(const std::string& key, + unsigned expiry_seconds, + const std::string& content_type); + +private: + struct Impl; + Config cfg_; + std::unique_ptr impl_; +}; diff --git a/src/session_repo.cpp b/src/session_repo.cpp new file mode 100644 index 00000000..28f1edbb --- /dev/null +++ b/src/session_repo.cpp @@ -0,0 +1,87 @@ +#include "session_repo.hpp" +#include "errors.hpp" + +#include + +#include +#include +#include +#include + +namespace { + +std::string random_token_hex() { + unsigned char buf[32]; + randombytes_buf(buf, sizeof(buf)); + static const char hex[] = "0123456789abcdef"; + std::string out; + out.resize(sizeof(buf) * 2); + for (std::size_t i = 0; i < sizeof(buf); ++i) { + out[i * 2] = hex[buf[i] >> 4]; + out[i * 2 + 1] = hex[buf[i] & 0x0f]; + } + return out; +} + +std::int64_t now_unix() { + return static_cast(std::time(nullptr)); +} + +redisReply* check_reply(redisContext* c, redisReply* r) { + if (r == nullptr) { + const std::string err = c->err ? c->errstr : "no reply"; + throw DependencyUnavailable("redis command failed: " + err); + } + return r; +} + +} + +ISessionRepo::Created SessionRepo::create(const std::string& user_id) { + const std::string token = random_token_hex(); + const std::int64_t exp = now_unix() + ttl_; + + auto lease = pool_.acquire(); + redisContext* c = lease.ctx(); + + redisReply* r = static_cast( + redisCommand(c, "SET session:%s %s EX %d", + token.c_str(), user_id.c_str(), ttl_)); + check_reply(c, r); + const bool ok = (r->type == REDIS_REPLY_STATUS); + freeReplyObject(r); + if (!ok) { + throw std::runtime_error("redis SET returned non-status"); + } + + return Created{token, exp}; +} + +std::optional SessionRepo::lookup(const std::string& token) { + auto lease = pool_.acquire(); + redisContext* c = lease.ctx(); + + redisReply* r = static_cast( + redisCommand(c, "GET session:%s", token.c_str())); + check_reply(c, r); + + std::optional out; + if (r->type == REDIS_REPLY_STRING) { + out = std::string(r->str, r->len); + } + freeReplyObject(r); + return out; +} + +bool SessionRepo::revoke(const std::string& token) { + auto lease = pool_.acquire(); + redisContext* c = lease.ctx(); + + redisReply* r = static_cast( + redisCommand(c, "DEL session:%s", token.c_str())); + check_reply(c, r); + + const bool existed = (r->type == REDIS_REPLY_INTEGER && r->integer == 1); + freeReplyObject(r); + return existed; +} \ No newline at end of file diff --git a/src/session_repo.hpp b/src/session_repo.hpp new file mode 100644 index 00000000..550eae6b --- /dev/null +++ b/src/session_repo.hpp @@ -0,0 +1,18 @@ +#pragma once + +#include "redis_pool.hpp" +#include "session_repo_base.hpp" + +class SessionRepo : public ISessionRepo { +public: + SessionRepo(RedisPool& pool, int ttl_seconds) + : pool_(pool), ttl_(ttl_seconds) {} + + Created create(const std::string& user_id) override; + std::optional lookup(const std::string& token) override; + bool revoke(const std::string& token) override; + +private: + RedisPool& pool_; + int ttl_; +}; \ No newline at end of file diff --git a/src/session_repo_base.hpp b/src/session_repo_base.hpp new file mode 100644 index 00000000..4a685ba2 --- /dev/null +++ b/src/session_repo_base.hpp @@ -0,0 +1,22 @@ +#pragma once + +#include +#include +#include + + +class ISessionRepo { +public: + virtual ~ISessionRepo() = default; + + struct Created { + std::string token; + std::int64_t expires_at; // unix-время в секундах UTC + }; + + virtual Created create(const std::string& user_id) = 0; + + virtual std::optional lookup(const std::string& token) = 0; + + virtual bool revoke(const std::string& token) = 0; +}; \ No newline at end of file diff --git a/src/user_repo.cpp b/src/user_repo.cpp new file mode 100644 index 00000000..2cc4bc9c --- /dev/null +++ b/src/user_repo.cpp @@ -0,0 +1,100 @@ +#include "user_repo.hpp" + +#include + +#include +#include +#include +#include +#include +#include + +namespace { + +std::string make_uuid() { + static std::mt19937_64 rng{std::random_device{}()}; + std::uniform_int_distribution d16(0, 0xffff); + std::uniform_int_distribution d32(0, 0xffffffffu); + std::ostringstream out; + out << std::hex << std::setfill('0'); + out << std::setw(8) << d32(rng); + out << '-' << std::setw(4) << d16(rng); + out << '-' << std::setw(4) << ((d16(rng) & 0x0fff) | 0x4000); + out << '-' << std::setw(4) << ((d16(rng) & 0x3fff) | 0x8000); + out << '-' << std::setw(4) << d16(rng) << std::setw(8) << d32(rng); + return out.str(); +} + +std::string epoch_to_rfc3339(long long epoch) { + const std::time_t t = static_cast(epoch); + std::tm tm{}; + gmtime_r(&t, &tm); + std::ostringstream out; + out << std::put_time(&tm, "%Y-%m-%dT%H:%M:%SZ"); + return out.str(); +} + +std::string now_epoch_str() { + const auto now = std::chrono::system_clock::now(); + const auto secs = std::chrono::duration_cast( + now.time_since_epoch()).count(); + return std::to_string(secs); +} + +User row_to_user(const pqxx::row& r) { + User u; + u.id = r["id"].as(); + u.username = r["username"].as(); + u.display_name = r["display_name"].as(); + u.password_hash = r["password_hash"].as(); + u.created_at = epoch_to_rfc3339(r["created_at_epoch"].as()); + return u; +} + +constexpr const char* kUserColumns = + "id, username, display_name, password_hash, " + "EXTRACT(EPOCH FROM created_at)::bigint AS created_at_epoch"; + +} + +std::optional UserRepo::create(const std::string& username, + const std::string& display_name, + const std::string& password_hash) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + try { + const std::string id = make_uuid(); + auto r = tx.exec( + "INSERT INTO users (id, username, display_name, password_hash, created_at) " + "VALUES ($1, $2, $3, $4, to_timestamp($5::bigint)) " + "RETURNING " + std::string(kUserColumns), + pqxx::params{id, username, display_name, password_hash, now_epoch_str()}); + tx.commit(); + return row_to_user(r[0]); + } catch (const pqxx::unique_violation&) { + tx.abort(); + return std::nullopt; + } +} + +std::optional UserRepo::find_by_id(const std::string& id) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto r = tx.exec( + "SELECT " + std::string(kUserColumns) + " FROM users WHERE id = $1", + pqxx::params{id}); + tx.commit(); + if (r.empty()) return std::nullopt; + return row_to_user(r[0]); +} + +std::optional UserRepo::find_by_username(const std::string& username) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + auto r = tx.exec( + "SELECT " + std::string(kUserColumns) + " FROM users WHERE username = $1", + pqxx::params{username}); + tx.commit(); + if (r.empty()) return std::nullopt; + return row_to_user(r[0]); +} \ No newline at end of file diff --git a/src/user_repo.hpp b/src/user_repo.hpp new file mode 100644 index 00000000..b8cbada2 --- /dev/null +++ b/src/user_repo.hpp @@ -0,0 +1,22 @@ +#pragma once + +#include "db.hpp" +#include "models.hpp" + +#include +#include + +class UserRepo { +public: + explicit UserRepo(PgPool& pool) : pool_(pool) {} + + std::optional create(const std::string& username, + const std::string& display_name, + const std::string& password_hash); + + std::optional find_by_id(const std::string& id); + std::optional find_by_username(const std::string& username); + +private: + PgPool& pool_; +}; \ No newline at end of file diff --git a/student-tests/lib.sh b/student-tests/lib.sh new file mode 100755 index 00000000..ac005902 --- /dev/null +++ b/student-tests/lib.sh @@ -0,0 +1,100 @@ +#!/bin/sh +# Shared helpers for student-tests/*.sh (curl + jq only). +# Usage: . "$(dirname "$0")/lib.sh" + +set -eu + +BASE_URL="${BASE_URL:-http://127.0.0.1:8080}" +PASS="${STUDENT_TEST_PASSWORD:-Student-test-password-1}" +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +FIXTURES="$ROOT/tools/fixtures" + +die() { + printf '%s\n' "$*" >&2 + exit 1 +} + +need() { + command -v "$1" >/dev/null 2>&1 || die "missing dependency: $1" +} + +need curl +need jq +need sha256sum +need python3 + +uniq_name() { + printf '%s_%s' "$1" "$(python3 -c 'import uuid; print(uuid.uuid4().hex[:12])')" +} + +# http_json METHOD PATH [curl args...] +# Sets: HTTP_CODE, HTTP_BODY, HTTP_HDRS +http_json() { + method=$1 + path=$2 + shift 2 + hdr=$(mktemp) + body=$(mktemp) + code=$(curl -sS -m 60 -o "$body" -D "$hdr" -w '%{http_code}' \ + -X "$method" "$BASE_URL$path" "$@") || { + rm -f "$hdr" "$body" + die "curl failed: $method $path" + } + HTTP_CODE=$code + HTTP_BODY=$(cat "$body") + HTTP_HDRS=$(cat "$hdr") + rm -f "$hdr" "$body" +} + +expect_code() { + want=$1 + [ "$HTTP_CODE" = "$want" ] || die "expected HTTP $want got $HTTP_CODE body=$HTTP_BODY" +} + +register_user() { + label=$1 + user=$(uniq_name "$label") + http_json POST /api/v1/users \ + -H 'Content-Type: application/json' \ + -d "{\"username\":\"$user\",\"display_name\":\"$label\",\"password\":\"$PASS\"}" + expect_code 201 + USER_ID=$(printf '%s' "$HTTP_BODY" | jq -r .id) + USERNAME=$user + cred=$(printf '%s' "$USERNAME:$PASS" | python3 -c 'import sys,base64; print(base64.b64encode(sys.stdin.buffer.read()).decode())') + http_json POST /api/v1/auth/sessions -H "Authorization: Basic $cred" + expect_code 201 + TOKEN=$(printf '%s' "$HTTP_BODY" | jq -r .token) + [ -n "$TOKEN" ] && [ "$TOKEN" != null ] || die "empty token" +} + +create_chat() { + title=${1:-test} + member_json=$2 + http_json POST /api/v1/chats \ + -H "Authorization: Bearer $TOKEN" \ + -H 'Content-Type: application/json' \ + -d "{\"title\":\"$title\",\"member_ids\":$member_json}" + expect_code 201 + CHAT_ID=$(printf '%s' "$HTTP_BODY" | jq -r .id) +} + +upload_file() { + chat_id=$1 + file=$2 + filename=$3 + ctype=$4 + http_json POST "/api/v1/chats/$chat_id/attachments?filename=$filename" \ + -H "Authorization: Bearer $TOKEN" \ + -H "Content-Type: $ctype" \ + --data-binary @"$file" +} + +sha256_file() { + sha256sum "$1" | awk '{print $1}' +} + +assert_eq() { + [ "$1" = "$2" ] || die "assert_eq failed: '$1' != '$2'${3:+ ($3)}" +} + +printf 'lib.sh: BASE_URL=%s\n' "$BASE_URL" >&2 diff --git a/student-tests/run_grade3.sh b/student-tests/run_grade3.sh new file mode 100755 index 00000000..5c0b0abf --- /dev/null +++ b/student-tests/run_grade3.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# Run grade-3 attachment student tests (+ drain / compensation dry-run). +set -eu +DIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd) +ROOT=$(CDPATH= cd -- "$DIR/.." && pwd) + +for t in \ + test_attachment_upload_ok.sh \ + test_attachment_too_large.sh \ + test_attachment_corrupted.sh \ + test_attachment_mime_spoof.sh \ + test_attachment_foreign.sh \ + test_attachment_wrong_chat.sh \ + test_graceful_drain.sh +do + echo "=== $t ===" + sh "$DIR/$t" +done + +echo "=== tools/gc_orphans.sh (dry-run) ===" +sh "$ROOT/tools/gc_orphans.sh" + +echo "ALL grade3 student-tests PASS" diff --git a/student-tests/run_grade4.sh b/student-tests/run_grade4.sh new file mode 100755 index 00000000..140a338e --- /dev/null +++ b/student-tests/run_grade4.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu +DIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd) +ROOT=$(CDPATH= cd -- "$DIR/.." && pwd) + +echo "=== tests/check_bucket_private.sh ===" +sh "$ROOT/tests/check_bucket_private.sh" + +echo "=== test_attachment_limited_creds.sh ===" +sh "$DIR/test_attachment_limited_creds.sh" + +# Load before persistence: restart cools cgroup RSS accounting and makes +# docker-stats delta noisy right after recreate. +echo "=== scripts/load_uploads.sh ===" +sh "$ROOT/scripts/load_uploads.sh" + +echo "=== test_attachment_persistence.sh ===" +sh "$DIR/test_attachment_persistence.sh" + +echo "ALL grade4 student-tests PASS" diff --git a/student-tests/run_grade5_track1.sh b/student-tests/run_grade5_track1.sh new file mode 100755 index 00000000..24144ac5 --- /dev/null +++ b/student-tests/run_grade5_track1.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# Grade 5 / Track 1: direct (presigned) upload + proxy still green. +set -eu +DIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd) + +echo "=== test_direct_upload_ok.sh ===" +sh "$DIR/test_direct_upload_ok.sh" + +echo "=== test_direct_upload_negatives.sh ===" +sh "$DIR/test_direct_upload_negatives.sh" + +echo "=== tools/gc_direct_uploads.sh (dry-run) ===" +sh "$DIR/../tools/gc_direct_uploads.sh" + +echo "ALL grade5 track1 student-tests PASS" diff --git a/student-tests/test_attachment_corrupted.sh b/student-tests/test_attachment_corrupted.sh new file mode 100755 index 00000000..28d3d4c6 --- /dev/null +++ b/student-tests/test_attachment_corrupted.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# Truncated / corrupt PNG → 415 (not 500). +set -eu +. "$(dirname "$0")/lib.sh" + +register_user alice +create_chat 'corrupt' "[\"$USER_ID\"]" + +bad=$(mktemp) +# PNG magic + IHDR-looking garbage, truncated — fails stbi decode. +printf '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x01\x00\x00\x00\x01\x00\x08\x02\x00\x00\x00' > "$bad" + +upload_file "$CHAT_ID" "$bad" 'broken.png' 'image/png' +rm -f "$bad" +expect_code 415 +code=$(printf '%s' "$HTTP_BODY" | jq -r .error.code) +assert_eq "$code" unsupported_media_type error_code + +printf 'PASS test_attachment_corrupted\n' diff --git a/student-tests/test_attachment_foreign.sh b/student-tests/test_attachment_foreign.sh new file mode 100755 index 00000000..eb6ad402 --- /dev/null +++ b/student-tests/test_attachment_foreign.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Non-member → 404 on GET metadata and /content (no leak). +set -eu +. "$(dirname "$0")/lib.sh" + +png="$FIXTURES/tiny.png" +[ -f "$png" ] || die "missing fixture $png" + +register_user alice +ALICE_ID=$USER_ID +ALICE_TOK=$TOKEN +register_user eve +EVE_TOK=$TOKEN + +TOKEN=$ALICE_TOK +create_chat 'foreign' "[\"$ALICE_ID\"]" +upload_file "$CHAT_ID" "$png" 'tiny.png' 'image/png' +expect_code 201 +AID=$(printf '%s' "$HTTP_BODY" | jq -r .id) + +http_json GET "/api/v1/attachments/$AID" -H "Authorization: Bearer $EVE_TOK" +expect_code 404 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .error.code)" not_found meta + +http_json GET "/api/v1/attachments/$AID/content" -H "Authorization: Bearer $EVE_TOK" +expect_code 404 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .error.code)" not_found content + +http_json GET "/api/v1/attachments/$AID" +expect_code 401 + +printf 'PASS test_attachment_foreign\n' diff --git a/student-tests/test_attachment_limited_creds.sh b/student-tests/test_attachment_limited_creds.sh new file mode 100755 index 00000000..131cfd4a --- /dev/null +++ b/student-tests/test_attachment_limited_creds.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# Grade 4: API uses limited S3 user via *_FILE secrets, not MinIO root. +set -eu +. "$(dirname "$0")/lib.sh" + +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" + +# API process env must expose limited-key secret paths, never root password vars. +env_dump=$($COMPOSE exec -T api sh -c 'env' | sort) + +printf '%s\n' "$env_dump" | grep -q '^S3_ACCESS_KEY_ID_FILE=' \ + || die "API missing S3_ACCESS_KEY_ID_FILE" +printf '%s\n' "$env_dump" | grep -q '^S3_SECRET_ACCESS_KEY_FILE=' \ + || die "API missing S3_SECRET_ACCESS_KEY_FILE" + +# Root MinIO credentials must not be injected into the API container. +if printf '%s\n' "$env_dump" | grep -E '^(MINIO_ROOT_USER|MINIO_ROOT_PASSWORD)=' >/dev/null; then + die "API container has MinIO root credentials in env" +fi + +# Secret file contents must differ from root user (compare access key id only). +api_key=$($COMPOSE exec -T api sh -c 'cat "$S3_ACCESS_KEY_ID_FILE"' | tr -d '\r\n') +root_user=$(grep -E '^MINIO_ROOT_USER=' "$ROOT/.env" | head -n1 | cut -d= -f2- | tr -d '\r\n"') +[ -n "$api_key" ] || die "empty limited access key" +[ -n "$root_user" ] || die "MINIO_ROOT_USER missing in .env" +[ "$api_key" != "$root_user" ] || die "API S3 access key equals MinIO root user" + +# Limited user cannot delete the bucket (admin action) — policy is object-scoped. +# Probe via mc with the limited credentials from secrets (same values as API). +lim_key=$api_key +lim_secret=$($COMPOSE exec -T api sh -c 'cat "$S3_SECRET_ACCESS_KEY_FILE"' | tr -d '\r\n') +bucket=$($COMPOSE exec -T api sh -c 'printf %s "$S3_BUCKET"') + +out=$($COMPOSE run --rm --no-deps \ + -e LIM_KEY="$lim_key" -e LIM_SECRET="$lim_secret" -e S3_BUCKET="$bucket" \ + --entrypoint /bin/sh minio-init -c ' + set +e + mc alias set lim "$S3_ENDPOINT" "$LIM_KEY" "$LIM_SECRET" >/dev/null + mc rb --force "lim/$S3_BUCKET" 2>/tmp/rb.err + rc=$? + cat /tmp/rb.err + exit $rc +' 2>&1) || true + +printf '%s\n' "$out" | grep -qiE 'AccessDenied|denied|not allowed|InvalidAccessKeyId|error' \ + || die "expected AccessDenied on bucket delete by limited user; out=$out" + +# Positive: limited user can still PutObject (smoke via API upload). +png="$FIXTURES/tiny.png" +register_user alice +create_chat 'creds' "[\"$USER_ID\"]" +upload_file "$CHAT_ID" "$png" 'tiny.png' 'image/png' +expect_code 201 + +printf 'PASS test_attachment_limited_creds\n' diff --git a/student-tests/test_attachment_mime_spoof.sh b/student-tests/test_attachment_mime_spoof.sh new file mode 100755 index 00000000..64f4698a --- /dev/null +++ b/student-tests/test_attachment_mime_spoof.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# JPEG bytes with Content-Type: image/png → 415 (content wins over header). +set -eu +. "$(dirname "$0")/lib.sh" + +jpg="$FIXTURES/tiny.jpg" +[ -f "$jpg" ] || die "missing fixture $jpg" + +register_user alice +create_chat 'mime-spoof' "[\"$USER_ID\"]" + +upload_file "$CHAT_ID" "$jpg" 'spoof.png' 'image/png' +expect_code 415 +code=$(printf '%s' "$HTTP_BODY" | jq -r .error.code) +assert_eq "$code" unsupported_media_type error_code + +printf 'PASS test_attachment_mime_spoof\n' diff --git a/student-tests/test_attachment_persistence.sh b/student-tests/test_attachment_persistence.sh new file mode 100755 index 00000000..5f2fd008 --- /dev/null +++ b/student-tests/test_attachment_persistence.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Grade 4: upload → restart API replicas (volumes kept) → download same bytes. +set -eu +. "$(dirname "$0")/lib.sh" + +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" +png="$FIXTURES/320x200.png" +[ -f "$png" ] || die "missing $png" +want_sha=$(sha256_file "$png") + +register_user alice +ALICE_ID=$USER_ID +create_chat 'persist' "[\"$ALICE_ID\"]" +upload_file "$CHAT_ID" "$png" 'sample.png' 'image/png' +expect_code 201 +AID=$(printf '%s' "$HTTP_BODY" | jq -r .id) +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .sha256)" "$want_sha" upload_sha + +# Restart only API (and LB); keep pgdata + miniodata. +$COMPOSE restart api +# Wait for both replicas healthy + LB ready. +i=0 +while [ "$i" -lt 60 ]; do + http_json GET /health/ready || true + if [ "${HTTP_CODE:-}" = "200" ]; then + break + fi + i=$((i + 1)) + sleep 1 +done +[ "${HTTP_CODE:-}" = "200" ] || die "stack not ready after api restart" + +# Session may still be in Redis (AOF); reuse token. +http_json GET "/api/v1/attachments/$AID" -H "Authorization: Bearer $TOKEN" +expect_code 200 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .sha256)" "$want_sha" meta_sha + +out=$(mktemp) +code=$(curl -sS -m 60 -o "$out" -w '%{http_code}' \ + -H "Authorization: Bearer $TOKEN" \ + "$BASE_URL/api/v1/attachments/$AID/content") +assert_eq "$code" 200 content_status +assert_eq "$(sha256_file "$out")" "$want_sha" content_sha +rm -f "$out" + +printf 'PASS test_attachment_persistence\n' diff --git a/student-tests/test_attachment_too_large.sh b/student-tests/test_attachment_too_large.sh new file mode 100755 index 00000000..eded5e99 --- /dev/null +++ b/student-tests/test_attachment_too_large.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# Grade 4 criteria (negative): 11 MiB body → 413 payload_too_large (not 500). +set -eu +. "$(dirname "$0")/lib.sh" + +register_user alice +create_chat 'too-large' "[\"$USER_ID\"]" + +big=$(mktemp) +# Valid PNG magic + padding to 11 MiB so Content-Length triggers early reject. +dd if=/dev/zero of="$big" bs=1M count=11 status=none +# Prepend PNG signature so it's not rejected as empty before size check. +printf '\x89PNG\r\n\x1a\n' | dd of="$big" conv=notrunc status=none 2>/dev/null || true + +upload_file "$CHAT_ID" "$big" 'huge.png' 'image/png' +rm -f "$big" +expect_code 413 +code=$(printf '%s' "$HTTP_BODY" | jq -r .error.code) +assert_eq "$code" payload_too_large error_code + +printf 'PASS test_attachment_too_large\n' diff --git a/student-tests/test_attachment_upload_ok.sh b/student-tests/test_attachment_upload_ok.sh new file mode 100755 index 00000000..59bc473f --- /dev/null +++ b/student-tests/test_attachment_upload_ok.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# Grade 3: PNG 320×200 → 201 ready → download bytes match sha256; message with attachment_ids. +set -eu +. "$(dirname "$0")/lib.sh" + +png="$FIXTURES/320x200.png" +[ -f "$png" ] || die "missing fixture $png" +want_sha=$(sha256_file "$png") +want_size=$(wc -c < "$png" | tr -d ' ') + +register_user alice +ALICE_ID=$USER_ID +ALICE_TOK=$TOKEN +register_user bob +BOB_ID=$USER_ID +BOB_TOK=$TOKEN + +TOKEN=$ALICE_TOK +create_chat 'upload-ok' "[\"$ALICE_ID\",\"$BOB_ID\"]" + +upload_file "$CHAT_ID" "$png" 'sample.png' 'image/png' +expect_code 201 +AID=$(printf '%s' "$HTTP_BODY" | jq -r .id) +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .status)" ready status +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .content_type)" image/png ctype +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .sha256)" "$want_sha" sha256 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .size_bytes)" "$want_size" size +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .error_code)" null error_code +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -c .variants)" '[]' variants + +http_json POST "/api/v1/chats/$CHAT_ID/messages" \ + -H "Authorization: Bearer $ALICE_TOK" \ + -H 'Content-Type: application/json' \ + -H "Idempotency-Key: $(uniq_name idem)" \ + -d "{\"text\":\"\",\"attachment_ids\":[\"$AID\"]}" +expect_code 201 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -c .attachment_ids)" "[\"$AID\"]" msg_atts + +out=$(mktemp) +curl -sS -m 60 -o "$out" -w '%{http_code}' \ + -H "Authorization: Bearer $BOB_TOK" \ + "$BASE_URL/api/v1/attachments/$AID/content" > /tmp/att_dl.code +assert_eq "$(cat /tmp/att_dl.code)" 200 download_status +got_sha=$(sha256_file "$out") +assert_eq "$got_sha" "$want_sha" download_sha256 +rm -f "$out" /tmp/att_dl.code + +printf 'PASS test_attachment_upload_ok\n' diff --git a/student-tests/test_attachment_wrong_chat.sh b/student-tests/test_attachment_wrong_chat.sh new file mode 100755 index 00000000..883ef476 --- /dev/null +++ b/student-tests/test_attachment_wrong_chat.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# attachment_id from another chat in POST messages → 404. +set -eu +. "$(dirname "$0")/lib.sh" + +png="$FIXTURES/tiny.png" +[ -f "$png" ] || die "missing fixture $png" + +register_user alice +ALICE_ID=$USER_ID + +create_chat 'chat-a' "[\"$ALICE_ID\"]" +CHAT_A=$CHAT_ID +upload_file "$CHAT_A" "$png" 'tiny.png' 'image/png' +expect_code 201 +AID=$(printf '%s' "$HTTP_BODY" | jq -r .id) + +create_chat 'chat-b' "[\"$ALICE_ID\"]" +CHAT_B=$CHAT_ID + +http_json POST "/api/v1/chats/$CHAT_B/messages" \ + -H "Authorization: Bearer $TOKEN" \ + -H 'Content-Type: application/json' \ + -H "Idempotency-Key: $(uniq_name idem)" \ + -d "{\"text\":\"hi\",\"attachment_ids\":[\"$AID\"]}" +expect_code 404 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .error.code)" not_found + +# Empty/whitespace text without attachments → 400 +http_json POST "/api/v1/chats/$CHAT_B/messages" \ + -H "Authorization: Bearer $TOKEN" \ + -H 'Content-Type: application/json' \ + -H "Idempotency-Key: $(uniq_name idem)" \ + -d '{"text":" "}' +expect_code 400 + +printf 'PASS test_attachment_wrong_chat\n' diff --git a/student-tests/test_direct_upload_negatives.sh b/student-tests/test_direct_upload_negatives.sh new file mode 100755 index 00000000..dc1e9309 --- /dev/null +++ b/student-tests/test_direct_upload_negatives.sh @@ -0,0 +1,101 @@ +#!/bin/sh +# Track 1 negatives: bad checksum complete, abort, foreign complete, no PUT. +. "$(dirname "$0")/lib.sh" + +png="$FIXTURES/320x200.png" +[ -f "$png" ] || die "missing fixture $png" +want_sha=$(sha256_file "$png") +want_size=$(wc -c < "$png" | tr -d ' ') +bad_sha=$(printf '%s' "$want_sha" | tr 'a-f0-9' '0-9a-f' | head -c 64) +# ensure different +[ "$bad_sha" != "$want_sha" ] || bad_sha="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + +register_user alice +ALICE_TOKEN=$TOKEN +ALICE_ID=$USER_ID +create_chat "du-neg" "[\"$ALICE_ID\"]" +register_user bob +BOB_TOKEN=$TOKEN +TOKEN=$ALICE_TOKEN + +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" + +put_via_net() { + url=$1 + ct=$2 + file=$3 + code=$($COMPOSE run --rm --no-deps \ + -v "$file:/tmp/up.bin:ro" \ + --entrypoint curl api \ + -sS -m 60 -o /dev/null -w '%{http_code}' \ + -X PUT -H "Content-Type: $ct" --data-binary @/tmp/up.bin \ + "$url") + printf '%s' "$code" +} + +# --- complete without PUT --- +http_json POST "/api/v1/chats/$CHAT_ID/direct-uploads" \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + -H 'Content-Type: application/json' \ + -d "{\"filename\":\"a.png\",\"content_type\":\"image/png\",\"size_bytes\":$want_size,\"sha256\":\"$want_sha\"}" +expect_code 201 +ID1=$(printf '%s' "$HTTP_BODY" | jq -r .id) +http_json POST "/api/v1/direct-uploads/$ID1/complete" \ + -H "Authorization: Bearer $ALICE_TOKEN" +expect_code 400 + +# --- abort --- +http_json POST "/api/v1/chats/$CHAT_ID/direct-uploads" \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + -H 'Content-Type: application/json' \ + -d "{\"filename\":\"b.png\",\"content_type\":\"image/png\",\"size_bytes\":$want_size,\"sha256\":\"$want_sha\"}" +expect_code 201 +ID2=$(printf '%s' "$HTTP_BODY" | jq -r .id) +URL2=$(printf '%s' "$HTTP_BODY" | jq -r .upload_url) +CT2=$(printf '%s' "$HTTP_BODY" | jq -r '.headers["Content-Type"]') +put_code=$(put_via_net "$URL2" "$CT2" "$png") +[ "$put_code" = "200" ] || die "PUT abort-case got $put_code" +http_json DELETE "/api/v1/direct-uploads/$ID2" \ + -H "Authorization: Bearer $ALICE_TOKEN" +expect_code 204 +http_json POST "/api/v1/direct-uploads/$ID2/complete" \ + -H "Authorization: Bearer $ALICE_TOKEN" +expect_code 409 + +# --- foreign owner --- +http_json POST "/api/v1/chats/$CHAT_ID/direct-uploads" \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + -H 'Content-Type: application/json' \ + -d "{\"filename\":\"c.png\",\"content_type\":\"image/png\",\"size_bytes\":$want_size,\"sha256\":\"$want_sha\"}" +expect_code 201 +ID3=$(printf '%s' "$HTTP_BODY" | jq -r .id) +URL3=$(printf '%s' "$HTTP_BODY" | jq -r .upload_url) +CT3=$(printf '%s' "$HTTP_BODY" | jq -r '.headers["Content-Type"]') +put_code=$(put_via_net "$URL3" "$CT3" "$png") +[ "$put_code" = "200" ] || die "PUT foreign-case got $put_code" +http_json POST "/api/v1/direct-uploads/$ID3/complete" \ + -H "Authorization: Bearer $BOB_TOKEN" +expect_code 404 + +# --- checksum mismatch (declared sha ≠ bytes) --- +http_json POST "/api/v1/chats/$CHAT_ID/direct-uploads" \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + -H 'Content-Type: application/json' \ + -d "{\"filename\":\"d.png\",\"content_type\":\"image/png\",\"size_bytes\":$want_size,\"sha256\":\"$bad_sha\"}" +expect_code 201 +ID4=$(printf '%s' "$HTTP_BODY" | jq -r .id) +URL4=$(printf '%s' "$HTTP_BODY" | jq -r .upload_url) +CT4=$(printf '%s' "$HTTP_BODY" | jq -r '.headers["Content-Type"]') +put_code=$(put_via_net "$URL4" "$CT4" "$png") +[ "$put_code" = "200" ] || die "PUT checksum-case got $put_code" +http_json POST "/api/v1/direct-uploads/$ID4/complete" \ + -H "Authorization: Bearer $ALICE_TOKEN" +expect_code 400 + +# Proxy path still works +upload_file "$CHAT_ID" "$png" "proxy.png" "image/png" +expect_code 201 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .status)" "ready" proxy_still_ok + +echo "PASS test_direct_upload_negatives" diff --git a/student-tests/test_direct_upload_ok.sh b/student-tests/test_direct_upload_ok.sh new file mode 100755 index 00000000..85096aa5 --- /dev/null +++ b/student-tests/test_direct_upload_ok.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# Track 1: initiate → PUT to MinIO (compose network) → complete → download. +. "$(dirname "$0")/lib.sh" + +png="$FIXTURES/320x200.png" +[ -f "$png" ] || die "missing fixture $png" +want_sha=$(sha256_file "$png") +want_size=$(wc -c < "$png" | tr -d ' ') + +register_user alice +ALICE_TOKEN=$TOKEN +ALICE_ID=$USER_ID +create_chat "du-ok" "[\"$ALICE_ID\"]" + +http_json POST "/api/v1/chats/$CHAT_ID/direct-uploads" \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + -H 'Content-Type: application/json' \ + -d "{\"filename\":\"photo.png\",\"content_type\":\"image/png\",\"size_bytes\":$want_size,\"sha256\":\"$want_sha\"}" +expect_code 201 +UPLOAD_ID=$(printf '%s' "$HTTP_BODY" | jq -r .id) +UPLOAD_URL=$(printf '%s' "$HTTP_BODY" | jq -r .upload_url) +CT=$(printf '%s' "$HTTP_BODY" | jq -r '.headers["Content-Type"]') +[ -n "$UPLOAD_ID" ] && [ "$UPLOAD_ID" != null ] || die "empty upload id" +[ -n "$UPLOAD_URL" ] && [ "$UPLOAD_URL" != null ] || die "empty upload_url" +assert_eq "$CT" "image/png" content_type_header + +# PUT bytes on the compose network (MinIO ports stay unpublished by default). +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" +$COMPOSE run --rm --no-deps \ + -v "$png:/tmp/up.bin:ro" \ + --entrypoint curl api \ + -sS -m 60 -o /dev/null -w '%{http_code}' \ + -X PUT -H "Content-Type: $CT" --data-binary @/tmp/up.bin \ + "$UPLOAD_URL" > /tmp/du_put_code.$$ +put_code=$(cat /tmp/du_put_code.$$) +rm -f /tmp/du_put_code.$$ +[ "$put_code" = "200" ] || die "presigned PUT expected 200 got $put_code" + +http_json POST "/api/v1/direct-uploads/$UPLOAD_ID/complete" \ + -H "Authorization: Bearer $ALICE_TOKEN" +expect_code 201 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .status)" "ready" status +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .sha256)" "$want_sha" sha256 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .id)" "$UPLOAD_ID" attachment_id + +out=$(mktemp) +curl -sS -m 60 -o "$out" -H "Authorization: Bearer $ALICE_TOKEN" \ + "$BASE_URL/api/v1/attachments/$UPLOAD_ID/content" +assert_eq "$(sha256_file "$out")" "$want_sha" download_sha256 +rm -f "$out" + +echo "PASS test_direct_upload_ok" diff --git a/student-tests/test_graceful_drain.sh b/student-tests/test_graceful_drain.sh new file mode 100755 index 00000000..851d2370 --- /dev/null +++ b/student-tests/test_graceful_drain.sh @@ -0,0 +1,50 @@ +#!/bin/sh +# Graceful shutdown: SIGTERM → /health/ready becomes 503 while process drains. +# Targets one API container; restores it at the end. +set -eu +. "$(dirname "$0")/lib.sh" + +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" + +cid=$($COMPOSE ps -q api | head -n1) +[ -n "$cid" ] || die "no api container" + +# Confirm ready before drain. +http_json GET /health/ready +expect_code 200 + +# docker stop → SIGTERM to PID1 (messenger after entrypoint exec). +# Probe the draining instance directly (LB may still hit the other replica). +docker stop -t 15 "$cid" >/dev/null & +stop_pid=$! + +saw_drain=0 +i=0 +while [ "$i" -lt 40 ]; do + code=$(docker exec "$cid" curl -sS -m 2 -o /dev/null -w '%{http_code}' \ + http://127.0.0.1:8080/health/ready 2>/dev/null || printf '000') + if [ "$code" = "503" ] || [ "$code" = "000" ]; then + saw_drain=1 + break + fi + i=$((i + 1)) + sleep 0.25 +done +wait "$stop_pid" || true +[ "$saw_drain" = "1" ] || die "did not observe drain/stop (last code=${code:-none})" + +# Restore replicas. +$COMPOSE up -d --no-deps api >/dev/null +j=0 +HTTP_CODE=000 +while [ "$j" -lt 40 ]; do + http_json GET /health/ready || true + if [ "${HTTP_CODE:-}" = "200" ]; then + break + fi + j=$((j + 1)) + sleep 1 +done +[ "${HTTP_CODE:-}" = "200" ] || die "stand not ready after recreate" + +printf 'PASS test_graceful_drain\n' diff --git a/tests/check_bucket_private.sh b/tests/check_bucket_private.sh new file mode 100755 index 00000000..ab03e0af --- /dev/null +++ b/tests/check_bucket_private.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# Grade 4: private bucket + MinIO ports not published on the host. +set -eu + +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" + +S3_BUCKET=$($COMPOSE exec -T api sh -c 'printf %s "$S3_BUCKET"') +[ -n "$S3_BUCKET" ] || { echo "S3_BUCKET empty" >&2; exit 1; } + +KEY=$($COMPOSE exec -T db sh -c \ + 'psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Atc "SELECT s3_key FROM attachments LIMIT 1"' \ + | tr -d '\r') +if [ -z "$KEY" ]; then + KEY="attachments/does-not-exist/probe" +fi + +echo "check_bucket_private: unsigned GET s3://$S3_BUCKET/$KEY" + +code=$($COMPOSE run --rm --no-deps --entrypoint /bin/sh minio-init -c \ + "curl -sS -o /tmp/body -w '%{http_code}' -m 10 \"http://minio:9000/$S3_BUCKET/$KEY\" || echo 000") + +echo "unsigned GET → HTTP $code" +[ "$code" != "200" ] || { echo "FAIL: bucket appears public" >&2; exit 1; } +[ "$code" != "000" ] || { echo "FAIL: cannot reach minio on compose network" >&2; exit 1; } + +for port in 9000 9001; do + if curl -sS -m 2 -o /dev/null "http://127.0.0.1:$port/" 2>/dev/null; then + echo "FAIL: host :$port is reachable" >&2 + exit 1 + fi + echo "ok: host :$port not published" +done + +echo "PASS check_bucket_private" diff --git a/third_party/stb/README.md b/third_party/stb/README.md new file mode 100644 index 00000000..a12cd42c --- /dev/null +++ b/third_party/stb/README.md @@ -0,0 +1,5 @@ +# stb (vendored) + +`stb_image.h` from [nothings/stb](https://github.com/nothings/stb). + +Pinned commit: see `VERSION`. diff --git a/third_party/stb/VERSION b/third_party/stb/VERSION new file mode 100644 index 00000000..adcd1f5a --- /dev/null +++ b/third_party/stb/VERSION @@ -0,0 +1 @@ +013ac3beddff3dbffafd5177e7972067cd2b5083 diff --git a/third_party/stb/stb_image.h b/third_party/stb/stb_image.h new file mode 100644 index 00000000..9eedabed --- /dev/null +++ b/third_party/stb/stb_image.h @@ -0,0 +1,7988 @@ +/* stb_image - v2.30 - public domain image loader - http://nothings.org/stb + no warranty implied; use at your own risk + + Do this: + #define STB_IMAGE_IMPLEMENTATION + before you include this file in *one* C or C++ file to create the implementation. + + // i.e. it should look like this: + #include ... + #include ... + #include ... + #define STB_IMAGE_IMPLEMENTATION + #include "stb_image.h" + + You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. + And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free + + + QUICK NOTES: + Primarily of interest to game developers and other people who can + avoid problematic images and only need the trivial interface + + JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) + PNG 1/2/4/8/16-bit-per-channel + + TGA (not sure what subset, if a subset) + BMP non-1bpp, non-RLE + PSD (composited view only, no extra channels, 8/16 bit-per-channel) + + GIF (*comp always reports as 4-channel) + HDR (radiance rgbE format) + PIC (Softimage PIC) + PNM (PPM and PGM binary only) + + Animated GIF still needs a proper API, but here's one way to do it: + http://gist.github.com/urraka/685d9a6340b26b830d49 + + - decode from memory or through FILE (define STBI_NO_STDIO to remove code) + - decode from arbitrary I/O callbacks + - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) + + Full documentation under "DOCUMENTATION" below. + + +LICENSE + + See end of file for license information. + +RECENT REVISION HISTORY: + + 2.30 (2024-05-31) avoid erroneous gcc warning + 2.29 (2023-05-xx) optimizations + 2.28 (2023-01-29) many error fixes, security errors, just tons of stuff + 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes + 2.26 (2020-07-13) many minor fixes + 2.25 (2020-02-02) fix warnings + 2.24 (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically + 2.23 (2019-08-11) fix clang static analysis warning + 2.22 (2019-03-04) gif fixes, fix warnings + 2.21 (2019-02-25) fix typo in comment + 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs + 2.19 (2018-02-11) fix warning + 2.18 (2018-01-30) fix warnings + 2.17 (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings + 2.16 (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes + 2.15 (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC + 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs + 2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes + 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes + 2.11 (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64 + RGB-format JPEG; remove white matting in PSD; + allocate large structures on the stack; + correct channel count for PNG & BMP + 2.10 (2016-01-22) avoid warning introduced in 2.09 + 2.09 (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED + + See end of file for full revision history. + + + ============================ Contributors ========================= + + Image formats Extensions, features + Sean Barrett (jpeg, png, bmp) Jetro Lauha (stbi_info) + Nicolas Schulz (hdr, psd) Martin "SpartanJ" Golini (stbi_info) + Jonathan Dummer (tga) James "moose2000" Brown (iPhone PNG) + Jean-Marc Lienher (gif) Ben "Disch" Wenger (io callbacks) + Tom Seddon (pic) Omar Cornut (1/2/4-bit PNG) + Thatcher Ulrich (psd) Nicolas Guillemot (vertical flip) + Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD) + github:urraka (animated gif) Junggon Kim (PNM comments) + Christopher Forseth (animated gif) Daniel Gibson (16-bit TGA) + socks-the-fox (16-bit PNG) + Jeremy Sawicki (handle all ImageNet JPGs) + Optimizations & bugfixes Mikhail Morozov (1-bit BMP) + Fabian "ryg" Giesen Anael Seghezzi (is-16-bit query) + Arseny Kapoulkine Simon Breuss (16-bit PNM) + John-Mark Allen + Carmelo J Fdez-Aguera + + Bug & warning fixes + Marc LeBlanc David Woo Guillaume George Martins Mozeiko + Christpher Lloyd Jerry Jansson Joseph Thomson Blazej Dariusz Roszkowski + Phil Jordan Dave Moore Roy Eltham + Hayaki Saito Nathan Reed Won Chun + Luke Graham Johan Duparc Nick Verigakis the Horde3D community + Thomas Ruf Ronny Chevalier github:rlyeh + Janez Zemva John Bartholomew Michal Cichon github:romigrou + Jonathan Blow Ken Hamada Tero Hanninen github:svdijk + Eugene Golushkov Laurent Gomila Cort Stratton github:snagar + Aruelien Pocheville Sergio Gonzalez Thibault Reuille github:Zelex + Cass Everitt Ryamond Barbiero github:grim210 + Paul Du Bois Engin Manap Aldo Culquicondor github:sammyhw + Philipp Wiesemann Dale Weiler Oriol Ferrer Mesia github:phprus + Josh Tobin Neil Bickford Matthew Gregan github:poppolopoppo + Julian Raschke Gregory Mullen Christian Floisand github:darealshinji + Baldur Karlsson Kevin Schmidt JR Smith github:Michaelangel007 + Brad Weinberger Matvey Cherevko github:mosra + Luca Sas Alexander Veselov Zack Middleton [reserved] + Ryan C. Gordon [reserved] [reserved] + DO NOT ADD YOUR NAME HERE + + Jacko Dirks + + To add your name to the credits, pick a random blank space in the middle and fill it. + 80% of merge conflicts on stb PRs are due to people adding their name at the end + of the credits. +*/ + +#ifndef STBI_INCLUDE_STB_IMAGE_H +#define STBI_INCLUDE_STB_IMAGE_H + +// DOCUMENTATION +// +// Limitations: +// - no 12-bit-per-channel JPEG +// - no JPEGs with arithmetic coding +// - GIF always returns *comp=4 +// +// Basic usage (see HDR discussion below for HDR usage): +// int x,y,n; +// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); +// // ... process data if not NULL ... +// // ... x = width, y = height, n = # 8-bit components per pixel ... +// // ... replace '0' with '1'..'4' to force that many components per pixel +// // ... but 'n' will always be the number that it would have been if you said 0 +// stbi_image_free(data); +// +// Standard parameters: +// int *x -- outputs image width in pixels +// int *y -- outputs image height in pixels +// int *channels_in_file -- outputs # of image components in image file +// int desired_channels -- if non-zero, # of image components requested in result +// +// The return value from an image loader is an 'unsigned char *' which points +// to the pixel data, or NULL on an allocation failure or if the image is +// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, +// with each pixel consisting of N interleaved 8-bit components; the first +// pixel pointed to is top-left-most in the image. There is no padding between +// image scanlines or between pixels, regardless of format. The number of +// components N is 'desired_channels' if desired_channels is non-zero, or +// *channels_in_file otherwise. If desired_channels is non-zero, +// *channels_in_file has the number of components that _would_ have been +// output otherwise. E.g. if you set desired_channels to 4, you will always +// get RGBA output, but you can check *channels_in_file to see if it's trivially +// opaque because e.g. there were only 3 channels in the source image. +// +// An output image with N components has the following components interleaved +// in this order in each pixel: +// +// N=#comp components +// 1 grey +// 2 grey, alpha +// 3 red, green, blue +// 4 red, green, blue, alpha +// +// If image loading fails for any reason, the return value will be NULL, +// and *x, *y, *channels_in_file will be unchanged. The function +// stbi_failure_reason() can be queried for an extremely brief, end-user +// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS +// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly +// more user-friendly ones. +// +// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. +// +// To query the width, height and component count of an image without having to +// decode the full file, you can use the stbi_info family of functions: +// +// int x,y,n,ok; +// ok = stbi_info(filename, &x, &y, &n); +// // returns ok=1 and sets x, y, n if image is a supported format, +// // 0 otherwise. +// +// Note that stb_image pervasively uses ints in its public API for sizes, +// including sizes of memory buffers. This is now part of the API and thus +// hard to change without causing breakage. As a result, the various image +// loaders all have certain limits on image size; these differ somewhat +// by format but generally boil down to either just under 2GB or just under +// 1GB. When the decoded image would be larger than this, stb_image decoding +// will fail. +// +// Additionally, stb_image will reject image files that have any of their +// dimensions set to a larger value than the configurable STBI_MAX_DIMENSIONS, +// which defaults to 2**24 = 16777216 pixels. Due to the above memory limit, +// the only way to have an image with such dimensions load correctly +// is for it to have a rather extreme aspect ratio. Either way, the +// assumption here is that such larger images are likely to be malformed +// or malicious. If you do need to load an image with individual dimensions +// larger than that, and it still fits in the overall size limit, you can +// #define STBI_MAX_DIMENSIONS on your own to be something larger. +// +// =========================================================================== +// +// UNICODE: +// +// If compiling for Windows and you wish to use Unicode filenames, compile +// with +// #define STBI_WINDOWS_UTF8 +// and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert +// Windows wchar_t filenames to utf8. +// +// =========================================================================== +// +// Philosophy +// +// stb libraries are designed with the following priorities: +// +// 1. easy to use +// 2. easy to maintain +// 3. good performance +// +// Sometimes I let "good performance" creep up in priority over "easy to maintain", +// and for best performance I may provide less-easy-to-use APIs that give higher +// performance, in addition to the easy-to-use ones. Nevertheless, it's important +// to keep in mind that from the standpoint of you, a client of this library, +// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all. +// +// Some secondary priorities arise directly from the first two, some of which +// provide more explicit reasons why performance can't be emphasized. +// +// - Portable ("ease of use") +// - Small source code footprint ("easy to maintain") +// - No dependencies ("ease of use") +// +// =========================================================================== +// +// I/O callbacks +// +// I/O callbacks allow you to read from arbitrary sources, like packaged +// files or some other source. Data read from callbacks are processed +// through a small internal buffer (currently 128 bytes) to try to reduce +// overhead. +// +// The three functions you must define are "read" (reads some bytes of data), +// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). +// +// =========================================================================== +// +// SIMD support +// +// The JPEG decoder will try to automatically use SIMD kernels on x86 when +// supported by the compiler. For ARM Neon support, you must explicitly +// request it. +// +// (The old do-it-yourself SIMD API is no longer supported in the current +// code.) +// +// On x86, SSE2 will automatically be used when available based on a run-time +// test; if not, the generic C versions are used as a fall-back. On ARM targets, +// the typical path is to have separate builds for NEON and non-NEON devices +// (at least this is true for iOS and Android). Therefore, the NEON support is +// toggled by a build flag: define STBI_NEON to get NEON loops. +// +// If for some reason you do not want to use any of SIMD code, or if +// you have issues compiling it, you can disable it entirely by +// defining STBI_NO_SIMD. +// +// =========================================================================== +// +// HDR image support (disable by defining STBI_NO_HDR) +// +// stb_image supports loading HDR images in general, and currently the Radiance +// .HDR file format specifically. You can still load any file through the existing +// interface; if you attempt to load an HDR file, it will be automatically remapped +// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; +// both of these constants can be reconfigured through this interface: +// +// stbi_hdr_to_ldr_gamma(2.2f); +// stbi_hdr_to_ldr_scale(1.0f); +// +// (note, do not use _inverse_ constants; stbi_image will invert them +// appropriately). +// +// Additionally, there is a new, parallel interface for loading files as +// (linear) floats to preserve the full dynamic range: +// +// float *data = stbi_loadf(filename, &x, &y, &n, 0); +// +// If you load LDR images through this interface, those images will +// be promoted to floating point values, run through the inverse of +// constants corresponding to the above: +// +// stbi_ldr_to_hdr_scale(1.0f); +// stbi_ldr_to_hdr_gamma(2.2f); +// +// Finally, given a filename (or an open file or memory block--see header +// file for details) containing image data, you can query for the "most +// appropriate" interface to use (that is, whether the image is HDR or +// not), using: +// +// stbi_is_hdr(char *filename); +// +// =========================================================================== +// +// iPhone PNG support: +// +// We optionally support converting iPhone-formatted PNGs (which store +// premultiplied BGRA) back to RGB, even though they're internally encoded +// differently. To enable this conversion, call +// stbi_convert_iphone_png_to_rgb(1). +// +// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per +// pixel to remove any premultiplied alpha *only* if the image file explicitly +// says there's premultiplied data (currently only happens in iPhone images, +// and only if iPhone convert-to-rgb processing is on). +// +// =========================================================================== +// +// ADDITIONAL CONFIGURATION +// +// - You can suppress implementation of any of the decoders to reduce +// your code footprint by #defining one or more of the following +// symbols before creating the implementation. +// +// STBI_NO_JPEG +// STBI_NO_PNG +// STBI_NO_BMP +// STBI_NO_PSD +// STBI_NO_TGA +// STBI_NO_GIF +// STBI_NO_HDR +// STBI_NO_PIC +// STBI_NO_PNM (.ppm and .pgm) +// +// - You can request *only* certain decoders and suppress all other ones +// (this will be more forward-compatible, as addition of new decoders +// doesn't require you to disable them explicitly): +// +// STBI_ONLY_JPEG +// STBI_ONLY_PNG +// STBI_ONLY_BMP +// STBI_ONLY_PSD +// STBI_ONLY_TGA +// STBI_ONLY_GIF +// STBI_ONLY_HDR +// STBI_ONLY_PIC +// STBI_ONLY_PNM (.ppm and .pgm) +// +// - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still +// want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB +// +// - If you define STBI_MAX_DIMENSIONS, stb_image will reject images greater +// than that size (in either width or height) without further processing. +// This is to let programs in the wild set an upper bound to prevent +// denial-of-service attacks on untrusted data, as one could generate a +// valid image of gigantic dimensions and force stb_image to allocate a +// huge block of memory and spend disproportionate time decoding it. By +// default this is set to (1 << 24), which is 16777216, but that's still +// very big. + +#ifndef STBI_NO_STDIO +#include +#endif // STBI_NO_STDIO + +#define STBI_VERSION 1 + +enum +{ + STBI_default = 0, // only used for desired_channels + + STBI_grey = 1, + STBI_grey_alpha = 2, + STBI_rgb = 3, + STBI_rgb_alpha = 4 +}; + +#include +typedef unsigned char stbi_uc; +typedef unsigned short stbi_us; + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef STBIDEF +#ifdef STB_IMAGE_STATIC +#define STBIDEF static +#else +#define STBIDEF extern +#endif +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// PRIMARY API - works on images of any type +// + +// +// load image by filename, open file, or memory buffer +// + +typedef struct +{ + int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read + void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative + int (*eof) (void *user); // returns nonzero if we are at end of file/data +} stbi_io_callbacks; + +//////////////////////////////////// +// +// 8-bits-per-channel interface +// + +STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *channels_in_file, int desired_channels); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); +// for stbi_load_from_file, file pointer is left pointing immediately after image +#endif + +#ifndef STBI_NO_GIF +STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp); +#endif + +#ifdef STBI_WINDOWS_UTF8 +STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input); +#endif + +//////////////////////////////////// +// +// 16-bits-per-channel interface +// + +STBIDEF stbi_us *stbi_load_16_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_us *stbi_load_16 (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); +#endif + +//////////////////////////////////// +// +// float-per-channel interface +// +#ifndef STBI_NO_LINEAR + STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); + STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); + + #ifndef STBI_NO_STDIO + STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); + STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); + #endif +#endif + +#ifndef STBI_NO_HDR + STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); + STBIDEF void stbi_hdr_to_ldr_scale(float scale); +#endif // STBI_NO_HDR + +#ifndef STBI_NO_LINEAR + STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); + STBIDEF void stbi_ldr_to_hdr_scale(float scale); +#endif // STBI_NO_LINEAR + +// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename); +STBIDEF int stbi_is_hdr_from_file(FILE *f); +#endif // STBI_NO_STDIO + + +// get a VERY brief reason for failure +// on most compilers (and ALL modern mainstream compilers) this is threadsafe +STBIDEF const char *stbi_failure_reason (void); + +// free the loaded image -- this is just free() +STBIDEF void stbi_image_free (void *retval_from_stbi_load); + +// get image dimensions & components without fully decoding +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); +STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len); +STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user); + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); +STBIDEF int stbi_is_16_bit (char const *filename); +STBIDEF int stbi_is_16_bit_from_file(FILE *f); +#endif + + + +// for image formats that explicitly notate that they have premultiplied alpha, +// we just return the colors as stored in the file. set this flag to force +// unpremultiplication. results are undefined if the unpremultiply overflow. +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); + +// indicate whether we should process iphone images back to canonical format, +// or just pass them through "as-is" +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); + +// flip the image vertically, so the first pixel in the output array is the bottom left +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); + +// as above, but only applies to images loaded on the thread that calls the function +// this function is only available if your compiler supports thread-local variables; +// calling it will fail to link if your compiler doesn't +STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply); +STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert); +STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip); + +// ZLIB client - used by PNG, available for other purposes + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); +STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + +STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + + +#ifdef __cplusplus +} +#endif + +// +// +//// end header file ///////////////////////////////////////////////////// +#endif // STBI_INCLUDE_STB_IMAGE_H + +#ifdef STB_IMAGE_IMPLEMENTATION + +#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ + || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ + || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ + || defined(STBI_ONLY_ZLIB) + #ifndef STBI_ONLY_JPEG + #define STBI_NO_JPEG + #endif + #ifndef STBI_ONLY_PNG + #define STBI_NO_PNG + #endif + #ifndef STBI_ONLY_BMP + #define STBI_NO_BMP + #endif + #ifndef STBI_ONLY_PSD + #define STBI_NO_PSD + #endif + #ifndef STBI_ONLY_TGA + #define STBI_NO_TGA + #endif + #ifndef STBI_ONLY_GIF + #define STBI_NO_GIF + #endif + #ifndef STBI_ONLY_HDR + #define STBI_NO_HDR + #endif + #ifndef STBI_ONLY_PIC + #define STBI_NO_PIC + #endif + #ifndef STBI_ONLY_PNM + #define STBI_NO_PNM + #endif +#endif + +#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) +#define STBI_NO_ZLIB +#endif + + +#include +#include // ptrdiff_t on osx +#include +#include +#include + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) +#include // ldexp, pow +#endif + +#ifndef STBI_NO_STDIO +#include +#endif + +#ifndef STBI_ASSERT +#include +#define STBI_ASSERT(x) assert(x) +#endif + +#ifdef __cplusplus +#define STBI_EXTERN extern "C" +#else +#define STBI_EXTERN extern +#endif + + +#ifndef _MSC_VER + #ifdef __cplusplus + #define stbi_inline inline + #else + #define stbi_inline + #endif +#else + #define stbi_inline __forceinline +#endif + +#ifndef STBI_NO_THREAD_LOCALS + #if defined(__cplusplus) && __cplusplus >= 201103L + #define STBI_THREAD_LOCAL thread_local + #elif defined(__GNUC__) && __GNUC__ < 5 + #define STBI_THREAD_LOCAL __thread + #elif defined(_MSC_VER) + #define STBI_THREAD_LOCAL __declspec(thread) + #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__) + #define STBI_THREAD_LOCAL _Thread_local + #endif + + #ifndef STBI_THREAD_LOCAL + #if defined(__GNUC__) + #define STBI_THREAD_LOCAL __thread + #endif + #endif +#endif + +#if defined(_MSC_VER) || defined(__SYMBIAN32__) +typedef unsigned short stbi__uint16; +typedef signed short stbi__int16; +typedef unsigned int stbi__uint32; +typedef signed int stbi__int32; +#else +#include +typedef uint16_t stbi__uint16; +typedef int16_t stbi__int16; +typedef uint32_t stbi__uint32; +typedef int32_t stbi__int32; +#endif + +// should produce compiler error if size is wrong +typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; + +#ifdef _MSC_VER +#define STBI_NOTUSED(v) (void)(v) +#else +#define STBI_NOTUSED(v) (void)sizeof(v) +#endif + +#ifdef _MSC_VER +#define STBI_HAS_LROTL +#endif + +#ifdef STBI_HAS_LROTL + #define stbi_lrot(x,y) _lrotl(x,y) +#else + #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (-(y) & 31))) +#endif + +#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED)) +// ok +#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED) +// ok +#else +#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)." +#endif + +#ifndef STBI_MALLOC +#define STBI_MALLOC(sz) malloc(sz) +#define STBI_REALLOC(p,newsz) realloc(p,newsz) +#define STBI_FREE(p) free(p) +#endif + +#ifndef STBI_REALLOC_SIZED +#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz) +#endif + +// x86/x64 detection +#if defined(__x86_64__) || defined(_M_X64) +#define STBI__X64_TARGET +#elif defined(__i386) || defined(_M_IX86) +#define STBI__X86_TARGET +#endif + +#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) +// gcc doesn't support sse2 intrinsics unless you compile with -msse2, +// which in turn means it gets to use SSE2 everywhere. This is unfortunate, +// but previous attempts to provide the SSE2 functions with runtime +// detection caused numerous issues. The way architecture extensions are +// exposed in GCC/Clang is, sadly, not really suited for one-file libs. +// New behavior: if compiled with -msse2, we use SSE2 without any +// detection; if not, we don't use it at all. +#define STBI_NO_SIMD +#endif + +#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) +// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET +// +// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the +// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. +// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not +// simultaneously enabling "-mstackrealign". +// +// See https://github.com/nothings/stb/issues/81 for more information. +// +// So default to no SSE2 on 32-bit MinGW. If you've read this far and added +// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. +#define STBI_NO_SIMD +#endif + +#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) +#define STBI_SSE2 +#include + +#ifdef _MSC_VER + +#if _MSC_VER >= 1400 // not VC6 +#include // __cpuid +static int stbi__cpuid3(void) +{ + int info[4]; + __cpuid(info,1); + return info[3]; +} +#else +static int stbi__cpuid3(void) +{ + int res; + __asm { + mov eax,1 + cpuid + mov res,edx + } + return res; +} +#endif + +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name + +#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) +static int stbi__sse2_available(void) +{ + int info3 = stbi__cpuid3(); + return ((info3 >> 26) & 1) != 0; +} +#endif + +#else // assume GCC-style if not VC++ +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) + +#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) +static int stbi__sse2_available(void) +{ + // If we're even attempting to compile this on GCC/Clang, that means + // -msse2 is on, which means the compiler is allowed to use SSE2 + // instructions at will, and so are we. + return 1; +} +#endif + +#endif +#endif + +// ARM NEON +#if defined(STBI_NO_SIMD) && defined(STBI_NEON) +#undef STBI_NEON +#endif + +#ifdef STBI_NEON +#include +#ifdef _MSC_VER +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name +#else +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) +#endif +#endif + +#ifndef STBI_SIMD_ALIGN +#define STBI_SIMD_ALIGN(type, name) type name +#endif + +#ifndef STBI_MAX_DIMENSIONS +#define STBI_MAX_DIMENSIONS (1 << 24) +#endif + +/////////////////////////////////////////////// +// +// stbi__context struct and start_xxx functions + +// stbi__context structure is our basic context used by all images, so it +// contains all the IO context, plus some basic image information +typedef struct +{ + stbi__uint32 img_x, img_y; + int img_n, img_out_n; + + stbi_io_callbacks io; + void *io_user_data; + + int read_from_callbacks; + int buflen; + stbi_uc buffer_start[128]; + int callback_already_read; + + stbi_uc *img_buffer, *img_buffer_end; + stbi_uc *img_buffer_original, *img_buffer_original_end; +} stbi__context; + + +static void stbi__refill_buffer(stbi__context *s); + +// initialize a memory-decode context +static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) +{ + s->io.read = NULL; + s->read_from_callbacks = 0; + s->callback_already_read = 0; + s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; + s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; +} + +// initialize a callback-based context +static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) +{ + s->io = *c; + s->io_user_data = user; + s->buflen = sizeof(s->buffer_start); + s->read_from_callbacks = 1; + s->callback_already_read = 0; + s->img_buffer = s->img_buffer_original = s->buffer_start; + stbi__refill_buffer(s); + s->img_buffer_original_end = s->img_buffer_end; +} + +#ifndef STBI_NO_STDIO + +static int stbi__stdio_read(void *user, char *data, int size) +{ + return (int) fread(data,1,size,(FILE*) user); +} + +static void stbi__stdio_skip(void *user, int n) +{ + int ch; + fseek((FILE*) user, n, SEEK_CUR); + ch = fgetc((FILE*) user); /* have to read a byte to reset feof()'s flag */ + if (ch != EOF) { + ungetc(ch, (FILE *) user); /* push byte back onto stream if valid. */ + } +} + +static int stbi__stdio_eof(void *user) +{ + return feof((FILE*) user) || ferror((FILE *) user); +} + +static stbi_io_callbacks stbi__stdio_callbacks = +{ + stbi__stdio_read, + stbi__stdio_skip, + stbi__stdio_eof, +}; + +static void stbi__start_file(stbi__context *s, FILE *f) +{ + stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); +} + +//static void stop_file(stbi__context *s) { } + +#endif // !STBI_NO_STDIO + +static void stbi__rewind(stbi__context *s) +{ + // conceptually rewind SHOULD rewind to the beginning of the stream, + // but we just rewind to the beginning of the initial buffer, because + // we only use it after doing 'test', which only ever looks at at most 92 bytes + s->img_buffer = s->img_buffer_original; + s->img_buffer_end = s->img_buffer_original_end; +} + +enum +{ + STBI_ORDER_RGB, + STBI_ORDER_BGR +}; + +typedef struct +{ + int bits_per_channel; + int num_channels; + int channel_order; +} stbi__result_info; + +#ifndef STBI_NO_JPEG +static int stbi__jpeg_test(stbi__context *s); +static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNG +static int stbi__png_test(stbi__context *s); +static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__png_is16(stbi__context *s); +#endif + +#ifndef STBI_NO_BMP +static int stbi__bmp_test(stbi__context *s); +static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_TGA +static int stbi__tga_test(stbi__context *s); +static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s); +static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc); +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__psd_is16(stbi__context *s); +#endif + +#ifndef STBI_NO_HDR +static int stbi__hdr_test(stbi__context *s); +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_test(stbi__context *s); +static void *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_GIF +static int stbi__gif_test(stbi__context *s); +static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp); +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNM +static int stbi__pnm_test(stbi__context *s); +static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__pnm_is16(stbi__context *s); +#endif + +static +#ifdef STBI_THREAD_LOCAL +STBI_THREAD_LOCAL +#endif +const char *stbi__g_failure_reason; + +STBIDEF const char *stbi_failure_reason(void) +{ + return stbi__g_failure_reason; +} + +#ifndef STBI_NO_FAILURE_STRINGS +static int stbi__err(const char *str) +{ + stbi__g_failure_reason = str; + return 0; +} +#endif + +static void *stbi__malloc(size_t size) +{ + return STBI_MALLOC(size); +} + +// stb_image uses ints pervasively, including for offset calculations. +// therefore the largest decoded image size we can support with the +// current code, even on 64-bit targets, is INT_MAX. this is not a +// significant limitation for the intended use case. +// +// we do, however, need to make sure our size calculations don't +// overflow. hence a few helper functions for size calculations that +// multiply integers together, making sure that they're non-negative +// and no overflow occurs. + +// return 1 if the sum is valid, 0 on overflow. +// negative terms are considered invalid. +static int stbi__addsizes_valid(int a, int b) +{ + if (b < 0) return 0; + // now 0 <= b <= INT_MAX, hence also + // 0 <= INT_MAX - b <= INTMAX. + // And "a + b <= INT_MAX" (which might overflow) is the + // same as a <= INT_MAX - b (no overflow) + return a <= INT_MAX - b; +} + +// returns 1 if the product is valid, 0 on overflow. +// negative factors are considered invalid. +static int stbi__mul2sizes_valid(int a, int b) +{ + if (a < 0 || b < 0) return 0; + if (b == 0) return 1; // mul-by-0 is always safe + // portable way to check for no overflows in a*b + return a <= INT_MAX/b; +} + +#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) +// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow +static int stbi__mad2sizes_valid(int a, int b, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add); +} +#endif + +// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow +static int stbi__mad3sizes_valid(int a, int b, int c, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && + stbi__addsizes_valid(a*b*c, add); +} + +// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) +static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && + stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add); +} +#endif + +#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) +// mallocs with size overflow checking +static void *stbi__malloc_mad2(int a, int b, int add) +{ + if (!stbi__mad2sizes_valid(a, b, add)) return NULL; + return stbi__malloc(a*b + add); +} +#endif + +static void *stbi__malloc_mad3(int a, int b, int c, int add) +{ + if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL; + return stbi__malloc(a*b*c + add); +} + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) +static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) +{ + if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL; + return stbi__malloc(a*b*c*d + add); +} +#endif + +// returns 1 if the sum of two signed ints is valid (between -2^31 and 2^31-1 inclusive), 0 on overflow. +static int stbi__addints_valid(int a, int b) +{ + if ((a >= 0) != (b >= 0)) return 1; // a and b have different signs, so no overflow + if (a < 0 && b < 0) return a >= INT_MIN - b; // same as a + b >= INT_MIN; INT_MIN - b cannot overflow since b < 0. + return a <= INT_MAX - b; +} + +// returns 1 if the product of two ints fits in a signed short, 0 on overflow. +static int stbi__mul2shorts_valid(int a, int b) +{ + if (b == 0 || b == -1) return 1; // multiplication by 0 is always 0; check for -1 so SHRT_MIN/b doesn't overflow + if ((a >= 0) == (b >= 0)) return a <= SHRT_MAX/b; // product is positive, so similar to mul2sizes_valid + if (b < 0) return a <= SHRT_MIN / b; // same as a * b >= SHRT_MIN + return a >= SHRT_MIN / b; +} + +// stbi__err - error +// stbi__errpf - error returning pointer to float +// stbi__errpuc - error returning pointer to unsigned char + +#ifdef STBI_NO_FAILURE_STRINGS + #define stbi__err(x,y) 0 +#elif defined(STBI_FAILURE_USERMSG) + #define stbi__err(x,y) stbi__err(y) +#else + #define stbi__err(x,y) stbi__err(x) +#endif + +#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) +#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) + +STBIDEF void stbi_image_free(void *retval_from_stbi_load) +{ + STBI_FREE(retval_from_stbi_load); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); +#endif + +#ifndef STBI_NO_HDR +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); +#endif + +static int stbi__vertically_flip_on_load_global = 0; + +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load_global = flag_true_if_should_flip; +} + +#ifndef STBI_THREAD_LOCAL +#define stbi__vertically_flip_on_load stbi__vertically_flip_on_load_global +#else +static STBI_THREAD_LOCAL int stbi__vertically_flip_on_load_local, stbi__vertically_flip_on_load_set; + +STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load_local = flag_true_if_should_flip; + stbi__vertically_flip_on_load_set = 1; +} + +#define stbi__vertically_flip_on_load (stbi__vertically_flip_on_load_set \ + ? stbi__vertically_flip_on_load_local \ + : stbi__vertically_flip_on_load_global) +#endif // STBI_THREAD_LOCAL + +static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) +{ + memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields + ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed + ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order + ri->num_channels = 0; + + // test the formats with a very explicit header first (at least a FOURCC + // or distinctive magic number first) + #ifndef STBI_NO_PNG + if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_BMP + if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_GIF + if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_PSD + if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc); + #else + STBI_NOTUSED(bpc); + #endif + #ifndef STBI_NO_PIC + if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri); + #endif + + // then the formats that can end up attempting to load with just 1 or 2 + // bytes matching expectations; these are prone to false positives, so + // try them later + #ifndef STBI_NO_JPEG + if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_PNM + if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp, ri); + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri); + return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); + } + #endif + + #ifndef STBI_NO_TGA + // test tga last because it's a crappy test! + if (stbi__tga_test(s)) + return stbi__tga_load(s,x,y,comp,req_comp, ri); + #endif + + return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); +} + +static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels) +{ + int i; + int img_len = w * h * channels; + stbi_uc *reduced; + + reduced = (stbi_uc *) stbi__malloc(img_len); + if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory"); + + for (i = 0; i < img_len; ++i) + reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling + + STBI_FREE(orig); + return reduced; +} + +static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels) +{ + int i; + int img_len = w * h * channels; + stbi__uint16 *enlarged; + + enlarged = (stbi__uint16 *) stbi__malloc(img_len*2); + if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); + + for (i = 0; i < img_len; ++i) + enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff + + STBI_FREE(orig); + return enlarged; +} + +static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel) +{ + int row; + size_t bytes_per_row = (size_t)w * bytes_per_pixel; + stbi_uc temp[2048]; + stbi_uc *bytes = (stbi_uc *)image; + + for (row = 0; row < (h>>1); row++) { + stbi_uc *row0 = bytes + row*bytes_per_row; + stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row; + // swap row0 with row1 + size_t bytes_left = bytes_per_row; + while (bytes_left) { + size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp); + memcpy(temp, row0, bytes_copy); + memcpy(row0, row1, bytes_copy); + memcpy(row1, temp, bytes_copy); + row0 += bytes_copy; + row1 += bytes_copy; + bytes_left -= bytes_copy; + } + } +} + +#ifndef STBI_NO_GIF +static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel) +{ + int slice; + int slice_size = w * h * bytes_per_pixel; + + stbi_uc *bytes = (stbi_uc *)image; + for (slice = 0; slice < z; ++slice) { + stbi__vertical_flip(bytes, w, h, bytes_per_pixel); + bytes += slice_size; + } +} +#endif + +static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__result_info ri; + void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8); + + if (result == NULL) + return NULL; + + // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. + STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); + + if (ri.bits_per_channel != 8) { + result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp); + ri.bits_per_channel = 8; + } + + // @TODO: move stbi__convert_format to here + + if (stbi__vertically_flip_on_load) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc)); + } + + return (unsigned char *) result; +} + +static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__result_info ri; + void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16); + + if (result == NULL) + return NULL; + + // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. + STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); + + if (ri.bits_per_channel != 16) { + result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp); + ri.bits_per_channel = 16; + } + + // @TODO: move stbi__convert_format16 to here + // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision + + if (stbi__vertically_flip_on_load) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16)); + } + + return (stbi__uint16 *) result; +} + +#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR) +static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) +{ + if (stbi__vertically_flip_on_load && result != NULL) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(float)); + } +} +#endif + +#ifndef STBI_NO_STDIO + +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) +STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); +STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); +#endif + +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) +STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) +{ + return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); +} +#endif + +static FILE *stbi__fopen(char const *filename, char const *mode) +{ + FILE *f; +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) + wchar_t wMode[64]; + wchar_t wFilename[1024]; + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename))) + return 0; + + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode))) + return 0; + +#if defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != _wfopen_s(&f, wFilename, wMode)) + f = 0; +#else + f = _wfopen(wFilename, wMode); +#endif + +#elif defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != fopen_s(&f, filename, mode)) + f=0; +#else + f = fopen(filename, mode); +#endif + return f; +} + + +STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + unsigned char *result; + if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} + +STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__uint16 *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} + +STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + stbi__uint16 *result; + if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file_16(f,x,y,comp,req_comp); + fclose(f); + return result; +} + + +#endif //!STBI_NO_STDIO + +STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); +} + +STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); + return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); +} + +STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); +} + +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_GIF +STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_mem(&s,buffer,len); + + result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp); + if (stbi__vertically_flip_on_load) { + stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); + } + + return result; +} +#endif + +#ifndef STBI_NO_LINEAR +static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *data; + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + stbi__result_info ri; + float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri); + if (hdr_data) + stbi__float_postprocess(hdr_data,x,y,comp,req_comp); + return hdr_data; + } + #endif + data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp); + if (data) + return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); + return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); +} + +STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_STDIO +STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + float *result; + FILE *f = stbi__fopen(filename, "rb"); + if (!f) return stbi__errpf("can't fopen", "Unable to open file"); + result = stbi_loadf_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_file(&s,f); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} +#endif // !STBI_NO_STDIO + +#endif // !STBI_NO_LINEAR + +// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is +// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always +// reports false! + +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(buffer); + STBI_NOTUSED(len); + return 0; + #endif +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result=0; + if (f) { + result = stbi_is_hdr_from_file(f); + fclose(f); + } + return result; +} + +STBIDEF int stbi_is_hdr_from_file(FILE *f) +{ + #ifndef STBI_NO_HDR + long pos = ftell(f); + int res; + stbi__context s; + stbi__start_file(&s,f); + res = stbi__hdr_test(&s); + fseek(f, pos, SEEK_SET); + return res; + #else + STBI_NOTUSED(f); + return 0; + #endif +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(clbk); + STBI_NOTUSED(user); + return 0; + #endif +} + +#ifndef STBI_NO_LINEAR +static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; + +STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } +STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } +#endif + +static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; + +STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } +STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } + + +////////////////////////////////////////////////////////////////////////////// +// +// Common code used by all image loaders +// + +enum +{ + STBI__SCAN_load=0, + STBI__SCAN_type, + STBI__SCAN_header +}; + +static void stbi__refill_buffer(stbi__context *s) +{ + int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); + s->callback_already_read += (int) (s->img_buffer - s->img_buffer_original); + if (n == 0) { + // at end of file, treat same as if from memory, but need to handle case + // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file + s->read_from_callbacks = 0; + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start+1; + *s->img_buffer = 0; + } else { + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start + n; + } +} + +stbi_inline static stbi_uc stbi__get8(stbi__context *s) +{ + if (s->img_buffer < s->img_buffer_end) + return *s->img_buffer++; + if (s->read_from_callbacks) { + stbi__refill_buffer(s); + return *s->img_buffer++; + } + return 0; +} + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_HDR) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +stbi_inline static int stbi__at_eof(stbi__context *s) +{ + if (s->io.read) { + if (!(s->io.eof)(s->io_user_data)) return 0; + // if feof() is true, check if buffer = end + // special case: we've only got the special 0 character at the end + if (s->read_from_callbacks == 0) return 1; + } + + return s->img_buffer >= s->img_buffer_end; +} +#endif + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) +// nothing +#else +static void stbi__skip(stbi__context *s, int n) +{ + if (n == 0) return; // already there! + if (n < 0) { + s->img_buffer = s->img_buffer_end; + return; + } + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + s->img_buffer = s->img_buffer_end; + (s->io.skip)(s->io_user_data, n - blen); + return; + } + } + s->img_buffer += n; +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_TGA) && defined(STBI_NO_HDR) && defined(STBI_NO_PNM) +// nothing +#else +static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) +{ + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + int res, count; + + memcpy(buffer, s->img_buffer, blen); + + count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); + res = (count == (n-blen)); + s->img_buffer = s->img_buffer_end; + return res; + } + } + + if (s->img_buffer+n <= s->img_buffer_end) { + memcpy(buffer, s->img_buffer, n); + s->img_buffer += n; + return 1; + } else + return 0; +} +#endif + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) +// nothing +#else +static int stbi__get16be(stbi__context *s) +{ + int z = stbi__get8(s); + return (z << 8) + stbi__get8(s); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) +// nothing +#else +static stbi__uint32 stbi__get32be(stbi__context *s) +{ + stbi__uint32 z = stbi__get16be(s); + return (z << 16) + stbi__get16be(s); +} +#endif + +#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) +// nothing +#else +static int stbi__get16le(stbi__context *s) +{ + int z = stbi__get8(s); + return z + (stbi__get8(s) << 8); +} +#endif + +#ifndef STBI_NO_BMP +static stbi__uint32 stbi__get32le(stbi__context *s) +{ + stbi__uint32 z = stbi__get16le(s); + z += (stbi__uint32)stbi__get16le(s) << 16; + return z; +} +#endif + +#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +////////////////////////////////////////////////////////////////////////////// +// +// generic converter from built-in img_n to req_comp +// individual types do this automatically as much as possible (e.g. jpeg +// does all cases internally since it needs to colorspace convert anyway, +// and it never has alpha, so very few cases ). png can automatically +// interleave an alpha=255 channel, but falls back to this for other cases +// +// assume data buffer is malloced, so malloc a new one and free that one +// only failure mode is malloc failing + +static stbi_uc stbi__compute_y(int r, int g, int b) +{ + return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + unsigned char *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0); + if (good == NULL) { + STBI_FREE(data); + return stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + unsigned char *src = data + j * x * img_n ; + unsigned char *dest = good + j * x * req_comp; + + #define STBI__COMBO(a,b) ((a)*8+(b)) + #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (STBI__COMBO(img_n, req_comp)) { + STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=255; } break; + STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=255; } break; + STBI__CASE(2,1) { dest[0]=src[0]; } break; + STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; + STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=255; } break; + STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; + STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = 255; } break; + STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; + STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break; + STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; + default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return stbi__errpuc("unsupported", "Unsupported format conversion"); + } + #undef STBI__CASE + } + + STBI_FREE(data); + return good; +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) +// nothing +#else +static stbi__uint16 stbi__compute_y_16(int r, int g, int b) +{ + return (stbi__uint16) (((r*77) + (g*150) + (29*b)) >> 8); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) +// nothing +#else +static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + stbi__uint16 *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2); + if (good == NULL) { + STBI_FREE(data); + return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + stbi__uint16 *src = data + j * x * img_n ; + stbi__uint16 *dest = good + j * x * req_comp; + + #define STBI__COMBO(a,b) ((a)*8+(b)) + #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (STBI__COMBO(img_n, req_comp)) { + STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=0xffff; } break; + STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=0xffff; } break; + STBI__CASE(2,1) { dest[0]=src[0]; } break; + STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; + STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=0xffff; } break; + STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; + STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = 0xffff; } break; + STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; + STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break; + STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; + default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return (stbi__uint16*) stbi__errpuc("unsupported", "Unsupported format conversion"); + } + #undef STBI__CASE + } + + STBI_FREE(data); + return good; +} +#endif + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) +{ + int i,k,n; + float *output; + if (!data) return NULL; + output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0); + if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); + } + } + if (n < comp) { + for (i=0; i < x*y; ++i) { + output[i*comp + n] = data[i*comp + n]/255.0f; + } + } + STBI_FREE(data); + return output; +} +#endif + +#ifndef STBI_NO_HDR +#define stbi__float2int(x) ((int) (x)) +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) +{ + int i,k,n; + stbi_uc *output; + if (!data) return NULL; + output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0); + if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + if (k < comp) { + float z = data[i*comp+k] * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + } + STBI_FREE(data); + return output; +} +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// "baseline" JPEG/JFIF decoder +// +// simple implementation +// - doesn't support delayed output of y-dimension +// - simple interface (only one output format: 8-bit interleaved RGB) +// - doesn't try to recover corrupt jpegs +// - doesn't allow partial loading, loading multiple at once +// - still fast on x86 (copying globals into locals doesn't help x86) +// - allocates lots of intermediate memory (full size of all components) +// - non-interleaved case requires this anyway +// - allows good upsampling (see next) +// high-quality +// - upsampled channels are bilinearly interpolated, even across blocks +// - quality integer IDCT derived from IJG's 'slow' +// performance +// - fast huffman; reasonable integer IDCT +// - some SIMD kernels for common paths on targets with SSE2/NEON +// - uses a lot of intermediate memory, could cache poorly + +#ifndef STBI_NO_JPEG + +// huffman decoding acceleration +#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache + +typedef struct +{ + stbi_uc fast[1 << FAST_BITS]; + // weirdly, repacking this into AoS is a 10% speed loss, instead of a win + stbi__uint16 code[256]; + stbi_uc values[256]; + stbi_uc size[257]; + unsigned int maxcode[18]; + int delta[17]; // old 'firstsymbol' - old 'firstcode' +} stbi__huffman; + +typedef struct +{ + stbi__context *s; + stbi__huffman huff_dc[4]; + stbi__huffman huff_ac[4]; + stbi__uint16 dequant[4][64]; + stbi__int16 fast_ac[4][1 << FAST_BITS]; + +// sizes for components, interleaved MCUs + int img_h_max, img_v_max; + int img_mcu_x, img_mcu_y; + int img_mcu_w, img_mcu_h; + +// definition of jpeg image component + struct + { + int id; + int h,v; + int tq; + int hd,ha; + int dc_pred; + + int x,y,w2,h2; + stbi_uc *data; + void *raw_data, *raw_coeff; + stbi_uc *linebuf; + short *coeff; // progressive only + int coeff_w, coeff_h; // number of 8x8 coefficient blocks + } img_comp[4]; + + stbi__uint32 code_buffer; // jpeg entropy-coded buffer + int code_bits; // number of valid bits + unsigned char marker; // marker seen while filling entropy buffer + int nomore; // flag if we saw a marker so must stop + + int progressive; + int spec_start; + int spec_end; + int succ_high; + int succ_low; + int eob_run; + int jfif; + int app14_color_transform; // Adobe APP14 tag + int rgb; + + int scan_n, order[4]; + int restart_interval, todo; + +// kernels + void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); + void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); + stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); +} stbi__jpeg; + +static int stbi__build_huffman(stbi__huffman *h, int *count) +{ + int i,j,k=0; + unsigned int code; + // build size list for each symbol (from JPEG spec) + for (i=0; i < 16; ++i) { + for (j=0; j < count[i]; ++j) { + h->size[k++] = (stbi_uc) (i+1); + if(k >= 257) return stbi__err("bad size list","Corrupt JPEG"); + } + } + h->size[k] = 0; + + // compute actual symbols (from jpeg spec) + code = 0; + k = 0; + for(j=1; j <= 16; ++j) { + // compute delta to add to code to compute symbol id + h->delta[j] = k - code; + if (h->size[k] == j) { + while (h->size[k] == j) + h->code[k++] = (stbi__uint16) (code++); + if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG"); + } + // compute largest code + 1 for this size, preshifted as needed later + h->maxcode[j] = code << (16-j); + code <<= 1; + } + h->maxcode[j] = 0xffffffff; + + // build non-spec acceleration table; 255 is flag for not-accelerated + memset(h->fast, 255, 1 << FAST_BITS); + for (i=0; i < k; ++i) { + int s = h->size[i]; + if (s <= FAST_BITS) { + int c = h->code[i] << (FAST_BITS-s); + int m = 1 << (FAST_BITS-s); + for (j=0; j < m; ++j) { + h->fast[c+j] = (stbi_uc) i; + } + } + } + return 1; +} + +// build a table that decodes both magnitude and value of small ACs in +// one go. +static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) +{ + int i; + for (i=0; i < (1 << FAST_BITS); ++i) { + stbi_uc fast = h->fast[i]; + fast_ac[i] = 0; + if (fast < 255) { + int rs = h->values[fast]; + int run = (rs >> 4) & 15; + int magbits = rs & 15; + int len = h->size[fast]; + + if (magbits && len + magbits <= FAST_BITS) { + // magnitude code followed by receive_extend code + int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); + int m = 1 << (magbits - 1); + if (k < m) k += (~0U << magbits) + 1; + // if the result is small enough, we can fit it in fast_ac table + if (k >= -128 && k <= 127) + fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits)); + } + } + } +} + +static void stbi__grow_buffer_unsafe(stbi__jpeg *j) +{ + do { + unsigned int b = j->nomore ? 0 : stbi__get8(j->s); + if (b == 0xff) { + int c = stbi__get8(j->s); + while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes + if (c != 0) { + j->marker = (unsigned char) c; + j->nomore = 1; + return; + } + } + j->code_buffer |= b << (24 - j->code_bits); + j->code_bits += 8; + } while (j->code_bits <= 24); +} + +// (1 << n) - 1 +static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; + +// decode a jpeg huffman value from the bitstream +stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) +{ + unsigned int temp; + int c,k; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + // look at the top FAST_BITS and determine what symbol ID it is, + // if the code is <= FAST_BITS + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + k = h->fast[c]; + if (k < 255) { + int s = h->size[k]; + if (s > j->code_bits) + return -1; + j->code_buffer <<= s; + j->code_bits -= s; + return h->values[k]; + } + + // naive test is to shift the code_buffer down so k bits are + // valid, then test against maxcode. To speed this up, we've + // preshifted maxcode left so that it has (16-k) 0s at the + // end; in other words, regardless of the number of bits, it + // wants to be compared against something shifted to have 16; + // that way we don't need to shift inside the loop. + temp = j->code_buffer >> 16; + for (k=FAST_BITS+1 ; ; ++k) + if (temp < h->maxcode[k]) + break; + if (k == 17) { + // error! code not found + j->code_bits -= 16; + return -1; + } + + if (k > j->code_bits) + return -1; + + // convert the huffman code to the symbol id + c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; + if(c < 0 || c >= 256) // symbol id out of bounds! + return -1; + STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); + + // convert the id to a symbol + j->code_bits -= k; + j->code_buffer <<= k; + return h->values[c]; +} + +// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing + + sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative) + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k + (stbi__jbias[n] & (sgn - 1)); +} + +// get some unsigned bits +stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) +{ + unsigned int k; + if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k; +} + +stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) +{ + unsigned int k; + if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); + if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s intead of continuing + k = j->code_buffer; + j->code_buffer <<= 1; + --j->code_bits; + return k & 0x80000000; +} + +// given a value that's at position X in the zigzag stream, +// where does it appear in the 8x8 matrix coded as row-major? +static const stbi_uc stbi__jpeg_dezigzag[64+15] = +{ + 0, 1, 8, 16, 9, 2, 3, 10, + 17, 24, 32, 25, 18, 11, 4, 5, + 12, 19, 26, 33, 40, 48, 41, 34, + 27, 20, 13, 6, 7, 14, 21, 28, + 35, 42, 49, 56, 57, 50, 43, 36, + 29, 22, 15, 23, 30, 37, 44, 51, + 58, 59, 52, 45, 38, 31, 39, 46, + 53, 60, 61, 54, 47, 55, 62, 63, + // let corrupt input sample past end + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63 +}; + +// decode one 64-entry block-- +static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant) +{ + int diff,dc,k; + int t; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0 || t > 15) return stbi__err("bad huffman code","Corrupt JPEG"); + + // 0 all the ac values now so we can do it 32-bits at a time + memset(data,0,64*sizeof(data[0])); + + diff = t ? stbi__extend_receive(j, t) : 0; + if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta","Corrupt JPEG"); + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + if (!stbi__mul2shorts_valid(dc, dequant[0])) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + data[0] = (short) (dc * dequant[0]); + + // decode AC components, see JPEG spec + k = 1; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); + j->code_buffer <<= s; + j->code_bits -= s; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * dequant[zig]); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (rs != 0xf0) break; // end block + k += 16; + } else { + k += r; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); + } + } + } while (k < 64); + return 1; +} + +static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) +{ + int diff,dc; + int t; + if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + if (j->succ_high == 0) { + // first scan for DC coefficient, must be first + memset(data,0,64*sizeof(data[0])); // 0 all the ac values now + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + diff = t ? stbi__extend_receive(j, t) : 0; + + if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta", "Corrupt JPEG"); + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + if (!stbi__mul2shorts_valid(dc, 1 << j->succ_low)) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + data[0] = (short) (dc * (1 << j->succ_low)); + } else { + // refinement scan for DC coefficient + if (stbi__jpeg_get_bit(j)) + data[0] += (short) (1 << j->succ_low); + } + return 1; +} + +// @OPTIMIZE: store non-zigzagged during the decode passes, +// and only de-zigzag when dequantizing +static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) +{ + int k; + if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->succ_high == 0) { + int shift = j->succ_low; + + if (j->eob_run) { + --j->eob_run; + return 1; + } + + k = j->spec_start; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); + j->code_buffer <<= s; + j->code_bits -= s; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * (1 << shift)); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r); + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + --j->eob_run; + break; + } + k += 16; + } else { + k += r; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * (1 << shift)); + } + } + } while (k <= j->spec_end); + } else { + // refinement scan for these AC coefficients + + short bit = (short) (1 << j->succ_low); + + if (j->eob_run) { + --j->eob_run; + for (k = j->spec_start; k <= j->spec_end; ++k) { + short *p = &data[stbi__jpeg_dezigzag[k]]; + if (*p != 0) + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } + } else { + k = j->spec_start; + do { + int r,s; + int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r) - 1; + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + r = 64; // force end of block + } else { + // r=15 s=0 should write 16 0s, so we just do + // a run of 15 0s and then write s (which is 0), + // so we don't have to do anything special here + } + } else { + if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); + // sign bit + if (stbi__jpeg_get_bit(j)) + s = bit; + else + s = -bit; + } + + // advance by r + while (k <= j->spec_end) { + short *p = &data[stbi__jpeg_dezigzag[k++]]; + if (*p != 0) { + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } else { + if (r == 0) { + *p = (short) s; + break; + } + --r; + } + } + } while (k <= j->spec_end); + } + } + return 1; +} + +// take a -128..127 value and stbi__clamp it and convert to 0..255 +stbi_inline static stbi_uc stbi__clamp(int x) +{ + // trick to use a single test to catch both cases + if ((unsigned int) x > 255) { + if (x < 0) return 0; + if (x > 255) return 255; + } + return (stbi_uc) x; +} + +#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) +#define stbi__fsh(x) ((x) * 4096) + +// derived from jidctint -- DCT_ISLOW +#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ + int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ + p2 = s2; \ + p3 = s6; \ + p1 = (p2+p3) * stbi__f2f(0.5411961f); \ + t2 = p1 + p3*stbi__f2f(-1.847759065f); \ + t3 = p1 + p2*stbi__f2f( 0.765366865f); \ + p2 = s0; \ + p3 = s4; \ + t0 = stbi__fsh(p2+p3); \ + t1 = stbi__fsh(p2-p3); \ + x0 = t0+t3; \ + x3 = t0-t3; \ + x1 = t1+t2; \ + x2 = t1-t2; \ + t0 = s7; \ + t1 = s5; \ + t2 = s3; \ + t3 = s1; \ + p3 = t0+t2; \ + p4 = t1+t3; \ + p1 = t0+t3; \ + p2 = t1+t2; \ + p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ + t0 = t0*stbi__f2f( 0.298631336f); \ + t1 = t1*stbi__f2f( 2.053119869f); \ + t2 = t2*stbi__f2f( 3.072711026f); \ + t3 = t3*stbi__f2f( 1.501321110f); \ + p1 = p5 + p1*stbi__f2f(-0.899976223f); \ + p2 = p5 + p2*stbi__f2f(-2.562915447f); \ + p3 = p3*stbi__f2f(-1.961570560f); \ + p4 = p4*stbi__f2f(-0.390180644f); \ + t3 += p1+p4; \ + t2 += p2+p3; \ + t1 += p2+p4; \ + t0 += p1+p3; + +static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) +{ + int i,val[64],*v=val; + stbi_uc *o; + short *d = data; + + // columns + for (i=0; i < 8; ++i,++d, ++v) { + // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing + if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 + && d[40]==0 && d[48]==0 && d[56]==0) { + // no shortcut 0 seconds + // (1|2|3|4|5|6|7)==0 0 seconds + // all separate -0.047 seconds + // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds + int dcterm = d[0]*4; + v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; + } else { + STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) + // constants scaled things up by 1<<12; let's bring them back + // down, but keep 2 extra bits of precision + x0 += 512; x1 += 512; x2 += 512; x3 += 512; + v[ 0] = (x0+t3) >> 10; + v[56] = (x0-t3) >> 10; + v[ 8] = (x1+t2) >> 10; + v[48] = (x1-t2) >> 10; + v[16] = (x2+t1) >> 10; + v[40] = (x2-t1) >> 10; + v[24] = (x3+t0) >> 10; + v[32] = (x3-t0) >> 10; + } + } + + for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { + // no fast case since the first 1D IDCT spread components out + STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) + // constants scaled things up by 1<<12, plus we had 1<<2 from first + // loop, plus horizontal and vertical each scale by sqrt(8) so together + // we've got an extra 1<<3, so 1<<17 total we need to remove. + // so we want to round that, which means adding 0.5 * 1<<17, + // aka 65536. Also, we'll end up with -128 to 127 that we want + // to encode as 0..255 by adding 128, so we'll add that before the shift + x0 += 65536 + (128<<17); + x1 += 65536 + (128<<17); + x2 += 65536 + (128<<17); + x3 += 65536 + (128<<17); + // tried computing the shifts into temps, or'ing the temps to see + // if any were out of range, but that was slower + o[0] = stbi__clamp((x0+t3) >> 17); + o[7] = stbi__clamp((x0-t3) >> 17); + o[1] = stbi__clamp((x1+t2) >> 17); + o[6] = stbi__clamp((x1-t2) >> 17); + o[2] = stbi__clamp((x2+t1) >> 17); + o[5] = stbi__clamp((x2-t1) >> 17); + o[3] = stbi__clamp((x3+t0) >> 17); + o[4] = stbi__clamp((x3-t0) >> 17); + } +} + +#ifdef STBI_SSE2 +// sse2 integer IDCT. not the fastest possible implementation but it +// produces bit-identical results to the generic C version so it's +// fully "transparent". +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + // This is constructed to match our regular (generic) integer IDCT exactly. + __m128i row0, row1, row2, row3, row4, row5, row6, row7; + __m128i tmp; + + // dot product constant: even elems=x, odd elems=y + #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) + + // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) + // out(1) = c1[even]*x + c1[odd]*y + #define dct_rot(out0,out1, x,y,c0,c1) \ + __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ + __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ + __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ + __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ + __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ + __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) + + // out = in << 12 (in 16-bit, out 32-bit) + #define dct_widen(out, in) \ + __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ + __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) + + // wide add + #define dct_wadd(out, a, b) \ + __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_add_epi32(a##_h, b##_h) + + // wide sub + #define dct_wsub(out, a, b) \ + __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) + + // butterfly a/b, add bias, then shift by "s" and pack + #define dct_bfly32o(out0, out1, a,b,bias,s) \ + { \ + __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ + __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ + dct_wadd(sum, abiased, b); \ + dct_wsub(dif, abiased, b); \ + out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ + out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ + } + + // 8-bit interleave step (for transposes) + #define dct_interleave8(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi8(a, b); \ + b = _mm_unpackhi_epi8(tmp, b) + + // 16-bit interleave step (for transposes) + #define dct_interleave16(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi16(a, b); \ + b = _mm_unpackhi_epi16(tmp, b) + + #define dct_pass(bias,shift) \ + { \ + /* even part */ \ + dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ + __m128i sum04 = _mm_add_epi16(row0, row4); \ + __m128i dif04 = _mm_sub_epi16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ + dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ + __m128i sum17 = _mm_add_epi16(row1, row7); \ + __m128i sum35 = _mm_add_epi16(row3, row5); \ + dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ + dct_wadd(x4, y0o, y4o); \ + dct_wadd(x5, y1o, y5o); \ + dct_wadd(x6, y2o, y5o); \ + dct_wadd(x7, y3o, y4o); \ + dct_bfly32o(row0,row7, x0,x7,bias,shift); \ + dct_bfly32o(row1,row6, x1,x6,bias,shift); \ + dct_bfly32o(row2,row5, x2,x5,bias,shift); \ + dct_bfly32o(row3,row4, x3,x4,bias,shift); \ + } + + __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); + __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); + __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); + __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); + __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); + __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); + __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); + __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); + + // rounding biases in column/row passes, see stbi__idct_block for explanation. + __m128i bias_0 = _mm_set1_epi32(512); + __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); + + // load + row0 = _mm_load_si128((const __m128i *) (data + 0*8)); + row1 = _mm_load_si128((const __m128i *) (data + 1*8)); + row2 = _mm_load_si128((const __m128i *) (data + 2*8)); + row3 = _mm_load_si128((const __m128i *) (data + 3*8)); + row4 = _mm_load_si128((const __m128i *) (data + 4*8)); + row5 = _mm_load_si128((const __m128i *) (data + 5*8)); + row6 = _mm_load_si128((const __m128i *) (data + 6*8)); + row7 = _mm_load_si128((const __m128i *) (data + 7*8)); + + // column pass + dct_pass(bias_0, 10); + + { + // 16bit 8x8 transpose pass 1 + dct_interleave16(row0, row4); + dct_interleave16(row1, row5); + dct_interleave16(row2, row6); + dct_interleave16(row3, row7); + + // transpose pass 2 + dct_interleave16(row0, row2); + dct_interleave16(row1, row3); + dct_interleave16(row4, row6); + dct_interleave16(row5, row7); + + // transpose pass 3 + dct_interleave16(row0, row1); + dct_interleave16(row2, row3); + dct_interleave16(row4, row5); + dct_interleave16(row6, row7); + } + + // row pass + dct_pass(bias_1, 17); + + { + // pack + __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 + __m128i p1 = _mm_packus_epi16(row2, row3); + __m128i p2 = _mm_packus_epi16(row4, row5); + __m128i p3 = _mm_packus_epi16(row6, row7); + + // 8bit 8x8 transpose pass 1 + dct_interleave8(p0, p2); // a0e0a1e1... + dct_interleave8(p1, p3); // c0g0c1g1... + + // transpose pass 2 + dct_interleave8(p0, p1); // a0c0e0g0... + dct_interleave8(p2, p3); // b0d0f0h0... + + // transpose pass 3 + dct_interleave8(p0, p2); // a0b0c0d0... + dct_interleave8(p1, p3); // a4b4c4d4... + + // store + _mm_storel_epi64((__m128i *) out, p0); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p2); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p1); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p3); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); + } + +#undef dct_const +#undef dct_rot +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_interleave8 +#undef dct_interleave16 +#undef dct_pass +} + +#endif // STBI_SSE2 + +#ifdef STBI_NEON + +// NEON integer IDCT. should produce bit-identical +// results to the generic C version. +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; + + int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); + int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); + int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); + int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); + int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); + int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); + int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); + int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); + int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); + int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); + int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); + int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); + +#define dct_long_mul(out, inq, coeff) \ + int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) + +#define dct_long_mac(out, acc, inq, coeff) \ + int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) + +#define dct_widen(out, inq) \ + int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ + int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) + +// wide add +#define dct_wadd(out, a, b) \ + int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vaddq_s32(a##_h, b##_h) + +// wide sub +#define dct_wsub(out, a, b) \ + int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vsubq_s32(a##_h, b##_h) + +// butterfly a/b, then shift using "shiftop" by "s" and pack +#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ + { \ + dct_wadd(sum, a, b); \ + dct_wsub(dif, a, b); \ + out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ + out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ + } + +#define dct_pass(shiftop, shift) \ + { \ + /* even part */ \ + int16x8_t sum26 = vaddq_s16(row2, row6); \ + dct_long_mul(p1e, sum26, rot0_0); \ + dct_long_mac(t2e, p1e, row6, rot0_1); \ + dct_long_mac(t3e, p1e, row2, rot0_2); \ + int16x8_t sum04 = vaddq_s16(row0, row4); \ + int16x8_t dif04 = vsubq_s16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + int16x8_t sum15 = vaddq_s16(row1, row5); \ + int16x8_t sum17 = vaddq_s16(row1, row7); \ + int16x8_t sum35 = vaddq_s16(row3, row5); \ + int16x8_t sum37 = vaddq_s16(row3, row7); \ + int16x8_t sumodd = vaddq_s16(sum17, sum35); \ + dct_long_mul(p5o, sumodd, rot1_0); \ + dct_long_mac(p1o, p5o, sum17, rot1_1); \ + dct_long_mac(p2o, p5o, sum35, rot1_2); \ + dct_long_mul(p3o, sum37, rot2_0); \ + dct_long_mul(p4o, sum15, rot2_1); \ + dct_wadd(sump13o, p1o, p3o); \ + dct_wadd(sump24o, p2o, p4o); \ + dct_wadd(sump23o, p2o, p3o); \ + dct_wadd(sump14o, p1o, p4o); \ + dct_long_mac(x4, sump13o, row7, rot3_0); \ + dct_long_mac(x5, sump24o, row5, rot3_1); \ + dct_long_mac(x6, sump23o, row3, rot3_2); \ + dct_long_mac(x7, sump14o, row1, rot3_3); \ + dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ + dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ + dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ + dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ + } + + // load + row0 = vld1q_s16(data + 0*8); + row1 = vld1q_s16(data + 1*8); + row2 = vld1q_s16(data + 2*8); + row3 = vld1q_s16(data + 3*8); + row4 = vld1q_s16(data + 4*8); + row5 = vld1q_s16(data + 5*8); + row6 = vld1q_s16(data + 6*8); + row7 = vld1q_s16(data + 7*8); + + // add DC bias + row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); + + // column pass + dct_pass(vrshrn_n_s32, 10); + + // 16bit 8x8 transpose + { +// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. +// whether compilers actually get this is another story, sadly. +#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } +#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } + + // pass 1 + dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 + dct_trn16(row2, row3); + dct_trn16(row4, row5); + dct_trn16(row6, row7); + + // pass 2 + dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 + dct_trn32(row1, row3); + dct_trn32(row4, row6); + dct_trn32(row5, row7); + + // pass 3 + dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 + dct_trn64(row1, row5); + dct_trn64(row2, row6); + dct_trn64(row3, row7); + +#undef dct_trn16 +#undef dct_trn32 +#undef dct_trn64 + } + + // row pass + // vrshrn_n_s32 only supports shifts up to 16, we need + // 17. so do a non-rounding shift of 16 first then follow + // up with a rounding shift by 1. + dct_pass(vshrn_n_s32, 16); + + { + // pack and round + uint8x8_t p0 = vqrshrun_n_s16(row0, 1); + uint8x8_t p1 = vqrshrun_n_s16(row1, 1); + uint8x8_t p2 = vqrshrun_n_s16(row2, 1); + uint8x8_t p3 = vqrshrun_n_s16(row3, 1); + uint8x8_t p4 = vqrshrun_n_s16(row4, 1); + uint8x8_t p5 = vqrshrun_n_s16(row5, 1); + uint8x8_t p6 = vqrshrun_n_s16(row6, 1); + uint8x8_t p7 = vqrshrun_n_s16(row7, 1); + + // again, these can translate into one instruction, but often don't. +#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } +#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } + + // sadly can't use interleaved stores here since we only write + // 8 bytes to each scan line! + + // 8x8 8-bit transpose pass 1 + dct_trn8_8(p0, p1); + dct_trn8_8(p2, p3); + dct_trn8_8(p4, p5); + dct_trn8_8(p6, p7); + + // pass 2 + dct_trn8_16(p0, p2); + dct_trn8_16(p1, p3); + dct_trn8_16(p4, p6); + dct_trn8_16(p5, p7); + + // pass 3 + dct_trn8_32(p0, p4); + dct_trn8_32(p1, p5); + dct_trn8_32(p2, p6); + dct_trn8_32(p3, p7); + + // store + vst1_u8(out, p0); out += out_stride; + vst1_u8(out, p1); out += out_stride; + vst1_u8(out, p2); out += out_stride; + vst1_u8(out, p3); out += out_stride; + vst1_u8(out, p4); out += out_stride; + vst1_u8(out, p5); out += out_stride; + vst1_u8(out, p6); out += out_stride; + vst1_u8(out, p7); + +#undef dct_trn8_8 +#undef dct_trn8_16 +#undef dct_trn8_32 + } + +#undef dct_long_mul +#undef dct_long_mac +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_pass +} + +#endif // STBI_NEON + +#define STBI__MARKER_none 0xff +// if there's a pending marker from the entropy stream, return that +// otherwise, fetch from the stream and get a marker. if there's no +// marker, return 0xff, which is never a valid marker value +static stbi_uc stbi__get_marker(stbi__jpeg *j) +{ + stbi_uc x; + if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } + x = stbi__get8(j->s); + if (x != 0xff) return STBI__MARKER_none; + while (x == 0xff) + x = stbi__get8(j->s); // consume repeated 0xff fill bytes + return x; +} + +// in each scan, we'll have scan_n components, and the order +// of the components is specified by order[] +#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) + +// after a restart interval, stbi__jpeg_reset the entropy decoder and +// the dc prediction +static void stbi__jpeg_reset(stbi__jpeg *j) +{ + j->code_bits = 0; + j->code_buffer = 0; + j->nomore = 0; + j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0; + j->marker = STBI__MARKER_none; + j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; + j->eob_run = 0; + // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, + // since we don't even allow 1<<30 pixels +} + +static int stbi__parse_entropy_coded_data(stbi__jpeg *z) +{ + stbi__jpeg_reset(z); + if (!z->progressive) { + if (z->scan_n == 1) { + int i,j; + STBI_SIMD_ALIGN(short, data[64]); + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + // if it's NOT a restart, then just bail, so we get corrupt data + // rather than no data + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + STBI_SIMD_ALIGN(short, data[64]); + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x)*8; + int y2 = (j*z->img_comp[n].v + y)*8; + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } else { + if (z->scan_n == 1) { + int i,j; + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + if (z->spec_start == 0) { + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } else { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) + return 0; + } + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x); + int y2 = (j*z->img_comp[n].v + y); + short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } +} + +static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant) +{ + int i; + for (i=0; i < 64; ++i) + data[i] *= dequant[i]; +} + +static void stbi__jpeg_finish(stbi__jpeg *z) +{ + if (z->progressive) { + // dequantize and idct the data + int i,j,n; + for (n=0; n < z->s->img_n; ++n) { + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + } + } + } + } +} + +static int stbi__process_marker(stbi__jpeg *z, int m) +{ + int L; + switch (m) { + case STBI__MARKER_none: // no marker found + return stbi__err("expected marker","Corrupt JPEG"); + + case 0xDD: // DRI - specify restart interval + if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); + z->restart_interval = stbi__get16be(z->s); + return 1; + + case 0xDB: // DQT - define quantization table + L = stbi__get16be(z->s)-2; + while (L > 0) { + int q = stbi__get8(z->s); + int p = q >> 4, sixteen = (p != 0); + int t = q & 15,i; + if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG"); + if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); + + for (i=0; i < 64; ++i) + z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s)); + L -= (sixteen ? 129 : 65); + } + return L==0; + + case 0xC4: // DHT - define huffman table + L = stbi__get16be(z->s)-2; + while (L > 0) { + stbi_uc *v; + int sizes[16],i,n=0; + int q = stbi__get8(z->s); + int tc = q >> 4; + int th = q & 15; + if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); + for (i=0; i < 16; ++i) { + sizes[i] = stbi__get8(z->s); + n += sizes[i]; + } + if(n > 256) return stbi__err("bad DHT header","Corrupt JPEG"); // Loop over i < n would write past end of values! + L -= 17; + if (tc == 0) { + if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; + v = z->huff_dc[th].values; + } else { + if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; + v = z->huff_ac[th].values; + } + for (i=0; i < n; ++i) + v[i] = stbi__get8(z->s); + if (tc != 0) + stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); + L -= n; + } + return L==0; + } + + // check for comment block or APP blocks + if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { + L = stbi__get16be(z->s); + if (L < 2) { + if (m == 0xFE) + return stbi__err("bad COM len","Corrupt JPEG"); + else + return stbi__err("bad APP len","Corrupt JPEG"); + } + L -= 2; + + if (m == 0xE0 && L >= 5) { // JFIF APP0 segment + static const unsigned char tag[5] = {'J','F','I','F','\0'}; + int ok = 1; + int i; + for (i=0; i < 5; ++i) + if (stbi__get8(z->s) != tag[i]) + ok = 0; + L -= 5; + if (ok) + z->jfif = 1; + } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment + static const unsigned char tag[6] = {'A','d','o','b','e','\0'}; + int ok = 1; + int i; + for (i=0; i < 6; ++i) + if (stbi__get8(z->s) != tag[i]) + ok = 0; + L -= 6; + if (ok) { + stbi__get8(z->s); // version + stbi__get16be(z->s); // flags0 + stbi__get16be(z->s); // flags1 + z->app14_color_transform = stbi__get8(z->s); // color transform + L -= 6; + } + } + + stbi__skip(z->s, L); + return 1; + } + + return stbi__err("unknown marker","Corrupt JPEG"); +} + +// after we see SOS +static int stbi__process_scan_header(stbi__jpeg *z) +{ + int i; + int Ls = stbi__get16be(z->s); + z->scan_n = stbi__get8(z->s); + if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); + if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); + for (i=0; i < z->scan_n; ++i) { + int id = stbi__get8(z->s), which; + int q = stbi__get8(z->s); + for (which = 0; which < z->s->img_n; ++which) + if (z->img_comp[which].id == id) + break; + if (which == z->s->img_n) return 0; // no match + z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); + z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); + z->order[i] = which; + } + + { + int aa; + z->spec_start = stbi__get8(z->s); + z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 + aa = stbi__get8(z->s); + z->succ_high = (aa >> 4); + z->succ_low = (aa & 15); + if (z->progressive) { + if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) + return stbi__err("bad SOS", "Corrupt JPEG"); + } else { + if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); + if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); + z->spec_end = 63; + } + } + + return 1; +} + +static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why) +{ + int i; + for (i=0; i < ncomp; ++i) { + if (z->img_comp[i].raw_data) { + STBI_FREE(z->img_comp[i].raw_data); + z->img_comp[i].raw_data = NULL; + z->img_comp[i].data = NULL; + } + if (z->img_comp[i].raw_coeff) { + STBI_FREE(z->img_comp[i].raw_coeff); + z->img_comp[i].raw_coeff = 0; + z->img_comp[i].coeff = 0; + } + if (z->img_comp[i].linebuf) { + STBI_FREE(z->img_comp[i].linebuf); + z->img_comp[i].linebuf = NULL; + } + } + return why; +} + +static int stbi__process_frame_header(stbi__jpeg *z, int scan) +{ + stbi__context *s = z->s; + int Lf,p,i,q, h_max=1,v_max=1,c; + Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG + p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline + s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG + s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + c = stbi__get8(s); + if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG"); + s->img_n = c; + for (i=0; i < c; ++i) { + z->img_comp[i].data = NULL; + z->img_comp[i].linebuf = NULL; + } + + if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); + + z->rgb = 0; + for (i=0; i < s->img_n; ++i) { + static const unsigned char rgb[3] = { 'R', 'G', 'B' }; + z->img_comp[i].id = stbi__get8(s); + if (s->img_n == 3 && z->img_comp[i].id == rgb[i]) + ++z->rgb; + q = stbi__get8(s); + z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); + z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); + z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); + } + + if (scan != STBI__SCAN_load) return 1; + + if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode"); + + for (i=0; i < s->img_n; ++i) { + if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; + if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; + } + + // check that plane subsampling factors are integer ratios; our resamplers can't deal with fractional ratios + // and I've never seen a non-corrupted JPEG file actually use them + for (i=0; i < s->img_n; ++i) { + if (h_max % z->img_comp[i].h != 0) return stbi__err("bad H","Corrupt JPEG"); + if (v_max % z->img_comp[i].v != 0) return stbi__err("bad V","Corrupt JPEG"); + } + + // compute interleaved mcu info + z->img_h_max = h_max; + z->img_v_max = v_max; + z->img_mcu_w = h_max * 8; + z->img_mcu_h = v_max * 8; + // these sizes can't be more than 17 bits + z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; + z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; + + for (i=0; i < s->img_n; ++i) { + // number of effective pixels (e.g. for non-interleaved MCU) + z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; + z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; + // to simplify generation, we'll allocate enough memory to decode + // the bogus oversized data from using interleaved MCUs and their + // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't + // discard the extra data until colorspace conversion + // + // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier) + // so these muls can't overflow with 32-bit ints (which we require) + z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; + z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; + z->img_comp[i].coeff = 0; + z->img_comp[i].raw_coeff = 0; + z->img_comp[i].linebuf = NULL; + z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15); + if (z->img_comp[i].raw_data == NULL) + return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); + // align blocks for idct using mmx/sse + z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); + if (z->progressive) { + // w2, h2 are multiples of 8 (see above) + z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8; + z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8; + z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15); + if (z->img_comp[i].raw_coeff == NULL) + return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); + z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); + } + } + + return 1; +} + +// use comparisons since in some cases we handle more than one case (e.g. SOF) +#define stbi__DNL(x) ((x) == 0xdc) +#define stbi__SOI(x) ((x) == 0xd8) +#define stbi__EOI(x) ((x) == 0xd9) +#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) +#define stbi__SOS(x) ((x) == 0xda) + +#define stbi__SOF_progressive(x) ((x) == 0xc2) + +static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) +{ + int m; + z->jfif = 0; + z->app14_color_transform = -1; // valid values are 0,1,2 + z->marker = STBI__MARKER_none; // initialize cached marker to empty + m = stbi__get_marker(z); + if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); + if (scan == STBI__SCAN_type) return 1; + m = stbi__get_marker(z); + while (!stbi__SOF(m)) { + if (!stbi__process_marker(z,m)) return 0; + m = stbi__get_marker(z); + while (m == STBI__MARKER_none) { + // some files have extra padding after their blocks, so ok, we'll scan + if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); + m = stbi__get_marker(z); + } + } + z->progressive = stbi__SOF_progressive(m); + if (!stbi__process_frame_header(z, scan)) return 0; + return 1; +} + +static stbi_uc stbi__skip_jpeg_junk_at_end(stbi__jpeg *j) +{ + // some JPEGs have junk at end, skip over it but if we find what looks + // like a valid marker, resume there + while (!stbi__at_eof(j->s)) { + stbi_uc x = stbi__get8(j->s); + while (x == 0xff) { // might be a marker + if (stbi__at_eof(j->s)) return STBI__MARKER_none; + x = stbi__get8(j->s); + if (x != 0x00 && x != 0xff) { + // not a stuffed zero or lead-in to another marker, looks + // like an actual marker, return it + return x; + } + // stuffed zero has x=0 now which ends the loop, meaning we go + // back to regular scan loop. + // repeated 0xff keeps trying to read the next byte of the marker. + } + } + return STBI__MARKER_none; +} + +// decode image to YCbCr format +static int stbi__decode_jpeg_image(stbi__jpeg *j) +{ + int m; + for (m = 0; m < 4; m++) { + j->img_comp[m].raw_data = NULL; + j->img_comp[m].raw_coeff = NULL; + } + j->restart_interval = 0; + if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; + m = stbi__get_marker(j); + while (!stbi__EOI(m)) { + if (stbi__SOS(m)) { + if (!stbi__process_scan_header(j)) return 0; + if (!stbi__parse_entropy_coded_data(j)) return 0; + if (j->marker == STBI__MARKER_none ) { + j->marker = stbi__skip_jpeg_junk_at_end(j); + // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 + } + m = stbi__get_marker(j); + if (STBI__RESTART(m)) + m = stbi__get_marker(j); + } else if (stbi__DNL(m)) { + int Ld = stbi__get16be(j->s); + stbi__uint32 NL = stbi__get16be(j->s); + if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG"); + if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG"); + m = stbi__get_marker(j); + } else { + if (!stbi__process_marker(j, m)) return 1; + m = stbi__get_marker(j); + } + } + if (j->progressive) + stbi__jpeg_finish(j); + return 1; +} + +// static jfif-centered resampling (across block boundaries) + +typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, + int w, int hs); + +#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) + +static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + STBI_NOTUSED(out); + STBI_NOTUSED(in_far); + STBI_NOTUSED(w); + STBI_NOTUSED(hs); + return in_near; +} + +static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples vertically for every one in input + int i; + STBI_NOTUSED(hs); + for (i=0; i < w; ++i) + out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); + return out; +} + +static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples horizontally for every one in input + int i; + stbi_uc *input = in_near; + + if (w == 1) { + // if only one sample, can't do any interpolation + out[0] = out[1] = input[0]; + return out; + } + + out[0] = input[0]; + out[1] = stbi__div4(input[0]*3 + input[1] + 2); + for (i=1; i < w-1; ++i) { + int n = 3*input[i]+2; + out[i*2+0] = stbi__div4(n+input[i-1]); + out[i*2+1] = stbi__div4(n+input[i+1]); + } + out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); + out[i*2+1] = input[w-1]; + + STBI_NOTUSED(in_far); + STBI_NOTUSED(hs); + + return out; +} + +#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) + +static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i,t0,t1; + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + out[0] = stbi__div4(t1+2); + for (i=1; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i=0,t0,t1; + + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + // process groups of 8 pixels for as long as we can. + // note we can't handle the last pixel in a row in this loop + // because we need to handle the filter boundary conditions. + for (; i < ((w-1) & ~7); i += 8) { +#if defined(STBI_SSE2) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + __m128i zero = _mm_setzero_si128(); + __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); + __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); + __m128i farw = _mm_unpacklo_epi8(farb, zero); + __m128i nearw = _mm_unpacklo_epi8(nearb, zero); + __m128i diff = _mm_sub_epi16(farw, nearw); + __m128i nears = _mm_slli_epi16(nearw, 2); + __m128i curr = _mm_add_epi16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + __m128i prv0 = _mm_slli_si128(curr, 2); + __m128i nxt0 = _mm_srli_si128(curr, 2); + __m128i prev = _mm_insert_epi16(prv0, t1, 0); + __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + __m128i bias = _mm_set1_epi16(8); + __m128i curs = _mm_slli_epi16(curr, 2); + __m128i prvd = _mm_sub_epi16(prev, curr); + __m128i nxtd = _mm_sub_epi16(next, curr); + __m128i curb = _mm_add_epi16(curs, bias); + __m128i even = _mm_add_epi16(prvd, curb); + __m128i odd = _mm_add_epi16(nxtd, curb); + + // interleave even and odd pixels, then undo scaling. + __m128i int0 = _mm_unpacklo_epi16(even, odd); + __m128i int1 = _mm_unpackhi_epi16(even, odd); + __m128i de0 = _mm_srli_epi16(int0, 4); + __m128i de1 = _mm_srli_epi16(int1, 4); + + // pack and write output + __m128i outv = _mm_packus_epi16(de0, de1); + _mm_storeu_si128((__m128i *) (out + i*2), outv); +#elif defined(STBI_NEON) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + uint8x8_t farb = vld1_u8(in_far + i); + uint8x8_t nearb = vld1_u8(in_near + i); + int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); + int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); + int16x8_t curr = vaddq_s16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + int16x8_t prv0 = vextq_s16(curr, curr, 7); + int16x8_t nxt0 = vextq_s16(curr, curr, 1); + int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); + int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + int16x8_t curs = vshlq_n_s16(curr, 2); + int16x8_t prvd = vsubq_s16(prev, curr); + int16x8_t nxtd = vsubq_s16(next, curr); + int16x8_t even = vaddq_s16(curs, prvd); + int16x8_t odd = vaddq_s16(curs, nxtd); + + // undo scaling and round, then store with even/odd phases interleaved + uint8x8x2_t o; + o.val[0] = vqrshrun_n_s16(even, 4); + o.val[1] = vqrshrun_n_s16(odd, 4); + vst2_u8(out + i*2, o); +#endif + + // "previous" value for next iter + t1 = 3*in_near[i+7] + in_far[i+7]; + } + + t0 = t1; + t1 = 3*in_near[i] + in_far[i]; + out[i*2] = stbi__div16(3*t1 + t0 + 8); + + for (++i; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} +#endif + +static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // resample with nearest-neighbor + int i,j; + STBI_NOTUSED(in_far); + for (i=0; i < w; ++i) + for (j=0; j < hs; ++j) + out[i*hs+j] = in_near[i]; + return out; +} + +// this is a reduced-precision calculation of YCbCr-to-RGB introduced +// to make sure the code produces the same results in both SIMD and scalar +#define stbi__float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* stbi__float2fixed(1.40200f); + g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* stbi__float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) +{ + int i = 0; + +#ifdef STBI_SSE2 + // step == 3 is pretty ugly on the final interleave, and i'm not convinced + // it's useful in practice (you wouldn't use it for textures, for example). + // so just accelerate step == 4 case. + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + __m128i signflip = _mm_set1_epi8(-0x80); + __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); + __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); + __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); + __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); + __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); + __m128i xw = _mm_set1_epi16(255); // alpha channel + + for (; i+7 < count; i += 8) { + // load + __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); + __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); + __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); + __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 + __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 + + // unpack to short (and left-shift cr, cb by 8) + __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); + __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); + __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); + + // color transform + __m128i yws = _mm_srli_epi16(yw, 4); + __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); + __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); + __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); + __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); + __m128i rws = _mm_add_epi16(cr0, yws); + __m128i gwt = _mm_add_epi16(cb0, yws); + __m128i bws = _mm_add_epi16(yws, cb1); + __m128i gws = _mm_add_epi16(gwt, cr1); + + // descale + __m128i rw = _mm_srai_epi16(rws, 4); + __m128i bw = _mm_srai_epi16(bws, 4); + __m128i gw = _mm_srai_epi16(gws, 4); + + // back to byte, set up for transpose + __m128i brb = _mm_packus_epi16(rw, bw); + __m128i gxb = _mm_packus_epi16(gw, xw); + + // transpose to interleave channels + __m128i t0 = _mm_unpacklo_epi8(brb, gxb); + __m128i t1 = _mm_unpackhi_epi8(brb, gxb); + __m128i o0 = _mm_unpacklo_epi16(t0, t1); + __m128i o1 = _mm_unpackhi_epi16(t0, t1); + + // store + _mm_storeu_si128((__m128i *) (out + 0), o0); + _mm_storeu_si128((__m128i *) (out + 16), o1); + out += 32; + } + } +#endif + +#ifdef STBI_NEON + // in this version, step=3 support would be easy to add. but is there demand? + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + uint8x8_t signflip = vdup_n_u8(0x80); + int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); + int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); + int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); + int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); + + for (; i+7 < count; i += 8) { + // load + uint8x8_t y_bytes = vld1_u8(y + i); + uint8x8_t cr_bytes = vld1_u8(pcr + i); + uint8x8_t cb_bytes = vld1_u8(pcb + i); + int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); + int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); + + // expand to s16 + int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); + int16x8_t crw = vshll_n_s8(cr_biased, 7); + int16x8_t cbw = vshll_n_s8(cb_biased, 7); + + // color transform + int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); + int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); + int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); + int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); + int16x8_t rws = vaddq_s16(yws, cr0); + int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); + int16x8_t bws = vaddq_s16(yws, cb1); + + // undo scaling, round, convert to byte + uint8x8x4_t o; + o.val[0] = vqrshrun_n_s16(rws, 4); + o.val[1] = vqrshrun_n_s16(gws, 4); + o.val[2] = vqrshrun_n_s16(bws, 4); + o.val[3] = vdup_n_u8(255); + + // store, interleaving r/g/b/a + vst4_u8(out, o); + out += 8*4; + } + } +#endif + + for (; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* stbi__float2fixed(1.40200f); + g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* stbi__float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +// set up the kernels +static void stbi__setup_jpeg(stbi__jpeg *j) +{ + j->idct_block_kernel = stbi__idct_block; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; + +#ifdef STBI_SSE2 + if (stbi__sse2_available()) { + j->idct_block_kernel = stbi__idct_simd; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; + } +#endif + +#ifdef STBI_NEON + j->idct_block_kernel = stbi__idct_simd; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; +#endif +} + +// clean up the temporary component buffers +static void stbi__cleanup_jpeg(stbi__jpeg *j) +{ + stbi__free_jpeg_components(j, j->s->img_n, 0); +} + +typedef struct +{ + resample_row_func resample; + stbi_uc *line0,*line1; + int hs,vs; // expansion factor in each axis + int w_lores; // horizontal pixels pre-expansion + int ystep; // how far through vertical expansion we are + int ypos; // which pre-expansion row we're on +} stbi__resample; + +// fast 0..255 * 0..255 => 0..255 rounded multiplication +static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y) +{ + unsigned int t = x*y + 128; + return (stbi_uc) ((t + (t >>8)) >> 8); +} + +static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) +{ + int n, decode_n, is_rgb; + z->s->img_n = 0; // make stbi__cleanup_jpeg safe + + // validate req_comp + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + + // load a jpeg image from whichever source, but leave in YCbCr format + if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } + + // determine actual number of components to generate + n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1; + + is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif)); + + if (z->s->img_n == 3 && n < 3 && !is_rgb) + decode_n = 1; + else + decode_n = z->s->img_n; + + // nothing to do if no components requested; check this now to avoid + // accessing uninitialized coutput[0] later + if (decode_n <= 0) { stbi__cleanup_jpeg(z); return NULL; } + + // resample and color-convert + { + int k; + unsigned int i,j; + stbi_uc *output; + stbi_uc *coutput[4] = { NULL, NULL, NULL, NULL }; + + stbi__resample res_comp[4]; + + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + + // allocate line buffer big enough for upsampling off the edges + // with upsample factor of 4 + z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); + if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + r->hs = z->img_h_max / z->img_comp[k].h; + r->vs = z->img_v_max / z->img_comp[k].v; + r->ystep = r->vs >> 1; + r->w_lores = (z->s->img_x + r->hs-1) / r->hs; + r->ypos = 0; + r->line0 = r->line1 = z->img_comp[k].data; + + if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; + else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; + else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; + else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; + else r->resample = stbi__resample_row_generic; + } + + // can't error after this so, this is safe + output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1); + if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + // now go ahead and resample + for (j=0; j < z->s->img_y; ++j) { + stbi_uc *out = output + n * z->s->img_x * j; + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + int y_bot = r->ystep >= (r->vs >> 1); + coutput[k] = r->resample(z->img_comp[k].linebuf, + y_bot ? r->line1 : r->line0, + y_bot ? r->line0 : r->line1, + r->w_lores, r->hs); + if (++r->ystep >= r->vs) { + r->ystep = 0; + r->line0 = r->line1; + if (++r->ypos < z->img_comp[k].y) + r->line1 += z->img_comp[k].w2; + } + } + if (n >= 3) { + stbi_uc *y = coutput[0]; + if (z->s->img_n == 3) { + if (is_rgb) { + for (i=0; i < z->s->img_x; ++i) { + out[0] = y[i]; + out[1] = coutput[1][i]; + out[2] = coutput[2][i]; + out[3] = 255; + out += n; + } + } else { + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } + } else if (z->s->img_n == 4) { + if (z->app14_color_transform == 0) { // CMYK + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + out[0] = stbi__blinn_8x8(coutput[0][i], m); + out[1] = stbi__blinn_8x8(coutput[1][i], m); + out[2] = stbi__blinn_8x8(coutput[2][i], m); + out[3] = 255; + out += n; + } + } else if (z->app14_color_transform == 2) { // YCCK + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + out[0] = stbi__blinn_8x8(255 - out[0], m); + out[1] = stbi__blinn_8x8(255 - out[1], m); + out[2] = stbi__blinn_8x8(255 - out[2], m); + out += n; + } + } else { // YCbCr + alpha? Ignore the fourth channel for now + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } + } else + for (i=0; i < z->s->img_x; ++i) { + out[0] = out[1] = out[2] = y[i]; + out[3] = 255; // not used if n==3 + out += n; + } + } else { + if (is_rgb) { + if (n == 1) + for (i=0; i < z->s->img_x; ++i) + *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); + else { + for (i=0; i < z->s->img_x; ++i, out += 2) { + out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); + out[1] = 255; + } + } + } else if (z->s->img_n == 4 && z->app14_color_transform == 0) { + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + stbi_uc r = stbi__blinn_8x8(coutput[0][i], m); + stbi_uc g = stbi__blinn_8x8(coutput[1][i], m); + stbi_uc b = stbi__blinn_8x8(coutput[2][i], m); + out[0] = stbi__compute_y(r, g, b); + out[1] = 255; + out += n; + } + } else if (z->s->img_n == 4 && z->app14_color_transform == 2) { + for (i=0; i < z->s->img_x; ++i) { + out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]); + out[1] = 255; + out += n; + } + } else { + stbi_uc *y = coutput[0]; + if (n == 1) + for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; + else + for (i=0; i < z->s->img_x; ++i) { *out++ = y[i]; *out++ = 255; } + } + } + } + stbi__cleanup_jpeg(z); + *out_x = z->s->img_x; + *out_y = z->s->img_y; + if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output + return output; + } +} + +static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + unsigned char* result; + stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg)); + if (!j) return stbi__errpuc("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); + STBI_NOTUSED(ri); + j->s = s; + stbi__setup_jpeg(j); + result = load_jpeg_image(j, x,y,comp,req_comp); + STBI_FREE(j); + return result; +} + +static int stbi__jpeg_test(stbi__context *s) +{ + int r; + stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg)); + if (!j) return stbi__err("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); + j->s = s; + stbi__setup_jpeg(j); + r = stbi__decode_jpeg_header(j, STBI__SCAN_type); + stbi__rewind(s); + STBI_FREE(j); + return r; +} + +static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) +{ + if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { + stbi__rewind( j->s ); + return 0; + } + if (x) *x = j->s->img_x; + if (y) *y = j->s->img_y; + if (comp) *comp = j->s->img_n >= 3 ? 3 : 1; + return 1; +} + +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) +{ + int result; + stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg))); + if (!j) return stbi__err("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); + j->s = s; + result = stbi__jpeg_info_raw(j, x, y, comp); + STBI_FREE(j); + return result; +} +#endif + +// public domain zlib decode v0.2 Sean Barrett 2006-11-18 +// simple implementation +// - all input must be provided in an upfront buffer +// - all output is written to a single output buffer (can malloc/realloc) +// performance +// - fast huffman + +#ifndef STBI_NO_ZLIB + +// fast-way is faster to check than jpeg huffman, but slow way is slower +#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables +#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) +#define STBI__ZNSYMS 288 // number of symbols in literal/length alphabet + +// zlib-style huffman encoding +// (jpegs packs from left, zlib from right, so can't share code) +typedef struct +{ + stbi__uint16 fast[1 << STBI__ZFAST_BITS]; + stbi__uint16 firstcode[16]; + int maxcode[17]; + stbi__uint16 firstsymbol[16]; + stbi_uc size[STBI__ZNSYMS]; + stbi__uint16 value[STBI__ZNSYMS]; +} stbi__zhuffman; + +stbi_inline static int stbi__bitreverse16(int n) +{ + n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); + n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); + n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); + n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); + return n; +} + +stbi_inline static int stbi__bit_reverse(int v, int bits) +{ + STBI_ASSERT(bits <= 16); + // to bit reverse n bits, reverse 16 and shift + // e.g. 11 bits, bit reverse and shift away 5 + return stbi__bitreverse16(v) >> (16-bits); +} + +static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num) +{ + int i,k=0; + int code, next_code[16], sizes[17]; + + // DEFLATE spec for generating codes + memset(sizes, 0, sizeof(sizes)); + memset(z->fast, 0, sizeof(z->fast)); + for (i=0; i < num; ++i) + ++sizes[sizelist[i]]; + sizes[0] = 0; + for (i=1; i < 16; ++i) + if (sizes[i] > (1 << i)) + return stbi__err("bad sizes", "Corrupt PNG"); + code = 0; + for (i=1; i < 16; ++i) { + next_code[i] = code; + z->firstcode[i] = (stbi__uint16) code; + z->firstsymbol[i] = (stbi__uint16) k; + code = (code + sizes[i]); + if (sizes[i]) + if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); + z->maxcode[i] = code << (16-i); // preshift for inner loop + code <<= 1; + k += sizes[i]; + } + z->maxcode[16] = 0x10000; // sentinel + for (i=0; i < num; ++i) { + int s = sizelist[i]; + if (s) { + int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; + stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); + z->size [c] = (stbi_uc ) s; + z->value[c] = (stbi__uint16) i; + if (s <= STBI__ZFAST_BITS) { + int j = stbi__bit_reverse(next_code[s],s); + while (j < (1 << STBI__ZFAST_BITS)) { + z->fast[j] = fastv; + j += (1 << s); + } + } + ++next_code[s]; + } + } + return 1; +} + +// zlib-from-memory implementation for PNG reading +// because PNG allows splitting the zlib stream arbitrarily, +// and it's annoying structurally to have PNG call ZLIB call PNG, +// we require PNG read all the IDATs and combine them into a single +// memory buffer + +typedef struct +{ + stbi_uc *zbuffer, *zbuffer_end; + int num_bits; + int hit_zeof_once; + stbi__uint32 code_buffer; + + char *zout; + char *zout_start; + char *zout_end; + int z_expandable; + + stbi__zhuffman z_length, z_distance; +} stbi__zbuf; + +stbi_inline static int stbi__zeof(stbi__zbuf *z) +{ + return (z->zbuffer >= z->zbuffer_end); +} + +stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) +{ + return stbi__zeof(z) ? 0 : *z->zbuffer++; +} + +static void stbi__fill_bits(stbi__zbuf *z) +{ + do { + if (z->code_buffer >= (1U << z->num_bits)) { + z->zbuffer = z->zbuffer_end; /* treat this as EOF so we fail. */ + return; + } + z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; + z->num_bits += 8; + } while (z->num_bits <= 24); +} + +stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) +{ + unsigned int k; + if (z->num_bits < n) stbi__fill_bits(z); + k = z->code_buffer & ((1 << n) - 1); + z->code_buffer >>= n; + z->num_bits -= n; + return k; +} + +static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s,k; + // not resolved by fast table, so compute it the slow way + // use jpeg approach, which requires MSbits at top + k = stbi__bit_reverse(a->code_buffer, 16); + for (s=STBI__ZFAST_BITS+1; ; ++s) + if (k < z->maxcode[s]) + break; + if (s >= 16) return -1; // invalid code! + // code size is s, so: + b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; + if (b >= STBI__ZNSYMS) return -1; // some data was corrupt somewhere! + if (z->size[b] != s) return -1; // was originally an assert, but report failure instead. + a->code_buffer >>= s; + a->num_bits -= s; + return z->value[b]; +} + +stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s; + if (a->num_bits < 16) { + if (stbi__zeof(a)) { + if (!a->hit_zeof_once) { + // This is the first time we hit eof, insert 16 extra padding btis + // to allow us to keep going; if we actually consume any of them + // though, that is invalid data. This is caught later. + a->hit_zeof_once = 1; + a->num_bits += 16; // add 16 implicit zero bits + } else { + // We already inserted our extra 16 padding bits and are again + // out, this stream is actually prematurely terminated. + return -1; + } + } else { + stbi__fill_bits(a); + } + } + b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; + if (b) { + s = b >> 9; + a->code_buffer >>= s; + a->num_bits -= s; + return b & 511; + } + return stbi__zhuffman_decode_slowpath(a, z); +} + +static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes +{ + char *q; + unsigned int cur, limit, old_limit; + z->zout = zout; + if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); + cur = (unsigned int) (z->zout - z->zout_start); + limit = old_limit = (unsigned) (z->zout_end - z->zout_start); + if (UINT_MAX - cur < (unsigned) n) return stbi__err("outofmem", "Out of memory"); + while (cur + n > limit) { + if(limit > UINT_MAX / 2) return stbi__err("outofmem", "Out of memory"); + limit *= 2; + } + q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit); + STBI_NOTUSED(old_limit); + if (q == NULL) return stbi__err("outofmem", "Out of memory"); + z->zout_start = q; + z->zout = q + cur; + z->zout_end = q + limit; + return 1; +} + +static const int stbi__zlength_base[31] = { + 3,4,5,6,7,8,9,10,11,13, + 15,17,19,23,27,31,35,43,51,59, + 67,83,99,115,131,163,195,227,258,0,0 }; + +static const int stbi__zlength_extra[31]= +{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; + +static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, +257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; + +static const int stbi__zdist_extra[32] = +{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +static int stbi__parse_huffman_block(stbi__zbuf *a) +{ + char *zout = a->zout; + for(;;) { + int z = stbi__zhuffman_decode(a, &a->z_length); + if (z < 256) { + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes + if (zout >= a->zout_end) { + if (!stbi__zexpand(a, zout, 1)) return 0; + zout = a->zout; + } + *zout++ = (char) z; + } else { + stbi_uc *p; + int len,dist; + if (z == 256) { + a->zout = zout; + if (a->hit_zeof_once && a->num_bits < 16) { + // The first time we hit zeof, we inserted 16 extra zero bits into our bit + // buffer so the decoder can just do its speculative decoding. But if we + // actually consumed any of those bits (which is the case when num_bits < 16), + // the stream actually read past the end so it is malformed. + return stbi__err("unexpected end","Corrupt PNG"); + } + return 1; + } + if (z >= 286) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, length codes 286 and 287 must not appear in compressed data + z -= 257; + len = stbi__zlength_base[z]; + if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); + z = stbi__zhuffman_decode(a, &a->z_distance); + if (z < 0 || z >= 30) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, distance codes 30 and 31 must not appear in compressed data + dist = stbi__zdist_base[z]; + if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); + if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); + if (len > a->zout_end - zout) { + if (!stbi__zexpand(a, zout, len)) return 0; + zout = a->zout; + } + p = (stbi_uc *) (zout - dist); + if (dist == 1) { // run of one byte; common in images. + stbi_uc v = *p; + if (len) { do *zout++ = v; while (--len); } + } else { + if (len) { do *zout++ = *p++; while (--len); } + } + } + } +} + +static int stbi__compute_huffman_codes(stbi__zbuf *a) +{ + static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; + stbi__zhuffman z_codelength; + stbi_uc lencodes[286+32+137];//padding for maximum single op + stbi_uc codelength_sizes[19]; + int i,n; + + int hlit = stbi__zreceive(a,5) + 257; + int hdist = stbi__zreceive(a,5) + 1; + int hclen = stbi__zreceive(a,4) + 4; + int ntot = hlit + hdist; + + memset(codelength_sizes, 0, sizeof(codelength_sizes)); + for (i=0; i < hclen; ++i) { + int s = stbi__zreceive(a,3); + codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; + } + if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; + + n = 0; + while (n < ntot) { + int c = stbi__zhuffman_decode(a, &z_codelength); + if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); + if (c < 16) + lencodes[n++] = (stbi_uc) c; + else { + stbi_uc fill = 0; + if (c == 16) { + c = stbi__zreceive(a,2)+3; + if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG"); + fill = lencodes[n-1]; + } else if (c == 17) { + c = stbi__zreceive(a,3)+3; + } else if (c == 18) { + c = stbi__zreceive(a,7)+11; + } else { + return stbi__err("bad codelengths", "Corrupt PNG"); + } + if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG"); + memset(lencodes+n, fill, c); + n += c; + } + } + if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG"); + if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; + return 1; +} + +static int stbi__parse_uncompressed_block(stbi__zbuf *a) +{ + stbi_uc header[4]; + int len,nlen,k; + if (a->num_bits & 7) + stbi__zreceive(a, a->num_bits & 7); // discard + // drain the bit-packed data into header + k = 0; + while (a->num_bits > 0) { + header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check + a->code_buffer >>= 8; + a->num_bits -= 8; + } + if (a->num_bits < 0) return stbi__err("zlib corrupt","Corrupt PNG"); + // now fill header the normal way + while (k < 4) + header[k++] = stbi__zget8(a); + len = header[1] * 256 + header[0]; + nlen = header[3] * 256 + header[2]; + if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); + if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); + if (a->zout + len > a->zout_end) + if (!stbi__zexpand(a, a->zout, len)) return 0; + memcpy(a->zout, a->zbuffer, len); + a->zbuffer += len; + a->zout += len; + return 1; +} + +static int stbi__parse_zlib_header(stbi__zbuf *a) +{ + int cmf = stbi__zget8(a); + int cm = cmf & 15; + /* int cinfo = cmf >> 4; */ + int flg = stbi__zget8(a); + if (stbi__zeof(a)) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png + if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png + // window = 1 << (8 + cinfo)... but who cares, we fully buffer output + return 1; +} + +static const stbi_uc stbi__zdefault_length[STBI__ZNSYMS] = +{ + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8 +}; +static const stbi_uc stbi__zdefault_distance[32] = +{ + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +}; +/* +Init algorithm: +{ + int i; // use <= to match clearly with spec + for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; + for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; + for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; + for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; + + for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; +} +*/ + +static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) +{ + int final, type; + if (parse_header) + if (!stbi__parse_zlib_header(a)) return 0; + a->num_bits = 0; + a->code_buffer = 0; + a->hit_zeof_once = 0; + do { + final = stbi__zreceive(a,1); + type = stbi__zreceive(a,2); + if (type == 0) { + if (!stbi__parse_uncompressed_block(a)) return 0; + } else if (type == 3) { + return 0; + } else { + if (type == 1) { + // use fixed code lengths + if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , STBI__ZNSYMS)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; + } else { + if (!stbi__compute_huffman_codes(a)) return 0; + } + if (!stbi__parse_huffman_block(a)) return 0; + } + } while (!final); + return 1; +} + +static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) +{ + a->zout_start = obuf; + a->zout = obuf; + a->zout_end = obuf + olen; + a->z_expandable = exp; + + return stbi__parse_zlib(a, parse_header); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) +{ + return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) + return (int) (a.zout - a.zout_start); + else + return -1; +} + +STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(16384); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer+len; + if (stbi__do_zlib(&a, p, 16384, 1, 0)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) + return (int) (a.zout - a.zout_start); + else + return -1; +} +#endif + +// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 +// simple implementation +// - only 8-bit samples +// - no CRC checking +// - allocates lots of intermediate memory +// - avoids problem of streaming data between subsystems +// - avoids explicit window management +// performance +// - uses stb_zlib, a PD zlib implementation with fast huffman decoding + +#ifndef STBI_NO_PNG +typedef struct +{ + stbi__uint32 length; + stbi__uint32 type; +} stbi__pngchunk; + +static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) +{ + stbi__pngchunk c; + c.length = stbi__get32be(s); + c.type = stbi__get32be(s); + return c; +} + +static int stbi__check_png_header(stbi__context *s) +{ + static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; + int i; + for (i=0; i < 8; ++i) + if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); + return 1; +} + +typedef struct +{ + stbi__context *s; + stbi_uc *idata, *expanded, *out; + int depth; +} stbi__png; + + +enum { + STBI__F_none=0, + STBI__F_sub=1, + STBI__F_up=2, + STBI__F_avg=3, + STBI__F_paeth=4, + // synthetic filter used for first scanline to avoid needing a dummy row of 0s + STBI__F_avg_first +}; + +static stbi_uc first_row_filter[5] = +{ + STBI__F_none, + STBI__F_sub, + STBI__F_none, + STBI__F_avg_first, + STBI__F_sub // Paeth with b=c=0 turns out to be equivalent to sub +}; + +static int stbi__paeth(int a, int b, int c) +{ + // This formulation looks very different from the reference in the PNG spec, but is + // actually equivalent and has favorable data dependencies and admits straightforward + // generation of branch-free code, which helps performance significantly. + int thresh = c*3 - (a + b); + int lo = a < b ? a : b; + int hi = a < b ? b : a; + int t0 = (hi <= thresh) ? lo : c; + int t1 = (thresh <= lo) ? hi : t0; + return t1; +} + +static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; + +// adds an extra all-255 alpha channel +// dest == src is legal +// img_n must be 1 or 3 +static void stbi__create_png_alpha_expand8(stbi_uc *dest, stbi_uc *src, stbi__uint32 x, int img_n) +{ + int i; + // must process data backwards since we allow dest==src + if (img_n == 1) { + for (i=x-1; i >= 0; --i) { + dest[i*2+1] = 255; + dest[i*2+0] = src[i]; + } + } else { + STBI_ASSERT(img_n == 3); + for (i=x-1; i >= 0; --i) { + dest[i*4+3] = 255; + dest[i*4+2] = src[i*3+2]; + dest[i*4+1] = src[i*3+1]; + dest[i*4+0] = src[i*3+0]; + } + } +} + +// create the png data from post-deflated data +static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) +{ + int bytes = (depth == 16 ? 2 : 1); + stbi__context *s = a->s; + stbi__uint32 i,j,stride = x*out_n*bytes; + stbi__uint32 img_len, img_width_bytes; + stbi_uc *filter_buf; + int all_ok = 1; + int k; + int img_n = s->img_n; // copy it into a local for later + + int output_bytes = out_n*bytes; + int filter_bytes = img_n*bytes; + int width = x; + + STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); + a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into + if (!a->out) return stbi__err("outofmem", "Out of memory"); + + // note: error exits here don't need to clean up a->out individually, + // stbi__do_png always does on error. + if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG"); + img_width_bytes = (((img_n * x * depth) + 7) >> 3); + if (!stbi__mad2sizes_valid(img_width_bytes, y, img_width_bytes)) return stbi__err("too large", "Corrupt PNG"); + img_len = (img_width_bytes + 1) * y; + + // we used to check for exact match between raw_len and img_len on non-interlaced PNGs, + // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros), + // so just check for raw_len < img_len always. + if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); + + // Allocate two scan lines worth of filter workspace buffer. + filter_buf = (stbi_uc *) stbi__malloc_mad2(img_width_bytes, 2, 0); + if (!filter_buf) return stbi__err("outofmem", "Out of memory"); + + // Filtering for low-bit-depth images + if (depth < 8) { + filter_bytes = 1; + width = img_width_bytes; + } + + for (j=0; j < y; ++j) { + // cur/prior filter buffers alternate + stbi_uc *cur = filter_buf + (j & 1)*img_width_bytes; + stbi_uc *prior = filter_buf + (~j & 1)*img_width_bytes; + stbi_uc *dest = a->out + stride*j; + int nk = width * filter_bytes; + int filter = *raw++; + + // check filter type + if (filter > 4) { + all_ok = stbi__err("invalid filter","Corrupt PNG"); + break; + } + + // if first row, use special filter that doesn't sample previous row + if (j == 0) filter = first_row_filter[filter]; + + // perform actual filtering + switch (filter) { + case STBI__F_none: + memcpy(cur, raw, nk); + break; + case STBI__F_sub: + memcpy(cur, raw, filter_bytes); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); + break; + case STBI__F_up: + for (k = 0; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + prior[k]); + break; + case STBI__F_avg: + for (k = 0; k < filter_bytes; ++k) + cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); + break; + case STBI__F_paeth: + for (k = 0; k < filter_bytes; ++k) + cur[k] = STBI__BYTECAST(raw[k] + prior[k]); // prior[k] == stbi__paeth(0,prior[k],0) + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes], prior[k], prior[k-filter_bytes])); + break; + case STBI__F_avg_first: + memcpy(cur, raw, filter_bytes); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); + break; + } + + raw += nk; + + // expand decoded bits in cur to dest, also adding an extra alpha channel if desired + if (depth < 8) { + stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range + stbi_uc *in = cur; + stbi_uc *out = dest; + stbi_uc inb = 0; + stbi__uint32 nsmp = x*img_n; + + // expand bits to bytes first + if (depth == 4) { + for (i=0; i < nsmp; ++i) { + if ((i & 1) == 0) inb = *in++; + *out++ = scale * (inb >> 4); + inb <<= 4; + } + } else if (depth == 2) { + for (i=0; i < nsmp; ++i) { + if ((i & 3) == 0) inb = *in++; + *out++ = scale * (inb >> 6); + inb <<= 2; + } + } else { + STBI_ASSERT(depth == 1); + for (i=0; i < nsmp; ++i) { + if ((i & 7) == 0) inb = *in++; + *out++ = scale * (inb >> 7); + inb <<= 1; + } + } + + // insert alpha=255 values if desired + if (img_n != out_n) + stbi__create_png_alpha_expand8(dest, dest, x, img_n); + } else if (depth == 8) { + if (img_n == out_n) + memcpy(dest, cur, x*img_n); + else + stbi__create_png_alpha_expand8(dest, cur, x, img_n); + } else if (depth == 16) { + // convert the image data from big-endian to platform-native + stbi__uint16 *dest16 = (stbi__uint16*)dest; + stbi__uint32 nsmp = x*img_n; + + if (img_n == out_n) { + for (i = 0; i < nsmp; ++i, ++dest16, cur += 2) + *dest16 = (cur[0] << 8) | cur[1]; + } else { + STBI_ASSERT(img_n+1 == out_n); + if (img_n == 1) { + for (i = 0; i < x; ++i, dest16 += 2, cur += 2) { + dest16[0] = (cur[0] << 8) | cur[1]; + dest16[1] = 0xffff; + } + } else { + STBI_ASSERT(img_n == 3); + for (i = 0; i < x; ++i, dest16 += 4, cur += 6) { + dest16[0] = (cur[0] << 8) | cur[1]; + dest16[1] = (cur[2] << 8) | cur[3]; + dest16[2] = (cur[4] << 8) | cur[5]; + dest16[3] = 0xffff; + } + } + } + } + } + + STBI_FREE(filter_buf); + if (!all_ok) return 0; + + return 1; +} + +static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) +{ + int bytes = (depth == 16 ? 2 : 1); + int out_bytes = out_n * bytes; + stbi_uc *final; + int p; + if (!interlaced) + return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); + + // de-interlacing + final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0); + if (!final) return stbi__err("outofmem", "Out of memory"); + for (p=0; p < 7; ++p) { + int xorig[] = { 0,4,0,2,0,1,0 }; + int yorig[] = { 0,0,4,0,2,0,1 }; + int xspc[] = { 8,8,4,4,2,2,1 }; + int yspc[] = { 8,8,8,4,4,2,2 }; + int i,j,x,y; + // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 + x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; + y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; + if (x && y) { + stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; + if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { + STBI_FREE(final); + return 0; + } + for (j=0; j < y; ++j) { + for (i=0; i < x; ++i) { + int out_y = j*yspc[p]+yorig[p]; + int out_x = i*xspc[p]+xorig[p]; + memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes, + a->out + (j*x+i)*out_bytes, out_bytes); + } + } + STBI_FREE(a->out); + image_data += img_len; + image_data_len -= img_len; + } + } + a->out = final; + + return 1; +} + +static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + // compute color-based transparency, assuming we've + // already got 255 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i=0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 255); + p += 2; + } + } else { + for (i=0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi__uint16 *p = (stbi__uint16*) z->out; + + // compute color-based transparency, assuming we've + // already got 65535 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i = 0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 65535); + p += 2; + } + } else { + for (i = 0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) +{ + stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; + stbi_uc *p, *temp_out, *orig = a->out; + + p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0); + if (p == NULL) return stbi__err("outofmem", "Out of memory"); + + // between here and free(out) below, exitting would leak + temp_out = p; + + if (pal_img_n == 3) { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p += 3; + } + } else { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p[3] = palette[n+3]; + p += 4; + } + } + STBI_FREE(a->out); + a->out = temp_out; + + STBI_NOTUSED(len); + + return 1; +} + +static int stbi__unpremultiply_on_load_global = 0; +static int stbi__de_iphone_flag_global = 0; + +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load_global = flag_true_if_should_unpremultiply; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag_global = flag_true_if_should_convert; +} + +#ifndef STBI_THREAD_LOCAL +#define stbi__unpremultiply_on_load stbi__unpremultiply_on_load_global +#define stbi__de_iphone_flag stbi__de_iphone_flag_global +#else +static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set; +static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set; + +STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply; + stbi__unpremultiply_on_load_set = 1; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag_local = flag_true_if_should_convert; + stbi__de_iphone_flag_set = 1; +} + +#define stbi__unpremultiply_on_load (stbi__unpremultiply_on_load_set \ + ? stbi__unpremultiply_on_load_local \ + : stbi__unpremultiply_on_load_global) +#define stbi__de_iphone_flag (stbi__de_iphone_flag_set \ + ? stbi__de_iphone_flag_local \ + : stbi__de_iphone_flag_global) +#endif // STBI_THREAD_LOCAL + +static void stbi__de_iphone(stbi__png *z) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + if (s->img_out_n == 3) { // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 3; + } + } else { + STBI_ASSERT(s->img_out_n == 4); + if (stbi__unpremultiply_on_load) { + // convert bgr to rgb and unpremultiply + for (i=0; i < pixel_count; ++i) { + stbi_uc a = p[3]; + stbi_uc t = p[0]; + if (a) { + stbi_uc half = a / 2; + p[0] = (p[2] * 255 + half) / a; + p[1] = (p[1] * 255 + half) / a; + p[2] = ( t * 255 + half) / a; + } else { + p[0] = p[2]; + p[2] = t; + } + p += 4; + } + } else { + // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 4; + } + } + } +} + +#define STBI__PNG_TYPE(a,b,c,d) (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d)) + +static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) +{ + stbi_uc palette[1024], pal_img_n=0; + stbi_uc has_trans=0, tc[3]={0}; + stbi__uint16 tc16[3]; + stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; + int first=1,k,interlace=0, color=0, is_iphone=0; + stbi__context *s = z->s; + + z->expanded = NULL; + z->idata = NULL; + z->out = NULL; + + if (!stbi__check_png_header(s)) return 0; + + if (scan == STBI__SCAN_type) return 1; + + for (;;) { + stbi__pngchunk c = stbi__get_chunk_header(s); + switch (c.type) { + case STBI__PNG_TYPE('C','g','B','I'): + is_iphone = 1; + stbi__skip(s, c.length); + break; + case STBI__PNG_TYPE('I','H','D','R'): { + int comp,filter; + if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); + first = 0; + if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); + s->img_x = stbi__get32be(s); + s->img_y = stbi__get32be(s); + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + z->depth = stbi__get8(s); if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only"); + color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3 && z->depth == 16) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); + comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); + filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); + interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); + if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); + if (!pal_img_n) { + s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + } else { + // if paletted, then pal_n is our final components, and + // img_n is # components to decompress/filter. + s->img_n = 1; + if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); + } + // even with SCAN_header, have to scan to see if we have a tRNS + break; + } + + case STBI__PNG_TYPE('P','L','T','E'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); + pal_len = c.length / 3; + if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); + for (i=0; i < pal_len; ++i) { + palette[i*4+0] = stbi__get8(s); + palette[i*4+1] = stbi__get8(s); + palette[i*4+2] = stbi__get8(s); + palette[i*4+3] = 255; + } + break; + } + + case STBI__PNG_TYPE('t','R','N','S'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); + if (pal_img_n) { + if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } + if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); + if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); + pal_img_n = 4; + for (i=0; i < c.length; ++i) + palette[i*4+3] = stbi__get8(s); + } else { + if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); + if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); + has_trans = 1; + // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now. + if (scan == STBI__SCAN_header) { ++s->img_n; return 1; } + if (z->depth == 16) { + for (k = 0; k < s->img_n && k < 3; ++k) // extra loop test to suppress false GCC warning + tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is + } else { + for (k = 0; k < s->img_n && k < 3; ++k) + tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger + } + } + break; + } + + case STBI__PNG_TYPE('I','D','A','T'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); + if (scan == STBI__SCAN_header) { + // header scan definitely stops at first IDAT + if (pal_img_n) + s->img_n = pal_img_n; + return 1; + } + if (c.length > (1u << 30)) return stbi__err("IDAT size limit", "IDAT section larger than 2^30 bytes"); + if ((int)(ioff + c.length) < (int)ioff) return 0; + if (ioff + c.length > idata_limit) { + stbi__uint32 idata_limit_old = idata_limit; + stbi_uc *p; + if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; + while (ioff + c.length > idata_limit) + idata_limit *= 2; + STBI_NOTUSED(idata_limit_old); + p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); + z->idata = p; + } + if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); + ioff += c.length; + break; + } + + case STBI__PNG_TYPE('I','E','N','D'): { + stbi__uint32 raw_len, bpl; + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (scan != STBI__SCAN_load) return 1; + if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); + // initial guess for decoded data size to avoid unnecessary reallocs + bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component + raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; + z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); + if (z->expanded == NULL) return 0; // zlib should set error + STBI_FREE(z->idata); z->idata = NULL; + if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) + s->img_out_n = s->img_n+1; + else + s->img_out_n = s->img_n; + if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0; + if (has_trans) { + if (z->depth == 16) { + if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0; + } else { + if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; + } + } + if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) + stbi__de_iphone(z); + if (pal_img_n) { + // pal_img_n == 3 or 4 + s->img_n = pal_img_n; // record the actual colors we had + s->img_out_n = pal_img_n; + if (req_comp >= 3) s->img_out_n = req_comp; + if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) + return 0; + } else if (has_trans) { + // non-paletted image with tRNS -> source image has (constant) alpha + ++s->img_n; + } + STBI_FREE(z->expanded); z->expanded = NULL; + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + return 1; + } + + default: + // if critical, fail + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if ((c.type & (1 << 29)) == 0) { + #ifndef STBI_NO_FAILURE_STRINGS + // not threadsafe + static char invalid_chunk[] = "XXXX PNG chunk not known"; + invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); + invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); + invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); + invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); + #endif + return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); + } + stbi__skip(s, c.length); + break; + } + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + } +} + +static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri) +{ + void *result=NULL; + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { + if (p->depth <= 8) + ri->bits_per_channel = 8; + else if (p->depth == 16) + ri->bits_per_channel = 16; + else + return stbi__errpuc("bad bits_per_channel", "PNG not supported: unsupported color depth"); + result = p->out; + p->out = NULL; + if (req_comp && req_comp != p->s->img_out_n) { + if (ri->bits_per_channel == 8) + result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + else + result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + p->s->img_out_n = req_comp; + if (result == NULL) return result; + } + *x = p->s->img_x; + *y = p->s->img_y; + if (n) *n = p->s->img_n; + } + STBI_FREE(p->out); p->out = NULL; + STBI_FREE(p->expanded); p->expanded = NULL; + STBI_FREE(p->idata); p->idata = NULL; + + return result; +} + +static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi__png p; + p.s = s; + return stbi__do_png(&p, x,y,comp,req_comp, ri); +} + +static int stbi__png_test(stbi__context *s) +{ + int r; + r = stbi__check_png_header(s); + stbi__rewind(s); + return r; +} + +static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) +{ + if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { + stbi__rewind( p->s ); + return 0; + } + if (x) *x = p->s->img_x; + if (y) *y = p->s->img_y; + if (comp) *comp = p->s->img_n; + return 1; +} + +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__png p; + p.s = s; + return stbi__png_info_raw(&p, x, y, comp); +} + +static int stbi__png_is16(stbi__context *s) +{ + stbi__png p; + p.s = s; + if (!stbi__png_info_raw(&p, NULL, NULL, NULL)) + return 0; + if (p.depth != 16) { + stbi__rewind(p.s); + return 0; + } + return 1; +} +#endif + +// Microsoft/Windows BMP image + +#ifndef STBI_NO_BMP +static int stbi__bmp_test_raw(stbi__context *s) +{ + int r; + int sz; + if (stbi__get8(s) != 'B') return 0; + if (stbi__get8(s) != 'M') return 0; + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + stbi__get32le(s); // discard data offset + sz = stbi__get32le(s); + r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); + return r; +} + +static int stbi__bmp_test(stbi__context *s) +{ + int r = stbi__bmp_test_raw(s); + stbi__rewind(s); + return r; +} + + +// returns 0..31 for the highest set bit +static int stbi__high_bit(unsigned int z) +{ + int n=0; + if (z == 0) return -1; + if (z >= 0x10000) { n += 16; z >>= 16; } + if (z >= 0x00100) { n += 8; z >>= 8; } + if (z >= 0x00010) { n += 4; z >>= 4; } + if (z >= 0x00004) { n += 2; z >>= 2; } + if (z >= 0x00002) { n += 1;/* >>= 1;*/ } + return n; +} + +static int stbi__bitcount(unsigned int a) +{ + a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 + a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 + a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits + a = (a + (a >> 8)); // max 16 per 8 bits + a = (a + (a >> 16)); // max 32 per 8 bits + return a & 0xff; +} + +// extract an arbitrarily-aligned N-bit value (N=bits) +// from v, and then make it 8-bits long and fractionally +// extend it to full full range. +static int stbi__shiftsigned(unsigned int v, int shift, int bits) +{ + static unsigned int mul_table[9] = { + 0, + 0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/, + 0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/, + }; + static unsigned int shift_table[9] = { + 0, 0,0,1,0,2,4,6,0, + }; + if (shift < 0) + v <<= -shift; + else + v >>= shift; + STBI_ASSERT(v < 256); + v >>= (8-bits); + STBI_ASSERT(bits >= 0 && bits <= 8); + return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits]; +} + +typedef struct +{ + int bpp, offset, hsz; + unsigned int mr,mg,mb,ma, all_a; + int extra_read; +} stbi__bmp_data; + +static int stbi__bmp_set_mask_defaults(stbi__bmp_data *info, int compress) +{ + // BI_BITFIELDS specifies masks explicitly, don't override + if (compress == 3) + return 1; + + if (compress == 0) { + if (info->bpp == 16) { + info->mr = 31u << 10; + info->mg = 31u << 5; + info->mb = 31u << 0; + } else if (info->bpp == 32) { + info->mr = 0xffu << 16; + info->mg = 0xffu << 8; + info->mb = 0xffu << 0; + info->ma = 0xffu << 24; + info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 + } else { + // otherwise, use defaults, which is all-0 + info->mr = info->mg = info->mb = info->ma = 0; + } + return 1; + } + return 0; // error +} + +static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) +{ + int hsz; + if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + info->offset = stbi__get32le(s); + info->hsz = hsz = stbi__get32le(s); + info->mr = info->mg = info->mb = info->ma = 0; + info->extra_read = 14; + + if (info->offset < 0) return stbi__errpuc("bad BMP", "bad BMP"); + + if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); + if (hsz == 12) { + s->img_x = stbi__get16le(s); + s->img_y = stbi__get16le(s); + } else { + s->img_x = stbi__get32le(s); + s->img_y = stbi__get32le(s); + } + if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); + info->bpp = stbi__get16le(s); + if (hsz != 12) { + int compress = stbi__get32le(s); + if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); + if (compress >= 4) return stbi__errpuc("BMP JPEG/PNG", "BMP type not supported: unsupported compression"); // this includes PNG/JPEG modes + if (compress == 3 && info->bpp != 16 && info->bpp != 32) return stbi__errpuc("bad BMP", "bad BMP"); // bitfields requires 16 or 32 bits/pixel + stbi__get32le(s); // discard sizeof + stbi__get32le(s); // discard hres + stbi__get32le(s); // discard vres + stbi__get32le(s); // discard colorsused + stbi__get32le(s); // discard max important + if (hsz == 40 || hsz == 56) { + if (hsz == 56) { + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + } + if (info->bpp == 16 || info->bpp == 32) { + if (compress == 0) { + stbi__bmp_set_mask_defaults(info, compress); + } else if (compress == 3) { + info->mr = stbi__get32le(s); + info->mg = stbi__get32le(s); + info->mb = stbi__get32le(s); + info->extra_read += 12; + // not documented, but generated by photoshop and handled by mspaint + if (info->mr == info->mg && info->mg == info->mb) { + // ?!?!? + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else { + // V4/V5 header + int i; + if (hsz != 108 && hsz != 124) + return stbi__errpuc("bad BMP", "bad BMP"); + info->mr = stbi__get32le(s); + info->mg = stbi__get32le(s); + info->mb = stbi__get32le(s); + info->ma = stbi__get32le(s); + if (compress != 3) // override mr/mg/mb unless in BI_BITFIELDS mode, as per docs + stbi__bmp_set_mask_defaults(info, compress); + stbi__get32le(s); // discard color space + for (i=0; i < 12; ++i) + stbi__get32le(s); // discard color space parameters + if (hsz == 124) { + stbi__get32le(s); // discard rendering intent + stbi__get32le(s); // discard offset of profile data + stbi__get32le(s); // discard size of profile data + stbi__get32le(s); // discard reserved + } + } + } + return (void *) 1; +} + + +static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *out; + unsigned int mr=0,mg=0,mb=0,ma=0, all_a; + stbi_uc pal[256][4]; + int psize=0,i,j,width; + int flip_vertically, pad, target; + stbi__bmp_data info; + STBI_NOTUSED(ri); + + info.all_a = 255; + if (stbi__bmp_parse_header(s, &info) == NULL) + return NULL; // error code already set + + flip_vertically = ((int) s->img_y) > 0; + s->img_y = abs((int) s->img_y); + + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + mr = info.mr; + mg = info.mg; + mb = info.mb; + ma = info.ma; + all_a = info.all_a; + + if (info.hsz == 12) { + if (info.bpp < 24) + psize = (info.offset - info.extra_read - 24) / 3; + } else { + if (info.bpp < 16) + psize = (info.offset - info.extra_read - info.hsz) >> 2; + } + if (psize == 0) { + // accept some number of extra bytes after the header, but if the offset points either to before + // the header ends or implies a large amount of extra data, reject the file as malformed + int bytes_read_so_far = s->callback_already_read + (int)(s->img_buffer - s->img_buffer_original); + int header_limit = 1024; // max we actually read is below 256 bytes currently. + int extra_data_limit = 256*4; // what ordinarily goes here is a palette; 256 entries*4 bytes is its max size. + if (bytes_read_so_far <= 0 || bytes_read_so_far > header_limit) { + return stbi__errpuc("bad header", "Corrupt BMP"); + } + // we established that bytes_read_so_far is positive and sensible. + // the first half of this test rejects offsets that are either too small positives, or + // negative, and guarantees that info.offset >= bytes_read_so_far > 0. this in turn + // ensures the number computed in the second half of the test can't overflow. + if (info.offset < bytes_read_so_far || info.offset - bytes_read_so_far > extra_data_limit) { + return stbi__errpuc("bad offset", "Corrupt BMP"); + } else { + stbi__skip(s, info.offset - bytes_read_so_far); + } + } + + if (info.bpp == 24 && ma == 0xff000000) + s->img_n = 3; + else + s->img_n = ma ? 4 : 3; + if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 + target = req_comp; + else + target = s->img_n; // if they want monochrome, we'll post-convert + + // sanity-check size + if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0)) + return stbi__errpuc("too large", "Corrupt BMP"); + + out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + if (info.bpp < 16) { + int z=0; + if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } + for (i=0; i < psize; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + if (info.hsz != 12) stbi__get8(s); + pal[i][3] = 255; + } + stbi__skip(s, info.offset - info.extra_read - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); + if (info.bpp == 1) width = (s->img_x + 7) >> 3; + else if (info.bpp == 4) width = (s->img_x + 1) >> 1; + else if (info.bpp == 8) width = s->img_x; + else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } + pad = (-width)&3; + if (info.bpp == 1) { + for (j=0; j < (int) s->img_y; ++j) { + int bit_offset = 7, v = stbi__get8(s); + for (i=0; i < (int) s->img_x; ++i) { + int color = (v>>bit_offset)&0x1; + out[z++] = pal[color][0]; + out[z++] = pal[color][1]; + out[z++] = pal[color][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + if((--bit_offset) < 0) { + bit_offset = 7; + v = stbi__get8(s); + } + } + stbi__skip(s, pad); + } + } else { + for (j=0; j < (int) s->img_y; ++j) { + for (i=0; i < (int) s->img_x; i += 2) { + int v=stbi__get8(s),v2=0; + if (info.bpp == 4) { + v2 = v & 15; + v >>= 4; + } + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + v = (info.bpp == 8) ? stbi__get8(s) : v2; + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + } + stbi__skip(s, pad); + } + } + } else { + int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; + int z = 0; + int easy=0; + stbi__skip(s, info.offset - info.extra_read - info.hsz); + if (info.bpp == 24) width = 3 * s->img_x; + else if (info.bpp == 16) width = 2*s->img_x; + else /* bpp = 32 and pad = 0 */ width=0; + pad = (-width) & 3; + if (info.bpp == 24) { + easy = 1; + } else if (info.bpp == 32) { + if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) + easy = 2; + } + if (!easy) { + if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + // right shift amt to put high bit in position #7 + rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); + gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); + bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); + ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); + if (rcount > 8 || gcount > 8 || bcount > 8 || acount > 8) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + } + for (j=0; j < (int) s->img_y; ++j) { + if (easy) { + for (i=0; i < (int) s->img_x; ++i) { + unsigned char a; + out[z+2] = stbi__get8(s); + out[z+1] = stbi__get8(s); + out[z+0] = stbi__get8(s); + z += 3; + a = (easy == 2 ? stbi__get8(s) : 255); + all_a |= a; + if (target == 4) out[z++] = a; + } + } else { + int bpp = info.bpp; + for (i=0; i < (int) s->img_x; ++i) { + stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); + unsigned int a; + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); + a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); + all_a |= a; + if (target == 4) out[z++] = STBI__BYTECAST(a); + } + } + stbi__skip(s, pad); + } + } + + // if alpha channel is all 0s, replace with all 255s + if (target == 4 && all_a == 0) + for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) + out[i] = 255; + + if (flip_vertically) { + stbi_uc t; + for (j=0; j < (int) s->img_y>>1; ++j) { + stbi_uc *p1 = out + j *s->img_x*target; + stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; + for (i=0; i < (int) s->img_x*target; ++i) { + t = p1[i]; p1[i] = p2[i]; p2[i] = t; + } + } + } + + if (req_comp && req_comp != target) { + out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + return out; +} +#endif + +// Targa Truevision - TGA +// by Jonathan Dummer +#ifndef STBI_NO_TGA +// returns STBI_rgb or whatever, 0 on error +static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16) +{ + // only RGB or RGBA (incl. 16bit) or grey allowed + if (is_rgb16) *is_rgb16 = 0; + switch(bits_per_pixel) { + case 8: return STBI_grey; + case 16: if(is_grey) return STBI_grey_alpha; + // fallthrough + case 15: if(is_rgb16) *is_rgb16 = 1; + return STBI_rgb; + case 24: // fallthrough + case 32: return bits_per_pixel/8; + default: return 0; + } +} + +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) +{ + int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp; + int sz, tga_colormap_type; + stbi__get8(s); // discard Offset + tga_colormap_type = stbi__get8(s); // colormap type + if( tga_colormap_type > 1 ) { + stbi__rewind(s); + return 0; // only RGB or indexed allowed + } + tga_image_type = stbi__get8(s); // image type + if ( tga_colormap_type == 1 ) { // colormapped (paletted) image + if (tga_image_type != 1 && tga_image_type != 9) { + stbi__rewind(s); + return 0; + } + stbi__skip(s,4); // skip index of first colormap entry and number of entries + sz = stbi__get8(s); // check bits per palette color entry + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) { + stbi__rewind(s); + return 0; + } + stbi__skip(s,4); // skip image x and y origin + tga_colormap_bpp = sz; + } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE + if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) { + stbi__rewind(s); + return 0; // only RGB or grey allowed, +/- RLE + } + stbi__skip(s,9); // skip colormap specification and image x/y origin + tga_colormap_bpp = 0; + } + tga_w = stbi__get16le(s); + if( tga_w < 1 ) { + stbi__rewind(s); + return 0; // test width + } + tga_h = stbi__get16le(s); + if( tga_h < 1 ) { + stbi__rewind(s); + return 0; // test height + } + tga_bits_per_pixel = stbi__get8(s); // bits per pixel + stbi__get8(s); // ignore alpha bits + if (tga_colormap_bpp != 0) { + if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) { + // when using a colormap, tga_bits_per_pixel is the size of the indexes + // I don't think anything but 8 or 16bit indexes makes sense + stbi__rewind(s); + return 0; + } + tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL); + } else { + tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL); + } + if(!tga_comp) { + stbi__rewind(s); + return 0; + } + if (x) *x = tga_w; + if (y) *y = tga_h; + if (comp) *comp = tga_comp; + return 1; // seems to have passed everything +} + +static int stbi__tga_test(stbi__context *s) +{ + int res = 0; + int sz, tga_color_type; + stbi__get8(s); // discard Offset + tga_color_type = stbi__get8(s); // color type + if ( tga_color_type > 1 ) goto errorEnd; // only RGB or indexed allowed + sz = stbi__get8(s); // image type + if ( tga_color_type == 1 ) { // colormapped (paletted) image + if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9 + stbi__skip(s,4); // skip index of first colormap entry and number of entries + sz = stbi__get8(s); // check bits per palette color entry + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; + stbi__skip(s,4); // skip image x and y origin + } else { // "normal" image w/o colormap + if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE + stbi__skip(s,9); // skip colormap specification and image x/y origin + } + if ( stbi__get16le(s) < 1 ) goto errorEnd; // test width + if ( stbi__get16le(s) < 1 ) goto errorEnd; // test height + sz = stbi__get8(s); // bits per pixel + if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; + + res = 1; // if we got this far, everything's good and we can return 1 instead of 0 + +errorEnd: + stbi__rewind(s); + return res; +} + +// read 16bit value and convert to 24bit RGB +static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out) +{ + stbi__uint16 px = (stbi__uint16)stbi__get16le(s); + stbi__uint16 fiveBitMask = 31; + // we have 3 channels with 5bits each + int r = (px >> 10) & fiveBitMask; + int g = (px >> 5) & fiveBitMask; + int b = px & fiveBitMask; + // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later + out[0] = (stbi_uc)((r * 255)/31); + out[1] = (stbi_uc)((g * 255)/31); + out[2] = (stbi_uc)((b * 255)/31); + + // some people claim that the most significant bit might be used for alpha + // (possibly if an alpha-bit is set in the "image descriptor byte") + // but that only made 16bit test images completely translucent.. + // so let's treat all 15 and 16bit TGAs as RGB with no alpha. +} + +static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + // read in the TGA header stuff + int tga_offset = stbi__get8(s); + int tga_indexed = stbi__get8(s); + int tga_image_type = stbi__get8(s); + int tga_is_RLE = 0; + int tga_palette_start = stbi__get16le(s); + int tga_palette_len = stbi__get16le(s); + int tga_palette_bits = stbi__get8(s); + int tga_x_origin = stbi__get16le(s); + int tga_y_origin = stbi__get16le(s); + int tga_width = stbi__get16le(s); + int tga_height = stbi__get16le(s); + int tga_bits_per_pixel = stbi__get8(s); + int tga_comp, tga_rgb16=0; + int tga_inverted = stbi__get8(s); + // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?) + // image data + unsigned char *tga_data; + unsigned char *tga_palette = NULL; + int i, j; + unsigned char raw_data[4] = {0}; + int RLE_count = 0; + int RLE_repeating = 0; + int read_next_pixel = 1; + STBI_NOTUSED(ri); + STBI_NOTUSED(tga_x_origin); // @TODO + STBI_NOTUSED(tga_y_origin); // @TODO + + if (tga_height > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (tga_width > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + // do a tiny bit of precessing + if ( tga_image_type >= 8 ) + { + tga_image_type -= 8; + tga_is_RLE = 1; + } + tga_inverted = 1 - ((tga_inverted >> 5) & 1); + + // If I'm paletted, then I'll use the number of bits from the palette + if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16); + else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16); + + if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency + return stbi__errpuc("bad format", "Can't find out TGA pixelformat"); + + // tga info + *x = tga_width; + *y = tga_height; + if (comp) *comp = tga_comp; + + if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0)) + return stbi__errpuc("too large", "Corrupt TGA"); + + tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0); + if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); + + // skip to the data's starting position (offset usually = 0) + stbi__skip(s, tga_offset ); + + if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) { + for (i=0; i < tga_height; ++i) { + int row = tga_inverted ? tga_height -i - 1 : i; + stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; + stbi__getn(s, tga_row, tga_width * tga_comp); + } + } else { + // do I need to load a palette? + if ( tga_indexed) + { + if (tga_palette_len == 0) { /* you have to have at least one entry! */ + STBI_FREE(tga_data); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + + // any data to skip? (offset usually = 0) + stbi__skip(s, tga_palette_start ); + // load the palette + tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0); + if (!tga_palette) { + STBI_FREE(tga_data); + return stbi__errpuc("outofmem", "Out of memory"); + } + if (tga_rgb16) { + stbi_uc *pal_entry = tga_palette; + STBI_ASSERT(tga_comp == STBI_rgb); + for (i=0; i < tga_palette_len; ++i) { + stbi__tga_read_rgb16(s, pal_entry); + pal_entry += tga_comp; + } + } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) { + STBI_FREE(tga_data); + STBI_FREE(tga_palette); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + } + // load the data + for (i=0; i < tga_width * tga_height; ++i) + { + // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? + if ( tga_is_RLE ) + { + if ( RLE_count == 0 ) + { + // yep, get the next byte as a RLE command + int RLE_cmd = stbi__get8(s); + RLE_count = 1 + (RLE_cmd & 127); + RLE_repeating = RLE_cmd >> 7; + read_next_pixel = 1; + } else if ( !RLE_repeating ) + { + read_next_pixel = 1; + } + } else + { + read_next_pixel = 1; + } + // OK, if I need to read a pixel, do it now + if ( read_next_pixel ) + { + // load however much data we did have + if ( tga_indexed ) + { + // read in index, then perform the lookup + int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s); + if ( pal_idx >= tga_palette_len ) { + // invalid index + pal_idx = 0; + } + pal_idx *= tga_comp; + for (j = 0; j < tga_comp; ++j) { + raw_data[j] = tga_palette[pal_idx+j]; + } + } else if(tga_rgb16) { + STBI_ASSERT(tga_comp == STBI_rgb); + stbi__tga_read_rgb16(s, raw_data); + } else { + // read in the data raw + for (j = 0; j < tga_comp; ++j) { + raw_data[j] = stbi__get8(s); + } + } + // clear the reading flag for the next pixel + read_next_pixel = 0; + } // end of reading a pixel + + // copy data + for (j = 0; j < tga_comp; ++j) + tga_data[i*tga_comp+j] = raw_data[j]; + + // in case we're in RLE mode, keep counting down + --RLE_count; + } + // do I need to invert the image? + if ( tga_inverted ) + { + for (j = 0; j*2 < tga_height; ++j) + { + int index1 = j * tga_width * tga_comp; + int index2 = (tga_height - 1 - j) * tga_width * tga_comp; + for (i = tga_width * tga_comp; i > 0; --i) + { + unsigned char temp = tga_data[index1]; + tga_data[index1] = tga_data[index2]; + tga_data[index2] = temp; + ++index1; + ++index2; + } + } + } + // clear my palette, if I had one + if ( tga_palette != NULL ) + { + STBI_FREE( tga_palette ); + } + } + + // swap RGB - if the source data was RGB16, it already is in the right order + if (tga_comp >= 3 && !tga_rgb16) + { + unsigned char* tga_pixel = tga_data; + for (i=0; i < tga_width * tga_height; ++i) + { + unsigned char temp = tga_pixel[0]; + tga_pixel[0] = tga_pixel[2]; + tga_pixel[2] = temp; + tga_pixel += tga_comp; + } + } + + // convert to target component count + if (req_comp && req_comp != tga_comp) + tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); + + // the things I do to get rid of an error message, and yet keep + // Microsoft's C compilers happy... [8^( + tga_palette_start = tga_palette_len = tga_palette_bits = + tga_x_origin = tga_y_origin = 0; + STBI_NOTUSED(tga_palette_start); + // OK, done + return tga_data; +} +#endif + +// ************************************************************************************************* +// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s) +{ + int r = (stbi__get32be(s) == 0x38425053); + stbi__rewind(s); + return r; +} + +static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount) +{ + int count, nleft, len; + + count = 0; + while ((nleft = pixelCount - count) > 0) { + len = stbi__get8(s); + if (len == 128) { + // No-op. + } else if (len < 128) { + // Copy next len+1 bytes literally. + len++; + if (len > nleft) return 0; // corrupt data + count += len; + while (len) { + *p = stbi__get8(s); + p += 4; + len--; + } + } else if (len > 128) { + stbi_uc val; + // Next -len+1 bytes in the dest are replicated from next source byte. + // (Interpret len as a negative 8-bit int.) + len = 257 - len; + if (len > nleft) return 0; // corrupt data + val = stbi__get8(s); + count += len; + while (len) { + *p = val; + p += 4; + len--; + } + } + } + + return 1; +} + +static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) +{ + int pixelCount; + int channelCount, compression; + int channel, i; + int bitdepth; + int w,h; + stbi_uc *out; + STBI_NOTUSED(ri); + + // Check identifier + if (stbi__get32be(s) != 0x38425053) // "8BPS" + return stbi__errpuc("not PSD", "Corrupt PSD image"); + + // Check file type version. + if (stbi__get16be(s) != 1) + return stbi__errpuc("wrong version", "Unsupported version of PSD image"); + + // Skip 6 reserved bytes. + stbi__skip(s, 6 ); + + // Read the number of channels (R, G, B, A, etc). + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) + return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); + + // Read the rows and columns of the image. + h = stbi__get32be(s); + w = stbi__get32be(s); + + if (h > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (w > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + // Make sure the depth is 8 bits. + bitdepth = stbi__get16be(s); + if (bitdepth != 8 && bitdepth != 16) + return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); + + // Make sure the color mode is RGB. + // Valid options are: + // 0: Bitmap + // 1: Grayscale + // 2: Indexed color + // 3: RGB color + // 4: CMYK color + // 7: Multichannel + // 8: Duotone + // 9: Lab color + if (stbi__get16be(s) != 3) + return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); + + // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) + stbi__skip(s,stbi__get32be(s) ); + + // Skip the image resources. (resolution, pen tool paths, etc) + stbi__skip(s, stbi__get32be(s) ); + + // Skip the reserved data. + stbi__skip(s, stbi__get32be(s) ); + + // Find out if the data is compressed. + // Known values: + // 0: no compression + // 1: RLE compressed + compression = stbi__get16be(s); + if (compression > 1) + return stbi__errpuc("bad compression", "PSD has an unknown compression format"); + + // Check size + if (!stbi__mad3sizes_valid(4, w, h, 0)) + return stbi__errpuc("too large", "Corrupt PSD"); + + // Create the destination image. + + if (!compression && bitdepth == 16 && bpc == 16) { + out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0); + ri->bits_per_channel = 16; + } else + out = (stbi_uc *) stbi__malloc(4 * w*h); + + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + pixelCount = w*h; + + // Initialize the data to zero. + //memset( out, 0, pixelCount * 4 ); + + // Finally, the image data. + if (compression) { + // RLE as used by .PSD and .TIFF + // Loop until you get the number of unpacked bytes you are expecting: + // Read the next source byte into n. + // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. + // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. + // Else if n is 128, noop. + // Endloop + + // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, + // which we're going to just skip. + stbi__skip(s, h * channelCount * 2 ); + + // Read the RLE data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out+channel; + if (channel >= channelCount) { + // Fill this channel with default data. + for (i = 0; i < pixelCount; i++, p += 4) + *p = (channel == 3 ? 255 : 0); + } else { + // Read the RLE data. + if (!stbi__psd_decode_rle(s, p, pixelCount)) { + STBI_FREE(out); + return stbi__errpuc("corrupt", "bad RLE data"); + } + } + } + + } else { + // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) + // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image. + + // Read the data by channel. + for (channel = 0; channel < 4; channel++) { + if (channel >= channelCount) { + // Fill this channel with default data. + if (bitdepth == 16 && bpc == 16) { + stbi__uint16 *q = ((stbi__uint16 *) out) + channel; + stbi__uint16 val = channel == 3 ? 65535 : 0; + for (i = 0; i < pixelCount; i++, q += 4) + *q = val; + } else { + stbi_uc *p = out+channel; + stbi_uc val = channel == 3 ? 255 : 0; + for (i = 0; i < pixelCount; i++, p += 4) + *p = val; + } + } else { + if (ri->bits_per_channel == 16) { // output bpc + stbi__uint16 *q = ((stbi__uint16 *) out) + channel; + for (i = 0; i < pixelCount; i++, q += 4) + *q = (stbi__uint16) stbi__get16be(s); + } else { + stbi_uc *p = out+channel; + if (bitdepth == 16) { // input bpc + for (i = 0; i < pixelCount; i++, p += 4) + *p = (stbi_uc) (stbi__get16be(s) >> 8); + } else { + for (i = 0; i < pixelCount; i++, p += 4) + *p = stbi__get8(s); + } + } + } + } + } + + // remove weird white matte from PSD + if (channelCount >= 4) { + if (ri->bits_per_channel == 16) { + for (i=0; i < w*h; ++i) { + stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i; + if (pixel[3] != 0 && pixel[3] != 65535) { + float a = pixel[3] / 65535.0f; + float ra = 1.0f / a; + float inv_a = 65535.0f * (1 - ra); + pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a); + pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a); + pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a); + } + } + } else { + for (i=0; i < w*h; ++i) { + unsigned char *pixel = out + 4*i; + if (pixel[3] != 0 && pixel[3] != 255) { + float a = pixel[3] / 255.0f; + float ra = 1.0f / a; + float inv_a = 255.0f * (1 - ra); + pixel[0] = (unsigned char) (pixel[0]*ra + inv_a); + pixel[1] = (unsigned char) (pixel[1]*ra + inv_a); + pixel[2] = (unsigned char) (pixel[2]*ra + inv_a); + } + } + } + } + + // convert to desired output format + if (req_comp && req_comp != 4) { + if (ri->bits_per_channel == 16) + out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h); + else + out = stbi__convert_format(out, 4, req_comp, w, h); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + if (comp) *comp = 4; + *y = h; + *x = w; + + return out; +} +#endif + +// ************************************************************************************************* +// Softimage PIC loader +// by Tom Seddon +// +// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format +// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ + +#ifndef STBI_NO_PIC +static int stbi__pic_is4(stbi__context *s,const char *str) +{ + int i; + for (i=0; i<4; ++i) + if (stbi__get8(s) != (stbi_uc)str[i]) + return 0; + + return 1; +} + +static int stbi__pic_test_core(stbi__context *s) +{ + int i; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) + return 0; + + for(i=0;i<84;++i) + stbi__get8(s); + + if (!stbi__pic_is4(s,"PICT")) + return 0; + + return 1; +} + +typedef struct +{ + stbi_uc size,type,channel; +} stbi__pic_packet; + +static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) +{ + int mask=0x80, i; + + for (i=0; i<4; ++i, mask>>=1) { + if (channel & mask) { + if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); + dest[i]=stbi__get8(s); + } + } + + return dest; +} + +static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) +{ + int mask=0x80,i; + + for (i=0;i<4; ++i, mask>>=1) + if (channel&mask) + dest[i]=src[i]; +} + +static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) +{ + int act_comp=0,num_packets=0,y,chained; + stbi__pic_packet packets[10]; + + // this will (should...) cater for even some bizarre stuff like having data + // for the same channel in multiple packets. + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return stbi__errpuc("bad format","too many packets"); + + packet = &packets[num_packets++]; + + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + + act_comp |= packet->channel; + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); + if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? + + for(y=0; ytype) { + default: + return stbi__errpuc("bad format","packet has bad compression type"); + + case 0: {//uncompressed + int x; + + for(x=0;xchannel,dest)) + return 0; + break; + } + + case 1://Pure RLE + { + int left=width, i; + + while (left>0) { + stbi_uc count,value[4]; + + count=stbi__get8(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); + + if (count > left) + count = (stbi_uc) left; + + if (!stbi__readval(s,packet->channel,value)) return 0; + + for(i=0; ichannel,dest,value); + left -= count; + } + } + break; + + case 2: {//Mixed RLE + int left=width; + while (left>0) { + int count = stbi__get8(s), i; + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); + + if (count >= 128) { // Repeated + stbi_uc value[4]; + + if (count==128) + count = stbi__get16be(s); + else + count -= 127; + if (count > left) + return stbi__errpuc("bad file","scanline overrun"); + + if (!stbi__readval(s,packet->channel,value)) + return 0; + + for(i=0;ichannel,dest,value); + } else { // Raw + ++count; + if (count>left) return stbi__errpuc("bad file","scanline overrun"); + + for(i=0;ichannel,dest)) + return 0; + } + left-=count; + } + break; + } + } + } + } + + return result; +} + +static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri) +{ + stbi_uc *result; + int i, x,y, internal_comp; + STBI_NOTUSED(ri); + + if (!comp) comp = &internal_comp; + + for (i=0; i<92; ++i) + stbi__get8(s); + + x = stbi__get16be(s); + y = stbi__get16be(s); + + if (y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); + if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode"); + + stbi__get32be(s); //skip `ratio' + stbi__get16be(s); //skip `fields' + stbi__get16be(s); //skip `pad' + + // intermediate buffer is RGBA + result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0); + if (!result) return stbi__errpuc("outofmem", "Out of memory"); + memset(result, 0xff, x*y*4); + + if (!stbi__pic_load_core(s,x,y,comp, result)) { + STBI_FREE(result); + result=0; + } + *px = x; + *py = y; + if (req_comp == 0) req_comp = *comp; + result=stbi__convert_format(result,4,req_comp,x,y); + + return result; +} + +static int stbi__pic_test(stbi__context *s) +{ + int r = stbi__pic_test_core(s); + stbi__rewind(s); + return r; +} +#endif + +// ************************************************************************************************* +// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb + +#ifndef STBI_NO_GIF +typedef struct +{ + stbi__int16 prefix; + stbi_uc first; + stbi_uc suffix; +} stbi__gif_lzw; + +typedef struct +{ + int w,h; + stbi_uc *out; // output buffer (always 4 components) + stbi_uc *background; // The current "background" as far as a gif is concerned + stbi_uc *history; + int flags, bgindex, ratio, transparent, eflags; + stbi_uc pal[256][4]; + stbi_uc lpal[256][4]; + stbi__gif_lzw codes[8192]; + stbi_uc *color_table; + int parse, step; + int lflags; + int start_x, start_y; + int max_x, max_y; + int cur_x, cur_y; + int line_size; + int delay; +} stbi__gif; + +static int stbi__gif_test_raw(stbi__context *s) +{ + int sz; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; + sz = stbi__get8(s); + if (sz != '9' && sz != '7') return 0; + if (stbi__get8(s) != 'a') return 0; + return 1; +} + +static int stbi__gif_test(stbi__context *s) +{ + int r = stbi__gif_test_raw(s); + stbi__rewind(s); + return r; +} + +static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) +{ + int i; + for (i=0; i < num_entries; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + pal[i][3] = transp == i ? 0 : 255; + } +} + +static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) +{ + stbi_uc version; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') + return stbi__err("not GIF", "Corrupt GIF"); + + version = stbi__get8(s); + if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); + if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); + + stbi__g_failure_reason = ""; + g->w = stbi__get16le(s); + g->h = stbi__get16le(s); + g->flags = stbi__get8(s); + g->bgindex = stbi__get8(s); + g->ratio = stbi__get8(s); + g->transparent = -1; + + if (g->w > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (g->h > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + + if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments + + if (is_info) return 1; + + if (g->flags & 0x80) + stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); + + return 1; +} + +static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif)); + if (!g) return stbi__err("outofmem", "Out of memory"); + if (!stbi__gif_header(s, g, comp, 1)) { + STBI_FREE(g); + stbi__rewind( s ); + return 0; + } + if (x) *x = g->w; + if (y) *y = g->h; + STBI_FREE(g); + return 1; +} + +static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) +{ + stbi_uc *p, *c; + int idx; + + // recurse to decode the prefixes, since the linked-list is backwards, + // and working backwards through an interleaved image would be nasty + if (g->codes[code].prefix >= 0) + stbi__out_gif_code(g, g->codes[code].prefix); + + if (g->cur_y >= g->max_y) return; + + idx = g->cur_x + g->cur_y; + p = &g->out[idx]; + g->history[idx / 4] = 1; + + c = &g->color_table[g->codes[code].suffix * 4]; + if (c[3] > 128) { // don't render transparent pixels; + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = c[3]; + } + g->cur_x += 4; + + if (g->cur_x >= g->max_x) { + g->cur_x = g->start_x; + g->cur_y += g->step; + + while (g->cur_y >= g->max_y && g->parse > 0) { + g->step = (1 << g->parse) * g->line_size; + g->cur_y = g->start_y + (g->step >> 1); + --g->parse; + } + } +} + +static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) +{ + stbi_uc lzw_cs; + stbi__int32 len, init_code; + stbi__uint32 first; + stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; + stbi__gif_lzw *p; + + lzw_cs = stbi__get8(s); + if (lzw_cs > 12) return NULL; + clear = 1 << lzw_cs; + first = 1; + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + bits = 0; + valid_bits = 0; + for (init_code = 0; init_code < clear; init_code++) { + g->codes[init_code].prefix = -1; + g->codes[init_code].first = (stbi_uc) init_code; + g->codes[init_code].suffix = (stbi_uc) init_code; + } + + // support no starting clear code + avail = clear+2; + oldcode = -1; + + len = 0; + for(;;) { + if (valid_bits < codesize) { + if (len == 0) { + len = stbi__get8(s); // start new block + if (len == 0) + return g->out; + } + --len; + bits |= (stbi__int32) stbi__get8(s) << valid_bits; + valid_bits += 8; + } else { + stbi__int32 code = bits & codemask; + bits >>= codesize; + valid_bits -= codesize; + // @OPTIMIZE: is there some way we can accelerate the non-clear path? + if (code == clear) { // clear code + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + avail = clear + 2; + oldcode = -1; + first = 0; + } else if (code == clear + 1) { // end of stream code + stbi__skip(s, len); + while ((len = stbi__get8(s)) > 0) + stbi__skip(s,len); + return g->out; + } else if (code <= avail) { + if (first) { + return stbi__errpuc("no clear code", "Corrupt GIF"); + } + + if (oldcode >= 0) { + p = &g->codes[avail++]; + if (avail > 8192) { + return stbi__errpuc("too many codes", "Corrupt GIF"); + } + + p->prefix = (stbi__int16) oldcode; + p->first = g->codes[oldcode].first; + p->suffix = (code == avail) ? p->first : g->codes[code].first; + } else if (code == avail) + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + + stbi__out_gif_code(g, (stbi__uint16) code); + + if ((avail & codemask) == 0 && avail <= 0x0FFF) { + codesize++; + codemask = (1 << codesize) - 1; + } + + oldcode = code; + } else { + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + } + } + } +} + +// this function is designed to support animated gifs, although stb_image doesn't support it +// two back is the image from two frames ago, used for a very specific disposal format +static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back) +{ + int dispose; + int first_frame; + int pi; + int pcount; + STBI_NOTUSED(req_comp); + + // on first frame, any non-written pixels get the background colour (non-transparent) + first_frame = 0; + if (g->out == 0) { + if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header + if (!stbi__mad3sizes_valid(4, g->w, g->h, 0)) + return stbi__errpuc("too large", "GIF image is too large"); + pcount = g->w * g->h; + g->out = (stbi_uc *) stbi__malloc(4 * pcount); + g->background = (stbi_uc *) stbi__malloc(4 * pcount); + g->history = (stbi_uc *) stbi__malloc(pcount); + if (!g->out || !g->background || !g->history) + return stbi__errpuc("outofmem", "Out of memory"); + + // image is treated as "transparent" at the start - ie, nothing overwrites the current background; + // background colour is only used for pixels that are not rendered first frame, after that "background" + // color refers to the color that was there the previous frame. + memset(g->out, 0x00, 4 * pcount); + memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent) + memset(g->history, 0x00, pcount); // pixels that were affected previous frame + first_frame = 1; + } else { + // second frame - how do we dispose of the previous one? + dispose = (g->eflags & 0x1C) >> 2; + pcount = g->w * g->h; + + if ((dispose == 3) && (two_back == 0)) { + dispose = 2; // if I don't have an image to revert back to, default to the old background + } + + if (dispose == 3) { // use previous graphic + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi]) { + memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); + } + } + } else if (dispose == 2) { + // restore what was changed last frame to background before that frame; + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi]) { + memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); + } + } + } else { + // This is a non-disposal case eithe way, so just + // leave the pixels as is, and they will become the new background + // 1: do not dispose + // 0: not specified. + } + + // background is what out is after the undoing of the previou frame; + memcpy( g->background, g->out, 4 * g->w * g->h ); + } + + // clear my history; + memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame + + for (;;) { + int tag = stbi__get8(s); + switch (tag) { + case 0x2C: /* Image Descriptor */ + { + stbi__int32 x, y, w, h; + stbi_uc *o; + + x = stbi__get16le(s); + y = stbi__get16le(s); + w = stbi__get16le(s); + h = stbi__get16le(s); + if (((x + w) > (g->w)) || ((y + h) > (g->h))) + return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); + + g->line_size = g->w * 4; + g->start_x = x * 4; + g->start_y = y * g->line_size; + g->max_x = g->start_x + w * 4; + g->max_y = g->start_y + h * g->line_size; + g->cur_x = g->start_x; + g->cur_y = g->start_y; + + // if the width of the specified rectangle is 0, that means + // we may not see *any* pixels or the image is malformed; + // to make sure this is caught, move the current y down to + // max_y (which is what out_gif_code checks). + if (w == 0) + g->cur_y = g->max_y; + + g->lflags = stbi__get8(s); + + if (g->lflags & 0x40) { + g->step = 8 * g->line_size; // first interlaced spacing + g->parse = 3; + } else { + g->step = g->line_size; + g->parse = 0; + } + + if (g->lflags & 0x80) { + stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); + g->color_table = (stbi_uc *) g->lpal; + } else if (g->flags & 0x80) { + g->color_table = (stbi_uc *) g->pal; + } else + return stbi__errpuc("missing color table", "Corrupt GIF"); + + o = stbi__process_gif_raster(s, g); + if (!o) return NULL; + + // if this was the first frame, + pcount = g->w * g->h; + if (first_frame && (g->bgindex > 0)) { + // if first frame, any pixel not drawn to gets the background color + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi] == 0) { + g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; + memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); + } + } + } + + return o; + } + + case 0x21: // Comment Extension. + { + int len; + int ext = stbi__get8(s); + if (ext == 0xF9) { // Graphic Control Extension. + len = stbi__get8(s); + if (len == 4) { + g->eflags = stbi__get8(s); + g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths. + + // unset old transparent + if (g->transparent >= 0) { + g->pal[g->transparent][3] = 255; + } + if (g->eflags & 0x01) { + g->transparent = stbi__get8(s); + if (g->transparent >= 0) { + g->pal[g->transparent][3] = 0; + } + } else { + // don't need transparent + stbi__skip(s, 1); + g->transparent = -1; + } + } else { + stbi__skip(s, len); + break; + } + } + while ((len = stbi__get8(s)) != 0) { + stbi__skip(s, len); + } + break; + } + + case 0x3B: // gif stream termination code + return (stbi_uc *) s; // using '1' causes warning on some compilers + + default: + return stbi__errpuc("unknown code", "Corrupt GIF"); + } + } +} + +static void *stbi__load_gif_main_outofmem(stbi__gif *g, stbi_uc *out, int **delays) +{ + STBI_FREE(g->out); + STBI_FREE(g->history); + STBI_FREE(g->background); + + if (out) STBI_FREE(out); + if (delays && *delays) STBI_FREE(*delays); + return stbi__errpuc("outofmem", "Out of memory"); +} + +static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp) +{ + if (stbi__gif_test(s)) { + int layers = 0; + stbi_uc *u = 0; + stbi_uc *out = 0; + stbi_uc *two_back = 0; + stbi__gif g; + int stride; + int out_size = 0; + int delays_size = 0; + + STBI_NOTUSED(out_size); + STBI_NOTUSED(delays_size); + + memset(&g, 0, sizeof(g)); + if (delays) { + *delays = 0; + } + + do { + u = stbi__gif_load_next(s, &g, comp, req_comp, two_back); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + + if (u) { + *x = g.w; + *y = g.h; + ++layers; + stride = g.w * g.h * 4; + + if (out) { + void *tmp = (stbi_uc*) STBI_REALLOC_SIZED( out, out_size, layers * stride ); + if (!tmp) + return stbi__load_gif_main_outofmem(&g, out, delays); + else { + out = (stbi_uc*) tmp; + out_size = layers * stride; + } + + if (delays) { + int *new_delays = (int*) STBI_REALLOC_SIZED( *delays, delays_size, sizeof(int) * layers ); + if (!new_delays) + return stbi__load_gif_main_outofmem(&g, out, delays); + *delays = new_delays; + delays_size = layers * sizeof(int); + } + } else { + out = (stbi_uc*)stbi__malloc( layers * stride ); + if (!out) + return stbi__load_gif_main_outofmem(&g, out, delays); + out_size = layers * stride; + if (delays) { + *delays = (int*) stbi__malloc( layers * sizeof(int) ); + if (!*delays) + return stbi__load_gif_main_outofmem(&g, out, delays); + delays_size = layers * sizeof(int); + } + } + memcpy( out + ((layers - 1) * stride), u, stride ); + if (layers >= 2) { + two_back = out - 2 * stride; + } + + if (delays) { + (*delays)[layers - 1U] = g.delay; + } + } + } while (u != 0); + + // free temp buffer; + STBI_FREE(g.out); + STBI_FREE(g.history); + STBI_FREE(g.background); + + // do the final conversion after loading everything; + if (req_comp && req_comp != 4) + out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h); + + *z = layers; + return out; + } else { + return stbi__errpuc("not GIF", "Image was not as a gif type."); + } +} + +static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *u = 0; + stbi__gif g; + memset(&g, 0, sizeof(g)); + STBI_NOTUSED(ri); + + u = stbi__gif_load_next(s, &g, comp, req_comp, 0); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + if (u) { + *x = g.w; + *y = g.h; + + // moved conversion to after successful load so that the same + // can be done for multiple frames. + if (req_comp && req_comp != 4) + u = stbi__convert_format(u, 4, req_comp, g.w, g.h); + } else if (g.out) { + // if there was an error and we allocated an image buffer, free it! + STBI_FREE(g.out); + } + + // free buffers needed for multiple frame loading; + STBI_FREE(g.history); + STBI_FREE(g.background); + + return u; +} + +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) +{ + return stbi__gif_info_raw(s,x,y,comp); +} +#endif + +// ************************************************************************************************* +// Radiance RGBE HDR loader +// originally by Nicolas Schulz +#ifndef STBI_NO_HDR +static int stbi__hdr_test_core(stbi__context *s, const char *signature) +{ + int i; + for (i=0; signature[i]; ++i) + if (stbi__get8(s) != signature[i]) + return 0; + stbi__rewind(s); + return 1; +} + +static int stbi__hdr_test(stbi__context* s) +{ + int r = stbi__hdr_test_core(s, "#?RADIANCE\n"); + stbi__rewind(s); + if(!r) { + r = stbi__hdr_test_core(s, "#?RGBE\n"); + stbi__rewind(s); + } + return r; +} + +#define STBI__HDR_BUFLEN 1024 +static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) +{ + int len=0; + char c = '\0'; + + c = (char) stbi__get8(z); + + while (!stbi__at_eof(z) && c != '\n') { + buffer[len++] = c; + if (len == STBI__HDR_BUFLEN-1) { + // flush to end of line + while (!stbi__at_eof(z) && stbi__get8(z) != '\n') + ; + break; + } + c = (char) stbi__get8(z); + } + + buffer[len] = 0; + return buffer; +} + +static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) +{ + if ( input[3] != 0 ) { + float f1; + // Exponent + f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); + if (req_comp <= 2) + output[0] = (input[0] + input[1] + input[2]) * f1 / 3; + else { + output[0] = input[0] * f1; + output[1] = input[1] * f1; + output[2] = input[2] * f1; + } + if (req_comp == 2) output[1] = 1; + if (req_comp == 4) output[3] = 1; + } else { + switch (req_comp) { + case 4: output[3] = 1; /* fallthrough */ + case 3: output[0] = output[1] = output[2] = 0; + break; + case 2: output[1] = 1; /* fallthrough */ + case 1: output[0] = 0; + break; + } + } +} + +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int width, height; + stbi_uc *scanline; + float *hdr_data; + int len; + unsigned char count, value; + int i, j, k, c1,c2, z; + const char *headerToken; + STBI_NOTUSED(ri); + + // Check identifier + headerToken = stbi__hdr_gettoken(s,buffer); + if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0) + return stbi__errpf("not HDR", "Corrupt HDR image"); + + // Parse header + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); + + // Parse width and height + // can't use sscanf() if we're not using stdio! + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + height = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + width = (int) strtol(token, NULL, 10); + + if (height > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)"); + if (width > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)"); + + *x = width; + *y = height; + + if (comp) *comp = 3; + if (req_comp == 0) req_comp = 3; + + if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0)) + return stbi__errpf("too large", "HDR image is too large"); + + // Read data + hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0); + if (!hdr_data) + return stbi__errpf("outofmem", "Out of memory"); + + // Load image data + // image data is stored as some number of sca + if ( width < 8 || width >= 32768) { + // Read flat data + for (j=0; j < height; ++j) { + for (i=0; i < width; ++i) { + stbi_uc rgbe[4]; + main_decode_loop: + stbi__getn(s, rgbe, 4); + stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); + } + } + } else { + // Read RLE-encoded data + scanline = NULL; + + for (j = 0; j < height; ++j) { + c1 = stbi__get8(s); + c2 = stbi__get8(s); + len = stbi__get8(s); + if (c1 != 2 || c2 != 2 || (len & 0x80)) { + // not run-length encoded, so we have to actually use THIS data as a decoded + // pixel (note this can't be a valid pixel--one of RGB must be >= 128) + stbi_uc rgbe[4]; + rgbe[0] = (stbi_uc) c1; + rgbe[1] = (stbi_uc) c2; + rgbe[2] = (stbi_uc) len; + rgbe[3] = (stbi_uc) stbi__get8(s); + stbi__hdr_convert(hdr_data, rgbe, req_comp); + i = 1; + j = 0; + STBI_FREE(scanline); + goto main_decode_loop; // yes, this makes no sense + } + len <<= 8; + len |= stbi__get8(s); + if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } + if (scanline == NULL) { + scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0); + if (!scanline) { + STBI_FREE(hdr_data); + return stbi__errpf("outofmem", "Out of memory"); + } + } + + for (k = 0; k < 4; ++k) { + int nleft; + i = 0; + while ((nleft = width - i) > 0) { + count = stbi__get8(s); + if (count > 128) { + // Run + value = stbi__get8(s); + count -= 128; + if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = value; + } else { + // Dump + if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = stbi__get8(s); + } + } + } + for (i=0; i < width; ++i) + stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); + } + if (scanline) + STBI_FREE(scanline); + } + + return hdr_data; +} + +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int dummy; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + if (stbi__hdr_test(s) == 0) { + stbi__rewind( s ); + return 0; + } + + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) { + stbi__rewind( s ); + return 0; + } + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *y = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *x = (int) strtol(token, NULL, 10); + *comp = 3; + return 1; +} +#endif // STBI_NO_HDR + +#ifndef STBI_NO_BMP +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) +{ + void *p; + stbi__bmp_data info; + + info.all_a = 255; + p = stbi__bmp_parse_header(s, &info); + if (p == NULL) { + stbi__rewind( s ); + return 0; + } + if (x) *x = s->img_x; + if (y) *y = s->img_y; + if (comp) { + if (info.bpp == 24 && info.ma == 0xff000000) + *comp = 3; + else + *comp = info.ma ? 4 : 3; + } + return 1; +} +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) +{ + int channelCount, dummy, depth; + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + *y = stbi__get32be(s); + *x = stbi__get32be(s); + depth = stbi__get16be(s); + if (depth != 8 && depth != 16) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 3) { + stbi__rewind( s ); + return 0; + } + *comp = 4; + return 1; +} + +static int stbi__psd_is16(stbi__context *s) +{ + int channelCount, depth; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + STBI_NOTUSED(stbi__get32be(s)); + STBI_NOTUSED(stbi__get32be(s)); + depth = stbi__get16be(s); + if (depth != 16) { + stbi__rewind( s ); + return 0; + } + return 1; +} +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) +{ + int act_comp=0,num_packets=0,chained,dummy; + stbi__pic_packet packets[10]; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { + stbi__rewind(s); + return 0; + } + + stbi__skip(s, 88); + + *x = stbi__get16be(s); + *y = stbi__get16be(s); + if (stbi__at_eof(s)) { + stbi__rewind( s); + return 0; + } + if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { + stbi__rewind( s ); + return 0; + } + + stbi__skip(s, 8); + + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return 0; + + packet = &packets[num_packets++]; + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + act_comp |= packet->channel; + + if (stbi__at_eof(s)) { + stbi__rewind( s ); + return 0; + } + if (packet->size != 8) { + stbi__rewind( s ); + return 0; + } + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); + + return 1; +} +#endif + +// ************************************************************************************************* +// Portable Gray Map and Portable Pixel Map loader +// by Ken Miller +// +// PGM: http://netpbm.sourceforge.net/doc/pgm.html +// PPM: http://netpbm.sourceforge.net/doc/ppm.html +// +// Known limitations: +// Does not support comments in the header section +// Does not support ASCII image data (formats P2 and P3) + +#ifndef STBI_NO_PNM + +static int stbi__pnm_test(stbi__context *s) +{ + char p, t; + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + return 1; +} + +static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *out; + STBI_NOTUSED(ri); + + ri->bits_per_channel = stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n); + if (ri->bits_per_channel == 0) + return 0; + + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + + if (!stbi__mad4sizes_valid(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0)) + return stbi__errpuc("too large", "PNM too large"); + + out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + if (!stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8))) { + STBI_FREE(out); + return stbi__errpuc("bad PNM", "PNM file truncated"); + } + + if (req_comp && req_comp != s->img_n) { + if (ri->bits_per_channel == 16) { + out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, s->img_n, req_comp, s->img_x, s->img_y); + } else { + out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + } + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + return out; +} + +static int stbi__pnm_isspace(char c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; +} + +static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) +{ + for (;;) { + while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) + *c = (char) stbi__get8(s); + + if (stbi__at_eof(s) || *c != '#') + break; + + while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' ) + *c = (char) stbi__get8(s); + } +} + +static int stbi__pnm_isdigit(char c) +{ + return c >= '0' && c <= '9'; +} + +static int stbi__pnm_getinteger(stbi__context *s, char *c) +{ + int value = 0; + + while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { + value = value*10 + (*c - '0'); + *c = (char) stbi__get8(s); + if((value > 214748364) || (value == 214748364 && *c > '7')) + return stbi__err("integer parse overflow", "Parsing an integer in the PPM header overflowed a 32-bit int"); + } + + return value; +} + +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) +{ + int maxv, dummy; + char c, p, t; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + stbi__rewind(s); + + // Get identifier + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind(s); + return 0; + } + + *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm + + c = (char) stbi__get8(s); + stbi__pnm_skip_whitespace(s, &c); + + *x = stbi__pnm_getinteger(s, &c); // read width + if(*x == 0) + return stbi__err("invalid width", "PPM image header had zero or overflowing width"); + stbi__pnm_skip_whitespace(s, &c); + + *y = stbi__pnm_getinteger(s, &c); // read height + if (*y == 0) + return stbi__err("invalid width", "PPM image header had zero or overflowing width"); + stbi__pnm_skip_whitespace(s, &c); + + maxv = stbi__pnm_getinteger(s, &c); // read max value + if (maxv > 65535) + return stbi__err("max value > 65535", "PPM image supports only 8-bit and 16-bit images"); + else if (maxv > 255) + return 16; + else + return 8; +} + +static int stbi__pnm_is16(stbi__context *s) +{ + if (stbi__pnm_info(s, NULL, NULL, NULL) == 16) + return 1; + return 0; +} +#endif + +static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNG + if (stbi__png_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_GIF + if (stbi__gif_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_BMP + if (stbi__bmp_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PIC + if (stbi__pic_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_info(s, x, y, comp)) return 1; + #endif + + // test tga last because it's a crappy test! + #ifndef STBI_NO_TGA + if (stbi__tga_info(s, x, y, comp)) + return 1; + #endif + return stbi__err("unknown image type", "Image not of any known type, or corrupt"); +} + +static int stbi__is_16_main(stbi__context *s) +{ + #ifndef STBI_NO_PNG + if (stbi__png_is16(s)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_is16(s)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_is16(s)) return 1; + #endif + return 0; +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_info_from_file(f, x, y, comp); + fclose(f); + return result; +} + +STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__info_main(&s,x,y,comp); + fseek(f,pos,SEEK_SET); + return r; +} + +STBIDEF int stbi_is_16_bit(char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_is_16_bit_from_file(f); + fclose(f); + return result; +} + +STBIDEF int stbi_is_16_bit_from_file(FILE *f) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__is_16_main(&s); + fseek(f,pos,SEEK_SET); + return r; +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__is_16_main(&s); +} + +STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__is_16_main(&s); +} + +#endif // STB_IMAGE_IMPLEMENTATION + +/* + revision history: + 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs + 2.19 (2018-02-11) fix warning + 2.18 (2018-01-30) fix warnings + 2.17 (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug + 1-bit BMP + *_is_16_bit api + avoid warnings + 2.16 (2017-07-23) all functions have 16-bit variants; + STBI_NO_STDIO works again; + compilation fixes; + fix rounding in unpremultiply; + optimize vertical flip; + disable raw_len validation; + documentation fixes + 2.15 (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode; + warning fixes; disable run-time SSE detection on gcc; + uniform handling of optional "return" values; + thread-safe initialization of zlib tables + 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs + 2.13 (2016-11-29) add 16-bit API, only supported for PNG right now + 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes + 2.11 (2016-04-02) allocate large structures on the stack + remove white matting for transparent PSD + fix reported channel count for PNG & BMP + re-enable SSE2 in non-gcc 64-bit + support RGB-formatted JPEG + read 16-bit PNGs (only as 8-bit) + 2.10 (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED + 2.09 (2016-01-16) allow comments in PNM files + 16-bit-per-pixel TGA (not bit-per-component) + info() for TGA could break due to .hdr handling + info() for BMP to shares code instead of sloppy parse + can use STBI_REALLOC_SIZED if allocator doesn't support realloc + code cleanup + 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA + 2.07 (2015-09-13) fix compiler warnings + partial animated GIF support + limited 16-bpc PSD support + #ifdef unused functions + bug with < 92 byte PIC,PNM,HDR,TGA + 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value + 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning + 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit + 2.03 (2015-04-12) extra corruption checking (mmozeiko) + stbi_set_flip_vertically_on_load (nguillemot) + fix NEON support; fix mingw support + 2.02 (2015-01-19) fix incorrect assert, fix warning + 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 + 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG + 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) + progressive JPEG (stb) + PGM/PPM support (Ken Miller) + STBI_MALLOC,STBI_REALLOC,STBI_FREE + GIF bugfix -- seemingly never worked + STBI_NO_*, STBI_ONLY_* + 1.48 (2014-12-14) fix incorrectly-named assert() + 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) + optimize PNG (ryg) + fix bug in interlaced PNG with user-specified channel count (stb) + 1.46 (2014-08-26) + fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG + 1.45 (2014-08-16) + fix MSVC-ARM internal compiler error by wrapping malloc + 1.44 (2014-08-07) + various warning fixes from Ronny Chevalier + 1.43 (2014-07-15) + fix MSVC-only compiler problem in code changed in 1.42 + 1.42 (2014-07-09) + don't define _CRT_SECURE_NO_WARNINGS (affects user code) + fixes to stbi__cleanup_jpeg path + added STBI_ASSERT to avoid requiring assert.h + 1.41 (2014-06-25) + fix search&replace from 1.36 that messed up comments/error messages + 1.40 (2014-06-22) + fix gcc struct-initialization warning + 1.39 (2014-06-15) + fix to TGA optimization when req_comp != number of components in TGA; + fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) + add support for BMP version 5 (more ignored fields) + 1.38 (2014-06-06) + suppress MSVC warnings on integer casts truncating values + fix accidental rename of 'skip' field of I/O + 1.37 (2014-06-04) + remove duplicate typedef + 1.36 (2014-06-03) + convert to header file single-file library + if de-iphone isn't set, load iphone images color-swapped instead of returning NULL + 1.35 (2014-05-27) + various warnings + fix broken STBI_SIMD path + fix bug where stbi_load_from_file no longer left file pointer in correct place + fix broken non-easy path for 32-bit BMP (possibly never used) + TGA optimization by Arseny Kapoulkine + 1.34 (unknown) + use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case + 1.33 (2011-07-14) + make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements + 1.32 (2011-07-13) + support for "info" function for all supported filetypes (SpartanJ) + 1.31 (2011-06-20) + a few more leak fixes, bug in PNG handling (SpartanJ) + 1.30 (2011-06-11) + added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) + removed deprecated format-specific test/load functions + removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway + error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) + fix inefficiency in decoding 32-bit BMP (David Woo) + 1.29 (2010-08-16) + various warning fixes from Aurelien Pocheville + 1.28 (2010-08-01) + fix bug in GIF palette transparency (SpartanJ) + 1.27 (2010-08-01) + cast-to-stbi_uc to fix warnings + 1.26 (2010-07-24) + fix bug in file buffering for PNG reported by SpartanJ + 1.25 (2010-07-17) + refix trans_data warning (Won Chun) + 1.24 (2010-07-12) + perf improvements reading from files on platforms with lock-heavy fgetc() + minor perf improvements for jpeg + deprecated type-specific functions so we'll get feedback if they're needed + attempt to fix trans_data warning (Won Chun) + 1.23 fixed bug in iPhone support + 1.22 (2010-07-10) + removed image *writing* support + stbi_info support from Jetro Lauha + GIF support from Jean-Marc Lienher + iPhone PNG-extensions from James Brown + warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) + 1.21 fix use of 'stbi_uc' in header (reported by jon blow) + 1.20 added support for Softimage PIC, by Tom Seddon + 1.19 bug in interlaced PNG corruption check (found by ryg) + 1.18 (2008-08-02) + fix a threading bug (local mutable static) + 1.17 support interlaced PNG + 1.16 major bugfix - stbi__convert_format converted one too many pixels + 1.15 initialize some fields for thread safety + 1.14 fix threadsafe conversion bug + header-file-only version (#define STBI_HEADER_FILE_ONLY before including) + 1.13 threadsafe + 1.12 const qualifiers in the API + 1.11 Support installable IDCT, colorspace conversion routines + 1.10 Fixes for 64-bit (don't use "unsigned long") + optimized upsampling by Fabian "ryg" Giesen + 1.09 Fix format-conversion for PSD code (bad global variables!) + 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz + 1.07 attempt to fix C++ warning/errors again + 1.06 attempt to fix C++ warning/errors again + 1.05 fix TGA loading to return correct *comp and use good luminance calc + 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free + 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR + 1.02 support for (subset of) HDR files, float interface for preferred access to them + 1.01 fix bug: possible bug in handling right-side up bmps... not sure + fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all + 1.00 interface to zlib that skips zlib header + 0.99 correct handling of alpha in palette + 0.98 TGA loader by lonesock; dynamically add loaders (untested) + 0.97 jpeg errors on too large a file; also catch another malloc failure + 0.96 fix detection of invalid v value - particleman@mollyrocket forum + 0.95 during header scan, seek to markers in case of padding + 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same + 0.93 handle jpegtran output; verbose errors + 0.92 read 4,8,16,24,32-bit BMP files of several formats + 0.91 output 24-bit Windows 3.0 BMP files + 0.90 fix a few more warnings; bump version number to approach 1.0 + 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd + 0.60 fix compiling as c++ + 0.59 fix warnings: merge Dave Moore's -Wall fixes + 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian + 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available + 0.56 fix bug: zlib uncompressed mode len vs. nlen + 0.55 fix bug: restart_interval not initialized to 0 + 0.54 allow NULL for 'int *comp' + 0.53 fix bug in png 3->4; speedup png decoding + 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments + 0.51 obey req_comp requests, 1-component jpegs return as 1-component, + on 'test' only check type, not whether we support this variant + 0.50 (2006-11-19) + first released version +*/ + + +/* +------------------------------------------------------------------------------ +This software is available under 2 licenses -- choose whichever you prefer. +------------------------------------------------------------------------------ +ALTERNATIVE A - MIT License +Copyright (c) 2017 Sean Barrett +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------ +ALTERNATIVE B - Public Domain (www.unlicense.org) +This is free and unencumbered software released into the public domain. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, +commercial or non-commercial, and by any means. +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to +this software under copyright law. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------------------------ +*/ diff --git a/tools/exp_direct_vs_proxy.sh b/tools/exp_direct_vs_proxy.sh new file mode 100755 index 00000000..f3d6a681 --- /dev/null +++ b/tools/exp_direct_vs_proxy.sh @@ -0,0 +1,154 @@ +#!/bin/sh +# Track 1 experiment: API RSS during transfer + approx body bytes through API. +# Direct PUT: client→MinIO (compose net). Complete measured separately. +# +# ./tools/exp_direct_vs_proxy.sh +# Optional: SIZES_MB="1 4" CONCURRENCY=3 +set -eu + +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +. "$ROOT/student-tests/lib.sh" + +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" +SIZES_MB="${SIZES_MB:-1 4}" +CONCURRENCY="${CONCURRENCY:-3}" +OUT_DIR="${OUT_DIR:-$ROOT/artifacts/track1}" +mkdir -p "$OUT_DIR" + +need docker + +rss_sum() { + ids=$($COMPOSE ps -q api) + total=0 + for id in $ids; do + [ -n "$id" ] || continue + rss=$(docker exec "$id" sh -c "awk '/^VmRSS:/ {print \$2}' /proc/1/status" 2>/dev/null || echo 0) + total=$((total + rss)) + done + printf '%s' "$total" +} + +sample_peak() { + dur=${1:-3} + peak=$(rss_sum) + end=$(( $(date +%s) + dur )) + while [ "$(date +%s)" -lt "$end" ]; do + cur=$(rss_sum) + [ "$cur" -gt "$peak" ] && peak=$cur + sleep 0.15 + done + printf '%s' "$peak" +} + +make_png() { + mb=$1 + out=$2 + python3 - "$mb" "$out" <<'PY' +import struct, zlib, sys +mb = float(sys.argv[1]) +path = sys.argv[2] +target = int(mb * 1024 * 1024) +w, h = 320, 200 +raw = b"".join(b"\x00" + bytes(w * 3) for _ in range(h)) +def chunk(tag, data): + return struct.pack(">I", len(data)) + tag + data + struct.pack(">I", zlib.crc32(tag + data) & 0xffffffff) +ihdr = chunk(b"IHDR", struct.pack(">IIBBBBB", w, h, 8, 2, 0, 0, 0)) +idat = chunk(b"IDAT", zlib.compress(raw, 9)) +sig = b"\x89PNG\r\n\x1a\n" +base = sig + ihdr + idat + chunk(b"IEND", b"") +pad_need = max(0, target - len(base) - 12) +text = b"Comment\0" + (b"x" * pad_need) +open(path, "wb").write(sig + ihdr + idat + chunk(b"tEXt", text) + chunk(b"IEND", b"")) +PY +} + +put_direct() { + url=$1 + ct=$2 + file=$3 + $COMPOSE run --rm --no-deps \ + -v "$file:/tmp/up.bin:ro" \ + --entrypoint curl api \ + -sS -m 120 -o /dev/null \ + -X PUT -H "Content-Type: $ct" --data-binary @/tmp/up.bin \ + "$url" >/dev/null +} + +register_user exp_alice3 +ALICE_TOKEN=$TOKEN +ALICE_ID=$USER_ID +create_chat "exp-track1c" "[\"$ALICE_ID\"]" + +RESULT="$OUT_DIR/results.tsv" +printf 'mode\tphase\tsize_mb\trss_before_kb\trss_peak_kb\trss_delta_kb\tapi_body_bytes_approx\n' > "$RESULT" + +for mb in $SIZES_MB; do + f="$OUT_DIR/payload_${mb}mb.png" + make_png "$mb" "$f" + sha=$(sha256_file "$f") + sz=$(wc -c < "$f" | tr -d ' ') + api_bytes=$((CONCURRENCY * sz)) + + # --- proxy transfer --- + sleep 1 + before=$(rss_sum) + i=0 + pids="" + while [ "$i" -lt "$CONCURRENCY" ]; do + ( upload_file "$CHAT_ID" "$f" "p_${mb}_$i.png" "image/png" >/dev/null 2>&1 || true ) & + pids="$pids $!" + i=$((i + 1)) + done + peak=$(sample_peak 10) + for p in $pids; do wait "$p" || true; done + [ "$peak" -lt "$before" ] && peak=$before + delta=$((peak - before)) + printf 'proxy\ttransfer\t%s\t%s\t%s\t%s\t%s\n' "$mb" "$before" "$peak" "$delta" "$api_bytes" | tee -a "$RESULT" + + # --- direct: create sessions, then PUT-only window --- + sess="$OUT_DIR/sess_${mb}.tsv" + : > "$sess" + i=0 + while [ "$i" -lt "$CONCURRENCY" ]; do + http_json POST "/api/v1/chats/$CHAT_ID/direct-uploads" \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + -H 'Content-Type: application/json' \ + -d "{\"filename\":\"d_${mb}_$i.png\",\"content_type\":\"image/png\",\"size_bytes\":$sz,\"sha256\":\"$sha\"}" + [ "$HTTP_CODE" = "201" ] || die "init failed: $HTTP_BODY" + printf '%s\t%s\t%s\n' \ + "$(printf '%s' "$HTTP_BODY" | jq -r .id)" \ + "$(printf '%s' "$HTTP_BODY" | jq -r .upload_url)" \ + "$(printf '%s' "$HTTP_BODY" | jq -r '.headers["Content-Type"]')" >> "$sess" + i=$((i + 1)) + done + + sleep 1 + before=$(rss_sum) + pids="" + while IFS="$(printf '\t')" read -r uid url ct; do + [ -n "$url" ] || continue + ( put_direct "$url" "$ct" "$f" ) & + pids="$pids $!" + done < "$sess" + peak=$(sample_peak 15) + for p in $pids; do wait "$p" || true; done + [ "$peak" -lt "$before" ] && peak=$before + delta=$((peak - before)) + printf 'direct\ttransfer\t%s\t%s\t%s\t%s\t%s\n' "$mb" "$before" "$peak" "$delta" "0" | tee -a "$RESULT" + + # --- direct complete --- + before=$(rss_sum) + while IFS="$(printf '\t')" read -r uid url ct; do + [ -n "$uid" ] || continue + http_json POST "/api/v1/direct-uploads/$uid/complete" \ + -H "Authorization: Bearer $ALICE_TOKEN" + [ "$HTTP_CODE" = "201" ] || die "complete failed id=$uid body=$HTTP_BODY" + done < "$sess" + peak=$(rss_sum) + [ "$peak" -lt "$before" ] && peak=$before + delta=$((peak - before)) + printf 'direct\tcomplete\t%s\t%s\t%s\t%s\t%s\n' "$mb" "$before" "$peak" "$delta" "$api_bytes" | tee -a "$RESULT" +done + +echo "wrote $RESULT" +cat "$RESULT" diff --git a/tools/fixtures/320x200.png b/tools/fixtures/320x200.png new file mode 100644 index 0000000000000000000000000000000000000000..1a40787ead633add21670ca23334e6ab5d582388 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoPjD~+NwKu`e}DpeJzX3_DsH{K?8wQ$z`=6x zbc)(xsnY`cS{gk!Y?!I{V5J8G8ygRggaim17$hWs@PPv$+|bC#+ziCbAO+YIH8dW? zs%Q-pvQaox85m$w1hfm;K9Ur{Tn%v)+$5OSAl8wj2=0G~o8Trzuwo4*R8=GeCD!nc a(Ya@H|4&2Ax(&eiWbkzLb6Mw<&;$VBk$``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTivX!XqN1l2cOC(lau%ic3n%$}1|Xnp;}i+B-VC zCQY6)b=ve9GiNPYykzOJeA&aSFc^aar4&0 zM~|O8efIpt%U2&ieg5+G+xH(oe}VkP$iNKo7LbH^49#DHKz}i@urRZ*gZ#zFR1U<< zf-J0xhHOHPf$WKe!b(Ps93oB=7j8VrscandK{To8BA1wo$wSqTAg_UaMx4i*$nqK7 jV+eoUV&GwB1V$dSAcH-_pY@Bnv`%noENXyZ`~Noq+u6ul literal 0 HcmV?d00001 diff --git a/tools/fixtures/tiny.jpg b/tools/fixtures/tiny.jpg new file mode 100644 index 0000000000000000000000000000000000000000..39c449f61e4e697713d3c99d3daf213a554366a2 GIT binary patch literal 633 zcmex=``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTivNsy6Qkn#T!26>=6SsB5A0SXwIfNo@C=iubx1}fMpz`(@F%*@2X z401J4buCbyfklv2NYT)dO*k--U8zvSsBz*#4rQl}2StM}eo!$^Dr(~75)+q@lu}hw z*U;25F*P%{u(Wb^admU|@bn4}2@MO6h>S{3Nli=7$jmA(DJ?6nsH|#kX>Duo=8f2KE_o9%~}YXK;@p d{B?_ghnW!=dCY`wr5A*;4 literal 0 HcmV?d00001 diff --git a/tools/gc_direct_uploads.sh b/tools/gc_direct_uploads.sh new file mode 100755 index 00000000..5f59b63b --- /dev/null +++ b/tools/gc_direct_uploads.sh @@ -0,0 +1,61 @@ +#!/bin/sh +# Expire pending direct-upload sessions past expires_at and delete their S3 +# objects (if any). Dry-run by default. +# +# ./tools/gc_direct_uploads.sh +# APPLY=1 ./tools/gc_direct_uploads.sh +set -eu + +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" +APPLY="${APPLY:-0}" + +S3_BUCKET=$($COMPOSE exec -T api sh -c 'printf %s "$S3_BUCKET"') +[ -n "$S3_BUCKET" ] || { echo "S3_BUCKET empty" >&2; exit 1; } + +TMP=$(mktemp -d) +trap 'rm -rf "$TMP"' EXIT + +echo "gc_direct_uploads: apply=$APPLY" + +$COMPOSE exec -T db sh -c \ + 'psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Atc " + SELECT id || E'\''\t'\'' || s3_key FROM direct_uploads + WHERE status = '\''pending'\'' AND expires_at < now() + "' > "$TMP/stale.tsv" || true + +n=$(wc -l < "$TMP/stale.tsv" | tr -d ' ') +echo "gc_direct_uploads: stale_pending=$n" + +if [ ! -s "$TMP/stale.tsv" ]; then + echo "gc_direct_uploads: nothing to do" + exit 0 +fi + +while IFS="$(printf '\t')" read -r id key; do + [ -n "$id" ] || continue + echo " STALE id=$id key=$key" +done < "$TMP/stale.tsv" + +if [ "$APPLY" != "1" ]; then + echo "gc_direct_uploads: dry-run; set APPLY=1 to expire + delete objects" + exit 0 +fi + +$COMPOSE exec -T db sh -c \ + 'psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c " + UPDATE direct_uploads SET status = '\''expired'\'', updated_at = now() + WHERE status = '\''pending'\'' AND expires_at < now() + "' >/dev/null + +cut -f2 "$TMP/stale.tsv" | $COMPOSE run --rm --no-deps --entrypoint /bin/sh minio-init -c " + set -eu + mc alias set local \"\$S3_ENDPOINT\" \"\$MINIO_ROOT_USER\" \"\$MINIO_ROOT_PASSWORD\" >/dev/null + while IFS= read -r key; do + [ -n \"\$key\" ] || continue + mc rm --force \"local/\$S3_BUCKET/\$key\" 2>/dev/null || true + echo \"deleted \$key\" + done +" + +echo "gc_direct_uploads: done" diff --git a/tools/gc_orphans.sh b/tools/gc_orphans.sh new file mode 100755 index 00000000..2e6da618 --- /dev/null +++ b/tools/gc_orphans.sh @@ -0,0 +1,111 @@ +#!/bin/sh +# Reconcile S3 orphans: bucket objects with no matching attachments.s3_key in PG. +# +# Upload path compensation: S3 PUT → PG INSERT; on INSERT failure the API +# best-effort DeleteObject. This script cleans leftovers after crashes between +# PUT and compensate (or a failed DeleteObject). +# +# Dry-run by default. Fresh objects inside GRACE_SECONDS are never deleted. +# +# ./tools/gc_orphans.sh +# APPLY=1 GRACE_SECONDS=3600 ./tools/gc_orphans.sh +set -eu + +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" +GRACE_SECONDS="${GRACE_SECONDS:-3600}" +APPLY="${APPLY:-0}" +PREFIX="${ORPHAN_PREFIX:-attachments/}" + +S3_BUCKET=$($COMPOSE exec -T api sh -c 'printf %s "$S3_BUCKET"') +[ -n "$S3_BUCKET" ] || { echo "S3_BUCKET empty" >&2; exit 1; } + +TMP=$(mktemp -d) +trap 'rm -rf "$TMP"' EXIT + +echo "gc_orphans: bucket=$S3_BUCKET grace=${GRACE_SECONDS}s apply=$APPLY prefix=$PREFIX" + +$COMPOSE run --rm --no-deps --entrypoint /bin/sh minio-init -c " + set -eu + mc alias set local \"\$S3_ENDPOINT\" \"\$MINIO_ROOT_USER\" \"\$MINIO_ROOT_PASSWORD\" >/dev/null + mc ls --recursive --json \"local/\$S3_BUCKET/$PREFIX\" || true +" > "$TMP/s3.json" + +# Known keys: ready attachments + still-pending direct uploads (Track 1). +$COMPOSE exec -T db sh -c \ + 'psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Atc " + SELECT s3_key FROM attachments + UNION + SELECT s3_key FROM direct_uploads WHERE status = '\''pending'\'' + "' \ + > "$TMP/pg.keys" + +python3 - "$TMP/s3.json" "$TMP/pg.keys" "$GRACE_SECONDS" "$TMP/del.keys" <<'PY' +import json, sys, time +from datetime import datetime + +s3_path, pg_path, grace_s, out_path = sys.argv[1], sys.argv[2], int(sys.argv[3]), sys.argv[4] +now = time.time() +known = {line.strip() for line in open(pg_path) if line.strip()} +orphans = [] +for line in open(s3_path): + line = line.strip() + if not line: + continue + try: + obj = json.loads(line) + except json.JSONDecodeError: + continue + key = obj.get("key") or obj.get("Key") + if not key: + continue + # mc ls under prefix returns keys relative to that prefix. + if not key.startswith("attachments/"): + key = "attachments/" + key.lstrip("/") + if key in known: + continue + age = None + lm = obj.get("lastModified") or obj.get("last_modified") + if lm: + try: + age = now - datetime.fromisoformat(lm.replace("Z", "+00:00")).timestamp() + except Exception: + age = None + orphans.append((key, age, obj.get("size"))) + +print(f"gc_orphans: scanned orphans={len(orphans)} known_pg={len(known)}") +to_delete = [] +for key, age, size in orphans: + age_s = f"{int(age)}s" if age is not None else "?" + if age is not None and age < grace_s: + print(f" SKIP (grace) key={key} age={age_s} size={size}") + continue + print(f" ORPHAN key={key} age={age_s} size={size}") + to_delete.append(key) + +with open(out_path, "w") as f: + f.write("\n".join(to_delete) + ("\n" if to_delete else "")) +print(f"gc_orphans: candidates={len(to_delete)}") +PY + +if [ "$APPLY" != "1" ]; then + echo "gc_orphans: dry-run; set APPLY=1 to delete candidates older than grace." + exit 0 +fi + +if [ ! -s "$TMP/del.keys" ]; then + echo "gc_orphans: nothing to delete" + exit 0 +fi + +$COMPOSE run --rm --no-deps --entrypoint /bin/sh minio-init -c " + set -eu + mc alias set local \"\$S3_ENDPOINT\" \"\$MINIO_ROOT_USER\" \"\$MINIO_ROOT_PASSWORD\" >/dev/null + while IFS= read -r key; do + [ -n \"\$key\" ] || continue + echo \"deleting \$S3_BUCKET/\$key\" + mc rm --force \"local/\$S3_BUCKET/\$key\" + done +" < "$TMP/del.keys" + +echo "gc_orphans: delete done" diff --git a/tools/image_smoke.cpp b/tools/image_smoke.cpp new file mode 100644 index 00000000..60f9a748 --- /dev/null +++ b/tools/image_smoke.cpp @@ -0,0 +1,111 @@ +// Step 5 smoke: PNG / JPEG / truncated PNG / non-image / size limit. +#include "image_util.hpp" + +#include +#include +#include +#include +#include +#include + +#ifndef IMAGE_SMOKE_FIXTURES +#define IMAGE_SMOKE_FIXTURES "tools/fixtures" +#endif + +namespace { + +std::vector read_all(const std::string& path) { + std::ifstream in(path, std::ios::binary); + if (!in) { + throw std::runtime_error("cannot open " + path); + } + return std::vector((std::istreambuf_iterator(in)), + std::istreambuf_iterator()); +} + +bool expect_ok(const char* name, const std::vector& bytes, + const char* want_ct) { + ImageLimits lim; + ImageInfo info; + auto rej = validate_image(bytes.data(), bytes.size(), lim, info); + if (rej) { + std::cerr << name << ": expected OK, got " << image_reject_code(*rej) + << "\n"; + return false; + } + if (info.content_type != want_ct) { + std::cerr << name << ": content_type " << info.content_type << "\n"; + return false; + } + std::cout << name << ": OK " << info.content_type << " " << info.width + << "x" << info.height << "\n"; + return true; +} + +bool expect_reject(const char* name, const std::vector& bytes, + ImageReject want) { + ImageLimits lim; + ImageInfo info; + auto rej = validate_image(bytes.data(), bytes.size(), lim, info); + if (!rej || *rej != want) { + std::cerr << name << ": expected " << image_reject_code(want) << ", got " + << (rej ? image_reject_code(*rej) : "OK") << "\n"; + return false; + } + std::cout << name << ": OK reject=" << image_reject_code(want) << "\n"; + return true; +} + +} // namespace + +int main(int argc, char** argv) { + try { + const std::string dir = + (argc > 1) ? argv[1] : std::string(IMAGE_SMOKE_FIXTURES); + const auto png = read_all(dir + "/tiny.png"); + const auto jpg = read_all(dir + "/tiny.jpg"); + + bool ok = true; + ok &= expect_ok("png", png, "image/png"); + ok &= expect_ok("jpeg", jpg, "image/jpeg"); + + std::vector trunc(png.begin(), + png.begin() + std::min(16, png.size())); + ok &= expect_reject("truncated_png", trunc, ImageReject::invalid_image); + + std::vector spoof = jpg; + spoof[0] = 'G'; + spoof[1] = 'I'; + spoof[2] = 'F'; + ok &= expect_reject("not_image", spoof, ImageReject::unsupported_media_type); + + ImageLimits tiny_lim; + tiny_lim.max_bytes = 10; + ImageInfo info; + auto rej = validate_image(png.data(), png.size(), tiny_lim, info); + if (!rej || *rej != ImageReject::payload_too_large) { + std::cerr << "max_bytes: FAIL\n"; + ok = false; + } else { + std::cout << "max_bytes: OK\n"; + } + + // JPEG bytes sniffed as jpeg regardless of any HTTP Content-Type. + auto sniffed = sniff_content_type(jpg.data(), jpg.size()); + if (!sniffed || *sniffed != "image/jpeg") { + std::cerr << "sniff_jpeg: FAIL\n"; + ok = false; + } else { + std::cout << "sniff_jpeg: OK (MIME spoof would be ignored)\n"; + } + + if (!ok) { + return 1; + } + std::cout << "image_smoke: OK\n"; + return 0; + } catch (const std::exception& e) { + std::cerr << "image_smoke: FAIL: " << e.what() << "\n"; + return 1; + } +} diff --git a/tools/s3_smoke.cpp b/tools/s3_smoke.cpp new file mode 100644 index 00000000..26cc1331 --- /dev/null +++ b/tools/s3_smoke.cpp @@ -0,0 +1,35 @@ +// Small smoke tool for step 4: put → get → delete against MinIO. +#include "s3_client.hpp" + +#include +#include +#include +#include +#include + +int main() { + try { + auto cfg = S3Client::from_env(); + S3Client s3(cfg); + + const std::string key = "smoke/step4.txt"; + const std::string payload = "lab4-s3-smoke-ok"; + std::istringstream in(payload); + s3.put_object(key, in, static_cast(payload.size()), + "text/plain"); + + std::ostringstream out; + s3.get_object(key, out); + if (out.str() != payload) { + std::cerr << "mismatch: got [" << out.str() << "]\n"; + return 2; + } + + s3.delete_object(key); + std::cout << "s3_smoke: OK bucket=" << cfg.bucket << " key=" << key << "\n"; + return 0; + } catch (const std::exception& e) { + std::cerr << "s3_smoke: FAIL: " << e.what() << "\n"; + return 1; + } +} -- 2.54.0 From 7741b66fd2f136147560e34b26e7ee92940622bf Mon Sep 17 00:00:00 2001 From: AndrewNikkk Date: Fri, 6 Nov 2026 04:23:59 +0300 Subject: [PATCH 2/2] fit: complete lab4, fix P1.1-P1.3, add Track 1 presigned --- REPORT.md | 40 ++- contracts/README.md | 2 +- evidence/load_uploads.json | 20 +- migrations/007_direct_upload_staging.sql | 12 + src/direct_upload_repo.cpp | 131 ++++++- src/direct_upload_repo.hpp | 33 +- src/main.cpp | 333 +++++++++--------- src/models.hpp | 4 +- src/s3_client.cpp | 16 + src/s3_client.hpp | 3 + student-tests/run_grade5_track1.sh | 3 + student-tests/test_direct_upload_negatives.sh | 6 +- student-tests/test_direct_upload_ok.sh | 13 +- student-tests/test_download_missing_object.sh | 59 ++++ .../test_presigned_complete_concurrent.sh | 73 ++++ tools/gc_orphans.sh | 48 +-- 16 files changed, 577 insertions(+), 219 deletions(-) create mode 100644 migrations/007_direct_upload_staging.sql create mode 100644 student-tests/test_download_missing_object.sh create mode 100644 student-tests/test_presigned_complete_concurrent.sh diff --git a/REPORT.md b/REPORT.md index 14aae345..d20214fa 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,7 +1,8 @@ # Отчёт — лабораторная 4 - Автор, группа: Никитин Андрей Александрович, группа БВТ2301 -- Целевая оценка: 5 (трек 1 — прямой/presigned upload) +- Целевая оценка: 5 +- Трек 5: Track 1 (Presigned upload) - Commit/PR: ветка `solution/nikitin-bvt2301` → MR в `main` (шаблон `.github/pull_request_template.md`); remote `gitea.privcloud.tech/AndrewNikkk/mtusi2026lab4` - Источники и помощь: контракт и публичные тесты курса; PostgreSQL 16, Valkey, Nginx, MinIO, libpqxx 7.10.0, libsodium, hiredis, nlohmann/json, minio-cpp v0.3.0 (официальный SigV4), stb_image. Помощь ИИ: Cursor. @@ -60,7 +61,7 @@ docker compose --env-file .env stop # docker compose --env-file .env down -v ``` -Хосты в секретах — имена сервисов Compose (`db`, `cache`, `minio`), не loopback. Порты MinIO **не** публикуются по умолчанию; снаружи только LB `:8080`. Для host-side PUT к presigned URL — опционально `compose.presign.yaml` + `S3_PRESIGN_ENDPOINT=http://127.0.0.1:9000` (loopback). Иначе PUT идёт из контейнера на сети compose (`http://minio:9000/...`). Миграции 001–006 применяет API при старте под `pg_advisory_lock`. +Хосты в секретах — имена сервисов Compose (`db`, `cache`, `minio`), не loopback. Порты MinIO **не** публикуются по умолчанию; снаружи только LB `:8080`. Для host-side PUT к presigned URL — опционально `compose.presign.yaml` + `S3_PRESIGN_ENDPOINT=http://127.0.0.1:9000` (loopback). Иначе PUT идёт из контейнера на сети compose (`http://minio:9000/...`). Миграции 001–007 применяет API при старте под `pg_advisory_lock`. Соответствие `.env.example` → compose: `S3_ENDPOINT`/`S3_BUCKET`/`S3_REGION`, `S3_*_FILE` → docker secrets, `MAX_UPLOAD_BYTES`/`MAX_IMAGE_PIXELS`, `DIRECT_UPLOAD_TTL_SECONDS`, `DRAIN_SECONDS`, `API_REPLICAS`, `SESSION_STORE=redis`. Root MinIO только у `minio` / init-job'ов; API видит лишь limited `*_FILE`. @@ -68,16 +69,22 @@ docker compose --env-file .env stop ``` Proxy: Клиент → lb → api (buffer body) → MinIO PutObject → PG attachments -Direct: Клиент → lb → api (JSON init) → presigned URL - Клиент ─────────────── PUT ──────→ MinIO - Клиент → lb → api complete (Stat+Get+sha256+image) → PG attachments +Direct: Клиент → lb → api init → presigned PUT URL (staging/{chat}/{upload}) + Клиент ─────────────── PUT ──────→ MinIO staging + Клиент → lb → api complete (HEAD+Get+sha256+image+CopyObject) + staging → attachments/{chat}/{attachment} + → PG attachment + completed session ``` -**Источник истины:** метаданные вложений и связь message↔attachment — PostgreSQL; байты — объект в MinIO с ключом `attachments/{chat_id}/{uuid}` (filename только для отображения). Pending direct sessions — таблица `direct_uploads` (миграция 006). +**Источник истины:** метаданные вложений и связь message↔attachment — PostgreSQL; оригинал — объект MinIO `attachments/{chat_id}/{attachment_id}` (filename только для отображения). Presigned PUT пишет в отдельный `staging/{chat_id}/{upload_id}`. Direct sessions хранят оба ключа в `direct_uploads` (миграции 006–007). **Порядок записи (proxy, компенсация):** S3 `PutObject` → `INSERT attachments` → COMMIT. Если INSERT/COMMIT упал — best-effort `DeleteObject`, ответ 500. Строка в PG без объекта недопустима. Orphan'ы: `tools/gc_orphans.sh` (учитывает `direct_uploads.status=pending`). -**Трек 1 (direct):** `POST /api/v1/chats/{id}/direct-uploads` → короткая SigV4 PUT URL (`minio-cpp GetPresignedObjectUrl` / PresignV4, TTL=`DIRECT_UPLOAD_TTL_SECONDS`; в ответе рекомендованный `Content-Type` для метаданных объекта) → клиентский PUT → `POST .../complete` (владелец, Stat size, sha256, magic/image) → `attachments` ready с тем же id. `DELETE .../direct-uploads/{id}` — abort + DeleteObject. Просроченные pending: `tools/gc_direct_uploads.sh`. Обязательный proxy `POST .../attachments` **сохранён**. +**Track 1 (presigned):** `POST /api/v1/chats/{id}/direct-uploads` создаёт `pending` сессию и выдаёт SigV4 PUT URL (`minio-cpp GetPresignedObjectUrl`, TTL по `DIRECT_UPLOAD_TTL_SECONDS`, 30–3600 секунд; default 300). URL сам по себе повторно используем до истечения TTL, поэтому он не считается одноразовым токеном. Одноразово публикуется именно сессия complete: её статус переходит `pending → completed`. + +`POST /api/v1/direct-uploads/{id}/complete` в одной PostgreSQL-транзакции делает `SELECT ... FOR UPDATE`, проверяет существование/размер/hash staging-объекта и изображение, затем выполняет серверный `CopyObject` в final prefix, вставляет `attachments.status=ready`, помечает сессию `completed` и коммитит. SHA-256 берётся из `expected_sha256`, заявленного при init. Повторный complete возвращает сохранённый Attachment без повторного S3 copy; конкурентные complete одного id сериализуются блокировкой строки. Удаление staging после публикации best-effort. + +Повторный PUT по ещё действующей старой ссылке может создать staging-orphan, но не перезаписывает final object. `tools/gc_orphans.sh` сканирует `attachments/` и `staging/`, сохраняет pending staging keys и удаляет неизвестные объекты только после `GRACE_SECONDS`. Abort удаляет staging best-effort; стандартный proxy `POST /api/v1/chats/{id}/attachments` **сохранён**. **ACL:** метаданные и `/content` только участнику чата; чужой → 404; без Bearer → 401. Unsigned GET на `http://minio:9000/$BUCKET/$KEY` → 403. @@ -108,6 +115,9 @@ Direct: Клиент → lb → api (JSON init) → presigned URL | Graceful drain | `sh student-tests/test_graceful_drain.sh` | SIGTERM → ready 503/stop; стенд восстановлен | вывод теста | | Идемпотентный bootstrap bucket/user | `minio-init`, `minio-user-init` | повторный up без ошибки; `mc mb --ignore-existing`; anonymous none | логи init | | Трек 1: init→PUT→complete; proxy жив | `sh student-tests/run_grade5_track1.sh` | PASS (ok + negatives + gc dry-run) | `student-tests/` | +| Track 1: concurrent complete | `sh student-tests/test_presigned_complete_concurrent.sh` | 4 complete: ровно 1×201, остальные 200/409, ни одного 500; metadata и `/content` SHA-256 совпали с исходником | `student-tests/test_presigned_complete_concurrent.sh` | +| Track 1: replay safety | `sh student-tests/test_direct_upload_ok.sh` | upload → complete → повторный PUT 20 B по старой ссылке → download SHA-256 исходного PNG; final не изменён | `student-tests/test_direct_upload_ok.sh` | +| Download при отсутствующем S3-объекте | `sh student-tests/test_download_missing_object.sh` | после `mc rm` content отвечает 404/5xx, не 200; объект восстанавливается тестом | `student-tests/test_download_missing_object.sh` | | Трек 1: RAM/трафик ≥2 размеров | `sh tools/exp_direct_vs_proxy.sh` | transfer: direct ≪ proxy по RSS и api_body | `artifacts/track1/results.tsv` | Перезапускаемые процессы при persistence hook: **db, cache, minio, api (все реплики), lb**. Volumes `pgdata`, `valkeydata`, `miniodata` **не** удаляются. Failover hook останавливает **только** одну API-реплику по `X-Instance-Id` ≡ `Config.Hostname`. @@ -157,9 +167,15 @@ Direct: Клиент → lb → api (JSON init) → presigned URL **Подтверждено измерением (grade 4):** 10 параллельных ~5.6 MiB proxy-загрузок → 201; delta RSS < naive; private bucket; persistence/failover. -## Трек 1 — прямой upload (оценка 5) +## Track 1: Presigned upload -**Гипотеза:** при одинаковом размере файла пиковый RSS API и объём трафика через LB/API на этапе передачи байт ниже для direct (клиент→MinIO), чем для proxy (клиент→API→MinIO); complete добавляет короткий GetObject на API. +**Архитектура и семантика:** presigned PUT направлен только на `staging/{chat_id}/{upload_id}`. После HEAD/stat, проверки `expected_size`, SHA-256 из init и image validation API копирует staging в `attachments/{chat_id}/{attachment_id}`. В `attachments.s3_key` хранится только final key. TTL ссылки задаётся `DIRECT_UPLOAD_TTL_SECONDS` (30–3600 секунд, default 300); пока TTL не истёк, URL можно повторно вызвать, но replay меняет только staging. Complete логически single-use: `pending → completed`; `SELECT FOR UPDATE` делает повторы и конкурентные запросы идемпотентными, они возвращают существующий Attachment без S3-публикации. + +Если старый PUT выполняется после complete, он оставляет staging-orphan; final-объект остаётся прежним. `tools/gc_orphans.sh` очищает orphan-объекты обоих prefix по `GRACE_SECONDS`, не удаляя staging активных `pending` сессий. Staging cleanup после успешной публикации и abort — best-effort. + +**Ограничения:** стандартная загрузка ограничена 10 MiB. Multipart-upload для файлов больше 100 MiB не реализован; presigned GET для скачивания тоже не реализован. Download остаётся авторизованным через API. Контракт `contracts/openapi.json` не менялся: Track 1 — расширение, обязательный proxy upload сохранён. + +**Proxy vs presigned:** proxy передаёт тело через LB/API и буферизует его перед MinIO, поэтому upload потребляет память API и дополнительный сетевой hop. При presigned передаче байты идут клиент→MinIO напрямую, API получает только init/complete и не буферизует тело PUT. Complete добавляет HEAD/stat, чтение для SHA/image validation и server-side copy, поэтому его latency выше собственно PUT и измеряется отдельно. **API (расширение, openapi не менялся):** @@ -171,9 +187,9 @@ Direct: Клиент → lb → api (JSON init) → presigned URL | DELETE | `/api/v1/direct-uploads/{id}` | abort + DeleteObject | | POST | `/api/v1/chats/{id}/attachments` | обязательный proxy — без изменений | -**Негативные:** complete без PUT → 400; checksum mismatch → 400 + abort; чужой complete → 404; abort → 204, повторный complete → 409; expired → 410 (`gc_direct_uploads` / expire_stale). +**Состояния и ошибки:** complete без объекта → `409 not_ready`; размер или checksum mismatch → `409 hash_mismatch`; чужой upload → 404; abort → 204; повторный complete после успеха → 200 с тем же Attachment; aborted/expired session не публикуется; просроченный pending → 410. -**Проверка:** `sh student-tests/run_grade5_track1.sh` → PASS. Эксперимент: `sh tools/exp_direct_vs_proxy.sh` → `artifacts/track1/results.tsv`. +**Проверка:** `sh student-tests/run_grade5_track1.sh` → PASS; `sh student-tests/run_grade3.sh` → PASS; `sh student-tests/run_grade4.sh` → PASS. Четыре одновременных complete дали ровно один 201, остальные ответы были 200/409, 500 не было; metadata и content SHA-256 совпали. Replay-проверка повторно PUT-ит 20-byte текст по старому URL и подтверждает SHA-256 исходного PNG при download. Эксперимент proxy vs direct: `sh tools/exp_direct_vs_proxy.sh` → `artifacts/track1/results.tsv`. Методика: closed-loop; concurrency 3 (1 MiB) / 4 (4 MiB); RSS = сумма `VmRSS` процессов `messenger` по репликам api; фаза `transfer` — только передача байт (для direct — параллельные PUT на MinIO); `complete` — отдельно (GetObject+sha256+image на API). `api_body_bytes_approx` — оценка объёма тел через API (proxy = N×size; direct transfer = 0). @@ -189,3 +205,5 @@ Direct: Клиент → lb → api (JSON init) → presigned URL **Вывод:** на этапе передачи байт direct почти не двигает RSS API и не гонит payload через LB/API; proxy платит и трафиком, и пиком RSS. Complete у direct кратковременно читает объект (учебный verify) — это отдельная фаза, не отменяет выигрыш на upload path. **Ограничение:** без `compose.presign.yaml` PUT выполняется с контейнера на сети compose (порты MinIO на хост не открыты). Подпись — `minio-cpp` PresignV4 (не самописный SigV4). + +Track 5 (reconciler) не выполнялся; Track 1 (presigned) выполнен, см. раздел выше. diff --git a/contracts/README.md b/contracts/README.md index 8c58b32f..70cbcad4 100644 --- a/contracts/README.md +++ b/contracts/README.md @@ -50,7 +50,7 @@ Basic — это кодирование, не шифрование. HTTP lab1– - Файл заранее привязан к чату. В POST сообщения добавляется `attachment_ids` (0–10 уникальных ID, по умолчанию []). Можно отправить `text=""` с хотя бы одним вложением. Все вложения должны принадлежать этому чату; чужое/неизвестное — 404. Любой участник может ссылаться на доступное вложение чата. Failed-вложение прикреплять нельзя (409); queued/processing с lab5 можно. - `GET /attachments/{id}` и `/content` доступны только участникам чата. Download возвращает байты с истинным Content-Type, через авторизованный API, **без redirect** в обязательном контракте. Приватный bucket сам по себе не заменяет эту проверку. `variant` по умолчанию original. Для queued/processing content — 409; для failed — 409. Отсутствующий вариант ready-объекта — 404. - В ready-метаданных `error_code=null`. В failed — краткий машинный код (например `invalid_image`, `processing_failed`, `retry_exhausted`), без stack trace. `size_bytes`, `sha256`, `content_type` всегда описывают оригинал; у вариантов отдельные поля. Публичный API не раскрывает ключи бакета, внутренние адреса и credentials. -- Прямой upload/download по временной подписи — факультативное расширение. Его дополняют ограничение срока/размера, уникальный ключ и подтверждение реально загруженного объекта; он не заменяет стандартный endpoint. Особенности подписанных URL: [S3](https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-presigned-url.html). +- Прямой upload/download по временной подписи — факультативное расширение. Его дополняют ограничение срока/размера, уникальный ключ и подтверждение реально загруженного объекта; он не заменяет стандартный endpoint. Особенности подписанных URL: [S3](https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-presigned-url.html). В этом решении checksum на complete — SHA-256, заявленный при init (`expected_sha256`); тело complete пустое, отдельный hash в complete не принимается. Presigned PUT пишет только в `staging/{chat_id}/{upload_id}`. Complete копирует объект в `attachments/{chat_id}/{id}` и именно этот ключ сохраняет в `attachments.s3_key`. Повторный PUT той же ссылкой после complete не затирает оригинал. Схема расширения: `contracts/extensions.openapi.json`. ## Фоновая обработка (с lab5) diff --git a/evidence/load_uploads.json b/evidence/load_uploads.json index 1c7af427..203f8e3a 100644 --- a/evidence/load_uploads.json +++ b/evidence/load_uploads.json @@ -5,18 +5,18 @@ "201": 10 }, "success": 10, - "wall_ms": 160918.8, + "wall_ms": 167347.8, "latency_ms": { - "p50": 398.4, - "p95": 669.1, - "p99": 669.1, - "max": 669.1 + "p50": 1125.9, + "p95": 1630.0, + "p99": 1630.0, + "max": 1630.0 }, - "approx_success_rps": 0.062, - "api_rss_baseline_mib": 51.96, - "api_rss_peak_mib": 68.4, - "api_rss_delta_mib": 16.44, - "api_cpu_peak_percent": 4.0, + "approx_success_rps": 0.06, + "api_rss_baseline_mib": 0.0, + "api_rss_peak_mib": 0.0, + "api_rss_delta_mib": 0.0, + "api_cpu_peak_percent": 0.0, "naive_full_buffer_mib": 56.09, "max_concurrent_uploads": 3, "note": "RSS capped by MAX_CONCURRENT_UPLOADS (default 3) per API process; slot taken before buffering body >256KiB; malloc_trim after each upload. rss_peak \u2264 baseline + MAX_CONCURRENT_UPLOADS \u00d7 (body + decoded_raster). Closed-loop client; RPS is throughput of confirmed 201s." diff --git a/migrations/007_direct_upload_staging.sql b/migrations/007_direct_upload_staging.sql new file mode 100644 index 00000000..cd3d4220 --- /dev/null +++ b/migrations/007_direct_upload_staging.sql @@ -0,0 +1,12 @@ +-- Track 1: presigned PUT lands in staging/; complete copies to attachments/. +-- Existing rows keep the old key as staging so in-flight sessions still resolve. +ALTER TABLE direct_uploads ADD COLUMN staging_key text; + +UPDATE direct_uploads + SET staging_key = s3_key + WHERE staging_key IS NULL; + +ALTER TABLE direct_uploads ALTER COLUMN staging_key SET NOT NULL; + +ALTER TABLE direct_uploads + ADD CONSTRAINT direct_uploads_staging_key_key UNIQUE (staging_key); diff --git a/src/direct_upload_repo.cpp b/src/direct_upload_repo.cpp index e79354e6..e5b925d2 100644 --- a/src/direct_upload_repo.cpp +++ b/src/direct_upload_repo.cpp @@ -36,7 +36,9 @@ DirectUpload row_to(const pqxx::row& r) { d.expected_size = r["expected_size"].as(); d.expected_sha256 = r["expected_sha256"].as(); d.s3_key = r["s3_key"].as(); + d.staging_key = r["staging_key"].as(); d.status = r["status"].as(); + d.overdue = r["overdue"].as(); if (r["attachment_id"].is_null()) { d.attachment_id = std::nullopt; } else { @@ -50,11 +52,40 @@ DirectUpload row_to(const pqxx::row& r) { constexpr const char* kCols = "id, chat_id, owner_id, filename, content_type, expected_size, " - "expected_sha256, s3_key, status, attachment_id, " + "expected_sha256, s3_key, staging_key, status, attachment_id, " + "(status = 'pending' AND expires_at < now()) AS overdue, " "EXTRACT(EPOCH FROM expires_at)::bigint AS expires_at_epoch, " "EXTRACT(EPOCH FROM created_at)::bigint AS created_at_epoch, " "EXTRACT(EPOCH FROM updated_at)::bigint AS updated_at_epoch"; +constexpr const char* kAttachmentColumns = + "id, chat_id, owner_id, filename, content_type, size_bytes, sha256, " + "status, s3_key, error_code, " + "EXTRACT(EPOCH FROM created_at)::bigint AS created_at_epoch, " + "EXTRACT(EPOCH FROM updated_at)::bigint AS updated_at_epoch"; + +Attachment attachment_from_row(const pqxx::row& r) { + Attachment a; + a.id = r["id"].as(); + a.chat_id = r["chat_id"].as(); + a.owner_id = r["owner_id"].as(); + a.filename = r["filename"].as(); + a.content_type = r["content_type"].as(); + a.size_bytes = r["size_bytes"].as(); + a.sha256 = r["sha256"].as(); + a.status = r["status"].as(); + a.s3_key = r["s3_key"].as(); + if (r["error_code"].is_null()) { + a.error_code = std::nullopt; + } else { + a.error_code = r["error_code"].as(); + } + a.created_at = epoch_to_rfc3339(r["created_at_epoch"].as()); + a.updated_at = epoch_to_rfc3339(r["updated_at_epoch"].as()); + a.variants.clear(); + return a; +} + } // namespace DirectUpload DirectUploadRepo::insert(const DirectUpload& in) { @@ -65,17 +96,18 @@ DirectUpload DirectUploadRepo::insert(const DirectUpload& in) { auto r = tx.exec( "INSERT INTO direct_uploads (" " id, chat_id, owner_id, filename, content_type, expected_size, " - " expected_sha256, s3_key, status, attachment_id, " + " expected_sha256, s3_key, staging_key, status, attachment_id, " " expires_at, created_at, updated_at" ") VALUES (" - " $1::uuid, $2::uuid, $3::uuid, $4, $5, $6, $7, $8, $9, NULL, " - " to_timestamp($10::bigint), to_timestamp($11::bigint), " - " to_timestamp($12::bigint)" + " $1::uuid, $2::uuid, $3::uuid, $4, $5, $6, $7, $8, $9, $10, NULL, " + " to_timestamp($11::bigint), to_timestamp($12::bigint), " + " to_timestamp($13::bigint)" ") RETURNING " + std::string(kCols), pqxx::params{in.id, in.chat_id, in.owner_id, in.filename, in.content_type, in.expected_size, in.expected_sha256, - in.s3_key, in.status, in.expires_at_epoch, ts, ts}); + in.s3_key, in.staging_key, in.status, in.expires_at_epoch, + ts, ts}); tx.commit(); return row_to(r[0]); } @@ -157,11 +189,94 @@ std::vector DirectUploadRepo::pending_s3_keys() { auto lease = pool_.acquire(); pqxx::work tx(*lease); auto r = tx.exec( - "SELECT s3_key FROM direct_uploads WHERE status = 'pending'"); + "SELECT staging_key FROM direct_uploads WHERE status = 'pending'"); std::vector out; out.reserve(r.size()); for (const auto& row : r) { - out.push_back(row["s3_key"].as()); + out.push_back(row["staging_key"].as()); } return out; } + +void DirectUploadRepo::with_lock(const std::function& fn) { + auto lease = pool_.acquire(); + pqxx::work tx(*lease); + UploadLock lock(tx); + fn(lock); +} + +std::optional UploadLock::lock(const std::string& id) { + auto r = tx_.exec( + "SELECT " + std::string(kCols) + + " FROM direct_uploads WHERE id = $1::uuid FOR UPDATE", + pqxx::params{id}); + if (r.empty()) { + return std::nullopt; + } + return row_to(r[0]); +} + +std::optional UploadLock::find_attachment(const std::string& id) { + auto r = tx_.exec( + "SELECT " + std::string(kAttachmentColumns) + + " FROM attachments WHERE id = $1::uuid", + pqxx::params{id}); + if (r.empty()) { + return std::nullopt; + } + return attachment_from_row(r[0]); +} + +std::optional UploadLock::insert_ready(const Attachment& in, + bool& inserted) { + inserted = false; + const std::string ts = now_epoch_str(); + auto r = tx_.exec( + "INSERT INTO attachments (" + " id, chat_id, owner_id, filename, content_type, size_bytes, sha256, " + " status, s3_key, error_code, created_at, updated_at" + ") VALUES (" + " $1::uuid, $2::uuid, $3::uuid, $4, $5, $6, $7, $8, $9, NULL, " + " to_timestamp($10::bigint), to_timestamp($11::bigint)" + ") ON CONFLICT (id) DO NOTHING RETURNING " + + std::string(kAttachmentColumns), + pqxx::params{in.id, in.chat_id, in.owner_id, in.filename, + in.content_type, in.size_bytes, in.sha256, in.status, + in.s3_key, ts, ts}); + if (r.empty()) { + return std::nullopt; + } + inserted = true; + return attachment_from_row(r[0]); +} + +void UploadLock::mark_completed(const std::string& id, + const std::string& attachment_id) { + const std::string ts = now_epoch_str(); + auto r = tx_.exec( + "UPDATE direct_uploads SET status = 'completed', " + " attachment_id = $2::uuid, " + " updated_at = to_timestamp($3::bigint) " + "WHERE id = $1::uuid AND status = 'pending'", + pqxx::params{id, attachment_id, ts}); + if (r.affected_rows() != 1) { + throw std::runtime_error("direct upload complete lost the pending row"); + } +} + +void UploadLock::mark_expired(const std::string& id) { + const std::string ts = now_epoch_str(); + tx_.exec( + "UPDATE direct_uploads SET status = 'expired', " + " updated_at = to_timestamp($2::bigint) " + "WHERE id = $1::uuid AND status = 'pending'", + pqxx::params{id, ts}); +} + +void UploadLock::commit() { + if (committed_) { + return; + } + tx_.commit(); + committed_ = true; +} diff --git a/src/direct_upload_repo.hpp b/src/direct_upload_repo.hpp index f676b5e7..571f4f91 100644 --- a/src/direct_upload_repo.hpp +++ b/src/direct_upload_repo.hpp @@ -3,10 +3,13 @@ #include "db.hpp" #include "models.hpp" +#include #include #include #include +class UploadLock; + class DirectUploadRepo { public: explicit DirectUploadRepo(PgPool& pool) : pool_(pool) {} @@ -22,12 +25,38 @@ public: std::optional mark_aborted(const std::string& id); - // pending → expired where expires_at < now; returns expired rows (s3_key). + // pending → expired where expires_at < now; returns expired rows. std::vector expire_stale(); - // Active pending keys (for orphan GC exclusion). + // Staging keys of still-pending sessions (orphan GC must keep these). std::vector pending_s3_keys(); + // One PG transaction. Callback may call S3 while the row lock is held. + // Commit explicitly via UploadLock::commit(); otherwise the work rolls back. + void with_lock(const std::function& fn); + private: PgPool& pool_; }; + +// Row lock for a single complete(). Not safe to use after with_lock returns. +class UploadLock { +public: + std::optional lock(const std::string& id); + + std::optional find_attachment(const std::string& id); + + // ON CONFLICT (id) DO NOTHING. inserted=false and nullopt → row already exists. + std::optional insert_ready(const Attachment& in, bool& inserted); + + void mark_completed(const std::string& id, const std::string& attachment_id); + void mark_expired(const std::string& id); + void commit(); + +private: + friend class DirectUploadRepo; + explicit UploadLock(pqxx::work& tx) : tx_(tx) {} + + pqxx::work& tx_; + bool committed_ = false; +}; diff --git a/src/main.cpp b/src/main.cpp index 993e4390..b9ccba02 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1686,6 +1686,7 @@ static void handle_client(int client, send_all(client, error_response(503, "unavailable", "service unavailable", request_id)); } else { + bool response_headers_sent = false; try { const auto att = attachments.find_by_id(attachment_id); if (!att) { @@ -1705,36 +1706,51 @@ static void handle_client(int client, 409, "conflict", "attachment not ready", request_id)); } else { - std::string head = - "HTTP/1.1 200 OK\r\n" - "Content-Type: " + att->content_type + "\r\n" - "X-Request-Id: " + request_id + "\r\n" - "X-Instance-Id: " + g_instance_id + "\r\n" - "Content-Length: " + - std::to_string(att->size_bytes) + "\r\n" - "Connection: close\r\n" - "\r\n"; - send_all(client, head); - s3->get_object(att->s3_key, [&](const char* data, - std::size_t n) { - size_t sent = 0; - while (sent < n) { - const ssize_t w = ::write( - client, data + sent, n - sent); - if (w <= 0) { - throw std::runtime_error( - "content write failed"); + std::int64_t object_size = 0; + std::string etag; + if (!s3->stat_object(att->s3_key, object_size, etag)) { + send_all(client, error_response( + 404, "not_found", "not found", request_id)); + } else if (object_size != att->size_bytes) { + send_all(client, error_response( + 500, "internal_error", "internal error", + request_id)); + } else { + std::string head = + "HTTP/1.1 200 OK\r\n" + "Content-Type: " + att->content_type + "\r\n" + "X-Request-Id: " + request_id + "\r\n" + "X-Instance-Id: " + g_instance_id + "\r\n" + "Content-Length: " + + std::to_string(att->size_bytes) + "\r\n" + "Connection: close\r\n" + "\r\n"; + response_headers_sent = true; + send_all(client, head); + s3->get_object(att->s3_key, [&](const char* data, + std::size_t n) { + size_t sent = 0; + while (sent < n) { + const ssize_t w = ::write( + client, data + sent, n - sent); + if (w <= 0) { + throw std::runtime_error( + "content write failed"); + } + sent += static_cast(w); } - sent += static_cast(w); - } - }); + }); + } } } } catch (const std::exception& e) { - // If headers were not sent yet, return JSON error; otherwise - // the connection is already mid-body — just close. - send_all(client, failure_response(e, "download_attachment", - request_id)); + if (response_headers_sent) { + std::clog << "download_attachment stream failed: " + << e.what() << "\n"; + } else { + send_all(client, failure_response(e, "download_attachment", + request_id)); + } } } } @@ -1845,6 +1861,7 @@ static void handle_client(int client, d.expected_size = static_cast(*size_b); d.expected_sha256 = *sha; d.s3_key = "attachments/" + chat_id + "/" + d.id; + d.staging_key = "staging/" + chat_id + "/" + d.id; d.status = "pending"; const auto now = std::chrono::system_clock::now(); const auto secs = @@ -1854,7 +1871,7 @@ static void handle_client(int client, d.expires_at_epoch = secs + ttl; const DirectUpload saved = direct_uploads.insert(d); const std::string url = s3->presign_put( - saved.s3_key, static_cast(ttl), + saved.staging_key, static_cast(ttl), saved.content_type); nlohmann::json out; out["id"] = saved.id; @@ -1890,137 +1907,137 @@ static void handle_client(int client, "service unavailable", request_id)); } else { try { - auto sess = direct_uploads.find_by_id(direct_upload_id); - if (!sess || sess->owner_id != user_id) { - send_all(client, error_response(404, "not_found", - "not found", request_id)); - } else if (sess->status != "pending") { - send_all(client, error_response( - 409, "conflict", - "upload session not pending", request_id)); - } else { - // Flip overdue pending → expired, then re-read. - direct_uploads.expire_stale(); - sess = direct_uploads.find_by_id(direct_upload_id); - if (!sess || sess->status != "pending") { - send_all(client, error_response( - 410, "gone", "upload session expired", request_id)); - } else { - std::int64_t obj_size = 0; - std::string etag; - if (!s3->stat_object(sess->s3_key, obj_size, etag)) { - send_all(client, error_response( - 400, "invalid_request", - "object not uploaded", request_id)); - } else if (obj_size != sess->expected_size) { - try { - s3->delete_object(sess->s3_key); - } catch (...) { - } - direct_uploads.mark_aborted(sess->id); - send_all(client, error_response( - 400, "invalid_request", - "size mismatch", request_id)); - } else { - std::vector buf; - buf.reserve(static_cast(obj_size)); - s3->get_object( - sess->s3_key, - [&](const char* data, std::size_t n) { - buf.insert(buf.end(), - reinterpret_cast( - data), - reinterpret_cast( - data) + - n); - }); - if (static_cast(buf.size()) != - sess->expected_size) { - send_all(client, error_response( - 400, "invalid_request", - "size mismatch", request_id)); - } else { - const std::string got_sha = sha256_hex_bytes( - buf.data(), buf.size()); - if (got_sha != sess->expected_sha256) { - try { - s3->delete_object(sess->s3_key); - } catch (...) { - } - direct_uploads.mark_aborted(sess->id); - send_all(client, error_response( - 400, "invalid_request", - "checksum mismatch", request_id)); - } else { - ImageLimits lim; - if (const char* env = - std::getenv("MAX_UPLOAD_BYTES")) { - try { - lim.max_bytes = std::stoll(env); - } catch (...) { - } - } - if (const char* env = - std::getenv("MAX_IMAGE_PIXELS")) { - try { - lim.max_pixels = std::stoll(env); - } catch (...) { - } - } - ImageInfo info; - auto rej = validate_image( - buf.data(), buf.size(), lim, info); - if (rej || - info.content_type != sess->content_type) { - try { - s3->delete_object(sess->s3_key); - } catch (...) { - } - direct_uploads.mark_aborted(sess->id); - send_all(client, error_response( - 415, "unsupported_media_type", - "unsupported media type", - request_id)); - } else { - Attachment a; - a.id = sess->id; // stable id = session id - a.chat_id = sess->chat_id; - a.owner_id = sess->owner_id; - a.filename = sess->filename; - a.content_type = sess->content_type; - a.size_bytes = sess->expected_size; - a.sha256 = sess->expected_sha256; - a.status = "ready"; - a.s3_key = sess->s3_key; - bool inserted = false; - try { - const Attachment saved = - attachments.insert(a); - inserted = true; - direct_uploads.mark_completed( - sess->id, saved.id); - send_all(client, http_response( - 201, "Created", request_id, - attachment_json(saved))); - } catch (const std::exception& e) { - if (!inserted) { - try { - s3->delete_object(a.s3_key); - } catch (...) { - } - direct_uploads.mark_aborted( - sess->id); - } - send_all(client, failure_response( - e, "direct_upload_complete", - request_id)); - } - } - } - } + std::string response; + direct_uploads.with_lock([&](UploadLock& upload) { + const auto sess = upload.lock(direct_upload_id); + if (!sess || sess->owner_id != user_id) { + response = error_response(404, "not_found", "not found", + request_id); + return; + } + if (sess->status == "completed") { + const auto saved = upload.find_attachment( + sess->attachment_id.value_or(sess->id)); + if (!saved) { + throw std::runtime_error( + "completed upload has no attachment"); + } + upload.commit(); + response = http_response(200, "OK", request_id, + attachment_json(*saved)); + return; + } + if (sess->status != "pending") { + response = error_response( + 409, "conflict", "upload session not pending", + request_id); + return; + } + if (sess->overdue) { + upload.mark_expired(sess->id); + upload.commit(); + response = error_response(410, "gone", + "upload session expired", + request_id); + return; + } + + std::int64_t obj_size = 0; + std::string etag; + if (!s3->stat_object(sess->staging_key, obj_size, etag)) { + upload.commit(); + response = error_response(409, "not_ready", + "upload object not ready", + request_id); + return; + } + if (obj_size != sess->expected_size) { + upload.commit(); + response = error_response(409, "hash_mismatch", + "uploaded object mismatch", + request_id); + return; + } + + std::vector buf; + buf.reserve(static_cast(obj_size)); + s3->get_object( + sess->staging_key, + [&](const char* data, std::size_t n) { + buf.insert(buf.end(), + reinterpret_cast(data), + reinterpret_cast(data) + n); + }); + if (static_cast(buf.size()) != + sess->expected_size || + sha256_hex_bytes(buf.data(), buf.size()) != + sess->expected_sha256) { + upload.commit(); + response = error_response(409, "hash_mismatch", + "uploaded object mismatch", + request_id); + return; + } + + ImageLimits lim; + if (const char* env = std::getenv("MAX_UPLOAD_BYTES")) { + try { + lim.max_bytes = std::stoll(env); + } catch (...) { } } - } + if (const char* env = std::getenv("MAX_IMAGE_PIXELS")) { + try { + lim.max_pixels = std::stoll(env); + } catch (...) { + } + } + ImageInfo info; + const auto rejection = + validate_image(buf.data(), buf.size(), lim, info); + if (rejection || info.content_type != sess->content_type) { + upload.commit(); + response = error_response(415, "unsupported_media_type", + "unsupported media type", + request_id); + return; + } + + Attachment a; + a.id = sess->id; + a.chat_id = sess->chat_id; + a.owner_id = sess->owner_id; + a.filename = sess->filename; + a.content_type = sess->content_type; + a.size_bytes = sess->expected_size; + a.sha256 = sess->expected_sha256; + a.status = "ready"; + a.s3_key = sess->s3_key; + + s3->copy_object(sess->staging_key, a.s3_key); + bool inserted = false; + auto saved = upload.insert_ready(a, inserted); + if (!saved) { + saved = upload.find_attachment(a.id); + } + if (!saved) { + throw std::runtime_error( + "attachment insert conflict without existing row"); + } + try { + s3->delete_object(sess->staging_key); + } catch (const std::exception& e) { + std::clog << "direct upload staging cleanup failed: " + << e.what() << "\n"; + } + upload.mark_completed(sess->id, saved->id); + upload.commit(); + response = http_response(inserted ? 201 : 200, + inserted ? "Created" : "OK", + request_id, + attachment_json(*saved)); + }); + send_all(client, response); } catch (const std::exception& e) { send_all(client, failure_response(e, "direct_upload_complete", request_id)); @@ -2050,8 +2067,8 @@ static void handle_client(int client, try { std::int64_t sz = 0; std::string et; - if (s3->stat_object(sess->s3_key, sz, et)) { - s3->delete_object(sess->s3_key); + if (s3->stat_object(sess->staging_key, sz, et)) { + s3->delete_object(sess->staging_key); } } catch (const std::exception& de) { std::clog << "abort DeleteObject failed: " diff --git a/src/models.hpp b/src/models.hpp index f3c39571..9350d866 100644 --- a/src/models.hpp +++ b/src/models.hpp @@ -71,8 +71,10 @@ struct DirectUpload { std::string content_type; int expected_size = 0; std::string expected_sha256; - std::string s3_key; // internal + std::string s3_key; // final key: attachments/{chat}/{id} + std::string staging_key; // presigned PUT target: staging/{chat}/{id} std::string status; // pending|completed|aborted|expired + bool overdue = false; // pending && expires_at < now(); not a column std::optional attachment_id; std::string expires_at; // RFC3339 for JSON long long expires_at_epoch = 0; // for INSERT diff --git a/src/s3_client.cpp b/src/s3_client.cpp index fc2222bf..e65b585f 100644 --- a/src/s3_client.cpp +++ b/src/s3_client.cpp @@ -181,6 +181,22 @@ std::int64_t S3Client::get_object( return total; } +void S3Client::copy_object(const std::string& src_key, + const std::string& dst_key) { + if (src_key.empty() || dst_key.empty() || src_key == dst_key) { + throw std::invalid_argument("copy_object: bad keys"); + } + minio::s3::CopyObjectArgs args; + args.bucket = cfg_.bucket; + args.object = dst_key; + args.source.bucket = cfg_.bucket; + args.source.object = src_key; + minio::s3::CopyObjectResponse resp = impl_->client->CopyObject(args); + if (!resp) { + throw std::runtime_error("S3 CopyObject failed: " + resp.Error().String()); + } +} + void S3Client::delete_object(const std::string& key) { minio::s3::RemoveObjectArgs args; args.bucket = cfg_.bucket; diff --git a/src/s3_client.hpp b/src/s3_client.hpp index 7babae25..7c48dc49 100644 --- a/src/s3_client.hpp +++ b/src/s3_client.hpp @@ -45,6 +45,9 @@ public: void delete_object(const std::string& key); + // Server-side copy inside the bucket (complete: staging → final). + void copy_object(const std::string& src_key, const std::string& dst_key); + // HeadObject-style metadata. Returns false if the object does not exist. bool stat_object(const std::string& key, std::int64_t& size_bytes, std::string& etag); diff --git a/student-tests/run_grade5_track1.sh b/student-tests/run_grade5_track1.sh index 24144ac5..fdab7a67 100755 --- a/student-tests/run_grade5_track1.sh +++ b/student-tests/run_grade5_track1.sh @@ -6,6 +6,9 @@ DIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd) echo "=== test_direct_upload_ok.sh ===" sh "$DIR/test_direct_upload_ok.sh" +echo "=== test_presigned_complete_concurrent.sh ===" +sh "$DIR/test_presigned_complete_concurrent.sh" + echo "=== test_direct_upload_negatives.sh ===" sh "$DIR/test_direct_upload_negatives.sh" diff --git a/student-tests/test_direct_upload_negatives.sh b/student-tests/test_direct_upload_negatives.sh index dc1e9309..d4fcdf1a 100755 --- a/student-tests/test_direct_upload_negatives.sh +++ b/student-tests/test_direct_upload_negatives.sh @@ -43,7 +43,8 @@ expect_code 201 ID1=$(printf '%s' "$HTTP_BODY" | jq -r .id) http_json POST "/api/v1/direct-uploads/$ID1/complete" \ -H "Authorization: Bearer $ALICE_TOKEN" -expect_code 400 +expect_code 409 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .error.code)" not_ready # --- abort --- http_json POST "/api/v1/chats/$CHAT_ID/direct-uploads" \ @@ -91,7 +92,8 @@ put_code=$(put_via_net "$URL4" "$CT4" "$png") [ "$put_code" = "200" ] || die "PUT checksum-case got $put_code" http_json POST "/api/v1/direct-uploads/$ID4/complete" \ -H "Authorization: Bearer $ALICE_TOKEN" -expect_code 400 +expect_code 409 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .error.code)" hash_mismatch # Proxy path still works upload_file "$CHAT_ID" "$png" "proxy.png" "image/png" diff --git a/student-tests/test_direct_upload_ok.sh b/student-tests/test_direct_upload_ok.sh index 85096aa5..712387db 100755 --- a/student-tests/test_direct_upload_ok.sh +++ b/student-tests/test_direct_upload_ok.sh @@ -27,14 +27,12 @@ assert_eq "$CT" "image/png" content_type_header # PUT bytes on the compose network (MinIO ports stay unpublished by default). ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" -$COMPOSE run --rm --no-deps \ +put_code=$($COMPOSE run --rm --no-deps \ -v "$png:/tmp/up.bin:ro" \ --entrypoint curl api \ -sS -m 60 -o /dev/null -w '%{http_code}' \ -X PUT -H "Content-Type: $CT" --data-binary @/tmp/up.bin \ - "$UPLOAD_URL" > /tmp/du_put_code.$$ -put_code=$(cat /tmp/du_put_code.$$) -rm -f /tmp/du_put_code.$$ + "$UPLOAD_URL") [ "$put_code" = "200" ] || die "presigned PUT expected 200 got $put_code" http_json POST "/api/v1/direct-uploads/$UPLOAD_ID/complete" \ @@ -45,6 +43,13 @@ assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .sha256)" "$want_sha" sha256 assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .id)" "$UPLOAD_ID" attachment_id out=$(mktemp) +replay_code=$($COMPOSE run --rm --no-deps \ + --entrypoint curl api \ + -sS -m 60 -o /dev/null -w '%{http_code}' \ + -X PUT -H "Content-Type: $CT" --data-binary 'replay-content-12345' \ + "$UPLOAD_URL") +[ "$replay_code" = "200" ] || die "replay PUT expected 200 got $replay_code" + curl -sS -m 60 -o "$out" -H "Authorization: Bearer $ALICE_TOKEN" \ "$BASE_URL/api/v1/attachments/$UPLOAD_ID/content" assert_eq "$(sha256_file "$out")" "$want_sha" download_sha256 diff --git a/student-tests/test_download_missing_object.sh b/student-tests/test_download_missing_object.sh new file mode 100644 index 00000000..8ec471f2 --- /dev/null +++ b/student-tests/test_download_missing_object.sh @@ -0,0 +1,59 @@ +#!/bin/sh +# A missing S3 object must fail before the content response headers are sent. +set -eu +. "$(dirname "$0")/lib.sh" + +png="$FIXTURES/320x200.png" +[ -f "$png" ] || die "missing fixture $png" +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" +response_body=$(mktemp) +object_deleted=0 + +restore_object() { + action=$1 + $COMPOSE run --rm --no-deps -T \ + -e "CHAT_ID=$CHAT_ID" -e "ATTACHMENT_ID=$AID" \ + -e "OBJECT_ACTION=$action" \ + -v "$png:/tmp/restore.png:ro" \ + --entrypoint /bin/sh minio-init -c ' + set -eu + mc alias set local "$S3_ENDPOINT" "$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD" >/dev/null + object="local/$S3_BUCKET/attachments/$CHAT_ID/$ATTACHMENT_ID" + if [ "$OBJECT_ACTION" = delete ]; then + mc rm --force "$object" + else + mc cp /tmp/restore.png "$object" + fi + ' +} + +cleanup() { + if [ "$object_deleted" = 1 ]; then + restore_object restore || printf 'WARNING: failed to restore test object\n' >&2 + fi + rm -f "$response_body" +} +trap cleanup 0 HUP INT TERM + +want_sha=$(sha256_file "$png") +TOKEN="" +register_user alice +create_chat 'missing-object' "[\"$USER_ID\"]" +upload_file "$CHAT_ID" "$png" 'sample.png' 'image/png' +expect_code 201 +AID=$(printf '%s' "$HTTP_BODY" | jq -r .id) +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .sha256)" "$want_sha" metadata_sha + +restore_object delete +object_deleted=1 +code=$(curl -sS -m 60 -o "$response_body" -w '%{http_code}' \ + -H "Authorization: Bearer $TOKEN" \ + "$BASE_URL/api/v1/attachments/$AID/content") +case "$code" in + 404|5??) ;; + *) die "expected 404/5xx for missing object, got HTTP $code body=$(cat "$response_body")" ;; +esac + +restore_object restore +object_deleted=0 +printf 'PASS test_download_missing_object\n' \ No newline at end of file diff --git a/student-tests/test_presigned_complete_concurrent.sh b/student-tests/test_presigned_complete_concurrent.sh new file mode 100644 index 00000000..8656de28 --- /dev/null +++ b/student-tests/test_presigned_complete_concurrent.sh @@ -0,0 +1,73 @@ +#!/bin/sh +# Track 1: concurrent complete calls publish one intact attachment. +. "$(dirname "$0")/lib.sh" + +png="$FIXTURES/320x200.png" +[ -f "$png" ] || die "missing fixture $png" +want_sha=$(sha256_file "$png") +want_size=$(wc -c < "$png" | tr -d ' ') +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' 0 HUP INT TERM + +register_user alice +ALICE_TOKEN=$TOKEN +ALICE_ID=$USER_ID +create_chat "du-concurrent" "[\"$ALICE_ID\"]" + +http_json POST "/api/v1/chats/$CHAT_ID/direct-uploads" \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + -H 'Content-Type: application/json' \ + -d "{\"filename\":\"concurrent.png\",\"content_type\":\"image/png\",\"size_bytes\":$want_size,\"sha256\":\"$want_sha\"}" +expect_code 201 +UPLOAD_ID=$(printf '%s' "$HTTP_BODY" | jq -r .id) +UPLOAD_URL=$(printf '%s' "$HTTP_BODY" | jq -r .upload_url) +CT=$(printf '%s' "$HTTP_BODY" | jq -r '.headers["Content-Type"]') +[ -n "$UPLOAD_ID" ] && [ "$UPLOAD_ID" != null ] || die "empty upload id" +[ -n "$UPLOAD_URL" ] && [ "$UPLOAD_URL" != null ] || die "empty upload_url" + +COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" +put_code=$($COMPOSE run --rm --no-deps \ + -v "$png:/tmp/up.bin:ro" \ + --entrypoint curl api \ + -sS -m 60 -o /dev/null -w '%{http_code}' \ + -X PUT -H "Content-Type: $CT" --data-binary @/tmp/up.bin \ + "$UPLOAD_URL") +[ "$put_code" = "200" ] || die "presigned PUT expected 200 got $put_code" + +pids= +for i in 1 2 3 4; do + curl -sS -m 60 -o "$tmpdir/body.$i" -w '%{http_code}' \ + -X POST \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + "$BASE_URL/api/v1/direct-uploads/$UPLOAD_ID/complete" \ + > "$tmpdir/code.$i" & + pids="$pids $!" +done +for pid in $pids; do + wait "$pid" || die "complete request failed" +done + +count_201=0 +for i in 1 2 3 4; do + code=$(cat "$tmpdir/code.$i") + case "$code" in + 201) count_201=$((count_201 + 1)) ;; + 200|409) ;; + *) die "unexpected concurrent complete HTTP $code: $(cat "$tmpdir/body.$i")" ;; + esac +done +assert_eq "$count_201" 1 created_count + +http_json GET "/api/v1/attachments/$UPLOAD_ID" \ + -H "Authorization: Bearer $ALICE_TOKEN" +expect_code 200 +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .status)" ready metadata_status +assert_eq "$(printf '%s' "$HTTP_BODY" | jq -r .sha256)" "$want_sha" metadata_sha + +code=$(curl -sS -m 60 -o "$tmpdir/content" -w '%{http_code}' \ + -H "Authorization: Bearer $ALICE_TOKEN" \ + "$BASE_URL/api/v1/attachments/$UPLOAD_ID/content") +assert_eq "$code" 200 content_status +assert_eq "$(sha256_file "$tmpdir/content")" "$want_sha" content_sha + +printf 'PASS test_presigned_complete_concurrent\n' \ No newline at end of file diff --git a/tools/gc_orphans.sh b/tools/gc_orphans.sh index 2e6da618..138a07dc 100755 --- a/tools/gc_orphans.sh +++ b/tools/gc_orphans.sh @@ -15,7 +15,7 @@ ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" COMPOSE="docker compose --env-file $ROOT/.env -f $ROOT/compose.yaml" GRACE_SECONDS="${GRACE_SECONDS:-3600}" APPLY="${APPLY:-0}" -PREFIX="${ORPHAN_PREFIX:-attachments/}" +PREFIX="${ORPHAN_PREFIX:-}" S3_BUCKET=$($COMPOSE exec -T api sh -c 'printf %s "$S3_BUCKET"') [ -n "$S3_BUCKET" ] || { echo "S3_BUCKET empty" >&2; exit 1; } @@ -25,26 +25,27 @@ trap 'rm -rf "$TMP"' EXIT echo "gc_orphans: bucket=$S3_BUCKET grace=${GRACE_SECONDS}s apply=$APPLY prefix=$PREFIX" -$COMPOSE run --rm --no-deps --entrypoint /bin/sh minio-init -c " +s3_listing=$($COMPOSE run --rm --no-deps -T --entrypoint /bin/sh minio-init -c " set -eu mc alias set local \"\$S3_ENDPOINT\" \"\$MINIO_ROOT_USER\" \"\$MINIO_ROOT_PASSWORD\" >/dev/null mc ls --recursive --json \"local/\$S3_BUCKET/$PREFIX\" || true -" > "$TMP/s3.json" +") +printf '%s\n' "$s3_listing" > "$TMP/s3.json" -# Known keys: ready attachments + still-pending direct uploads (Track 1). -$COMPOSE exec -T db sh -c \ +# Keep published attachments and staging objects for active direct uploads. +pg_keys=$($COMPOSE exec -T db sh -c \ 'psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Atc " SELECT s3_key FROM attachments UNION - SELECT s3_key FROM direct_uploads WHERE status = '\''pending'\'' - "' \ - > "$TMP/pg.keys" + SELECT staging_key FROM direct_uploads WHERE status = '\''pending'\'' + "') +printf '%s\n' "$pg_keys" > "$TMP/pg.keys" -python3 - "$TMP/s3.json" "$TMP/pg.keys" "$GRACE_SECONDS" "$TMP/del.keys" <<'PY' +python3 - "$TMP/s3.json" "$TMP/pg.keys" "$GRACE_SECONDS" "$TMP/del.keys" "$PREFIX" <<'PY' import json, sys, time from datetime import datetime -s3_path, pg_path, grace_s, out_path = sys.argv[1], sys.argv[2], int(sys.argv[3]), sys.argv[4] +s3_path, pg_path, grace_s, out_path, prefix = sys.argv[1], sys.argv[2], int(sys.argv[3]), sys.argv[4], sys.argv[5] now = time.time() known = {line.strip() for line in open(pg_path) if line.strip()} orphans = [] @@ -59,9 +60,11 @@ for line in open(s3_path): key = obj.get("key") or obj.get("Key") if not key: continue - # mc ls under prefix returns keys relative to that prefix. - if not key.startswith("attachments/"): - key = "attachments/" + key.lstrip("/") + key = key.lstrip("/") + if prefix and not key.startswith(prefix): + key = prefix.rstrip("/") + "/" + key + if not key.startswith(("attachments/", "staging/")): + continue if key in known: continue age = None @@ -98,14 +101,15 @@ if [ ! -s "$TMP/del.keys" ]; then exit 0 fi -$COMPOSE run --rm --no-deps --entrypoint /bin/sh minio-init -c " - set -eu - mc alias set local \"\$S3_ENDPOINT\" \"\$MINIO_ROOT_USER\" \"\$MINIO_ROOT_PASSWORD\" >/dev/null - while IFS= read -r key; do - [ -n \"\$key\" ] || continue - echo \"deleting \$S3_BUCKET/\$key\" - mc rm --force \"local/\$S3_BUCKET/\$key\" - done -" < "$TMP/del.keys" +while IFS= read -r key; do + [ -n "$key" ] || continue + echo "deleting $S3_BUCKET/$key" + $COMPOSE run --rm --no-deps -T -e "GC_OBJECT_KEY=$key" \ + --entrypoint /bin/sh minio-init -c ' + set -eu + mc alias set local "$S3_ENDPOINT" "$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD" >/dev/null + mc rm --force "local/$S3_BUCKET/$GC_OBJECT_KEY" + ' +done < "$TMP/del.keys" echo "gc_orphans: delete done" -- 2.54.0