@opensumi/ide-core-node 2.17.1 → 2.17.3-next-1651908670.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/lib/common-module/common.server.d.ts +2 -2
- package/lib/common-module/common.server.d.ts.map +1 -1
- package/lib/common-module/common.server.js.map +1 -1
- package/lib/common-module/{cryptr.server.d.ts → crypto.server.d.ts} +3 -3
- package/lib/common-module/{cryptr.server.d.ts.map → crypto.server.d.ts.map} +1 -1
- package/lib/common-module/crypto.server.js +44 -0
- package/lib/common-module/{cryptr.server.js.map → crypto.server.js.map} +1 -1
- package/lib/common-module/index.d.ts +2 -2
- package/lib/common-module/index.js +5 -5
- package/package.json +4 -4
- package/lib/common-module/cryptr.server.js +0 -44
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ICommonServer,
|
|
1
|
+
import { ICommonServer, OperatingSystem } from '@opensumi/ide-core-common';
|
|
2
2
|
export declare class CommonServer implements ICommonServer {
|
|
3
|
-
getBackendOS(): Promise<
|
|
3
|
+
getBackendOS(): Promise<OperatingSystem>;
|
|
4
4
|
}
|
|
5
5
|
//# sourceMappingURL=common.server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.server.d.ts","sourceRoot":"","sources":["../../src/common-module/common.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"common.server.d.ts","sourceRoot":"","sources":["../../src/common-module/common.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAM,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE/E,qBACa,YAAa,YAAW,aAAa;IAC1C,YAAY,IAAI,OAAO,CAAC,eAAe,CAAC;CAG/C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.server.js","sourceRoot":"","sources":["../../src/common-module/common.server.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+
|
|
1
|
+
{"version":3,"file":"common.server.js","sourceRoot":"","sources":["../../src/common-module/common.server.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAA+E;AAG/E,IAAa,YAAY,GAAzB,MAAa,YAAY;IACvB,KAAK,CAAC,YAAY;QAChB,OAAO,oBAAE,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;CACF,CAAA;AAJY,YAAY;IADxB,IAAA,eAAU,GAAE;GACA,YAAY,CAIxB;AAJY,oCAAY"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare class
|
|
1
|
+
import { INativeCryptoService } from '@opensumi/ide-core-common';
|
|
2
|
+
export declare class CryptoService implements INativeCryptoService {
|
|
3
3
|
private static SECRET_KEY;
|
|
4
4
|
private static IV_LENGTH;
|
|
5
5
|
private static SALT_LENGTH;
|
|
@@ -11,4 +11,4 @@ export declare class CryptrService implements INativeCryptrService {
|
|
|
11
11
|
encrypt(password: string): Promise<string>;
|
|
12
12
|
decrypt(hash: string): Promise<string>;
|
|
13
13
|
}
|
|
14
|
-
//# sourceMappingURL=
|
|
14
|
+
//# sourceMappingURL=crypto.server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"crypto.server.d.ts","sourceRoot":"","sources":["../../src/common-module/crypto.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,qBACa,aAAc,YAAW,oBAAoB;IACxD,OAAO,CAAC,MAAM,CAAC,UAAU,CAAmB;IAC5C,OAAO,CAAC,MAAM,CAAC,SAAS,CAAM;IAC9B,OAAO,CAAC,MAAM,CAAC,WAAW,CAAM;IAChC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAM;IAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAiB;IACzC,OAAO,CAAC,MAAM,CAAC,YAAY,CAA+D;IAC1F,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAiE;IAElG,OAAO,CAAC,MAAM;IAIR,OAAO,CAAC,QAAQ,EAAE,MAAM;IAcxB,OAAO,CAAC,IAAI,EAAE,MAAM;CAgB3B"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var CryptoService_1;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.CryptoService = void 0;
|
|
5
|
+
const tslib_1 = require("tslib");
|
|
6
|
+
const crypto_1 = tslib_1.__importDefault(require("crypto"));
|
|
7
|
+
const di_1 = require("@opensumi/di");
|
|
8
|
+
let CryptoService = CryptoService_1 = class CryptoService {
|
|
9
|
+
getKey(salt) {
|
|
10
|
+
return crypto_1.default.pbkdf2Sync(CryptoService_1.SECRET_KEY, salt, 100000, 32, 'sha512');
|
|
11
|
+
}
|
|
12
|
+
async encrypt(password) {
|
|
13
|
+
const iv = crypto_1.default.randomBytes(CryptoService_1.IV_LENGTH);
|
|
14
|
+
const salt = crypto_1.default.randomBytes(CryptoService_1.SALT_LENGTH);
|
|
15
|
+
const key = this.getKey(salt);
|
|
16
|
+
const cipher = crypto_1.default.createCipheriv(CryptoService_1.ALGORITHM, key, iv);
|
|
17
|
+
const encrypted = Buffer.concat([cipher.update(password, 'utf8'), cipher.final()]);
|
|
18
|
+
const tag = cipher.getAuthTag();
|
|
19
|
+
return Buffer.concat([salt, iv, tag, encrypted]).toString('hex');
|
|
20
|
+
}
|
|
21
|
+
async decrypt(hash) {
|
|
22
|
+
const stringValue = Buffer.from(String(hash), 'hex');
|
|
23
|
+
const salt = stringValue.slice(0, CryptoService_1.SALT_LENGTH);
|
|
24
|
+
const iv = stringValue.slice(CryptoService_1.SALT_LENGTH, CryptoService_1.TAG_POSITION);
|
|
25
|
+
const tag = stringValue.slice(CryptoService_1.TAG_POSITION, CryptoService_1.ENCRYPTED_POSITION);
|
|
26
|
+
const encrypted = stringValue.slice(CryptoService_1.ENCRYPTED_POSITION);
|
|
27
|
+
const key = this.getKey(salt);
|
|
28
|
+
const decipher = crypto_1.default.createDecipheriv(CryptoService_1.ALGORITHM, key, iv);
|
|
29
|
+
decipher.setAuthTag(tag);
|
|
30
|
+
return decipher.update(encrypted) + decipher.final('utf8');
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
CryptoService.SECRET_KEY = 'CryptoService';
|
|
34
|
+
CryptoService.IV_LENGTH = 16;
|
|
35
|
+
CryptoService.SALT_LENGTH = 64;
|
|
36
|
+
CryptoService.TAG_LENGTH = 16;
|
|
37
|
+
CryptoService.ALGORITHM = 'aes-256-gcm';
|
|
38
|
+
CryptoService.TAG_POSITION = CryptoService_1.SALT_LENGTH + CryptoService_1.IV_LENGTH;
|
|
39
|
+
CryptoService.ENCRYPTED_POSITION = CryptoService_1.TAG_POSITION + CryptoService_1.TAG_LENGTH;
|
|
40
|
+
CryptoService = CryptoService_1 = tslib_1.__decorate([
|
|
41
|
+
(0, di_1.Injectable)()
|
|
42
|
+
], CryptoService);
|
|
43
|
+
exports.CryptoService = CryptoService;
|
|
44
|
+
//# sourceMappingURL=crypto.server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"crypto.server.js","sourceRoot":"","sources":["../../src/common-module/crypto.server.ts"],"names":[],"mappings":";;;;;AAAA,4DAA4B;AAE5B,qCAA0C;AAI1C,IAAa,aAAa,qBAA1B,MAAa,aAAa;IAShB,MAAM,CAAC,IAAqB;QAClC,OAAO,gBAAM,CAAC,UAAU,CAAC,eAAa,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAgB;QAC5B,MAAM,EAAE,GAAG,gBAAM,CAAC,WAAW,CAAC,eAAa,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,IAAI,GAAG,gBAAM,CAAC,WAAW,CAAC,eAAa,CAAC,WAAW,CAAC,CAAC;QAE3D,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,gBAAM,CAAC,cAAc,CAAC,eAAa,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACvE,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEnF,MAAM,GAAG,GAAI,MAAc,CAAC,UAAU,EAAE,CAAC;QAEzC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY;QACxB,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,eAAa,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,eAAa,CAAC,WAAW,EAAE,eAAa,CAAC,YAAY,CAAC,CAAC;QACpF,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,eAAa,CAAC,YAAY,EAAE,eAAa,CAAC,kBAAkB,CAAC,CAAC;QAC5F,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,eAAa,CAAC,kBAAkB,CAAC,CAAC;QAEtE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE9B,MAAM,QAAQ,GAAG,gBAAM,CAAC,gBAAgB,CAAC,eAAa,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAE1E,QAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAElC,OAAO,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC;CACF,CAAA;AA1CgB,wBAAU,GAAG,eAAgB,CAAA;AAC7B,uBAAS,GAAG,EAAG,CAAA;AACf,yBAAW,GAAG,EAAG,CAAA;AACjB,wBAAU,GAAG,EAAG,CAAA;AAChB,uBAAS,GAAG,aAAc,CAAA;AAC1B,0BAAY,GAAW,eAAa,CAAC,WAAW,GAAG,eAAa,CAAC,SAAU,CAAA;AAC3E,gCAAkB,GAAW,eAAa,CAAC,YAAY,GAAG,eAAa,CAAC,UAAW,CAAA;AAPvF,aAAa;IADzB,IAAA,eAAU,GAAE;GACA,aAAa,CA2CzB;AA3CY,sCAAa"}
|
|
@@ -2,7 +2,7 @@ import { HashCalculateContribution } from '../hash-calculate/hash-calculate.cont
|
|
|
2
2
|
import { NodeModule } from '../node-module';
|
|
3
3
|
import { CommonServer } from './common.server';
|
|
4
4
|
import { CredentialService } from './credential.server';
|
|
5
|
-
import {
|
|
5
|
+
import { CryptoService } from './crypto.server';
|
|
6
6
|
export declare class ServerCommonModule extends NodeModule {
|
|
7
7
|
providers: (typeof HashCalculateContribution | {
|
|
8
8
|
token: symbol;
|
|
@@ -12,7 +12,7 @@ export declare class ServerCommonModule extends NodeModule {
|
|
|
12
12
|
useClass: typeof CredentialService;
|
|
13
13
|
} | {
|
|
14
14
|
token: symbol;
|
|
15
|
-
useClass: typeof
|
|
15
|
+
useClass: typeof CryptoService;
|
|
16
16
|
})[];
|
|
17
17
|
backServices: {
|
|
18
18
|
servicePath: string;
|
|
@@ -8,7 +8,7 @@ const hash_calculate_contribution_1 = require("../hash-calculate/hash-calculate.
|
|
|
8
8
|
const node_module_1 = require("../node-module");
|
|
9
9
|
const common_server_1 = require("./common.server");
|
|
10
10
|
const credential_server_1 = require("./credential.server");
|
|
11
|
-
const
|
|
11
|
+
const crypto_server_1 = require("./crypto.server");
|
|
12
12
|
let ServerCommonModule = class ServerCommonModule extends node_module_1.NodeModule {
|
|
13
13
|
constructor() {
|
|
14
14
|
super(...arguments);
|
|
@@ -23,8 +23,8 @@ let ServerCommonModule = class ServerCommonModule extends node_module_1.NodeModu
|
|
|
23
23
|
useClass: credential_server_1.CredentialService,
|
|
24
24
|
},
|
|
25
25
|
{
|
|
26
|
-
token: ide_core_common_1.
|
|
27
|
-
useClass:
|
|
26
|
+
token: ide_core_common_1.INativeCryptoService,
|
|
27
|
+
useClass: crypto_server_1.CryptoService,
|
|
28
28
|
},
|
|
29
29
|
];
|
|
30
30
|
this.backServices = [
|
|
@@ -37,8 +37,8 @@ let ServerCommonModule = class ServerCommonModule extends node_module_1.NodeModu
|
|
|
37
37
|
token: ide_core_common_1.INativeCredentialService,
|
|
38
38
|
},
|
|
39
39
|
{
|
|
40
|
-
servicePath: ide_core_common_1.
|
|
41
|
-
token: ide_core_common_1.
|
|
40
|
+
servicePath: ide_core_common_1.CryptoServicePath,
|
|
41
|
+
token: ide_core_common_1.INativeCryptoService,
|
|
42
42
|
},
|
|
43
43
|
];
|
|
44
44
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-core-node",
|
|
3
|
-
"version": "2.17.
|
|
3
|
+
"version": "2.17.3-next-1651908670.0",
|
|
4
4
|
"description": "@opensumi/ide-core-node",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib"
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "2.17.
|
|
21
|
-
"@opensumi/ide-core-common": "2.17.
|
|
20
|
+
"@opensumi/ide-connection": "2.17.3-next-1651908670.0",
|
|
21
|
+
"@opensumi/ide-core-common": "2.17.3-next-1651908670.0",
|
|
22
22
|
"keytar": "^7.7.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@opensumi/ide-dev-tool": "^1.3.1"
|
|
26
26
|
},
|
|
27
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "04330791c7ea20344767db47739de54ddbeff75b"
|
|
28
28
|
}
|
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var CryptrService_1;
|
|
3
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.CryptrService = void 0;
|
|
5
|
-
const tslib_1 = require("tslib");
|
|
6
|
-
const crypto_1 = tslib_1.__importDefault(require("crypto"));
|
|
7
|
-
const di_1 = require("@opensumi/di");
|
|
8
|
-
let CryptrService = CryptrService_1 = class CryptrService {
|
|
9
|
-
getKey(salt) {
|
|
10
|
-
return crypto_1.default.pbkdf2Sync(CryptrService_1.SECRET_KEY, salt, 100000, 32, 'sha512');
|
|
11
|
-
}
|
|
12
|
-
async encrypt(password) {
|
|
13
|
-
const iv = crypto_1.default.randomBytes(CryptrService_1.IV_LENGTH);
|
|
14
|
-
const salt = crypto_1.default.randomBytes(CryptrService_1.SALT_LENGTH);
|
|
15
|
-
const key = this.getKey(salt);
|
|
16
|
-
const cipher = crypto_1.default.createCipheriv(CryptrService_1.ALGORITHM, key, iv);
|
|
17
|
-
const encrypted = Buffer.concat([cipher.update(password, 'utf8'), cipher.final()]);
|
|
18
|
-
const tag = cipher.getAuthTag();
|
|
19
|
-
return Buffer.concat([salt, iv, tag, encrypted]).toString('hex');
|
|
20
|
-
}
|
|
21
|
-
async decrypt(hash) {
|
|
22
|
-
const stringValue = Buffer.from(String(hash), 'hex');
|
|
23
|
-
const salt = stringValue.slice(0, CryptrService_1.SALT_LENGTH);
|
|
24
|
-
const iv = stringValue.slice(CryptrService_1.SALT_LENGTH, CryptrService_1.TAG_POSITION);
|
|
25
|
-
const tag = stringValue.slice(CryptrService_1.TAG_POSITION, CryptrService_1.ENCRYPTED_POSITION);
|
|
26
|
-
const encrypted = stringValue.slice(CryptrService_1.ENCRYPTED_POSITION);
|
|
27
|
-
const key = this.getKey(salt);
|
|
28
|
-
const decipher = crypto_1.default.createDecipheriv(CryptrService_1.ALGORITHM, key, iv);
|
|
29
|
-
decipher.setAuthTag(tag);
|
|
30
|
-
return decipher.update(encrypted) + decipher.final('utf8');
|
|
31
|
-
}
|
|
32
|
-
};
|
|
33
|
-
CryptrService.SECRET_KEY = 'CryptrService';
|
|
34
|
-
CryptrService.IV_LENGTH = 16;
|
|
35
|
-
CryptrService.SALT_LENGTH = 64;
|
|
36
|
-
CryptrService.TAG_LENGTH = 16;
|
|
37
|
-
CryptrService.ALGORITHM = 'aes-256-gcm';
|
|
38
|
-
CryptrService.TAG_POSITION = CryptrService_1.SALT_LENGTH + CryptrService_1.IV_LENGTH;
|
|
39
|
-
CryptrService.ENCRYPTED_POSITION = CryptrService_1.TAG_POSITION + CryptrService_1.TAG_LENGTH;
|
|
40
|
-
CryptrService = CryptrService_1 = tslib_1.__decorate([
|
|
41
|
-
(0, di_1.Injectable)()
|
|
42
|
-
], CryptrService);
|
|
43
|
-
exports.CryptrService = CryptrService;
|
|
44
|
-
//# sourceMappingURL=cryptr.server.js.map
|