@it-enterprise/digital-signature 1.3.19 → 1.3.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@it-enterprise/digital-signature",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "description": "digital signature",
   "private": false,
   "main": "src/index.js",

package/src/DigitalSignature.js

@@ -1,6 +1,6 @@
 import { EndUser, EndUserConstants, EndUserProxySettings, EndUserError, KSPSettings, EndUserCertificate, EndUserKeyMedia, EndUserSignContainerInfo, EndUserCertificateInfoEx, EndUserTaxReport } from "../euscp/euscp";
 import { DigitalSignatureKeyType, PrivateKeyInfo, FilePrivateKeyInfo, HardwarePrivateKeyInfo, KspPrivateKeyInfo, EndUserKSP, KSPKeyMediasResponse, KSPUserAuthData, KSPPrivateKeyAuthData, DigitalSignatureKeyTypeWindowsCertStore, ProtectTaxReportParams } from "./Models";
-import { base64ToArray, convertToBase64, downloadAndSignFiles, downloadData, format, isDefaultValue, readFile, signAlgoToHashAlgo } from "./Utils";
+import { base64ToArray, convertToBase64, downloadAndSignFiles, downloadData, format, isDefaultValue, readFile } from "./Utils";
 import Resourses from "./Resourses.json";
 import GlSign from "./GlSign";
 
@@ -307,6 +307,8 @@ export default class DigitalSignature {
         return await this.readHardwareKey(keyInfo.keyMedia, keyInfo.certificates);
       case DigitalSignatureKeyType.KSP:
         return await this.readPrivateKeyKSP(keyInfo.ksp, keyInfo.kspUserId, false);
+      default:
+        return null;
     }
   }
 
@@ -346,6 +348,7 @@ export default class DigitalSignature {
         await this._euSign.GetOwnCertificates(),
         keyMedia
       );
+      this._readedKey._glSign = this._glSign;
       return this._readedKey;
     } catch (error) {
       if (error && error.code === EndUserError.EU_ERROR_CERT_NOT_FOUND) {
@@ -412,6 +415,7 @@ export default class DigitalSignature {
         privateKey,
         password
       );
+      this._readedKey._glSign = this._glSign;
       return this._readedKey;
     } catch (error) {
       if (error && error.code === EndUserError.EU_ERROR_CERT_NOT_FOUND) {
@@ -466,7 +470,7 @@ export default class DigitalSignature {
      * @param {boolean?} getCerts - Получать информацию о ключе пользователя. Это приведёт к дополнительному запросу на подписание
      */
   async readPrivateKeyDepositsign(userId, getCerts = false) {
-    const deposit = this.KSPs.find(ksp => ksp.id === "depositsign");
+    const deposit = this.KSPs.find(ksp => ksp.id === "DEPOSITSIGN");
     return await this.readPrivateKeyKSP(deposit, userId, getCerts);
   }
 
@@ -475,7 +479,7 @@ export default class DigitalSignature {
    * @param {boolean?} getCerts - Получать информацию о ключе пользователя. Это приведёт к дополнительному запросу на подписание
    */
   async readPrivateKeyDiia(getCerts = false) {
-    const diia = this.KSPs.find(ksp => ksp.id === "diia-sign");
+    const diia = this.KSPs.find(ksp => ksp.id === "DIIA-SIGN");
     return await this.readPrivateKeyKSP(diia, null, getCerts);
   }
 
@@ -509,6 +513,7 @@ export default class DigitalSignature {
       ksp,
       keyId
     );
+    this._readedKey._glSign = this._glSign;
     return this._readedKey;
   }
 
@@ -574,7 +579,7 @@ export default class DigitalSignature {
     const certInfo = await this.parseCertificate(keyInfo.Cert);
 
     this._readedKey = new PrivateKeyInfo(DigitalSignatureKeyType.WindowsCertStore, certInfo.infoEx, [certInfo], certInfo.infoEx.subjCN, keyInfo.CertThumbPrint);
-
+    this._readedKey._glSign = this._glSign;
     return this._readedKey;
   }
 
@@ -693,7 +698,7 @@ export default class DigitalSignature {
       }
     }
 
-    const signAlgo = this._readedKey.getSignAlgo(this.glSign);
+    const signAlgo = this._readedKey.getSignAlgo();
 
     if (signType.type === EndUserConstants.EndUserSignContainerType.ASiC) {
       const signLevel = signType.signLevel || signType.asicSignType === EndUserConstants.EndUserASiCSignType.CAdES ? EndUserConstants.EndUserSignType.CAdES_X_Long : EndUserConstants.EndUserXAdESSignLevel.B_LT;
@@ -721,7 +726,7 @@ export default class DigitalSignature {
       await this._euSign.SetRuntimeParameter(EndUserConstants.EU_SIGN_TYPE_PARAMETER, signLevel);
 
       if (signType.subType === EndUserConstants.EndUserCAdESType.Detached) {
-        const hash = await this._euSign.HashData(this._readedKey.getHashAlgo(this.glSign), data, !asByteArray);
+        const hash = await this._euSign.HashData(this._readedKey.getHashAlgo(), data, !asByteArray);
 
         if (this._readedKey.keyType == DigitalSignatureKeyTypeWindowsCertStore) {
           return this._signHashWindowsCertificateStore(hash, signType, asByteArray);
@@ -731,7 +736,7 @@ export default class DigitalSignature {
       } else {
 
         if (this._readedKey.keyType == DigitalSignatureKeyTypeWindowsCertStore) {
-          const hash = await this._euSign.HashData(this._readedKey.getHashAlgo(this.glSign), data, !asByteArray);
+          const hash = await this._euSign.HashData(this._readedKey.getHashAlgo(), data, !asByteArray);
           const signedData = await this._signHashWindowsCertificateStore(hash, signType, asByteArray);
 
           return this._euSign.m_library.m_worker.postMessage("AppendDataToSignedData", [signedData, data, !asByteArray]);
@@ -771,7 +776,7 @@ export default class DigitalSignature {
       return this._signHashWindowsCertificateStore(hash, false, asByteArray);
     }
 
-    return await this._euSign.SignHash(this._readedKey.getSignAlgo(this.glSign), hash, true, !asByteArray);
+    return await this._euSign.SignHash(this._readedKey.getSignAlgo(), hash, true, !asByteArray);
   }
 
   /**
@@ -1193,6 +1198,7 @@ export default class DigitalSignature {
       );
       readedKey.context = ctx;
       readedKey.keyContext = keyCtx;
+      readedKey._glSign = this._glSign;
       return readedKey;
     } catch (error) {
       if (error && error.code === EndUserError.EU_ERROR_CERT_NOT_FOUND) {
@@ -1262,6 +1268,7 @@ export default class DigitalSignature {
       );
       readedKey.context = ctx;
       readedKey.keyContext = keyCtx;
+      readedKey._glSign = this._glSign;
       return readedKey;
     } catch (error) {
       if (error && error.code === EndUserError.EU_ERROR_CERT_NOT_FOUND) {

package/src/GlSign.js

@@ -102,12 +102,8 @@ export default class GlSign {
       }
 
       this.KSPs.forEach(element => {
-        if (element.ksp === EU_KSP_DIIA || element.address.includes("acsk.privatbank.ua/cloud") || element.address.includes("cs.vchasno.ua")) {
-          if (IS_DSTU_7564_DAY()) {
-            element.signAlgos = [ EndUserConstants.EndUserSignAlgo.DSTU4145WithDSTU7564 ];
-          } else {
-            element.signAlgos = [ EndUserConstants.EndUserSignAlgo.DSTU4145WithGOST34311 ];
-          }
+        if (/* element.ksp === EU_KSP_DIIA || */ element.address.includes("acsk.privatbank.ua/cloud") || element.address.includes("cs.vchasno.ua")) {
+          element.signAlgos = [ EndUserConstants.EndUserSignAlgo.DSTU4145WithDSTU7564, EndUserConstants.EndUserSignAlgo.DSTU4145WithGOST34311 ];
         }
         // if (element.ksp === EU_KSP_GRYADA) {
         //   element.signAlgos = this.HashAlgorithm !== "GOST34311" ? [ EndUserSignAlgo.DSTU4145WithDSTU7564 ] : [ EndUserSignAlgo.DSTU4145WithGOST34311 ];

package/src/Models.js

@@ -413,24 +413,21 @@ export class PrivateKeyInfo {
   /**
    * Получить алгоритм подписи
    */
-  getSignAlgo(glsign = null) {
+  getSignAlgo() {
     const certificates = this.certificates;
     if (this.keyType === DigitalSignatureKeyTypeKSP) {
-      if (this.ksp.ksp === EU_KSP_DIIA || this.ksp.address.includes("acsk.privatbank.ua/cloud") || this.ksp.address.includes("cs.vchasno.ua")) {
-        if (IS_DSTU_7564_DAY()) {
-          return EndUserConstants.EndUserSignAlgo.DSTU4145WithDSTU7564;
-        } else {
-          return EndUserConstants.DSTU4145WithGOST34311;
+      const ksp = this.ksp;
+      if (Array.isArray(ksp.signAlgos) && ksp.signAlgos.length > 0) {
+        const signAlgo = ksp.signAlgos[0];
+        if (signAlgo === EndUserConstants.EndUserSignAlgo.DSTU4145WithDSTU7564 && this._glsign?.HashAlgorithm === "GOST34311" && ksp.signAlgos.includes(EndUserConstants.EndUserSignAlgo.DSTU4145WithGOST34311)) {
+          return EndUserConstants.EndUserSignAlgo.DSTU4145WithGOST34311;
         }
+        return signAlgo;
       }
-      // if (this.ksp.ksp === EU_KSP_GRYADA) {
-      //   return glsign?.HashAlgorithm !== "GOST34311" ? EndUserSignAlgo.DSTU4145WithDSTU7564 : EndUserSignAlgo.DSTU4145WithGOST34311;
-      // }
-
       return EndUserConstants.EndUserSignAlgo.DSTU4145WithGOST34311;
     }
     else if (certificates.length > 0) {
-      return getSupportedSignAlgos(certificates, glsign)[0];
+      return getSupportedSignAlgos(certificates, this._glsign)[0];
     }
     else {
       return EndUserConstants.EndUserSignAlgo.Unknown;
@@ -440,30 +437,19 @@ export class PrivateKeyInfo {
   /**
    * Получить алгоритм хеширования
    */
-  getHashAlgo(glsign = null) {
+  getHashAlgo() {
     if (this.keyType === DigitalSignatureKeyTypeKSP) {
-      if (this.ksp.ksp === EU_KSP_DIIA || this.ksp.address.includes("acsk.privatbank.ua/cloud") || this.ksp.address.includes("cs.vchasno.ua")) {
-        if (IS_DSTU_7564_DAY()) {
-          return EndUserConstants.EndUserHashAlgo.DSTU7564_256;
-        } else {
-          return EndUserConstants.EndUserHashAlgo.GOST34311;
-        }
-      }
-      // if (this.ksp.ksp === EU_KSP_GRYADA) {
-      //   return glsign?.HashAlgorithm !== "GOST34311" ? EndUserConstants.EndUserHashAlgo.DSTU7564_256 : EndUserConstants.EndUserHashAlgo.GOST34311;
-      // }
-
-      return EndUserConstants.EndUserHashAlgo.GOST34311;
+      return signAlgoToHashAlgo(this.getSignAlgo());
     }
 
     const certificates = this.certificates;
     if (certificates.length > 0 && certificates[0]?.infoEx?.certHashType) {
       const hashType = certificates[0].infoEx.certHashType;
 
-      if (hashType == EndUserConstants.EndUserHashAlgo.GOST34311 && glsign?.HashAlgorithm !== "GOST34311") {
+      if (hashType == EndUserConstants.EndUserHashAlgo.GOST34311 && this._glsign?.HashAlgorithm !== "GOST34311") {
         return EndUserConstants.EndUserHashAlgo.DSTU7564_256;
       }
-      if (hashType == EndUserConstants.EndUserHashAlgo.DSTU7564_256 && glsign?.HashAlgorithm === "GOST34311") {
+      if (hashType == EndUserConstants.EndUserHashAlgo.DSTU7564_256 && this._glsign?.HashAlgorithm === "GOST34311") {
         return EndUserConstants.EndUserHashAlgo.GOST34311;
       }
 
@@ -520,17 +506,16 @@ export class KspPrivateKeyInfo extends PrivateKeyInfo {
 
 export function getDefaultKSPs(allowTest) {
   const depositsign = new KSPSettings();
-  depositsign.id = "depositsign";
+  depositsign.id = "DEPOSITSIGN";
   depositsign.name = "DepositSign";
   depositsign.ksp = EndUserConstants.EU_KSP_PB;
   depositsign.address = "https://depositsign.com/api/v1/it-enterprise/sign-server";
   depositsign.clientIdPrefix = "";
   depositsign.directAccess = true;
   depositsign.needQRCode = false;
-  depositsign.codeEDRPOU = "43005049";
 
   const diia = new KSPSettings();
-  diia.id = "diia-sign";
+  diia.id = "DIIA-SIGN";
   diia.name = "Дія.Підпис";
   diia.ksp = EndUserConstants.EU_KSP_DIIA;
   diia.directAccess = false;
@@ -538,11 +523,10 @@ export function getDefaultKSPs(allowTest) {
   diia.address = "https://diia-sign.it.ua/KSPSign";
   diia.systemId = "diia-sign-it-ent";
   diia.needQRCode = true;
-  diia.codeEDRPOU = "43395033";
   diia.signAlgos = [1];
 
   const smartId = new KSPSettings();
-  smartId.id = "pb-smartid";
+  smartId.id = "PB-SMARTID";
   smartId.name = "Приватбанк - хмарний підпис \"SmartID\"";
   smartId.ksp = EndUserConstants.EU_KSP_PB;
   smartId.directAccess = true;
@@ -551,20 +535,18 @@ export function getDefaultKSPs(allowTest) {
   smartId.clientIdPrefix = "IEIS_";
   smartId.confirmationURL = "https://www.privat24.ua/rd/kep";
   smartId.needQRCode = true;
-  smartId.codeEDRPOU = "14360570";
 
   const vchasno = new KSPSettings();
-  vchasno.id = "vchasno";
+  vchasno.id = "VCHASNO";
   vchasno.name = "Вчасно - хмарний підпис";
   vchasno.ksp = EndUserConstants.EU_KSP_PB;
   vchasno.address = "https://cs.vchasno.ua/ss/";
   vchasno.clientIdPrefix = "";
   vchasno.directAccess = false;
   vchasno.needQRCode = false;
-  vchasno.codeEDRPOU = "41231992";
 
   const vchasnoQR = new KSPSettings();
-  vchasnoQR.id = "vchasnoQR";
+  vchasnoQR.id = "VCHASNOQR";
   vchasnoQR.name = "Вчасно - хмарний підпис (QR)";
   vchasnoQR.ksp = EndUserConstants.EU_KSP_PB;
   vchasnoQR.address = "https://cs.vchasno.ua/ss/";
@@ -575,7 +557,7 @@ export function getDefaultKSPs(allowTest) {
   vchasnoQR.needQRCode = true;
 
   const cloudKey = new KSPSettings();
-  cloudKey.id = "cloudkey";
+  cloudKey.id = "CLOUDKEY";
   cloudKey.name = "ТОВ «ЦСК «Україна» - хмарний підпис CloudKey";
   cloudKey.ksp = EndUserConstants.EU_KSP_PB;
   cloudKey.directAccess = true;
@@ -584,29 +566,28 @@ export function getDefaultKSPs(allowTest) {
   cloudKey.clientIdPrefix = "DIIA_2";
   cloudKey.confirmationURL = "https://sid.uakey.com.ua/kep?hash=rd/kep";
   cloudKey.needQRCode = true;
-  cloudKey.codeEDRPOU = "36865753";
 
   const esign = new KSPSettings();
-  esign.id = "esign";
+  esign.id = "ESIGN";
   esign.name = "ESign - хмарний підпис";
   esign.ksp = EndUserConstants.EU_KSP_PB;
   esign.address = "https://cabinet.e-life.com.ua/api/EDG/Sign";
   esign.clientIdPrefix = "";
   esign.directAccess = true;
   esign.needQRCode = false;
-  esign.codeEDRPOU = "36049014";
 
   const smartSignTax = new KSPSettings();
-  smartSignTax.id = "smartsigntax";
+  smartSignTax.id = "SMARTSIGNTAX";
   smartSignTax.name = "ДПС - хмарний підпис";
   smartSignTax.ksp = EndUserConstants.EU_KSP_PB;
   smartSignTax.address = "https://smart-sign.tax.gov.ua/";
   smartSignTax.port = "443";
   smartSignTax.directAccess = true;
   smartSignTax.clientIdType = EndUserKSPClientIdType.Name;
+  smartSignTax.needQRCode = false;
 
   const pumb = new KSPSettings();
-  pumb.id = "pumb";
+  pumb.id = "PUMB";
   pumb.name = "ПУМБ - хмарний підпис";
   pumb.ksp = EndUserConstants.EU_KSP_PB;
   pumb.address = "https://apiext.pumb.ua/hogsmeade/striga/v1";
@@ -614,15 +595,17 @@ export function getDefaultKSPs(allowTest) {
   pumb.clientIdPrefix = "SMARTTENDER_";
   pumb.confirmationURL = "https://www.pumb.ua/qes";
   pumb.mobileAppName = "";
+  pumb.needQRCode = true;
 
   const ugb = new KSPSettings();
-  ugb.id = "ugb";
+  ugb.id = "UGB";
   ugb.name = "Укргазбанк - хмарний підпис «EcoSign»";
   ugb.ksp = EndUserKSP.VTOKEN;
   ugb.address = "https://vtms-api-qca.ukrgasbank.com/vtco/api/v1";
   ugb.systemId = "cihsmVtcoServiceClientSmartTender";
   ugb.directAccess = true;
   ugb.clientIdType = EndUserKSPClientIdType.NamePassword;
+  ugb.needQRCode = false;
 
   const alliance = new KSPSettings();
   alliance.id = "alliance";
@@ -632,6 +615,7 @@ export function getDefaultKSPs(allowTest) {
   alliance.systemId = "cihsmVtcoServiceClientSmartTender";
   alliance.directAccess = true;
   alliance.clientIdType = EndUserKSPClientIdType.NamePassword;
+  alliance.needQRCode = false;
 
   const vtoken = new KSPSettings();
   vtoken.id = "vtoken";
@@ -641,6 +625,64 @@ export function getDefaultKSPs(allowTest) {
   vtoken.systemId = "cipherVTokenIntegrationClient";
   vtoken.directAccess = true;
   vtoken.clientIdType = EndUserKSPClientIdType.NamePassword;
+  vtoken.needQRCode = false;
+
+  const amokey = new KSPSettings();
+  amokey.id = "AMOKEY";
+  amokey.name = "АМО ФІНТЕХ – хмарний підпис AMOKEY";
+  amokey.ksp = EndUserKSP.PB;
+  amokey.address = "https://sserver.amokey.com";
+  amokey.port = "443";
+  amokey.clientIdPrefix = "";
+  amokey.directAccess = true;
+  amokey.clientIdType = EndUserKSPClientIdType.Name;
+  amokey.needQRCode = false;
+
+  const tascombank = new KSPSettings();
+  tascombank.id = "TASCOMBANK";
+  tascombank.name = "Сервер підпису КНЕДП АТ \"ТАСКОМБАНК\"";
+  tascombank.ksp = EndUserKSP.PB;
+  tascombank.address = "https://smartsign.tascombank.ua";
+  tascombank.port = "443";
+  tascombank.clientIdPrefix = "";
+  tascombank.directAccess = true;
+  tascombank.clientIdType = EndUserKSPClientIdType.Name;
+  tascombank.needQRCode = false;
+
+  const edinQr = new KSPSettings();
+  edinQr.id = "EDINQR";
+  edinQr.name = "EDIN ID - хмарний підпис (QR)";
+  edinQr.ksp = EndUserKSP.PB;
+  edinQr.address = "https://id.edin.ua/api/ess/v1/";
+  edinQr.confirmationURL = "https://id.edin.ua/mobile/sign";
+  edinQr.port = "";
+  edinQr.clientIdPrefix = "EDIN_";
+  edinQr.directAccess = true;
+  edinQr.mobileAppName = "edinid";
+  edinQr.needQRCode = true;
+
+  const edin = new KSPSettings();
+  edin.id = "EDIN";
+  edin.name = "EDIN ID - хмарний підпис";
+  edin.ksp = EndUserKSP.PB;
+  edin.address = "https://id.edin.ua/api/ess/v1/";
+  edin.port = "";
+  edin.clientIdPrefix = "";
+  edin.directAccess = true;
+  edin.clientIdType = EndUserKSPClientIdType.Name;
+  edin.needQRCode = false;
+
+  const ukrsibbank = new KSPSettings();
+  ukrsibbank.id = "UKRSIBBANK";
+  ukrsibbank.name = "УКРСИББАНК - хмарний підпис";
+  ukrsibbank.ksp = EndUserKSP.PB;
+  ukrsibbank.address = "https://business.ukrsibbank.com/morpheus/smart-sign/";
+  ukrsibbank.confirmationURL = "https://business.ukrsibbank.com/smartsign";
+  ukrsibbank.port = "";
+  ukrsibbank.clientIdPrefix = "USB_";
+  ukrsibbank.directAccess = true;
+  ukrsibbank.mobileAppName = "UKRSIB business";
+  ukrsibbank.needQRCode = true;
 
   const ksps = [
     depositsign,
@@ -653,7 +695,12 @@ export function getDefaultKSPs(allowTest) {
     smartSignTax,
     pumb,
     ugb,
-    alliance
+    alliance,
+    amokey,
+    tascombank,
+    edinQr,
+    edin,
+    ukrsibbank
   ];
 
   if (allowTest) {

package/src/Utils.js

@@ -201,6 +201,7 @@ export function signAlgoToHashAlgo(signAlgo) {
     case EndUserConstants.EndUserSignAlgo.ECDSAWithSHA:
       return EndUserConstants.EndUserHashAlgo.SHA256;
     case EndUserConstants.EndUserSignAlgo.DSTU4145WithGOST34311:
+      return EndUserConstants.EndUserHashAlgo.GOST34311;
     case EndUserConstants.EndUserSignAlgo.DSTU4145WithDSTU7564:
       return EndUserConstants.EndUserHashAlgo.DSTU7564_256;
     default: