refactor: лимит размера входа во всех слоях — MAX_MB (МБ=MiB), байты вычисляются в checkInput
Ядро: WordPdfSettings.MAX_INPUT_MB=5, ConvertOptions.maxMb, WordPdfValidator.checkInput(byte[], long maxMb) — единственная точка пересчёта МБ→байты, сообщение «Файл больше N МБ: X байт > Y байт». Приложение: свойство wordpdf.max-mb (env WORDPDF_MAX_MB, relaxed binding). CI/конфиг/автотесты/доки: WORDPDF_MAX_BYTES → WORDPDF_MAX_MB (значение 5).
This commit is contained in:
@@ -118,12 +118,12 @@ jobs:
|
||||
DEPLOY_USER: ${{ vars.DEPLOY_USER }}
|
||||
DEPLOY_DIR: ${{ vars.DEPLOY_DIR }}
|
||||
REGISTRY: ${{ vars.REGISTRY }}
|
||||
WORDPDF_MAX_BYTES: ${{ vars.WORDPDF_MAX_BYTES }}
|
||||
WORDPDF_MAX_MB: ${{ vars.WORDPDF_MAX_MB }}
|
||||
WORDPDF_MAX_PAGES: ${{ vars.WORDPDF_MAX_PAGES }}
|
||||
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||
run: |
|
||||
[ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_DIR" ] && [ -n "$REGISTRY" ] && [ -n "$WORDPDF_MAX_BYTES" ] && [ -n "$WORDPDF_MAX_PAGES" ] && [ -n "$DEPLOY_SSH_KEY" ] || {
|
||||
echo "Задайте Actions Variables DEPLOY_HOST/DEPLOY_USER/DEPLOY_DIR/REGISTRY/WORDPDF_MAX_BYTES/WORDPDF_MAX_PAGES и Secret DEPLOY_SSH_KEY — см. GITEA-vars.md" >&2
|
||||
[ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_DIR" ] && [ -n "$REGISTRY" ] && [ -n "$WORDPDF_MAX_MB" ] && [ -n "$WORDPDF_MAX_PAGES" ] && [ -n "$DEPLOY_SSH_KEY" ] || {
|
||||
echo "Задайте Actions Variables DEPLOY_HOST/DEPLOY_USER/DEPLOY_DIR/REGISTRY/WORDPDF_MAX_MB/WORDPDF_MAX_PAGES и Secret DEPLOY_SSH_KEY — см. GITEA-vars.md" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ jobs:
|
||||
script: |
|
||||
set -euo pipefail
|
||||
cd "${{ vars.DEPLOY_DIR }}"
|
||||
export WORDPDF_MAX_BYTES="${{ vars.WORDPDF_MAX_BYTES }}" WORDPDF_MAX_PAGES="${{ vars.WORDPDF_MAX_PAGES }}"
|
||||
export WORDPDF_MAX_MB="${{ vars.WORDPDF_MAX_MB }}" WORDPDF_MAX_PAGES="${{ vars.WORDPDF_MAX_PAGES }}"
|
||||
umask 077
|
||||
{
|
||||
echo "PREV_APP=$(podman inspect -f '{{.Image}}' wordpdf-prod-app-1)"
|
||||
@@ -160,11 +160,11 @@ jobs:
|
||||
env:
|
||||
WORDPDF_BASE_URL: ${{ vars.WORDPDF_BASE_URL }}
|
||||
WORDPDF_MAX_PAGES: ${{ vars.WORDPDF_MAX_PAGES }}
|
||||
WORDPDF_MAX_BYTES: ${{ vars.WORDPDF_MAX_BYTES }}
|
||||
WORDPDF_MAX_MB: ${{ vars.WORDPDF_MAX_MB }}
|
||||
WORDPDF_API_KEY: ${{ secrets.WORDPDF_API_KEY }}
|
||||
run: |
|
||||
[ -n "$WORDPDF_BASE_URL" ] && [ -n "$WORDPDF_MAX_PAGES" ] && [ -n "$WORDPDF_MAX_BYTES" ] && [ -n "$WORDPDF_API_KEY" ] || {
|
||||
echo "Задайте Actions Variables WORDPDF_BASE_URL/WORDPDF_MAX_PAGES/WORDPDF_MAX_BYTES и Secret WORDPDF_API_KEY — см. GITEA-vars.md" >&2
|
||||
[ -n "$WORDPDF_BASE_URL" ] && [ -n "$WORDPDF_MAX_PAGES" ] && [ -n "$WORDPDF_MAX_MB" ] && [ -n "$WORDPDF_API_KEY" ] || {
|
||||
echo "Задайте Actions Variables WORDPDF_BASE_URL/WORDPDF_MAX_PAGES/WORDPDF_MAX_MB и Secret WORDPDF_API_KEY — см. GITEA-vars.md" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ jobs:
|
||||
env:
|
||||
WORDPDF_BASE_URL: ${{ vars.WORDPDF_BASE_URL }}
|
||||
WORDPDF_MAX_PAGES: ${{ vars.WORDPDF_MAX_PAGES }}
|
||||
WORDPDF_MAX_BYTES: ${{ vars.WORDPDF_MAX_BYTES }}
|
||||
WORDPDF_MAX_MB: ${{ vars.WORDPDF_MAX_MB }}
|
||||
WORDPDF_API_KEY: ${{ secrets.WORDPDF_API_KEY }}
|
||||
run: cd prod-autotests && ../.venv/bin/python -m pytest -q .
|
||||
|
||||
@@ -191,7 +191,7 @@ jobs:
|
||||
script: |
|
||||
set -euo pipefail
|
||||
cd "${{ vars.DEPLOY_DIR }}"
|
||||
export WORDPDF_MAX_BYTES="${{ vars.WORDPDF_MAX_BYTES }}" WORDPDF_MAX_PAGES="${{ vars.WORDPDF_MAX_PAGES }}"
|
||||
export WORDPDF_MAX_MB="${{ vars.WORDPDF_MAX_MB }}" WORDPDF_MAX_PAGES="${{ vars.WORDPDF_MAX_PAGES }}"
|
||||
if [ ! -f .rollback.env ]; then
|
||||
echo "НЕТ .rollback.env — АВТОМАТИЧЕСКИЙ ОТКАТ НЕВОЗМОЖЕН" >&2
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user