@it-enterprise/digital-signature 1.3.12 → 1.3.13

package/.eslintrc.js

@@ -7,6 +7,9 @@ module.exports = {
     },
     "extends": "eslint:recommended",
     "parser": "@babel/eslint-parser",
+    "parserOptions": {
+        "requireConfigFile": false
+    },
     "rules": {
         "semi": ["warn", "always"],
         "quotes": ["warn", "double"],

package/package.json

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

package/src/DigitalSignature.js

@@ -259,13 +259,13 @@ export default class DigitalSignature {
 
   /**
    * Распарсить сертификат
-   * @param {Uint8Array|string} cert 
+   * @param {Uint8Array|string} cert
    * @returns {Promise<EndUserCertificate>}
    */
   async parseCertificate(cert) {
     await this.setLibraryType(DigitalSignatureKeyType.File);
 
-    if (typeof cert == 'string') {
+    if (typeof cert == "string") {
       cert = base64ToArray(cert);
     }
 
@@ -465,7 +465,7 @@ export default class DigitalSignature {
      * @param {boolean?} getCerts - Получать информацию о ключе пользователя. Это приведёт к дополнительному запросу на подписание
      */
   async readPrivateKeyDepositsign(userId, getCerts = false) {
-    var deposit = this.KSPs.find(ksp => ksp.id === "depositsign");
+    const deposit = this.KSPs.find(ksp => ksp.id === "depositsign");
     return await this.readPrivateKeyKSP(deposit, userId, getCerts);
   }
 
@@ -474,7 +474,7 @@ export default class DigitalSignature {
    * @param {boolean?} getCerts - Получать информацию о ключе пользователя. Это приведёт к дополнительному запросу на подписание
    */
   async readPrivateKeyDiia(getCerts = false) {
-    var 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);
   }
 
@@ -513,8 +513,8 @@ export default class DigitalSignature {
 
   /**
    * Получить список ключей у пользователя облачного провайдера
-   * @param {KSPSettings} kspSettings 
-   * @param {KSPUserAuthData} authData 
+   * @param {KSPSettings} kspSettings Облачный провайдер
+   * @param {KSPUserAuthData} authData
    * @returns {KSPKeyMediasResponse}
    */
   async getKeyMediasKSP(kspSettings, authData) {
@@ -560,6 +560,7 @@ export default class DigitalSignature {
     let keyInfo;
 
     try {
+      // eslint-disable-next-line no-undef
       keyInfo = await SignerDigital.getSelectedCertificate();
     } catch (error) {
       throw {
@@ -570,7 +571,7 @@ export default class DigitalSignature {
 
     keyInfo = JSON.parse(keyInfo);
     const certInfo = await this.parseCertificate(keyInfo.Cert);
-    
+
     this._readedKey = new PrivateKeyInfo(DigitalSignatureKeyType.WindowsCertStore, certInfo.infoEx, [certInfo], certInfo.infoEx.subjCN, keyInfo.CertThumbPrint);
 
     return this._readedKey;
@@ -681,7 +682,7 @@ export default class DigitalSignature {
         }
       }
     }
-    
+
     if (this.readedKey.keyType === DigitalSignatureKeyType.WindowsCertStore) {
       if (signType.type !== EndUserConstants.EU_SIGN_CONTAINER_TYPE_CADES) {
         throw {
@@ -718,7 +719,7 @@ export default class DigitalSignature {
 
       if (signType.subType === EndUserConstants.EndUserCAdESType.Detached) {
         const hash = await this._euSign.HashData(this._readedKey.getHashAlgo(), data, !asByteArray);
-        
+
         if (this._readedKey.keyType == DigitalSignatureKeyTypeWindowsCertStore) {
           return this._signHashWindowsCertificateStore(hash, signType, asByteArray);
         }
@@ -727,10 +728,10 @@ export default class DigitalSignature {
       } else {
 
         if (this._readedKey.keyType == DigitalSignatureKeyTypeWindowsCertStore) {
-          
+          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, asBase64String]);
+          return this._euSign.m_library.m_worker.postMessage("AppendDataToSignedData", [signedData, data, !asByteArray]);
         }
 
         return await this._euSign.SignDataEx(this._readedKey.getSignAlgo(), data, false, true, !asByteArray);
@@ -901,7 +902,7 @@ export default class DigitalSignature {
         if (Array.isArray(signInfo)) {
           signInfo = signInfo[signInfo.length - 1];
         }
-        var cert = this._readedKey.certificates[0];
+        const cert = this._readedKey.certificates[0];
         if (cert) {
           signInfo.ownerInfo.certBeginTime = cert.infoEx.certBeginTime;
           signInfo.ownerInfo.certEndTime = cert.infoEx.certEndTime;
@@ -1044,23 +1045,24 @@ export default class DigitalSignature {
 
     const that = this;
     async function signFunc(signValue) {
-      if (typeof signValue != 'string') {
+      if (typeof signValue != "string") {
         signValue = convertToBase64(signValue);
       }
 
       let signedData;
 
       try {
-        
-        signedData = await SignerDigital.signHashCms(signValue, hashType, 2, that._readedKey.id);
+        const signAlgo = 2;
+        // eslint-disable-next-line no-undef
+        signedData = await SignerDigital.signHashCms(signValue, hashType, signAlgo, that._readedKey.id);
       } catch (error) {
         throw {
           code: EndUserError.EU_ERROR_BAD_CERT,
           message: String(error)
-        }
+        };
       }
-      
-      return await that._euSign.m_library.m_worker.postMessage("AppendValidationData", 
+
+      return await that._euSign.m_library.m_worker.postMessage("AppendValidationData",
         [signedData, that._readedKey.certificates[0].data, that._readedKey.getSignAlgo(), !asByteArray]);
     }
 

package/src/Models.js

@@ -87,7 +87,7 @@ export class WebserviceSettingProvider {
   }
 
   async getGlSign() {
-    return new GlSign(await downloadData(`${this.apiPath}/webservice.asmx/ExecuteEx?pureJSON=`, undefined, undefined, { calcId: 'GETGLSIGNBEFORELOGIN', args: '', ticket: '' }));
+    return new GlSign(await downloadData(`${this.apiPath}/webservice.asmx/ExecuteEx?pureJSON=`, undefined, undefined, { calcId: "GETGLSIGNBEFORELOGIN", args: "", ticket: "" }));
   }
 
   async getSettings() {
@@ -95,7 +95,7 @@ export class WebserviceSettingProvider {
       return this._settings;
     }
 
-    const json = await downloadData(`${this.apiPath}/webservice.asmx/ExecuteEx?pureJSON=`, "json", undefined, { calcId: 'GETCASANDCERTIFICATEFILES', args: '', ticket: '' });
+    const json = await downloadData(`${this.apiPath}/webservice.asmx/ExecuteEx?pureJSON=`, "json", undefined, { calcId: "GETCASANDCERTIFICATEFILES", args: "", ticket: "" });
     this._settings = new DigitalSignatureSettings(
       this.language,
       this.userId,
@@ -335,15 +335,17 @@ export const EndUserKSP = {
   DIIA: EU_KSP_DIIA,
   GRYADA: EU_KSP_GRYADA,
   VTOKEN: EU_KSP_VTOKEN
-}
+};
+
+export const EU_KSP_ClientIdType = -1;
 
 export const EndUserKSPClientIdType = {
-  Default: 0,
-  Name: 1,
-  Phone: 2,
-  Email: 3,
-  NamePassword: -1
-}
+  Default: EndUserConstants.EndUserKSPClientIdType.Default,
+  Name: EndUserConstants.EndUserKSPClientIdType.Name,
+  Phone: EndUserConstants.EndUserKSPClientIdType.Phone,
+  Email: EndUserConstants.EndUserKSPClientIdType.Email,
+  NamePassword: EU_KSP_ClientIdType
+};
 
 export class PrivateKeyInfo {
   /**
@@ -430,7 +432,13 @@ export class PrivateKeyInfo {
   getHashAlgo() {
     const certificates = this.certificates;
     if (certificates.length > 0 && certificates[0]?.infoEx?.certHashType) {
-      return certificates[0].infoEx.certHashType;
+      const hashType = certificates[0].infoEx.certHashType;
+
+      if (hashType == EndUserConstants.EndUserHashAlgo.GOST34311) {
+        return EndUserConstants.EndUserHashAlgo.DSTU7564_256;
+      }
+
+      return hashType;
     }
     return signAlgoToHashAlgo(this.getSignAlgo());
   }
@@ -605,7 +613,7 @@ export function getDefaultKSPs(allowTest) {
   vtoken.directAccess = true;
   vtoken.clientIdType = EndUserKSPClientIdType.NamePassword;
 
-  var ksps = [
+  const ksps = [
     depositsign,
     diia,
     smartId,
@@ -685,7 +693,7 @@ export class KSPUserAuthData {
  */
 export class KSPPrivateKeyAuthData {
   /**
-   * 
+   *
    * @param {string} pin Пароль от ключа
    * @param {string} token Токен авторизации аккаунта
    * @param {string} twoFactorCode Код двухфакторной авторизации
@@ -695,4 +703,4 @@ export class KSPPrivateKeyAuthData {
     this.token = token;
     this.twoFactorCode = twoFactorCode;
   }
-}
+}

package/src/Utils.js

@@ -185,7 +185,7 @@ export function convertToBase64(str) {
 }
 
 export function convertFromBase64(str) {
-  return arrayToString(base64ToArray(str))
+  return arrayToString(base64ToArray(str));
 }
 
 /**
@@ -220,7 +220,7 @@ export function getSupportedSignAlgos(certificates) {
     }
     switch (certificate.infoEx.publicKeyType) {
       case EndUserConstants.EndUserCertKeyType.DSTU4145:
-        signAlgos.push(EndUserConstants.EndUserSignAlgo.DSTU4145WithGOST34311);
+        signAlgos.push(EndUserConstants.EndUserSignAlgo.DSTU4145WithDSTU7564);
         break;
       case EndUserConstants.EndUserCertKeyType.RSA:
         signAlgos.push(EndUserConstants.EndUserSignAlgo.RSAWithSHA);