Dockerfile

@@ -4,12 +4,12 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update && apt install -y wget libgtk-3-0 libpcsclite-dev pcscd curl software-properties-common git zip bash
 RUN add-apt-repository ppa:ondrej/php
 RUN apt update && apt install -y \
-    php8.3-fpm  \
+    php-fpm  \
-    php8.3-curl \
+    php-curl \
-    php8.3 \
+    php \
-    php8.3-common \
+    php-common \
-    php8.3-cli \
+    php-cli \
-    php8.3-xml \
+    php-xml \
     gnupg \
     g++ \
     procps \
@@ -55,7 +55,7 @@ RUN apt update && apt install -y okular-csp-utils
 
 RUN mkdir -p /root/.config
 COPY license.key /license.key
-# RUN echo Y | pdfcpro install-license /license.key
+RUN echo Y | pdfcpro install-license /license.key
 COPY Inter-Bold.ttf /usr/local/share/fonts/Inter-Bold.ttf
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

Dockerfile_local

@@ -1,79 +0,0 @@
-FROM ubuntu:22.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt update && apt install -y wget libgtk-3-0 libpcsclite-dev pcscd curl software-properties-common git zip bash
-RUN add-apt-repository ppa:ondrej/php
-RUN apt update && apt install -y \
-    php8.3-fpm  \
-    php8.3-curl \
-    php8.3 \
-    php8.3-common \
-    php8.3-cli \
-    php8.3-xml \
-    gnupg \
-    g++ \
-    procps \
-    git \
-    unzip \
-    zlib1g-dev \
-    libzip-dev \
-    libfreetype6-dev \
-    libpng-dev \
-    libjpeg-dev \
-    libicu-dev  \
-    libonig-dev \
-    libxslt1-dev \
-    acl \
-    && echo 'alias sf="php bin/console"' >> ~/.bashrc
-
-RUN wget -q -O /etc/apt/trusted.gpg.d/lab50.gpg http://packages.lab50.net/lab50.gpg
-RUN echo 'deb http://packages.lab50.net/okular jammy main non-free' > /etc/apt/sources.list.d/okulargost.list
-COPY 3party/cprocsp/linux-amd64_deb.tgz /tmp/src/
-RUN cd /tmp/src && \
-    tar -xf linux-amd64_deb.tgz && \
-    linux-amd64_deb/install.sh && \
-    dpkg -i linux-amd64_deb/cprocsp-pki-cades-64*.deb && \
-    dpkg -i linux-amd64_deb/cprocsp-rdr-* && \
-    # делаем симлинки 
-    cd /bin && \
-    ln -s /opt/cprocsp/bin/amd64/certmgr && \
-    ln -s /opt/cprocsp/bin/amd64/cpverify && \
-    ln -s /opt/cprocsp/bin/amd64/cryptcp && \
-    ln -s /opt/cprocsp/bin/amd64/csptest && \
-    ln -s /opt/cprocsp/bin/amd64/csptestf && \
-    ln -s /opt/cprocsp/bin/amd64/der2xer && \
-    ln -s /opt/cprocsp/bin/amd64/inittst && \
-    ln -s /opt/cprocsp/bin/amd64/wipefile && \
-    ln -s /opt/cprocsp/sbin/amd64/cpconfig && \
-    #прибираемся
-    rm -rf /tmp/src
-
-COPY 3party/okular/install.sh /tmp/
-RUN bash /tmp/install.sh && rm -fv /tmp/install.sh
-RUN apt update && apt install -y okular-csp-utils
-
-RUN mkdir -p /root/.config
-COPY license.key /license.key
-RUN echo Y | pdfcpro install-license /license.key
-COPY Inter-Bold.ttf /usr/local/share/fonts/Inter-Bold.ttf
-
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-WORKDIR /usr/src/signer/
-COPY ./backend /usr/src/signer
-
-COPY ./docker/php/www.conf /etc/php/8.3/fpm/pool.d/www.conf
-
-# RUN curl curl https://frankenphp.dev/install.sh | sh
-# RUN mv /usr/src/signer/frankenphp /usr/local/bin/
-
-ENV COMPOSER_ALLOW_SUPERUSER=1
-RUN composer install
-RUN service php8.3-fpm start
-
-COPY entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT [ "/entrypoint.sh" ]
-CMD ["php-fpm8.3", "-F"]
-
-EXPOSE 9000

backend/config/bundles.php

@@ -10,5 +10,4 @@ return [
     Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
     Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
     Symfony\UX\Chartjs\ChartjsBundle::class => ['all' => true],
-    Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
 ];

backend/config/packages/twig_component.yaml

@@ -1,5 +0,0 @@
-twig_component:
-    anonymous_template_directory: 'components/'
-    defaults:
-        # Namespace & directory for components
-        App\Twig\Components\: 'components/'

backend/config/routes.yaml

@@ -1,5 +1,5 @@
-controllers_sign_document:
+controllers:
     resource:
-        path: ../src/SignDocument/Controller/
+        path: ../src/Controller/
-        namespace: App\SignDocument\Controller
+        namespace: App\Controller
     type: attribute

backend/config/services.yaml

@@ -28,6 +28,6 @@ services:
 
     GuzzleHttp\Client: '@guzzle.http_client'
 
-    App\SignDocument\Api\ApiParams:
+    App\Api\ApiParams:
         arguments:
             $endPointUrl: '%env(DOT_DOT_URL)%'

backend/src/Api/Api.php

@@ -2,19 +2,18 @@
 
 declare(strict_types=1);
 
-namespace App\SignDocument\Api;
+namespace App\Api;
 
 use App\Infrastructure\External\Api\AbstractApi;
 use App\Infrastructure\External\Api\BinaryStringFileResult;
-use GuzzleHttp\Exception\BadResponseException;
+use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\RequestOptions;
 
 class Api extends AbstractApi
 {
     public ApiParams $apiParams;
 
-    public function send(string $token, string $path, int $order): array
+    public function send(string $token, string $path, int $batch): array
     {
         $params = [
             RequestOptions::HEADERS => [
@@ -24,7 +23,7 @@ class Api extends AbstractApi
             RequestOptions::MULTIPART => [
                 [
                     'name' => 'file',
-                    'contents' => file_get_contents($path),
+                    'contents' => fopen($path, 'r'),
                     'filename' => $path,
                     'headers' => [
                         'Content-Type' => '<Content-type header>',
@@ -37,7 +36,7 @@ class Api extends AbstractApi
             ],
         ];
 
-        $response = $this->client->post(sprintf('%s%s%s', $this->apiParams->endPointUrl, '/api/v1/documents/upload/carrier/order/', $order), $params);
+        $response = $this->client->post(sprintf('%s%s%s', $this->apiParams->endPointUrl, '/api/v1/document/upload/batch/', $batch), $params);
 
         return $this->responseHandler->setResponse($response)->getContentJsonToArray();
     }

backend/src/Api/ApiParams.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\SignDocument\Api;
+namespace App\Api;
 
 class ApiParams
 {

backend/src/Api/Request/SignRequest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace App\SignDocument\Api\Request;
+namespace App\Api\Request;
 
 use App\Infrastructure\Http\RequestDtoInterface;
 
 class SignRequest implements RequestDtoInterface
 {
     public string $url;
-    public int $order;
+    public int $batch;
     public string $apiToken;
 }

backend/src/Controller/SignController.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace App\SignDocument\Controller;
+namespace App\Controller;
 
-use App\SignDocument\Api\Request\SignRequest;
+use App\Api\Request\SignRequest;
-use App\SignDocument\Services\SignService;
+use App\SignService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\HttpFoundation\Response;
 
 class SignController extends AbstractController
 {

backend/src/DevSignService.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\SignDocument\Services;
+namespace App;
 
 class DevSignService
 {

backend/src/Infrastructure/Api/Response/AbstractResponse.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Infrastructure\Api\Response;
-
-// Абстрактный респонс - от него наследуются нужные респонсы для стандартизации ответа в ApiHelperTrait -> createNewJsonResponse
-
-abstract class AbstractResponse
-{
-}

backend/src/Infrastructure/External/Api/BinaryStringFileResult.php

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace App\Infrastructure\External\Api;
 
-use RuntimeException;
-
 /**
  * Враппер бинарных фалов, при создании класса содает новый временный файл,
  * при необходимости сохраняет файл под новым именем
@@ -25,14 +23,4 @@ class BinaryStringFileResult
         $this->tempFileName = sprintf('%s/%s_%s', sys_get_temp_dir(), 'Document', time());
         file_put_contents($this->tempFileName, $content);
     }
-
-    public function remove(): bool
-    {
-        if (file_exists($this->tempFileName)) {
-            unlink($this->tempFileName);
-            return true;
-        }
-
-        throw new RuntimeException('Temp file not found');
-    }
 }

backend/src/Infrastructure/Traits/ApiHelperTrait.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Infrastructure\Traits;
-
-use App\Infrastructure\Api\Response\AbstractResponse;
-use ReflectionClass;
-use Symfony\Component\HttpFoundation\JsonResponse;
-
-trait ApiHelperTrait
-{
-    public function createJsonResponse(array $body, string $message = 'OK', int $code = 200): JsonResponse
-    {
-        return new JsonResponse([
-            'message' => $message,
-            'body' => $body,
-        ], $code);
-    }
-
-    public function createPaginateJsonResponse(array $items, int $limit, int $totalCount): JsonResponse
-    {
-        return $this->createJsonResponse(
-            [
-                'items' => $items,
-                'pages' => ceil($totalCount / $limit),
-                'totalCount' => $totalCount,
-            ]
-        );
-    }
-
-    public function createJsonResponseFromObject(AbstractResponse $body, string $message = 'OK', int $code = 200): JsonResponse
-    {
-        return new JsonResponse([
-            'message' => $message,
-            'body' => $this->toArray($body),
-        ], $code);
-    }
-
-    private function toArray(AbstractResponse $body): array
-    {
-        $reflect = new ReflectionClass($body);
-        $props = $reflect->getProperties();
-        $array = [];
-        foreach ($props as $prop) {
-            $prop->setAccessible(true);
-            $array[$prop->getName()] = $prop->getValue($body);
-            $prop->setAccessible(false);
-        }
-
-        return $array;
-    }
-}

backend/src/ProdSignService.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 
-namespace App\SignDocument\Services;
+namespace App;
 
 
 class ProdSignService

backend/src/SignDocument/Api/Request/DigitalSignatureRequest.php

@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\SignDocument\Api\Request;
-
-use App\Infrastructure\Http\RequestDtoInterface;
-
-class DigitalSignatureRequest implements RequestDtoInterface
-{
-    public string $url;
-    public string $apiToken;
-}

backend/src/SignDocument/Api/Response/DigitalSignatureResponse.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-
-namespace App\SignDocument\Api\Response;
-
-use App\Infrastructure\Api\Response\AbstractResponse;
-
-class DigitalSignatureResponse extends AbstractResponse
-{
-    public function __construct(
-        public string $hash,
-        public string $content,
-    )
-    {
-    }
-}

backend/src/SignDocument/Controller/DigitalSignatureController.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\SignDocument\Controller;
-
-use App\Infrastructure\Traits\ApiHelperTrait;
-use App\SignDocument\Api\Request\DigitalSignatureRequest;
-use App\SignDocument\Services\DigitalSignatureService;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-
-class DigitalSignatureController extends AbstractController
-{
-    use ApiHelperTrait;
-    public function __construct(
-        private readonly DigitalSignatureService $digitalSignatureService
-    ){
-    }
-
-    #[Route(path: '/digital/sign', name: 'app.digital.sign',  methods: ['POST'])]
-    public function __invoke(Request $request, DigitalSignatureRequest $digitalSignatureRequest): Response
-    {
-        $token = $request->server->get('HTTP_AUTHORIZATION');
-
-        return $this->createJsonResponseFromObject(
-            $this->digitalSignatureService->getSignature($digitalSignatureRequest, $token)
-        );
-    }
-}

backend/src/SignDocument/Services/DigitalSignatureService.php

@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\SignDocument\Services;
-
-use App\Infrastructure\External\Api\BinaryStringFileResult;
-use App\SignDocument\Api\Api;
-use App\SignDocument\Api\ApiParams;
-use App\SignDocument\Api\Request\DigitalSignatureRequest;
-use App\SignDocument\Api\Response\DigitalSignatureResponse;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Exception;
-use RuntimeException;
-
-class DigitalSignatureService
-{
-    private BinaryStringFileResult $document;
-
-    public function __construct(
-        private readonly Api                           $api,
-        private readonly ApiParams                     $apiParams,
-    ){
-    }
-
-    public function __destruct()
-    {
-        $this->document->remove();
-    }
-
-    public function getSignature(DigitalSignatureRequest $request, string $token): DigitalSignatureResponse
-    {
-        if ($_ENV['API_TOKEN'] !== $request->apiToken) {
-            throw new AccessDeniedHttpException('Доступ запрещен');
-        }
-
-        $this->api->apiParams = $this->apiParams;
-
-        try {
-            $this->document = $this->api->download($request->url, $token);
-
-            exec(sprintf('cp %s %s.pdf', $this->document->tempFileName, $this->document->tempFileName));
-            exec(sprintf('cryptcp -sign -detached -der %s.pdf', $this->document->tempFileName));
-
-            $response = base64_encode(file_get_contents($this->document->tempFileName . '.pdf.sgn'));
-
-            return new DigitalSignatureResponse(
-                hash: $response,
-                content: base64_encode(file_get_contents(sprintf('%s.pdf', $this->document->tempFileName)))
-            );
-        } catch (Exception $e) {
-            throw new RuntimeException($e->getMessage());
-        }
-    }
-}

backend/src/SignDocument/Services/RemoveExistingDocumentService.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\SignDocument\Services;
-
-use App\Infrastructure\External\Api\BinaryStringFileResult;
-
-class RemoveExistingDocumentService
-{
-
-    public function removeExistingDocument(BinaryStringFileResult $document): void
-    {
-        if (file_exists($document->tempFileName)) {
-            unlink($document->tempFileName);
-        }
-    }
-}

backend/src/SignService.php

@@ -2,24 +2,27 @@
 
 declare(strict_types=1);
 
-namespace App\SignDocument\Services;
+namespace App;
 
-use App\SignDocument\Api\Api;
+use App\Api\Api;
-use App\SignDocument\Api\ApiParams;
+use App\Api\ApiParams;
-use App\SignDocument\Api\Request\SignRequest;
+use App\Api\Request\SignRequest;
+use App\Infrastructure\External\Api\BinaryStringFileResult;
 use Exception;
 use RuntimeException;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 class SignService
 {
+    private DevSignService $devSignService;
+    private ProdSignService $prodSignService;
+
     public function __construct(
-        private readonly Api                           $api,
+        private Api $api,
-        private readonly ApiParams                     $apiParams,
+        private ApiParams $apiParams
-        private readonly DevSignService                $devSignService,
-        private readonly ProdSignService               $prodSignService,
-        private readonly RemoveExistingDocumentService $removeExistingDocumentService,
     ){
+        $this->devSignService = new DevSignService();
+        $this->prodSignService = new ProdSignService();
     }
     public function signDocument(SignRequest $request,string $token): array
     {
@@ -34,9 +37,9 @@ class SignService
 
             $this->sign($document->tempFileName);
 
-            $response = $this->api->send($token, $document->tempFileName . '_sign.pdf', $request->order);
+            $response = $this->api->send($token, $document->tempFileName . '_sign.pdf', $request->batch);
 
-            $this->removeExistingDocumentService->removeExistingDocument($document);
+            $this->removeExistingDocument($document);
 
             return $response;
         } catch (Exception $e) {
@@ -51,4 +54,11 @@ class SignService
             'prod' => $this->prodSignService->sign($documentUrl),
         };
     }
+
+    private function removeExistingDocument(BinaryStringFileResult $document): void
+    {
+        if (file_exists($document->tempFileName)) {
+            unlink($document->tempFileName);
+        }
+    }
 }

backend/symfony.lock

@@ -176,18 +176,6 @@
     "symfony/ux-chartjs": {
         "version": "v2.19.3"
     },
-    "symfony/ux-twig-component": {
-        "version": "2.22",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "2.13",
-            "ref": "67814b5f9794798b885cec9d3f48631424449a01"
-        },
-        "files": [
-            "config/packages/twig_component.yaml"
-        ]
-    },
     "symfony/validator": {
         "version": "6.2",
         "recipe": {

docker/nginx/default.conf

@@ -5,16 +5,14 @@ server {
     root /usr/src/signer/public;
 
 
-    location / {
+    location ~* \.php$ {
-        try_files $uri $uri/ /index.php?$args;
+        try_files $uri $uri/ /index.php last;
-    }
+        fastcgi_split_path_info (.+?\.php)(/.*)$;
-
+        fastcgi_pass localhost:9000;
-    location ~ \.php$ {
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
-        fastcgi_pass signer:9000;
-        try_files $uri =404;
         fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
     }
 
     location ~* .php/ {

license.key

@@ -1,22 +1,22 @@
 -----BEGIN PGP MESSAGE-----
 
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
++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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+5bEJfP1AByw+qXEiLNqt8Mi2ig1MT76fKje6vlelXuH6iqtrpn/9Grx7xcWTDkdD
-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
+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
-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
+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
-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
+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
-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
+CrWidbcJSRe+2FDD4tRmdydlDmPKNoGEKd+nZv4okAtaey6r8cixDzn3o/6d7XD3
-Z5nlXzK2NK24ulalb7ry9Ys5d/MX3A8tvH7ckGdSt19Hu8LpyPsPqnyn9u7wX/Y5
+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
-MI/v0jVZQ5fiXx/msZ3yzOhbvjoHAA==
+fnm1QWZSluMsx5972jPC+3d3zrjqXfnJ5Nt1XRYA
-=l3X2
+=UzI0
 -----END PGP MESSAGE-----