2025-04-21 04:43:04 +03:00
9 changed files with 24 additions and 245 deletions
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@ -1,97 +0,0 @@
-name: "Static analysis code"
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-env:
-  COMPOSER_FLAGS: "--ansi --prefer-dist --no-interaction --no-progress"
-
-jobs:
-
-  ## PHP linter
-  linter:
-    name: "Check syntax errors"
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-version:
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-          - "8.1"
-          - "8.2"
-          - "8.3"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v3"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: ${{ matrix.php-version }}
-
-      - name: "Lint PHP files"
-        run: find ./src -type f -name '*.php' -print0 | xargs -0 -L1 -P4 -- php -l -f
-
-  ## PHPSTAN
-  phpstan:
-    name: "PHP Static Analysis"
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-version:
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-          - "8.1"
-          - "8.2"
-          - "8.3"
-    steps:
-      - name: "Cancel Previous Runs"
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          all_but_latest: true
-          access_token: ${{ github.token }}
-
-      - name: "Checkout"
-        uses: "actions/checkout@v3"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: ${{ matrix.php-version }}
-
-      - name: "Setup github auth token for composer"
-        run: composer config github-oauth.github.com ${{ github.token }}
-
-      - name: "Get composer cache directory"
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: "Cache Composer Directory"
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: "Composer Install"
-        run: |
-          composer install ${{ env.COMPOSER_FLAGS }}
-          rm composer.lock
-          composer config platform.php ${{ matrix.php-version }}
-
-      - name: Run phpstan
-        run: composer phpstan
--- a/composer.json
+++ b/composer.json
@ -29,7 +29,7 @@
 		}
 	],
 	"require": {
-		"php": ">=7.2 || ^8.0",
+		"php": ">7.2 <8.0",
 		"ext-mbstring": "*"
 	},
 	"require-dev": {
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "41cee9532212142277f16725a26986f3",
+    "content-hash": "f3e18e3b232f3c425afb730e38714eea",
    "packages": [],
    "packages-dev": [
        {
@ -68,16 +68,16 @@
        },
        {
            "name": "webmasterskaya/crypto-pro-php-stubs",
-            "version": "1.0.4",
+            "version": "1.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/webmasterskaya/crypto-pro-php-stubs.git",
-                "reference": "0bf897d4a4d9b092999aa310e8ab2b8d26acd530"
+                "reference": "cc216cfde1eafdab824996ef629df4db1c658834"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/webmasterskaya/crypto-pro-php-stubs/zipball/0bf897d4a4d9b092999aa310e8ab2b8d26acd530",
-                "reference": "0bf897d4a4d9b092999aa310e8ab2b8d26acd530",
+                "url": "https://api.github.com/repos/webmasterskaya/crypto-pro-php-stubs/zipball/cc216cfde1eafdab824996ef629df4db1c658834",
+                "reference": "cc216cfde1eafdab824996ef629df4db1c658834",
                "shasum": ""
            },
            "require": {
@ -116,7 +116,7 @@
                "issues": "https://github.com/webmasterskaya/crypto-pro-php-stubs/issues",
                "source": "https://github.com/webmasterskaya/crypto-pro-php-stubs"
            },
-            "time": "2022-11-15T09:19:03+00:00"
+            "time": "2022-11-09T18:59:03+00:00"
        }
    ],
    "aliases": [],
@ -125,7 +125,7 @@
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
-        "php": ">=7.2 <8.0",
+        "php": ">7.2 <8.0",
        "ext-mbstring": "*"
    },
    "platform-dev": [],
--- a/doc/GET-TEST-CERT.md
+++ b/doc/GET-TEST-CERT.md
@ -10,4 +10,4 @@
    -certusage "1.3.6.1.5.5.7.3.4,1.3.6.1.5.5.7.3.2,1.2.643.2.2.34.6" \
    -ku -cont '\\.\HDIMAGE\ContainerName' \
    -provtype 80 ./main.req
-```
+```
--- a/src/Constants/CADESCOM_ENCODING_TYPE.php
+++ b/src/Constants/CADESCOM_ENCODING_TYPE.php
@ -5,7 +5,7 @@ namespace Webmasterskaya\CryptoPro\Constants;
 /**
 * Тип перечисления CADESCOM_ENCODING_TYPE указывает используемый тип кодирования.
 */
-class CADESCOM_ENCODING_TYPE
+class CADESCOM_ENCODE
 {
 	/**
 	 * Данные сохраняются в виде строки в кодировке Base64.
--- a/src/Constants/CAPICOM_STORE_OPEN_MODE.php
+++ b/src/Constants/CAPICOM_STORE_OPEN_MODE.php
@ -1,36 +0,0 @@
-<?php
-
-namespace Webmasterskaya\CryptoPro\Constants;
-
-/**
- * Тип перечисления CAPICOM_STORE_OPEN_MODE используется с методом \CPStore->Open() для указания способа открытия хранилища сертификатов.
- */
-class CAPICOM_STORE_OPEN_MODE
-{
-	/**
-	 * Откройте хранилище в режиме только для чтения.
-	 */
-	const READ_ONLY = 0;
-
-	/**
-	 * Откройте хранилище в режиме чтения и записи.
-	 */
-	const READ_WRITE = 1;
-
-	/**
-	 * Откройте хранилище в режиме чтения и записи, если у пользователя есть разрешения на чтение и запись.
-	 * Если у пользователя нет разрешений на чтение и запись, откройте хранилище в режиме только для чтения.
-	 */
-	const MAXIMUM_ALLOWED = 2;
-
-	/**
-	 * Открывать только существующие магазины; не создавайте новое хранилище.
-	 */
-	const EXISTING_ONLY = 128;
-
-	/**
-	 * Включите архивные сертификаты при использовании хранилища.
-	 */
-	const INCLUDE_ARCHIVED = 256;
-
-}
--- a/src/CryptoPro.php
+++ b/src/CryptoPro.php
@ -5,13 +5,12 @@ namespace Webmasterskaya\CryptoPro;
 use Webmasterskaya\CryptoPro\Constants\CADESCOM_ATTRIBUTE;
 use Webmasterskaya\CryptoPro\Constants\CADESCOM_CADES_TYPE;
 use Webmasterskaya\CryptoPro\Constants\CADESCOM_CONTENT_ENCODING_TYPE;
-use Webmasterskaya\CryptoPro\Constants\CADESCOM_ENCODING_TYPE;
+use Webmasterskaya\CryptoPro\Constants\CADESCOM_ENCODE;
 use Webmasterskaya\CryptoPro\Constants\CADESCOM_HASH_ALGORITHM;
 use Webmasterskaya\CryptoPro\Constants\CADESCOM_STORE_LOCATION;
 use Webmasterskaya\CryptoPro\Constants\CAPICOM_CERTIFICATE_FIND_TYPE;
 use Webmasterskaya\CryptoPro\Constants\CAPICOM_CERTIFICATE_INCLUDE_OPTION;
 use Webmasterskaya\CryptoPro\Constants\CAPICOM_PROPID;
-use Webmasterskaya\CryptoPro\Constants\CAPICOM_STORE_OPEN_MODE;
 use Webmasterskaya\CryptoPro\Helpers\CertificateHelper;
 use Webmasterskaya\CryptoPro\Helpers\ErrorMessageHelper;

@ -55,7 +54,7 @@ class CryptoPro
 		{
 			$certificates = self::getCertificatesFromStore(
 				CADESCOM_STORE_LOCATION::CURRENT_USER_STORE,
-				static::CP_MY_STORE,
+				self::CP_MY_STORE,
 				false
 			);
 		}
@ -99,7 +98,7 @@ class CryptoPro
 		{
 			$certificates = self::getCertificatesFromStore(
 				CADESCOM_STORE_LOCATION::CONTAINER_STORE,
-				static::CP_MY_STORE,
+				self::CP_MY_STORE,
 				false
 			);
 		}
@ -299,7 +298,7 @@ class CryptoPro
 				$cadesSigner,
 				CADESCOM_CADES_TYPE::PKCS7_TYPE,
 				false,
-				CADESCOM_ENCODING_TYPE::BASE64
+				CADESCOM_ENCODE::BASE64
 			);
 		}
 		catch (\Throwable $e)
@ -363,6 +362,7 @@ class CryptoPro
 			$cadesAuthAttrs->Add($cadesAttrs);

 			$cadesSigner->set_Options(CAPICOM_CERTIFICATE_INCLUDE_OPTION::WHOLE_CHAIN);
+
 		}
 		catch (\Throwable $e)
 		{
@ -372,10 +372,8 @@ class CryptoPro
 		try
 		{
 			$cadesHashedData->set_Algorithm(CADESCOM_HASH_ALGORITHM::HASH_CP_GOST_3411_2012_256);
-			$cadesHashedData->set_DataEncoding(CADESCOM_CONTENT_ENCODING_TYPE::BASE64_TO_BINARY);
 			$cadesHashedData->SetHashValue($messageHash);

-			$cadesSignedData->set_ContentEncoding(CADESCOM_CONTENT_ENCODING_TYPE::BASE64_TO_BINARY);
 			// Для получения объекта отсоединенной (открепленной) подписи, необходимо задать любой контент.
 			// Этот баг описан на форуме.
 			// https://www.cryptopro.ru/forum2/default.aspx?g=posts&m=78553#post78553
@ -393,7 +391,7 @@ class CryptoPro
 				$cadesHashedData,
 				$cadesSigner,
 				CADESCOM_CADES_TYPE::PKCS7_TYPE,
-				CADESCOM_ENCODING_TYPE::BASE64
+				CADESCOM_ENCODE::BASE64
 			);
 		}
 		catch (\Throwable $e)
@ -478,7 +476,7 @@ class CryptoPro
 			$signature = $cadesSignedData->CoSignCades(
 				$cadesSigner,
 				CADESCOM_CADES_TYPE::PKCS7_TYPE,
-				CADESCOM_ENCODING_TYPE::BASE64
+				CADESCOM_ENCODE::BASE64
 			);
 		}
 		catch (\Throwable $e)
@ -552,10 +550,8 @@ class CryptoPro
 		try
 		{
 			$cadesHashedData->set_Algorithm(CADESCOM_HASH_ALGORITHM::HASH_CP_GOST_3411_2012_256);
-			$cadesHashedData->set_DataEncoding(CADESCOM_CONTENT_ENCODING_TYPE::BASE64_TO_BINARY);
 			$cadesHashedData->SetHashValue($messageHash);

-			$cadesSignedData->set_ContentEncoding(CADESCOM_CONTENT_ENCODING_TYPE::BASE64_TO_BINARY);
 			// Для получения объекта отсоединенной (открепленной) подписи, необходимо задать любой контент.
 			// Этот баг описан на форуме.
 			// https://www.cryptopro.ru/forum2/default.aspx?g=posts&m=78553#post78553
@ -578,7 +574,7 @@ class CryptoPro
 				$cadesSigner,
 				$cadesHashedData,
 				CADESCOM_CADES_TYPE::PKCS7_TYPE,
-				CADESCOM_ENCODING_TYPE::BASE64
+				CADESCOM_ENCODE::BASE64
 			);
 		}
 		catch (\Throwable $e)
@ -613,7 +609,7 @@ class CryptoPro
 		try
 		{
 			$cadesHashedData->set_Algorithm(CADESCOM_HASH_ALGORITHM::HASH_CP_GOST_3411_2012_256);
-			$cadesHashedData->set_DataEncoding(CADESCOM_CONTENT_ENCODING_TYPE::BASE64_TO_BINARY);
+			$cadesHashedData->set_DataEncoding(BASE64_TO_BINARY);
 			$cadesHashedData->Hash($messageBase64);
 		}
 		catch (\Throwable $e)
@ -634,95 +630,12 @@ class CryptoPro
 	}

 	/**
-	 * Возвращает информацию о CSP и плагине
+	 * возвращает информацию о CSP и плагине
 	 *
-	 * @throws \Exception
-	 * @return array
+	 * @return void
 	 */
 	public static function getSystemInfo()
 	{
-		try
-		{
-			$about = new \About();
-		}
-		catch (\Throwable $e)
-		{
-			throw new \Exception(ErrorMessageHelper::getErrorMessage($e, 'Ошибка при получении информации о системе'));
-		}
-
-		try
-		{
-			$cadesVersion = $about->PluginVersion();
-
-			if ($cadesVersion instanceof \Version)
-			{
-				$cadesVersion = $cadesVersion->toString();
-			}
-
-			if (!$cadesVersion)
-			{
-				$cadesVersion = $about->get_Version();
-			}
-		}
-		catch (\Throwable $e)
-		{
-			throw new \Exception(ErrorMessageHelper::getErrorMessage($e, 'Ошибка при получении информации о плагине'));
-		}
-
-		try
-		{
-			$cspVersion = $about->CSPVersion();
-			$cspVersion = $cspVersion->toString();
-		}
-		catch (\Throwable $e)
-		{
-			throw new \Exception(ErrorMessageHelper::getErrorMessage($e, 'Ошибка при получении информации о CSP'));
-		}
-
-		return [
-			'cadesVersion' => $cadesVersion,
-			'cspVersion'   => $cspVersion,
-		];
-	}
-
-	/**
-	 * Проверяет корректность настроек средств ЭП
-	 *
-	 * @throws \Exception
-	 * @return true
-	 */
-	public static function isValidSystemSetup()
-	{
-		$systemInfo = static::getSystemInfo();
-
-		$extractedCadesVersion = [];
-
-		if (!preg_match('/(\d+)\.(\d+)\.(\d+)/', $systemInfo['cadesVersion'], $extractedCadesVersion))
-		{
-			throw new \Exception('Ошибка чтеня версии плагина');
-		}
-
-		list(, $cadesVersionMajor, $cadesVersionMinor, $cadesVersionPatch) = $extractedCadesVersion;
-
-		if ((int) $cadesVersionMajor < 2
-			|| ((int) $cadesVersionMajor === 2 && (int) $cadesVersionMinor === 0 && (int) $cadesVersionPatch < 12438))
-		{
-			throw new \Exception('Не поддерживаемая версия плагина');
-		}
-
-		if (!preg_match('/(\d+)\.(\d+)\.(\d+)/', $systemInfo['cspVersion'], $extractedCSPVersion))
-		{
-			throw new \Exception('Ошибка чтеня версии CSP');
-		}
-
-		list(, $cspVersionMajor, $cspVersionMinor, $cspVersionPatch) = $extractedCSPVersion;
-
-		if ((int) $cspVersionMajor < 4)
-		{
-			throw new \Exception('Не поддерживаемая версия CSP');
-		}
-
-		return true;
 	}

 	/**
@ -766,7 +679,7 @@ class CryptoPro

 		try
 		{
-			$cadesStore->Open($storeLocation, $storeName, CAPICOM_STORE_OPEN_MODE::MAXIMUM_ALLOWED);
+			$cadesStore->Open($storeLocation, $storeName, STORE_OPEN_MAXIMUM_ALLOWED);
 		}
 		catch (\Throwable $e)
 		{
@ -859,7 +772,7 @@ class CryptoPro

 		try
 		{
-			$cadesStore->Open($storeLocation, $storeName, CAPICOM_STORE_OPEN_MODE::MAXIMUM_ALLOWED);
+			$cadesStore->Open($storeLocation, $storeName, STORE_OPEN_MAXIMUM_ALLOWED);
 		}
 		catch (\Throwable $e)
 		{
--- a/src/Helpers/CertificateHelper.php
+++ b/src/Helpers/CertificateHelper.php
@ -23,7 +23,7 @@ class CertificateHelper
 		$extractedEntities = [];

 		preg_match_all(
-			'/([a-zа-я0-9\s.]+)=(?:("[^"]+?")|(.+?))(?:,|$)/i',
+			'/([\w0-9\s.]+)=(?:("[^"]+?")|(.+?))(?:,|$)/',
 			$rawInfo,
 			$extractedEntities,
 			PREG_SET_ORDER,
--- a/tmp/src.txt
+++ b/tmp/src.txt
@ -1 +0,0 @@
-foo bar master