@it-enterprise/digital-signature 1.4.6 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@it-enterprise/digital-signature",
3
- "version": "1.4.6",
3
+ "version": "1.5.0",
4
4
  "description": "IT-Enterprise package for digital signature",
5
5
  "private": false,
6
6
  "main": "src/index.js",
@@ -38,9 +38,8 @@
38
38
  },
39
39
  "scripts": {
40
40
  "build-worker": "powershell bin/worker.ps1",
41
- "prebuild": "npm run build-worker",
42
41
  "dev": "vite",
43
42
  "build": "vite build",
44
- "prepublishOnly": "npm run build"
43
+ "prepublishOnly": "npm run build && npm run build-worker"
45
44
  }
46
45
  }
package/readme.md CHANGED
@@ -128,7 +128,7 @@ const ds = new DigitalSignature(
128
128
  worker)
129
129
  );
130
130
  // Возвращает текущий тип ключа (файловый, аппаратный, облачный)
131
- const currentKeyType = await ds.initialise();
131
+ const currentKeyType = await ds.initialize();
132
132
  ```
133
133
  Сменить тип библиотеки
134
134
  ```javascript
@@ -1,6 +1,6 @@
1
- import { EndUser, EndUserConstants, EndUserProxySettings, EndUserError, KSPSettings, EndUserCertificate, EndUserKeyMedia, EndUserSignContainerInfo, EndUserCertificateInfoEx, EndUserTaxReport } from "../euscp/euscp";
1
+ import { EndUser, EndUserConstants, EndUserProxySettings, EndUserError, KSPSettings, EndUserCertificate, EndUserKeyMedia, EndUserSignContainerInfo, EndUserTaxReport } from "../euscp/euscp";
2
2
  import { DigitalSignatureKeyType, PrivateKeyInfo, FilePrivateKeyInfo, HardwarePrivateKeyInfo, KspPrivateKeyInfo, EndUserKSP, KSPKeyMediasResponse, KSPUserAuthData, KSPPrivateKeyAuthData, DigitalSignatureKeyTypeWindowsCertStore, ProtectTaxReportParams } from "./Models";
3
- import { arrayToBase64, base64ToArray, convertToBase64, dateWithoutTimezone, downloadAndSignFiles, downloadData, format, isDefaultValue, readFile } from "./Utils";
3
+ import { arrayToBase64, base64ToArray, dateWithoutTimezone, downloadAndSignFiles, downloadData, format, isDefaultValue, readFile } from "./Utils";
4
4
  import UmCAService from "./umcaservice";
5
5
  import Resourses from "./Resourses.json";
6
6
  import GlSign from "./GlSign";
@@ -37,6 +37,9 @@ export default class DigitalSignature {
37
37
 
38
38
  /** @type {PrivateKeyInfo} */
39
39
  this._readedKey = null;
40
+
41
+ this._isInitializing = false;
42
+ this._initializationPromise = Promise.resolve(DigitalSignatureKeyType.File);
40
43
  }
41
44
 
42
45
  /**
@@ -81,17 +84,45 @@ export default class DigitalSignature {
81
84
  if (type != null && type != undefined) {
82
85
  this._preferredKeyType = type;
83
86
  }
84
-
85
- await this.initialise();
86
87
  this.keyType = type;
88
+ await this.initialise();
89
+ }
90
+
91
+ /**
92
+ * Инициализировать библиотеку
93
+ * @returns {Promise<number>} Текущий тип библиотеки
94
+ */
95
+ initialise() {
96
+ // обратная совместимость
97
+ return this.initialize();
87
98
  }
88
99
 
89
100
  /**
90
101
  * Инициализировать библиотеку
91
102
  * @returns {Promise<number>} Текущий тип библиотеки
92
103
  */
93
- async initialise() {
94
- if (!this._glSign) {
104
+ initialize() {
105
+ // защита от одновременного вызова инициализации из нескольких источников
106
+ if (this._isInitializing) {
107
+ return this._initializationPromise;
108
+ }
109
+
110
+ this._isInitializing = true;
111
+ this._initializationPromise = new Promise(async (resolve, reject) => {
112
+ try {
113
+ const result = await this._initialize();
114
+ resolve(result);
115
+ } catch (error) {
116
+ reject(error);
117
+ } finally {
118
+ this._isInitializing = false;
119
+ }
120
+ });
121
+ return this._initializationPromise;
122
+ }
123
+
124
+ async _initialize() {
125
+ if (!this._glSign) {
95
126
  this._glSign = await Promise.resolve(this._settingsProvider.getGlSign());
96
127
  }
97
128
 
@@ -126,6 +157,11 @@ export default class DigitalSignature {
126
157
 
127
158
  const euSign = this._euSign;
128
159
 
160
+ const isInitialised = await euSign.IsInitialized();
161
+ if (isInitialised) {
162
+ return this.getLibraryType();
163
+ }
164
+
129
165
  if (euSign === this._euSignKeyMedia) {
130
166
  const library = await euSign.GetLibraryInfo();
131
167
 
@@ -179,11 +215,6 @@ export default class DigitalSignature {
179
215
  }
180
216
  }
181
217
 
182
- const isInitialised = await euSign.IsInitialized();
183
- if (isInitialised) {
184
- return this.getLibraryType();
185
- }
186
-
187
218
  if (!this._euSettings) {
188
219
  let certificates;
189
220
  try {
@@ -321,7 +352,7 @@ export default class DigitalSignature {
321
352
  case DigitalSignatureKeyType.Token:
322
353
  return await this.readHardwareKey(keyInfo.keyMedia, keyInfo.certificates);
323
354
  case DigitalSignatureKeyType.KSP:
324
- return await this.readPrivateKeyKSP(keyInfo.ksp, keyInfo.kspUserId, false);
355
+ return await this.readPrivateKeyKSP(keyInfo.ksp, keyInfo.userId, false, keyInfo.keyId);
325
356
  case DigitalSignatureKeyType.UmCAService:
326
357
  return await this.readPrivateKeyUmCAService(keyInfo.keyMedia);
327
358
  case DigitalSignatureKeyType.WindowsCertStore:
@@ -432,18 +463,30 @@ export default class DigitalSignature {
432
463
  }
433
464
 
434
465
  try {
435
- const ownerInfo = await this._euSign.ReadPrivateKeyBinary(privateKey, password, certs, this._selectedIssuerCN);
466
+ let ownerInfo;
467
+ try {
468
+ ownerInfo = await this._euSign.ReadPrivateKeyBinary(privateKey, password, certs, this._selectedIssuerCN);
469
+ } catch (error) {
470
+ // Если в контейнере ключа записаны старые сертификаты, попробовать загрузить новые сертификаты по протоколу CMP
471
+ if (error && error.code === EndUserError.EU_ERROR_CERT_BAD_BY_OCSP) {
472
+ const { certs } = await this._searchPrivateKeyCertificatesWithCMP_JS(privateKey, password, this._selectedIssuerCN);
473
+ ownerInfo = await this._euSign.ReadPrivateKeyBinary(privateKey, password, certs, this._selectedIssuerCN);
474
+ } else {
475
+ throw error;
476
+ }
477
+ }
478
+ const ownCertifcates = await this._euSign.GetOwnCertificates();
436
479
  this._readedKey = new FilePrivateKeyInfo(
437
480
  DigitalSignatureKeyType.File,
438
481
  ownerInfo,
439
- await this._euSign.GetOwnCertificates(),
482
+ ownCertifcates,
440
483
  privateKey,
441
484
  password
442
485
  );
443
486
  this._readedKey._glSign = this._glSign;
444
487
  return this._readedKey;
445
488
  } catch (error) {
446
- if (error && error.code === EndUserError.EU_ERROR_CERT_NOT_FOUND) {
489
+ if (error && (error.code === EndUserError.EU_ERROR_CERT_NOT_FOUND)) {
447
490
  if (!this._selectedIssuerCN) {
448
491
  throw {
449
492
  code: EndUserError.EU_ERROR_CERT_NOT_FOUND,
@@ -489,6 +532,10 @@ export default class DigitalSignature {
489
532
  return file.name.endsWith(".jks");
490
533
  }
491
534
 
535
+ async _searchPrivateKeyCertificatesWithCMP_JS(privateKey, password, caCN) {
536
+ return await this._euSignFile.m_library.m_worker.postMessage("CallSearchPrivateKeyCertificatesWithCMP", [privateKey, password, caCN]);
537
+ }
538
+
492
539
  /**
493
540
  * Считать ключ с DepositSign
494
541
  * @param {string} userId - Идентификатор пользователя
@@ -515,16 +562,26 @@ export default class DigitalSignature {
515
562
  * @param {boolean?} getCerts - Получать информацию о ключе пользователя. Это приведёт к дополнительному запросу на подписание
516
563
  * @param {string?} keyId Идентификатор ключа
517
564
  * @param {KSPPrivateKeyAuthData?} authData Параметры авторизации ключа
565
+ * @param {Array<Uint8Array|File>?} certs - Сертификаты ключа (при необходимости)
518
566
  */
519
- async readPrivateKeyKSP(ksp, userId, getCerts = false, keyId, authData) {
567
+ async readPrivateKeyKSP(ksp, userId, getCerts = false, keyId, authData, certs) {
520
568
  await this.setLibraryType(DigitalSignatureKeyType.KSP);
521
569
 
522
570
  if (ksp.ksp === EndUserConstants.EU_KSP_DIIA) {
523
571
  await this._diiaCheckAccess(ksp);
524
572
  }
525
573
 
526
- const ownerInfo = await this._euSign.ReadPrivateKeyKSP(userId, ksp.name, getCerts, keyId, null, authData);
527
- if (getCerts && !ownerInfo) {
574
+ if (Array.isArray(certs) && certs.length > 0) {
575
+ certs = await Promise.all(certs.map(cert =>
576
+ cert instanceof File || cert instanceof Blob? readFile(cert)
577
+ : cert instanceof EndUserCertificate ? cert.data
578
+ : cert));
579
+ } else {
580
+ certs = null;
581
+ }
582
+
583
+ const ownerInfo = await this._euSign.ReadPrivateKeyKSP(userId, ksp.name, getCerts, keyId, null, authData, certs);
584
+ if ((getCerts || certs) && !ownerInfo) {
528
585
  throw {
529
586
  code: EndUserError.EU_ERROR_KEY_MEDIAS_READ_FAILED,
530
587
  message: this._resourses.PrivateKeyNotReaded
@@ -533,7 +590,7 @@ export default class DigitalSignature {
533
590
  this._readedKey = new KspPrivateKeyInfo(
534
591
  DigitalSignatureKeyType.KSP,
535
592
  ownerInfo,
536
- getCerts ? await this._euSign.GetOwnCertificates() : [],
593
+ (getCerts || certs) ? await this._euSign.GetOwnCertificates() : [],
537
594
  userId,
538
595
  ksp,
539
596
  keyId
@@ -772,7 +829,7 @@ export default class DigitalSignature {
772
829
  };
773
830
  }
774
831
 
775
- const hash = await this._euSign.HashData(this._readedKey.getHashAlgo(), data, !asByteArray);
832
+ const hash = await this._euSign.HashData(this._readedKey.getHashAlgo(), data, true);
776
833
  const signedData = await this._signHashWindowsCertificateStore(hash, signType, asByteArray);
777
834
 
778
835
  return this._euSign.m_library.m_worker.postMessage("AppendDataToSignedData", [signedData, data, !asByteArray]);
@@ -903,14 +960,13 @@ export default class DigitalSignature {
903
960
  } else if (signContainerInfo.type === EndUserConstants.EndUserSignContainerType.XAdES) {
904
961
  return await this._euSign.XAdESVerifyData(data, sign.val || sign, signIndex);
905
962
  } else if (signContainerInfo.type === EndUserConstants.EndUserSignContainerType.CAdES) {
906
- if (!data) {
907
- if (signContainerInfo.subType === EndUserConstants.EndUserCAdESType.Detached) {
908
- throw {
909
- code: EndUserError.EU_ERROR_BAD_PARAMETER,
910
- message: this._resourses.BadParameter + " data"
911
- };
912
- }
963
+ if (signContainerInfo.subType === EndUserConstants.EndUserCAdESType.Enveloped) {
913
964
  return await this._euSign.VerifyDataInternal(sign.val || sign, signIndex);
965
+ } else if (!data) {
966
+ throw {
967
+ code: EndUserError.EU_ERROR_BAD_PARAMETER,
968
+ message: this._resourses.BadParameter + " data"
969
+ };
914
970
  }
915
971
  }
916
972
  return await this._euSign.VerifyData(data.val || data, sign.val || sign, signIndex);
@@ -1160,7 +1216,7 @@ export default class DigitalSignature {
1160
1216
  const that = this;
1161
1217
  async function signFunc(signValue) {
1162
1218
  if (typeof signValue != "string") {
1163
- signValue = convertToBase64(signValue);
1219
+ signValue = arrayToBase64(signValue);
1164
1220
  }
1165
1221
 
1166
1222
  let signedData;
@@ -1594,6 +1650,5 @@ export default class DigitalSignature {
1594
1650
  message: this._resourses.DiiaHealthCheckError
1595
1651
  };
1596
1652
  }
1597
-
1598
1653
  }
1599
1654
  }
package/src/GlSign.js CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  import { EndUserConstants } from "../euscp/euscp";
4
4
  import { EndUserKSP, getDefaultKSPs } from "./Models";
5
- import { convertFromBase64, IS_DSTU_7564_DAY } from "./Utils";
5
+ import { convertFromBase64 } from "./Utils";
6
6
 
7
7
  /**
8
8
  * ПГУ GlSign