Merge pull request #88 from node-ebics/update-deps

Update deps
This commit is contained in:
Dimitar Nanov 2023-10-11 22:20:43 +03:00 committed by GitHub
commit e251cc0e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 199 additions and 146 deletions

View File

@ -1,5 +1,21 @@
### Changelog ### Changelog
#### [v4.0.0](https://github.com/node-ebics/node-ebics-client/compare/v3.0.0...v0.4.0)
- Add CI [`#75`](https://github.com/node-ebics/node-ebics-client/pull/75)
- feat: update dependencies [`a03ec22`](https://github.com/node-ebics/node-ebics-client/commit/a03ec2283fdd3dcf750c5ed448f0195d92c5c9f0)
- chore: Update dev dependency libxmljs [`3a8dc1d`](https://github.com/node-ebics/node-ebics-client/commit/3a8dc1da0bac20a6f25a687da0a783f3b52d5163)
- feat: replace <request> with <rock-req> [`b6b2751`](https://github.com/node-ebics/node-ebics-client/commit/b6b27516d5854b38dcdbe56f23967001f844e631)
### [v3.0.0](https://github.com/node-ebics/node-ebics-client/compare/v0.2.1...v3.0.0)
> 4 August 2022
- Update LICENSE [`7520a56`](https://github.com/node-ebics/node-ebics-client/commit/7520a56be8ba446d3466c6dc9202b1d65ea3396f)
- changelog [`fe0f585`](https://github.com/node-ebics/node-ebics-client/commit/fe0f585b277c390415841a343aa86d4533997057)
- chore: update license in package.json, bump version [`b46b214`](https://github.com/node-ebics/node-ebics-client/commit/b46b214e57cf1b4e30455da306b26b3a06dc8a5f)
#### [v0.2.1](https://github.com/node-ebics/node-ebics-client/compare/v0.2.0...v0.2.1) #### [v0.2.1](https://github.com/node-ebics/node-ebics-client/compare/v0.2.0...v0.2.1)
> 30 March 2021 > 30 March 2021
@ -84,38 +100,43 @@
#### [v0.1.1](https://github.com/node-ebics/node-ebics-client/compare/v0.1.0...v0.1.1) #### [v0.1.1](https://github.com/node-ebics/node-ebics-client/compare/v0.1.0...v0.1.1)
> 5 November 2019 > 7 November 2019
- chore: update license [`9aabe93`](https://github.com/node-ebics/node-ebics-client/commit/9aabe933e91b506ea38820b952ce8e5e58b4c2ff) - chore: update license [`9aabe93`](https://github.com/node-ebics/node-ebics-client/commit/9aabe933e91b506ea38820b952ce8e5e58b4c2ff)
#### [v0.1.0](https://github.com/node-ebics/node-ebics-client/compare/v0.0.8...v0.1.0) #### [v0.1.0](https://github.com/node-ebics/node-ebics-client/compare/v0.0.36...v0.1.0)
> 5 November 2019 > 5 November 2019
- Feat: handle unsual exponent migrate to node-forge [`#16`](https://github.com/node-ebics/node-ebics-client/pull/16) - Feat: handle unsual exponent migrate to node-forge [`#16`](https://github.com/node-ebics/node-ebics-client/pull/16)
- Add order generation tests and fix linting [`#15`](https://github.com/node-ebics/node-ebics-client/pull/15) - Add order generation tests and fix linting [`#15`](https://github.com/node-ebics/node-ebics-client/pull/15)
- test script run mocha [`#14`](https://github.com/node-ebics/node-ebics-client/pull/14) - test script run mocha [`#14`](https://github.com/node-ebics/node-ebics-client/pull/14)
- chore: readme maintenance [`#11`](https://github.com/node-ebics/node-ebics-client/pull/11)
- Provide examples [`#10`](https://github.com/node-ebics/node-ebics-client/pull/10)
- * Add Z53 order type [`#7`](https://github.com/node-ebics/node-ebics-client/pull/7)
- remove eCollect from constant and minor verbose error handeling [`#2`](https://github.com/node-ebics/node-ebics-client/pull/2)
- add iso pain format XCT order type [`#1`](https://github.com/node-ebics/node-ebics-client/pull/1)
- remove eCollect from constant and minor verbose error handaling [`#4`](https://github.com/node-ebics/node-ebics-client/pull/4)
- add iso pain format XCT order type [`#5`](https://github.com/node-ebics/node-ebics-client/pull/5)
- Fix parsing of the bank keys in the HPB response [`#3`](https://github.com/node-ebics/node-ebics-client/pull/3)
- feat: prepare order generation tests [`e40f79c`](https://github.com/node-ebics/node-ebics-client/commit/e40f79cee68a194272c93f07e763175b213a77a1) - feat: prepare order generation tests [`e40f79c`](https://github.com/node-ebics/node-ebics-client/commit/e40f79cee68a194272c93f07e763175b213a77a1)
- chore: cleanup [`0c01420`](https://github.com/node-ebics/node-ebics-client/commit/0c01420c1e14992a4169098ccd47cd196b899f06) - Major changes. Separating responsibilities. Orders builder, serializer. [`ff9a3a1`](https://github.com/node-ebics/node-ebics-client/commit/ff9a3a16b47d0a25674134c875bfd651995837e4)
- code optimization [`1876360`](https://github.com/node-ebics/node-ebics-client/commit/187636019c290d757aca77d4c14fb4f2519acd38)
#### [v0.0.36](https://github.com/node-ebics/node-ebics-client/compare/v0.0.35...v0.0.36) #### [v0.0.36](https://github.com/node-ebics/node-ebics-client/compare/v0.0.35...v0.0.36)
> 1 June 2018 > 7 November 2019
- various modular fixes [`8492d94`](https://github.com/node-ebics/node-ebics-client/commit/8492d940542f61b17aa3a2da7de23f6539ffaad5) - various modular fixes [`8492d94`](https://github.com/node-ebics/node-ebics-client/commit/8492d940542f61b17aa3a2da7de23f6539ffaad5)
#### [v0.0.35](https://github.com/node-ebics/node-ebics-client/compare/v0.0.3...v0.0.35) #### [v0.0.35](https://github.com/node-ebics/node-ebics-client/compare/v0.0.8...v0.0.35)
> 31 May 2018 > 7 November 2019
- update License to GPL v3 [`babcf76`](https://github.com/node-ebics/node-ebics-client/commit/babcf76b61af6eb737ab291a301e71bb84621820)
- Add MGF1.js file - mask generation utility class [`7e6e2ff`](https://github.com/node-ebics/node-ebics-client/commit/7e6e2ff142688b0c453369fa7137b49e8b89cd81)
- Add sign, _emsaPSS and _modPowe methods in Key.js file [`5ace213`](https://github.com/node-ebics/node-ebics-client/commit/5ace2137231af9a3563ab31fa0f70fbdf4b148cb)
#### [v0.0.8](https://github.com/node-ebics/node-ebics-client/compare/v0.0.7...v0.0.8) #### [v0.0.8](https://github.com/node-ebics/node-ebics-client/compare/v0.0.7...v0.0.8)
> 8 October 2019 > 7 November 2019
- chore: readme maintenance [`#11`](https://github.com/node-ebics/node-ebics-client/pull/11) - chore: readme maintenance [`#11`](https://github.com/node-ebics/node-ebics-client/pull/11)
- Provide examples [`#10`](https://github.com/node-ebics/node-ebics-client/pull/10) - Provide examples [`#10`](https://github.com/node-ebics/node-ebics-client/pull/10)
@ -126,7 +147,7 @@
#### [v0.0.7](https://github.com/node-ebics/node-ebics-client/compare/v0.0.6...v0.0.7) #### [v0.0.7](https://github.com/node-ebics/node-ebics-client/compare/v0.0.6...v0.0.7)
> 2 August 2019 > 7 November 2019
- * Add Z53 order type [`#7`](https://github.com/node-ebics/node-ebics-client/pull/7) - * Add Z53 order type [`#7`](https://github.com/node-ebics/node-ebics-client/pull/7)
- remove eCollect from constant and minor verbose error handeling [`#2`](https://github.com/node-ebics/node-ebics-client/pull/2) - remove eCollect from constant and minor verbose error handeling [`#2`](https://github.com/node-ebics/node-ebics-client/pull/2)
@ -138,7 +159,7 @@
#### [v0.0.6](https://github.com/node-ebics/node-ebics-client/compare/v0.0.5...v0.0.6) #### [v0.0.6](https://github.com/node-ebics/node-ebics-client/compare/v0.0.5...v0.0.6)
> 24 July 2019 > 7 November 2019
- remove eCollect from constant and minor verbose error handaling [`#4`](https://github.com/node-ebics/node-ebics-client/pull/4) - remove eCollect from constant and minor verbose error handaling [`#4`](https://github.com/node-ebics/node-ebics-client/pull/4)
- add iso pain format XCT order type [`#5`](https://github.com/node-ebics/node-ebics-client/pull/5) - add iso pain format XCT order type [`#5`](https://github.com/node-ebics/node-ebics-client/pull/5)
@ -148,24 +169,24 @@
#### [v0.0.5](https://github.com/node-ebics/node-ebics-client/compare/v0.0.4...v0.0.5) #### [v0.0.5](https://github.com/node-ebics/node-ebics-client/compare/v0.0.4...v0.0.5)
> 28 June 2019 > 7 November 2019
- Fix parsing of the bank keys in the HPB response [`#3`](https://github.com/node-ebics/node-ebics-client/pull/3) - Fix parsing of the bank keys in the HPB response [`#3`](https://github.com/node-ebics/node-ebics-client/pull/3)
- tc for bank keys parsing error [`c571ef1`](https://github.com/node-ebics/node-ebics-client/commit/c571ef181bca2e0cbec70bc6df53c706acd6c829) - tc for bank keys parsing error [`c571ef1`](https://github.com/node-ebics/node-ebics-client/commit/c571ef181bca2e0cbec70bc6df53c706acd6c829)
- #2 corrected bank keys parsing [`5f0b6cd`](https://github.com/node-ebics/node-ebics-client/commit/5f0b6cd3747c4613920d2f71f3c04ce13225d397) - #2 corrected bank keys parsing [`5f0b6cd`](https://github.com/node-ebics/node-ebics-client/commit/5f0b6cd3747c4613920d2f71f3c04ce13225d397)
#### [v0.0.4](https://github.com/node-ebics/node-ebics-client/compare/v0.0.36...v0.0.4) #### [v0.0.4](https://github.com/node-ebics/node-ebics-client/compare/v0.0.3...v0.0.4)
> 3 September 2018 > 3 September 2018
- Major changes. Separating responsibilities. Orders builder, serializer. [`ff9a3a1`](https://github.com/node-ebics/node-ebics-client/commit/ff9a3a16b47d0a25674134c875bfd651995837e4) - Major changes. Separating responsibilities. Orders builder, serializer. [`ff9a3a1`](https://github.com/node-ebics/node-ebics-client/commit/ff9a3a16b47d0a25674134c875bfd651995837e4)
- code optimization [`1876360`](https://github.com/node-ebics/node-ebics-client/commit/187636019c290d757aca77d4c14fb4f2519acd38) - code optimization [`1876360`](https://github.com/node-ebics/node-ebics-client/commit/187636019c290d757aca77d4c14fb4f2519acd38)
- client and order optimization [`9454992`](https://github.com/node-ebics/node-ebics-client/commit/945499290a8698aed504b573019de2c23148006a) - various modular fixes [`8492d94`](https://github.com/node-ebics/node-ebics-client/commit/8492d940542f61b17aa3a2da7de23f6539ffaad5)
#### v0.0.3 #### v0.0.3
> 17 May 2018 > 7 November 2019
- initial commit [`1f947ff`](https://github.com/node-ebics/node-ebics-client/commit/1f947ff1480c522f89fa1f547581b55e2378d920) - initial commit [`1f947ff`](https://github.com/node-ebics/node-ebics-client/commit/1f947ff1480c522f89fa1f547581b55e2378d920)
- Initial commit [`cd37de3`](https://github.com/node-ebics/node-ebics-client/commit/cd37de3895e32a61798c79ce3a6447e2f269019d) - Initial commit [`cd37de3`](https://github.com/node-ebics/node-ebics-client/commit/cd37de3895e32a61798c79ce3a6447e2f269019d)

View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
const $request = require('request'); const rock = require('rock-req');
const constants = require('./consts'); const constants = require('./consts');
const Keys = require('./keymanagers/Keys'); const Keys = require('./keymanagers/Keys');
@ -52,7 +52,6 @@ const stringifyKeys = (keys) => {
* @property {string} storageLocation - Location where to store the files that are downloaded. This can be a network share for example. * @property {string} storageLocation - Location where to store the files that are downloaded. This can be a network share for example.
*/ */
module.exports = class Client { module.exports = class Client {
/** /**
*Creates an instance of Client. *Creates an instance of Client.
@ -71,18 +70,17 @@ module.exports = class Client {
languageCode, languageCode,
storageLocation, storageLocation,
}) { }) {
if (!url) if (!url) throw new Error('EBICS URL is required');
throw new Error('EBICS URL is required'); if (!partnerId) throw new Error('partnerId is required');
if (!partnerId) if (!userId) throw new Error('userId is required');
throw new Error('partnerId is required'); if (!hostId) throw new Error('hostId is required');
if (!userId) if (!passphrase) throw new Error('passphrase is required');
throw new Error('userId is required');
if (!hostId)
throw new Error('hostId is required');
if (!passphrase)
throw new Error('passphrase is required');
if (!keyStorage || typeof keyStorage.read !== 'function' || typeof keyStorage.write !== 'function') if (
!keyStorage
|| typeof keyStorage.read !== 'function'
|| typeof keyStorage.write !== 'function'
)
throw new Error('keyStorage implementation missing or wrong'); throw new Error('keyStorage implementation missing or wrong');
this.url = url; this.url = url;
@ -99,17 +97,25 @@ module.exports = class Client {
} }
async send(order) { async send(order) {
const isInObject = ('operation' in order); const isInObject = 'operation' in order;
if (!isInObject) throw new Error('Operation for the order needed'); if (!isInObject) throw new Error('Operation for the order needed');
if (order.operation.toUpperCase() === constants.orderOperations.ini) return this.initialization(order); if (order.operation.toUpperCase() === constants.orderOperations.ini)
return this.initialization(order);
const keys = await this.keys(); const keys = await this.keys();
if (keys === null) throw new Error('No keys provided. Can not send the order or any other order for that matter.'); if (keys === null)
throw new Error(
'No keys provided. Can not send the order or any other order for that matter.',
);
if (order.operation.toUpperCase() === constants.orderOperations.upload) return this.upload(order); if (order.operation.toUpperCase() === constants.orderOperations.upload)
if (order.operation.toUpperCase() === constants.orderOperations.download) return this.download(order); return this.upload(order);
if (
order.operation.toUpperCase() === constants.orderOperations.download
)
return this.download(order);
throw new Error('Wrong order operation provided'); throw new Error('Wrong order operation provided');
} }
@ -118,8 +124,7 @@ module.exports = class Client {
const keys = await this.keys(); const keys = await this.keys();
if (keys === null) await this._generateKeys(); if (keys === null) await this._generateKeys();
if (this.tracesStorage) if (this.tracesStorage) this.tracesStorage.new().ofType('ORDER.INI');
this.tracesStorage.new().ofType('ORDER.INI');
const res = await this.ebicsRequest(order); const res = await this.ebicsRequest(order);
const xml = res.orderData(); const xml = res.orderData();
@ -132,7 +137,9 @@ module.exports = class Client {
technicalCode: returnedTechnicalCode, technicalCode: returnedTechnicalCode,
technicalCodeSymbol: res.technicalSymbol(), technicalCodeSymbol: res.technicalSymbol(),
technicalCodeShortText: res.technicalShortText(returnedTechnicalCode), technicalCodeShortText: res.technicalShortText(
returnedTechnicalCode,
),
technicalCodeMeaning: res.technicalMeaning(returnedTechnicalCode), technicalCodeMeaning: res.technicalMeaning(returnedTechnicalCode),
businessCode: returnedBusinessCode, businessCode: returnedBusinessCode,
@ -167,7 +174,9 @@ module.exports = class Client {
technicalCode: returnedTechnicalCode, technicalCode: returnedTechnicalCode,
technicalCodeSymbol: res.technicalSymbol(), technicalCodeSymbol: res.technicalSymbol(),
technicalCodeShortText: res.technicalShortText(returnedTechnicalCode), technicalCodeShortText: res.technicalShortText(
returnedTechnicalCode,
),
technicalCodeMeaning: res.technicalMeaning(returnedTechnicalCode), technicalCodeMeaning: res.technicalMeaning(returnedTechnicalCode),
businessCode: returnedBusinessCode, businessCode: returnedBusinessCode,
@ -178,8 +187,7 @@ module.exports = class Client {
} }
async upload(order) { async upload(order) {
if (this.tracesStorage) if (this.tracesStorage) this.tracesStorage.new().ofType('ORDER.UPLOAD');
this.tracesStorage.new().ofType('ORDER.UPLOAD');
let res = await this.ebicsRequest(order); let res = await this.ebicsRequest(order);
const transactionId = res.transactionId(); const transactionId = res.transactionId();
const orderId = res.orderId(); const orderId = res.orderId();
@ -197,32 +205,46 @@ module.exports = class Client {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const { version } = order; const { version } = order;
const keys = await this.keys(); const keys = await this.keys();
const r = signer.version(version).sign((await serializer.use(order, this)).toXML(), keys.x()); const r = signer
.version(version)
.sign((await serializer.use(order, this)).toXML(), keys.x());
if (this.tracesStorage) if (this.tracesStorage)
this.tracesStorage.label(`REQUEST.${order.orderDetails.OrderType}`).data(r).persist(); this.tracesStorage
.label(`REQUEST.${order.orderDetails.OrderType}`)
.data(r)
.persist();
$request.post({ rock.post(
url: this.url, this.url,
body: r, {
headers: { 'content-type': 'text/xml;charset=UTF-8' }, body: r,
}, (err, res, data) => { headers: { 'content-type': 'text/xml;charset=UTF-8' },
if (err) reject(err); },
(err, res, data) => {
if (err) reject(err);
const ebicsResponse = response.version(version)(data, keys); const ebicsResponse = response.version(version)(data, keys);
if (this.tracesStorage) if (this.tracesStorage)
this.tracesStorage.label(`RESPONSE.${order.orderDetails.OrderType}`).connect().data(ebicsResponse.toXML()).persist(); this.tracesStorage
.label(`RESPONSE.${order.orderDetails.OrderType}`)
.connect()
.data(ebicsResponse.toXML())
.persist();
resolve(ebicsResponse); resolve(ebicsResponse);
}); },
);
}); });
} }
async signOrder(order) { async signOrder(order) {
const { version } = order; const { version } = order;
const keys = await this.keys(); const keys = await this.keys();
return signer.version(version).sign((await serializer.use(order, this)).toXML(), keys.x()); return signer
.version(version)
.sign((await serializer.use(order, this)).toXML(), keys.x());
} }
async keys() { async keys() {
@ -253,6 +275,8 @@ module.exports = class Client {
} }
_writeKeys(keysObject) { _writeKeys(keysObject) {
return this.keyStorage.write(this.keyEncryptor.encrypt(stringifyKeys(keysObject.keys))); return this.keyStorage.write(
this.keyEncryptor.encrypt(stringifyKeys(keysObject.keys)),
);
} }
}; };

View File

@ -1,11 +1,11 @@
"use strict"; 'use strict';
const H004Signer = require("../orders/H004/signer"); const H004Signer = require('../orders/H004/signer');
module.exports = { module.exports = {
version(v) { version(v) {
if (v.toUpperCase() === "H004") return H004Signer; if (v.toUpperCase() === 'H004') return H004Signer;
throw Error("Error from middleware/signer.js: Invalid version number"); throw Error('Error from middleware/signer.js: Invalid version number');
}, },
}; };

View File

@ -1,13 +1,13 @@
"use strict"; 'use strict';
const zlib = require("zlib"); const zlib = require('zlib');
const crypto = require("crypto"); const crypto = require('crypto');
const Crypto = require("../../crypto/Crypto"); const Crypto = require('../../crypto/Crypto');
const { DOMParser, XMLSerializer } = require("@xmldom/xmldom"); const { DOMParser, XMLSerializer } = require('@xmldom/xmldom');
const xpath = require("xpath"); const xpath = require('xpath');
const errors = require("./errors"); const errors = require('./errors');
const DEFAULT_IV = Buffer.from(Array(16).fill(0, 0, 15)); const DEFAULT_IV = Buffer.from(Array(16).fill(0, 0, 15));
@ -21,23 +21,23 @@ const lastChild = (node) => {
module.exports = (xml, keys) => ({ module.exports = (xml, keys) => ({
keys, keys,
doc: new DOMParser().parseFromString(xml, "text/xml"), doc: new DOMParser().parseFromString(xml, 'text/xml'),
isSegmented() { isSegmented() {
const select = xpath.useNamespaces({ xmlns: "urn:org:ebics:H004" }); const select = xpath.useNamespaces({ xmlns: 'urn:org:ebics:H004' });
const node = select( const node = select(
"//xmlns:header/xmlns:mutable/xmlns:SegmentNumber", '//xmlns:header/xmlns:mutable/xmlns:SegmentNumber',
this.doc this.doc,
); );
return !!node.length; return !!node.length;
}, },
isLastSegment() { isLastSegment() {
const select = xpath.useNamespaces({ xmlns: "urn:org:ebics:H004" }); const select = xpath.useNamespaces({ xmlns: 'urn:org:ebics:H004' });
const node = select( const node = select(
"//xmlns:header/xmlns:mutable/*[@lastSegment='true']", "//xmlns:header/xmlns:mutable/*[@lastSegment='true']",
this.doc this.doc,
); );
return !!node.length; return !!node.length;
@ -45,20 +45,20 @@ module.exports = (xml, keys) => ({
orderData() { orderData() {
const orderDataNode = this.doc.getElementsByTagNameNS( const orderDataNode = this.doc.getElementsByTagNameNS(
"urn:org:ebics:H004", 'urn:org:ebics:H004',
"OrderData" 'OrderData',
); );
if (!orderDataNode.length) return {}; if (!orderDataNode.length) return {};
const orderData = orderDataNode[0].textContent; const orderData = orderDataNode[0].textContent;
const decipher = crypto const decipher = crypto
.createDecipheriv("aes-128-cbc", this.transactionKey(), DEFAULT_IV) .createDecipheriv('aes-128-cbc', this.transactionKey(), DEFAULT_IV)
.setAutoPadding(false); .setAutoPadding(false);
const data = Buffer.from( const data = Buffer.from(
decipher.update(orderData, "base64", "binary") + decipher.update(orderData, 'base64', 'binary')
decipher.final("binary"), + decipher.final('binary'),
"binary" 'binary',
); );
return zlib.inflateSync(data); return zlib.inflateSync(data);
@ -66,40 +66,40 @@ module.exports = (xml, keys) => ({
transactionKey() { transactionKey() {
const keyNodeText = this.doc.getElementsByTagNameNS( const keyNodeText = this.doc.getElementsByTagNameNS(
"urn:org:ebics:H004", 'urn:org:ebics:H004',
"TransactionKey" 'TransactionKey',
)[0].textContent; )[0].textContent;
return Crypto.privateDecrypt( return Crypto.privateDecrypt(
this.keys.e(), this.keys.e(),
Buffer.from(keyNodeText, "base64") Buffer.from(keyNodeText, 'base64'),
); );
}, },
transactionId() { transactionId() {
const select = xpath.useNamespaces({ xmlns: "urn:org:ebics:H004" }); const select = xpath.useNamespaces({ xmlns: 'urn:org:ebics:H004' });
const node = select( const node = select(
"//xmlns:header/xmlns:static/xmlns:TransactionID", '//xmlns:header/xmlns:static/xmlns:TransactionID',
this.doc this.doc,
); );
return node.length ? node[0].textContent : ""; return node.length ? node[0].textContent : '';
}, },
orderId() { orderId() {
const select = xpath.useNamespaces({ xmlns: "urn:org:ebics:H004" }); const select = xpath.useNamespaces({ xmlns: 'urn:org:ebics:H004' });
const node = select( const node = select(
".//xmlns:header/xmlns:mutable/xmlns:OrderID", './/xmlns:header/xmlns:mutable/xmlns:OrderID',
this.doc this.doc,
); );
return node.length ? node[0].textContent : ""; return node.length ? node[0].textContent : '';
}, },
businessCode() { businessCode() {
const select = xpath.useNamespaces({ xmlns: "urn:org:ebics:H004" }); const select = xpath.useNamespaces({ xmlns: 'urn:org:ebics:H004' });
const node = select("//xmlns:body/xmlns:ReturnCode", this.doc); const node = select('//xmlns:body/xmlns:ReturnCode', this.doc);
return node.length ? node[0].textContent : ""; return node.length ? node[0].textContent : '';
}, },
businessSymbol(code) { businessSymbol(code) {
@ -115,23 +115,23 @@ module.exports = (xml, keys) => ({
}, },
technicalCode() { technicalCode() {
const select = xpath.useNamespaces({ xmlns: "urn:org:ebics:H004" }); const select = xpath.useNamespaces({ xmlns: 'urn:org:ebics:H004' });
const node = select( const node = select(
"//xmlns:header/xmlns:mutable/xmlns:ReturnCode", '//xmlns:header/xmlns:mutable/xmlns:ReturnCode',
this.doc this.doc,
); );
return node.length ? node[0].textContent : ""; return node.length ? node[0].textContent : '';
}, },
technicalSymbol() { technicalSymbol() {
const select = xpath.useNamespaces({ xmlns: "urn:org:ebics:H004" }); const select = xpath.useNamespaces({ xmlns: 'urn:org:ebics:H004' });
const node = select( const node = select(
"//xmlns:header/xmlns:mutable/xmlns:ReportText", '//xmlns:header/xmlns:mutable/xmlns:ReportText',
this.doc this.doc,
); );
return node.length ? node[0].textContent : ""; return node.length ? node[0].textContent : '';
}, },
technicalShortText(code) { technicalShortText(code) {
@ -146,9 +146,9 @@ module.exports = (xml, keys) => ({
const orderData = this.orderData().toString(); const orderData = this.orderData().toString();
if (!Object.keys(orderData).length) return {}; if (!Object.keys(orderData).length) return {};
const doc = new DOMParser().parseFromString(orderData, "text/xml"); const doc = new DOMParser().parseFromString(orderData, 'text/xml');
const select = xpath.useNamespaces({ xmlns: "urn:org:ebics:H004" }); const select = xpath.useNamespaces({ xmlns: 'urn:org:ebics:H004' });
const keyNodes = select("//xmlns:PubKeyValue", doc); const keyNodes = select('//xmlns:PubKeyValue', doc);
const bankKeys = {}; const bankKeys = {};
if (!keyNodes.length) return {}; if (!keyNodes.length) return {};
@ -157,15 +157,15 @@ module.exports = (xml, keys) => ({
const type = lastChild(keyNodes[i].parentNode).textContent; const type = lastChild(keyNodes[i].parentNode).textContent;
const modulus = xpath.select( const modulus = xpath.select(
".//*[local-name(.)='Modulus']", ".//*[local-name(.)='Modulus']",
keyNodes[i] keyNodes[i],
)[0].textContent; )[0].textContent;
const exponent = xpath.select( const exponent = xpath.select(
".//*[local-name(.)='Exponent']", ".//*[local-name(.)='Exponent']",
keyNodes[i] keyNodes[i],
)[0].textContent; )[0].textContent;
const mod = Buffer.from(modulus, "base64"); const mod = Buffer.from(modulus, 'base64');
const exp = Buffer.from(exponent, "base64"); const exp = Buffer.from(exponent, 'base64');
bankKeys[`bank${type}`] = { bankKeys[`bank${type}`] = {
mod, mod,
exp, exp,

View File

@ -1,49 +1,48 @@
"use strict"; 'use strict';
// const crypto = require('crypto'); // const crypto = require('crypto');
const Crypto = require("../../crypto/Crypto"); const Crypto = require('../../crypto/Crypto');
const { DOMParser, XMLSerializer } = require("@xmldom/xmldom"); const { DOMParser, XMLSerializer } = require('@xmldom/xmldom');
const xpath = require("xpath"); const xpath = require('xpath');
const C14n = const C14n = require('xml-crypto/lib/c14n-canonicalization').C14nCanonicalization;
require("xml-crypto/lib/c14n-canonicalization").C14nCanonicalization;
const digest = (doc) => { const digest = (doc) => {
// get the xml node, where the digested value is supposed to be // get the xml node, where the digested value is supposed to be
const nodeDigestValue = doc.getElementsByTagName("ds:DigestValue")[0]; const nodeDigestValue = doc.getElementsByTagName('ds:DigestValue')[0];
// canonicalize the node that has authenticate='true' attribute // canonicalize the node that has authenticate='true' attribute
const contentToDigest = xpath const contentToDigest = xpath
.select("//*[@authenticate='true']", doc) .select("//*[@authenticate='true']", doc)
.map((x) => new C14n().process(x)) .map(x => new C14n().process(x))
.join(""); .join('');
// fix the canonicalization // fix the canonicalization
const fixedContent = contentToDigest.replace( const fixedContent = contentToDigest.replace(
/xmlns="urn:org:ebics:H004"/g, /xmlns="urn:org:ebics:H004"/g,
'xmlns="urn:org:ebics:H004" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"' 'xmlns="urn:org:ebics:H004" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"',
); );
if (nodeDigestValue) if (nodeDigestValue)
nodeDigestValue.textContent = Crypto.digestWithHash(fixedContent) nodeDigestValue.textContent = Crypto.digestWithHash(fixedContent)
.toString("base64") .toString('base64')
.trim(); .trim();
return doc; return doc;
}; };
const sign = (doc, key) => { const sign = (doc, key) => {
const nodeSignatureValue = doc.getElementsByTagName("ds:SignatureValue")[0]; const nodeSignatureValue = doc.getElementsByTagName('ds:SignatureValue')[0];
if (nodeSignatureValue) { if (nodeSignatureValue) {
const select = xpath.useNamespaces({ const select = xpath.useNamespaces({
ds: "http://www.w3.org/2000/09/xmldsig#", ds: 'http://www.w3.org/2000/09/xmldsig#',
}); });
const contentToSign = new C14n() const contentToSign = new C14n()
.process(select("//ds:SignedInfo", doc)[0]) .process(select('//ds:SignedInfo', doc)[0])
.replace( .replace(
'xmlns:ds="http://www.w3.org/2000/09/xmldsig#"', 'xmlns:ds="http://www.w3.org/2000/09/xmldsig#"',
'xmlns="urn:org:ebics:H004" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"' 'xmlns="urn:org:ebics:H004" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"',
); );
nodeSignatureValue.textContent = Crypto.privateSign(key, contentToSign); // this.keys.x().key.sign(contentToSign, 'base64'); nodeSignatureValue.textContent = Crypto.privateSign(key, contentToSign); // this.keys.x().key.sign(contentToSign, 'base64');
@ -52,11 +51,11 @@ const sign = (doc, key) => {
return doc; return doc;
}; };
const toXML = (doc) => new XMLSerializer().serializeToString(doc); const toXML = doc => new XMLSerializer().serializeToString(doc);
module.exports = { module.exports = {
sign(data, keyX) { sign(data, keyX) {
const doc = new DOMParser().parseFromString(data, "text/xml"); const doc = new DOMParser().parseFromString(data, 'text/xml');
return toXML(sign(digest(doc), keyX)); return toXML(sign(digest(doc), keyX));
}, },

9
package-lock.json generated
View File

@ -14,6 +14,7 @@
"js2xmlparser": "^5.0.0", "js2xmlparser": "^5.0.0",
"node-forge": "^1.3.1", "node-forge": "^1.3.1",
"request": "^2.88.2", "request": "^2.88.2",
"rock-req": "^5.1.3",
"uuid": "^9.0.1", "uuid": "^9.0.1",
"xml-crypto": "^4.0.1", "xml-crypto": "^4.0.1",
"xpath": "0.0.32" "xpath": "0.0.32"
@ -4277,6 +4278,14 @@
"url": "https://github.com/sponsors/isaacs" "url": "https://github.com/sponsors/isaacs"
} }
}, },
"node_modules/rock-req": {
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/rock-req/-/rock-req-5.1.3.tgz",
"integrity": "sha512-aorqEtp9YKws/KRiHlEbAHDWof/ILjTViTXMTe9juAgLjNrT9jsuQNM/cMbpK+zZsrFEHSHMCSK/wzi0DWelZA==",
"engines": {
"node": ">=16"
}
},
"node_modules/run-async": { "node_modules/run-async": {
"version": "2.4.1", "version": "2.4.1",
"dev": true, "dev": true,

View File

@ -1,6 +1,6 @@
{ {
"name": "ebics-client", "name": "ebics-client",
"version": "0.2.1", "version": "4.0.0",
"description": "Node.js ISO 20022 Compliant EBICS Client", "description": "Node.js ISO 20022 Compliant EBICS Client",
"main": "index.js", "main": "index.js",
"files": [ "files": [
@ -59,13 +59,13 @@
], ],
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"dependencies": { "dependencies": {
"@xmldom/xmldom": "^0.8.10",
"handlebars": "^4.7.8", "handlebars": "^4.7.8",
"js2xmlparser": "^5.0.0", "js2xmlparser": "^5.0.0",
"node-forge": "^1.3.1", "node-forge": "^1.3.1",
"request": "^2.88.2", "rock-req": "^5.1.3",
"uuid": "^9.0.1", "uuid": "^9.0.1",
"xml-crypto": "^4.0.1", "xml-crypto": "^4.0.1",
"@xmldom/xmldom": "^0.8.10",
"xpath": "0.0.32" "xpath": "0.0.32"
}, },
"devDependencies": { "devDependencies": {

View File

@ -1,19 +1,19 @@
"use strict"; 'use strict';
/* eslint-env node, mocha */ /* eslint-env node, mocha */
const { assert } = require("chai"); const { assert } = require('chai');
const path = require("path"); const path = require('path');
const fs = require("fs"); const fs = require('fs');
const ebics = require("../../"); const ebics = require('../../');
const libxml = require("libxmljs"); const libxml = require('libxmljs');
const schemaPath = path.resolve(__dirname, "../xsd/ebics_H004.xsd"); const schemaPath = path.resolve(__dirname, '../xsd/ebics_H004.xsd');
const schemaDoc = libxml.parseXml( const schemaDoc = libxml.parseXml(
fs.readFileSync(schemaPath, { encoding: "utf8" }) fs.readFileSync(schemaPath, { encoding: 'utf8' }),
); );
const schemaDir = path.dirname(schemaPath); const schemaDir = path.dirname(schemaPath);
@ -32,13 +32,13 @@ const validateXML = (str) => {
}; };
const client = new ebics.Client({ const client = new ebics.Client({
url: "https://iso20022test.credit-suisse.com/ebicsweb/ebicsweb", url: 'https://iso20022test.credit-suisse.com/ebicsweb/ebicsweb',
partnerId: "CRS04381", partnerId: 'CRS04381',
userId: "CRS04381", userId: 'CRS04381',
hostId: "CRSISOTB", hostId: 'CRSISOTB',
passphrase: "test", passphrase: 'test',
keyStorage: ebics.fsKeysStorage( keyStorage: ebics.fsKeysStorage(
path.resolve(__dirname, "../support/TEST_KEYS.key") path.resolve(__dirname, '../support/TEST_KEYS.key'),
), ),
}); });
@ -56,8 +56,8 @@ const CCS = require('./CCS');
const XE3 = require('./XE3'); const XE3 = require('./XE3');
const XCT = require('./XCT'); const XCT = require('./XCT');
*/ */
const uploadBuilder = (fn) => fn(""); const uploadBuilder = fn => fn('');
const dateBuilder = (fn) => fn("2018-01-01", "2019-01-01"); const dateBuilder = fn => fn('2018-01-01', '2019-01-01');
const fnOrders = { const fnOrders = {
// upload | document // upload | document
@ -87,12 +87,12 @@ const fnOrders = {
}; };
const getOrderObject = (name, order) => { const getOrderObject = (name, order) => {
if (typeof order === "object") return order; if (typeof order === 'object') return order;
if (fnOrders[name]) return fnOrders[name](order); if (fnOrders[name]) return fnOrders[name](order);
return null; return null;
}; };
describe("H004 order generation", () => { describe('H004 order generation', () => {
// eslint-disable-next-line no-restricted-syntax // eslint-disable-next-line no-restricted-syntax
for (const [name, orderDefinition] of Object.entries(Orders)) { for (const [name, orderDefinition] of Object.entries(Orders)) {
const order = getOrderObject(name, orderDefinition); const order = getOrderObject(name, orderDefinition);