@sap-cloud-sdk/connectivity 4.2.1-20251223014444.0 → 4.2.1-20251230014443.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.
|
@@ -1,4 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
37
|
};
|
|
@@ -8,6 +41,7 @@ exports.urlAndAgent = urlAndAgent;
|
|
|
8
41
|
const promises_1 = require("fs/promises");
|
|
9
42
|
const http_1 = __importDefault(require("http"));
|
|
10
43
|
const https_1 = __importDefault(require("https"));
|
|
44
|
+
const jks = __importStar(require("jks-js"));
|
|
11
45
|
const util_1 = require("@sap-cloud-sdk/util");
|
|
12
46
|
/* Careful the proxy imports cause circular dependencies if imported from scp directly */
|
|
13
47
|
// eslint-disable-next-line import/no-internal-modules
|
|
@@ -90,6 +124,28 @@ function getKeyStoreOptions(destination) {
|
|
|
90
124
|
logger.debug(`Destination '${destination.name}' does not have a keystore password.`);
|
|
91
125
|
}
|
|
92
126
|
const certBuffer = Buffer.from(certificate.content, 'base64');
|
|
127
|
+
if (getFormat(certificate) === 'jks' ||
|
|
128
|
+
getFormat(certificate) === 'keystore') {
|
|
129
|
+
const pemKeystore = jks.toPem(certBuffer, destination.keyStorePassword || '');
|
|
130
|
+
const aliases = Object.keys(pemKeystore);
|
|
131
|
+
if (aliases.length === 0) {
|
|
132
|
+
throw Error('No entries found in JKS keystore');
|
|
133
|
+
}
|
|
134
|
+
const alias = aliases[0];
|
|
135
|
+
if (aliases.length > 1) {
|
|
136
|
+
logger.debug(`JKS keystore contains ${aliases.length} aliases. ` +
|
|
137
|
+
'Using the first one. ' +
|
|
138
|
+
'If this is not the correct certificate, please use a JKS file with only one entry.');
|
|
139
|
+
}
|
|
140
|
+
const entry = pemKeystore[alias];
|
|
141
|
+
if (!entry.cert || !entry.key) {
|
|
142
|
+
throw Error('Invalid JKS entry: missing cert or key');
|
|
143
|
+
}
|
|
144
|
+
return {
|
|
145
|
+
cert: Buffer.from(entry.cert, 'utf8'),
|
|
146
|
+
key: Buffer.from(entry.key, 'utf8')
|
|
147
|
+
};
|
|
148
|
+
}
|
|
93
149
|
// if the format is pem, the key and certificate needs to be passed separately
|
|
94
150
|
// it could be required to separate the string into two parts, but this seems to work as well
|
|
95
151
|
if (getFormat(certificate) === 'pem') {
|
|
@@ -137,7 +193,7 @@ function mtlsIsEnabled(destination) {
|
|
|
137
193
|
/*
|
|
138
194
|
The node client supports only these store formats https://nodejs.org/api/tls.html#tlscreatesecurecontextoptions.
|
|
139
195
|
*/
|
|
140
|
-
const supportedCertificateFormats = ['p12', 'pfx', 'pem'];
|
|
196
|
+
const supportedCertificateFormats = ['p12', 'pfx', 'pem', 'jks', 'keystore'];
|
|
141
197
|
function isSupportedFormat(format) {
|
|
142
198
|
return !!format && supportedCertificateFormats.includes(format);
|
|
143
199
|
}
|
|
@@ -154,9 +210,7 @@ function getFormat(certificate) {
|
|
|
154
210
|
function validateFormat(certificate) {
|
|
155
211
|
const format = getFormat(certificate);
|
|
156
212
|
if (!isSupportedFormat(format)) {
|
|
157
|
-
throw Error(`The format of the provided certificate '${certificate.name}' is not supported. Supported formats are: ${supportedCertificateFormats.join(', ')}
|
|
158
|
-
? "You can convert Java Keystores (.jks, .keystore) into PKCS#12 keystores using the JVM's keytool CLI: keytool -importkeystore -srckeystore your-keystore.jks -destkeystore your-keystore.p12 -deststoretype pkcs12"
|
|
159
|
-
: ''}`);
|
|
213
|
+
throw Error(`The format of the provided certificate '${certificate.name}' is not supported. Supported formats are: ${supportedCertificateFormats.join(', ')}.`);
|
|
160
214
|
}
|
|
161
215
|
}
|
|
162
216
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-agent.js","sourceRoot":"","sources":["../../src/http-agent/http-agent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-agent.js","sourceRoot":"","sources":["../../src/http-agent/http-agent.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sap-cloud-sdk/connectivity",
|
|
3
|
-
"version": "4.2.1-
|
|
3
|
+
"version": "4.2.1-20251230014443.0",
|
|
4
4
|
"description": "SAP Cloud SDK for JavaScript connectivity",
|
|
5
5
|
"homepage": "https://sap.github.io/cloud-sdk/docs/js/overview",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -40,12 +40,13 @@
|
|
|
40
40
|
"readme": "ts-node ../../scripts/replace-common-readme.ts"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@sap-cloud-sdk/resilience": "^4.2.1-
|
|
44
|
-
"@sap-cloud-sdk/util": "^4.2.1-
|
|
43
|
+
"@sap-cloud-sdk/resilience": "^4.2.1-20251230014443.0",
|
|
44
|
+
"@sap-cloud-sdk/util": "^4.2.1-20251230014443.0",
|
|
45
45
|
"@sap/xsenv": "^6.0.0",
|
|
46
46
|
"@sap/xssec": "^4.12.1",
|
|
47
47
|
"async-retry": "^1.3.3",
|
|
48
48
|
"axios": "^1.13.2",
|
|
49
|
+
"jks-js": "^1.1.4",
|
|
49
50
|
"jsonwebtoken": "^9.0.3"
|
|
50
51
|
},
|
|
51
52
|
"devDependencies": {
|