Merge pull request #2 from andrew-svirin/3.0.2

savelja-dev · web-flow · commit 9ac5b3b36af8 · 2020-01-02T18:51:28.000+02:00
upd euspe
diff --git a/src/Client.php b/src/Client.php
@@ -19,13 +19,16 @@ private function handleResult(string $command, $iResult, int $iErrorCode = null,
   {
     if (!empty($iErrorCode) && !in_array($iErrorCode, $aAcceptableErrorCodes)) {
       euspe_geterrdescr($iErrorCode, $sErrorDescription);
+      $utfEncoding = 'utf-8';
       throw new Exception(
         sprintf(
           'Result: %s Code: %s Command: %s Error: %s. Check error in EUSignConsts.php by code.',
-           dechex($iResult),
+          dechex($iResult),
           dechex($iErrorCode),
           $command,
-          mb_convert_encoding($sErrorDescription, 'windows-1251', 'utf-8')
+          ($encoding = mb_detect_encoding($sErrorDescription)) && strtolower($encoding) !== $utfEncoding ?
+                mb_convert_encoding($sErrorDescription, $encoding, $utfEncoding) :
+                $sErrorDescription
         )
       );
     }
diff --git a/src/User.php b/src/User.php
@@ -30,7 +30,7 @@ class User
    */
   private $password;
 
-  public function __construct($userName, $serverHost, $keyType = null, $keyData = null, $password = null)
+  public function __construct(string $userName, string $serverHost, string $keyType = null, string $keyData = null, string $password = null)
   {
     $this->userName = $userName;
     $this->serverHost = $serverHost;
diff --git a/src/servers/acsk.privatbank.ua.dist.ini b/src/servers/acsk.privatbank.ua.dist.ini
@@ -2,11 +2,11 @@
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\FileStore]
 ExpireTime=3600
 SaveLoadedCerts=1
-AutoDownloadCRLs=0
-FullAndDeltaCRLs=1
-OnlyOwnCRLs=1
-AutoRefresh=0
-CheckCRLs=0
+AutoDownloadCRLs=1
+FullAndDeltaCRLs=0
+OnlyOwnCRLs=0
+AutoRefresh=1
+CheckCRLs=1
 Path={dir}
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\Proxy]
 SavePassword=0
@@ -43,30 +43,11 @@ Port=80
 Offline=0
 ResetPKey=0
 MakePKeyPFXContainer=0
-[\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\Log]
-System=1
-ReportAgent=0
-Address=
-Port=10111
-OnlyErrors=1
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\Libraries\Sign]
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\Libraries\Sign\KeyMedia]
 ProtectPassword=0
 Password=
 Device=0
 Type=3
 ShowErrors=0
-SourceType=2
-[\SOFTWARE\Institute of Informational Technologies\Key Medias]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System\Folders]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System\Folders\{dir}]
-OrderNumber=0
-Path={dir}
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301\Modules]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301\Modules\001]
-OrderNumber=0
-SN=001
-Address=20.0.0.1
-AddressMask=255.0.0.0
+SourceType=2
diff --git a/src/servers/acskidd.gov.ua.dist.ini b/src/servers/acskidd.gov.ua.dist.ini
@@ -2,11 +2,11 @@
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\FileStore]
 ExpireTime=3600
 SaveLoadedCerts=1
-AutoDownloadCRLs=0
-FullAndDeltaCRLs=1
-OnlyOwnCRLs=1
-AutoRefresh=0
-CheckCRLs=0
+AutoDownloadCRLs=1
+FullAndDeltaCRLs=0
+OnlyOwnCRLs=0
+AutoRefresh=1
+CheckCRLs=1
 Path={dir}
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\Proxy]
 SavePassword=0
@@ -56,17 +56,4 @@ Password=
 Device=0
 Type=3
 ShowErrors=0
-SourceType=2
-[\SOFTWARE\Institute of Informational Technologies\Key Medias]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System\Folders]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System\Folders\{dir}]
-OrderNumber=0
-Path={dir}
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301\Modules]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301\Modules\001]
-OrderNumber=0
-SN=001
-Address=20.0.0.1
-AddressMask=255.0.0.0
+SourceType=2
diff --git a/src/servers/ca.iit.com.ua.dist.ini b/src/servers/ca.iit.com.ua.dist.ini
@@ -2,11 +2,11 @@
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\FileStore]
 ExpireTime=3600
 SaveLoadedCerts=1
-AutoDownloadCRLs=0
-FullAndDeltaCRLs=1
-OnlyOwnCRLs=1
-AutoRefresh=0
-CheckCRLs=0
+AutoDownloadCRLs=1
+FullAndDeltaCRLs=0
+OnlyOwnCRLs=0
+AutoRefresh=1
+CheckCRLs=1
 Path={dir}
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\Proxy]
 SavePassword=0
@@ -57,16 +57,3 @@ Device=0
 Type=3
 ShowErrors=0
 SourceType=2
-[\SOFTWARE\Institute of Informational Technologies\Key Medias]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System\Folders]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System\Folders\{dir}]
-OrderNumber=0
-Path={dir}
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301\Modules]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301\Modules\001]
-OrderNumber=0
-SN=001
-Address=20.0.0.1
-AddressMask=255.0.0.0
diff --git a/src/servers/ca.ksystems.com.ua.dist.ini b/src/servers/ca.ksystems.com.ua.dist.ini
@@ -2,11 +2,11 @@
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\FileStore]
 ExpireTime=3600
 SaveLoadedCerts=1
-AutoDownloadCRLs=0
-FullAndDeltaCRLs=1
-OnlyOwnCRLs=1
-AutoRefresh=0
-CheckCRLs=0
+AutoDownloadCRLs=1
+FullAndDeltaCRLs=0
+OnlyOwnCRLs=0
+AutoRefresh=1
+CheckCRLs=1
 Path={dir}
 [\SOFTWARE\Institute of Informational Technologies\Certificate Authority-1.3\End User\Proxy]
 SavePassword=0
@@ -57,16 +57,3 @@ Device=0
 Type=3
 ShowErrors=0
 SourceType=2
-[\SOFTWARE\Institute of Informational Technologies\Key Medias]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System\Folders]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\File System\Folders\{dir}]
-OrderNumber=0
-Path={dir}
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301\Modules]
-[\SOFTWARE\Institute of Informational Technologies\Key Medias\NCM Gryada-301\Modules\001]
-OrderNumber=0
-SN=001
-Address=20.0.0.1
-AddressMask=255.0.0.0

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,16 @@ private function handleResult(string $command, $iResult, int $iErrorCode = null,`
`19`	`19`	`{`
`20`	`20`	`if (!empty($iErrorCode) && !in_array($iErrorCode, $aAcceptableErrorCodes)) {`
`21`	`21`	`euspe_geterrdescr($iErrorCode, $sErrorDescription);`
	`22`	`+ $utfEncoding = 'utf-8';`
`22`	`23`	`throw new Exception(`
`23`	`24`	`sprintf(`
`24`	`25`	`'Result: %s Code: %s Command: %s Error: %s. Check error in EUSignConsts.php by code.',`
`25`		`- dechex($iResult),`
	`26`	`+ dechex($iResult),`
`26`	`27`	`dechex($iErrorCode),`
`27`	`28`	`$command,`
`28`		`- mb_convert_encoding($sErrorDescription, 'windows-1251', 'utf-8')`
	`29`	`+ ($encoding = mb_detect_encoding($sErrorDescription)) && strtolower($encoding) !== $utfEncoding ?`
	`30`	`+ mb_convert_encoding($sErrorDescription, $encoding, $utfEncoding) :`
	`31`	`+ $sErrorDescription`
`29`	`32`	`)`
`30`	`33`	`);`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class User`
`30`	`30`	`*/`
`31`	`31`	`private $password;`
`32`	`32`
`33`		`- public function __construct($userName, $serverHost, $keyType = null, $keyData = null, $password = null)`
	`33`	`+ public function __construct(string $userName, string $serverHost, string $keyType = null, string $keyData = null, string $password = null)`
`34`	`34`	`{`
`35`	`35`	`$this->userName = $userName;`
`36`	`36`	`$this->serverHost = $serverHost;`