@protontech/drive-sdk 0.3.0 → 0.3.1
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/dist/crypto/interface.d.ts +5 -0
- package/dist/diagnostic/httpClient.d.ts +3 -3
- package/dist/interface/httpClient.d.ts +5 -5
- package/dist/interface/index.d.ts +15 -5
- package/dist/internal/apiService/apiService.js +1 -1
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/errorCodes.d.ts +1 -0
- package/dist/internal/apiService/errorCodes.js.map +1 -1
- package/dist/internal/apiService/errors.d.ts +4 -3
- package/dist/internal/apiService/errors.js +7 -4
- package/dist/internal/apiService/errors.js.map +1 -1
- package/dist/internal/apiService/errors.test.js +2 -1
- package/dist/internal/apiService/errors.test.js.map +1 -1
- package/dist/internal/events/index.d.ts +1 -1
- package/dist/internal/nodes/cryptoCache.js +6 -7
- package/dist/internal/nodes/cryptoCache.js.map +1 -1
- package/dist/internal/nodes/cryptoCache.test.js +4 -7
- package/dist/internal/nodes/cryptoCache.test.js.map +1 -1
- package/dist/internal/shares/cryptoCache.d.ts +4 -3
- package/dist/internal/shares/cryptoCache.js +23 -6
- package/dist/internal/shares/cryptoCache.js.map +1 -1
- package/dist/internal/shares/cryptoCache.test.js +3 -2
- package/dist/internal/shares/cryptoCache.test.js.map +1 -1
- package/dist/internal/shares/index.js +1 -1
- package/dist/internal/shares/index.js.map +1 -1
- package/dist/internal/sharing/cryptoService.js +8 -6
- package/dist/internal/sharing/cryptoService.js.map +1 -1
- package/dist/internal/sharing/cryptoService.test.js +13 -0
- package/dist/internal/sharing/cryptoService.test.js.map +1 -1
- package/dist/internal/sharing/index.js +1 -1
- package/dist/internal/sharing/index.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.d.ts +3 -1
- package/dist/internal/sharing/sharingManagement.js +10 -1
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +32 -1
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/sharingPublic/apiService.d.ts +19 -0
- package/dist/internal/sharingPublic/apiService.js +134 -0
- package/dist/internal/sharingPublic/apiService.js.map +1 -0
- package/dist/internal/sharingPublic/cryptoCache.d.ts +19 -0
- package/dist/internal/sharingPublic/cryptoCache.js +72 -0
- package/dist/internal/sharingPublic/cryptoCache.js.map +1 -0
- package/dist/internal/sharingPublic/cryptoService.d.ts +23 -0
- package/dist/internal/sharingPublic/cryptoService.js +120 -0
- package/dist/internal/sharingPublic/cryptoService.js.map +1 -0
- package/dist/internal/sharingPublic/index.d.ts +15 -0
- package/dist/internal/sharingPublic/index.js +27 -0
- package/dist/internal/sharingPublic/index.js.map +1 -0
- package/dist/internal/sharingPublic/interface.d.ts +48 -0
- package/dist/internal/sharingPublic/interface.js +3 -0
- package/dist/internal/sharingPublic/interface.js.map +1 -0
- package/dist/internal/sharingPublic/manager.d.ts +19 -0
- package/dist/internal/sharingPublic/manager.js +79 -0
- package/dist/internal/sharingPublic/manager.js.map +1 -0
- package/dist/internal/sharingPublic/session/apiService.d.ts +28 -0
- package/dist/internal/sharingPublic/session/apiService.js +55 -0
- package/dist/internal/sharingPublic/session/apiService.js.map +1 -0
- package/dist/internal/sharingPublic/session/httpClient.d.ts +16 -0
- package/dist/internal/sharingPublic/session/httpClient.js +41 -0
- package/dist/internal/sharingPublic/session/httpClient.js.map +1 -0
- package/dist/internal/sharingPublic/session/index.d.ts +1 -0
- package/dist/internal/sharingPublic/session/index.js +6 -0
- package/dist/internal/sharingPublic/session/index.js.map +1 -0
- package/dist/internal/sharingPublic/session/interface.d.ts +18 -0
- package/dist/internal/sharingPublic/session/interface.js +3 -0
- package/dist/internal/sharingPublic/session/interface.js.map +1 -0
- package/dist/internal/sharingPublic/session/manager.d.ts +49 -0
- package/dist/internal/sharingPublic/session/manager.js +75 -0
- package/dist/internal/sharingPublic/session/manager.js.map +1 -0
- package/dist/internal/sharingPublic/session/session.d.ts +34 -0
- package/dist/internal/sharingPublic/session/session.js +67 -0
- package/dist/internal/sharingPublic/session/session.js.map +1 -0
- package/dist/internal/sharingPublic/session/url.d.ts +12 -0
- package/dist/internal/sharingPublic/session/url.js +23 -0
- package/dist/internal/sharingPublic/session/url.js.map +1 -0
- package/dist/internal/sharingPublic/session/url.test.d.ts +1 -0
- package/dist/internal/sharingPublic/session/url.test.js +59 -0
- package/dist/internal/sharingPublic/session/url.test.js.map +1 -0
- package/dist/protonDriveClient.d.ts +18 -3
- package/dist/protonDriveClient.js +30 -8
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePublicLinkClient.d.ts +48 -0
- package/dist/protonDrivePublicLinkClient.js +71 -0
- package/dist/protonDrivePublicLinkClient.js.map +1 -0
- package/package.json +1 -1
- package/src/crypto/interface.ts +11 -0
- package/src/diagnostic/httpClient.ts +4 -4
- package/src/interface/httpClient.ts +5 -5
- package/src/interface/index.ts +18 -6
- package/src/internal/apiService/apiService.ts +1 -1
- package/src/internal/apiService/errorCodes.ts +1 -0
- package/src/internal/apiService/errors.test.ts +2 -1
- package/src/internal/apiService/errors.ts +15 -4
- package/src/internal/events/index.ts +1 -1
- package/src/internal/nodes/cryptoCache.test.ts +4 -7
- package/src/internal/nodes/cryptoCache.ts +6 -7
- package/src/internal/nodes/interface.ts +2 -0
- package/src/internal/shares/cryptoCache.test.ts +3 -2
- package/src/internal/shares/cryptoCache.ts +26 -7
- package/src/internal/shares/index.ts +1 -1
- package/src/internal/sharing/cryptoService.test.ts +22 -1
- package/src/internal/sharing/cryptoService.ts +8 -6
- package/src/internal/sharing/index.ts +1 -0
- package/src/internal/sharing/sharingManagement.test.ts +33 -0
- package/src/internal/sharing/sharingManagement.ts +9 -0
- package/src/internal/sharingPublic/apiService.ts +164 -0
- package/src/internal/sharingPublic/cryptoCache.ts +79 -0
- package/src/internal/sharingPublic/cryptoService.ts +162 -0
- package/src/internal/sharingPublic/index.ts +40 -0
- package/src/internal/sharingPublic/interface.ts +59 -0
- package/src/internal/sharingPublic/manager.ts +85 -0
- package/src/internal/sharingPublic/session/apiService.ts +74 -0
- package/src/internal/sharingPublic/session/httpClient.ts +48 -0
- package/src/internal/sharingPublic/session/index.ts +1 -0
- package/src/internal/sharingPublic/session/interface.ts +20 -0
- package/src/internal/sharingPublic/session/manager.ts +97 -0
- package/src/internal/sharingPublic/session/session.ts +78 -0
- package/src/internal/sharingPublic/session/url.test.ts +72 -0
- package/src/internal/sharingPublic/session/url.ts +23 -0
- package/src/protonDriveClient.ts +47 -11
- package/src/protonDrivePublicLinkClient.ts +121 -0
|
@@ -34,6 +34,11 @@ export declare enum VERIFICATION_STATUS {
|
|
|
34
34
|
SIGNED_AND_INVALID = 2
|
|
35
35
|
}
|
|
36
36
|
export interface SRPModule {
|
|
37
|
+
getSrp: (version: number, modulus: string, serverEphemeral: string, salt: string, password: string) => Promise<{
|
|
38
|
+
expectedServerProof: string;
|
|
39
|
+
clientProof: string;
|
|
40
|
+
clientEphemeral: string;
|
|
41
|
+
}>;
|
|
37
42
|
getSrpVerifier: (password: string) => Promise<SRPVerifier>;
|
|
38
43
|
computeKeyPassword: (password: string, salt: string) => Promise<string>;
|
|
39
44
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ProtonDriveHTTPClient,
|
|
1
|
+
import { ProtonDriveHTTPClient, ProtonDriveHTTPClientBlobRequest, ProtonDriveHTTPClientJsonRequest } from '../interface';
|
|
2
2
|
import { EventsGenerator } from './eventsGenerator';
|
|
3
3
|
/**
|
|
4
4
|
* Special HTTP client that is compatible with the SDK.
|
|
@@ -11,6 +11,6 @@ import { EventsGenerator } from './eventsGenerator';
|
|
|
11
11
|
export declare class DiagnosticHTTPClient extends EventsGenerator implements ProtonDriveHTTPClient {
|
|
12
12
|
private httpClient;
|
|
13
13
|
constructor(httpClient: ProtonDriveHTTPClient);
|
|
14
|
-
fetchJson(options:
|
|
15
|
-
fetchBlob(options:
|
|
14
|
+
fetchJson(options: ProtonDriveHTTPClientJsonRequest): Promise<Response>;
|
|
15
|
+
fetchBlob(options: ProtonDriveHTTPClientBlobRequest): Promise<Response>;
|
|
16
16
|
}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
export interface ProtonDriveHTTPClient {
|
|
2
|
-
fetchJson(
|
|
3
|
-
fetchBlob(
|
|
2
|
+
fetchJson(request: ProtonDriveHTTPClientJsonRequest): Promise<Response>;
|
|
3
|
+
fetchBlob(request: ProtonDriveHTTPClientBlobRequest): Promise<Response>;
|
|
4
4
|
}
|
|
5
|
-
export type
|
|
5
|
+
export type ProtonDriveHTTPClientJsonRequest = ProtonDriveHTTPClientBaseRequest & {
|
|
6
6
|
json?: object;
|
|
7
7
|
};
|
|
8
|
-
export type
|
|
8
|
+
export type ProtonDriveHTTPClientBlobRequest = ProtonDriveHTTPClientBaseRequest & {
|
|
9
9
|
body?: XMLHttpRequestBodyInit;
|
|
10
10
|
onProgress?: (progress: number) => void;
|
|
11
11
|
};
|
|
12
|
-
type
|
|
12
|
+
type ProtonDriveHTTPClientBaseRequest = {
|
|
13
13
|
url: string;
|
|
14
14
|
method: string;
|
|
15
15
|
headers: Headers;
|
|
@@ -15,7 +15,7 @@ export { DeviceType } from './devices';
|
|
|
15
15
|
export type { FileDownloader, DownloadController, SeekableReadableStream } from './download';
|
|
16
16
|
export type { DriveListener, LatestEventIdProvider, DriveEvent, NodeEvent, FastForwardEvent, TreeRefreshEvent, TreeRemovalEvent, SharedWithMeUpdated, } from './events';
|
|
17
17
|
export { DriveEventType, SDKEvent } from './events';
|
|
18
|
-
export type { ProtonDriveHTTPClient,
|
|
18
|
+
export type { ProtonDriveHTTPClient, ProtonDriveHTTPClientJsonRequest, ProtonDriveHTTPClientBlobRequest, } from './httpClient';
|
|
19
19
|
export type { MaybeNode, NodeEntity, DegradedNode, MaybeMissingNode, MissingNode, InvalidNameError, Revision, NodeOrUid, RevisionOrUid, NodeResult, Membership, } from './nodes';
|
|
20
20
|
export { NodeType, MemberRole, RevisionState } from './nodes';
|
|
21
21
|
export type { ProtonInvitation, ProtonInvitationWithNode, NonProtonInvitation, Member, PublicLink, MaybeBookmark, Bookmark, DegradedBookmark, ProtonInvitationOrUid, NonProtonInvitationOrUid, BookmarkOrUid, ShareNodeSettings, UnshareNodeSettings, ShareMembersSettings, SharePublicLinkSettings, SharePublicLinkSettingsObject, ShareResult, } from './sharing';
|
|
@@ -29,10 +29,20 @@ export type ProtonDriveTelemetry = Telemetry<MetricEvent>;
|
|
|
29
29
|
export type ProtonDriveEntitiesCache = ProtonDriveCache<string>;
|
|
30
30
|
export type ProtonDriveCryptoCache = ProtonDriveCache<CachedCryptoMaterial>;
|
|
31
31
|
export type CachedCryptoMaterial = {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
nodeKeys?: {
|
|
33
|
+
passphrase: string;
|
|
34
|
+
key: PrivateKey;
|
|
35
|
+
passphraseSessionKey: SessionKey;
|
|
36
|
+
contentKeyPacketSessionKey?: SessionKey;
|
|
37
|
+
hashKey?: Uint8Array;
|
|
38
|
+
};
|
|
39
|
+
shareKey?: {
|
|
40
|
+
key: PrivateKey;
|
|
41
|
+
passphraseSessionKey: SessionKey;
|
|
42
|
+
};
|
|
43
|
+
publicShareKey?: {
|
|
44
|
+
key: PrivateKey;
|
|
45
|
+
};
|
|
36
46
|
};
|
|
37
47
|
export interface ProtonDriveClientContructorParameters {
|
|
38
48
|
httpClient: ProtonDriveHTTPClient;
|
|
@@ -135,7 +135,7 @@ class DriveAPIService {
|
|
|
135
135
|
if (error instanceof errors_1.ProtonDriveError) {
|
|
136
136
|
throw error;
|
|
137
137
|
}
|
|
138
|
-
throw (0, errors_2.apiErrorFactory)({ response });
|
|
138
|
+
throw (0, errors_2.apiErrorFactory)({ response, error });
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
async getBlockStream(baseUrl, token, signal) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/apiService/apiService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/apiService/apiService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorCodes.js","sourceRoot":"","sources":["../../../src/internal/apiService/errorCodes.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"errorCodes.js","sourceRoot":"","sources":["../../../src/internal/apiService/errorCodes.ts"],"names":[],"mappings":";;AAQA,4BAEC;AAED,sCAEC;AAND,SAAgB,QAAQ,CAAC,IAAY;IACjC,OAAO,IAAI,4BAAiB,IAAI,IAAI,iCAAsB,IAAI,IAAI,kCAAuB,CAAC;AAC9F,CAAC;AAED,SAAgB,aAAa,CAAC,IAAY;IACtC,OAAO,IAAI,kCAAuB,CAAC;AACvC,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { ServerError } from '../../errors';
|
|
2
|
-
export declare function apiErrorFactory({ response, result }: {
|
|
1
|
+
import { ServerError, ValidationError } from '../../errors';
|
|
2
|
+
export declare function apiErrorFactory({ response, result, error, }: {
|
|
3
3
|
response: Response;
|
|
4
4
|
result?: unknown;
|
|
5
|
+
error?: unknown;
|
|
5
6
|
}): ServerError;
|
|
6
7
|
export declare class APIHTTPError extends ServerError {
|
|
7
8
|
name: string;
|
|
@@ -14,6 +15,6 @@ export declare class APICodeError extends ServerError {
|
|
|
14
15
|
readonly debug?: object;
|
|
15
16
|
constructor(message: string, code: number, debug?: object);
|
|
16
17
|
}
|
|
17
|
-
export declare class NotFoundAPIError extends
|
|
18
|
+
export declare class NotFoundAPIError extends ValidationError {
|
|
18
19
|
name: string;
|
|
19
20
|
}
|
|
@@ -4,12 +4,15 @@ exports.NotFoundAPIError = exports.APICodeError = exports.APIHTTPError = void 0;
|
|
|
4
4
|
exports.apiErrorFactory = apiErrorFactory;
|
|
5
5
|
const ttag_1 = require("ttag");
|
|
6
6
|
const errors_1 = require("../../errors");
|
|
7
|
-
function apiErrorFactory({ response, result }) {
|
|
7
|
+
function apiErrorFactory({ response, result, error, }) {
|
|
8
8
|
// Backend responses with 404 both in the response and body code.
|
|
9
9
|
// In such a case we want to stick to APIHTTPError to be very clear
|
|
10
10
|
// it is not NotFoundAPIError.
|
|
11
11
|
if (response.status === 404 /* HTTPErrorCode.NOT_FOUND */ || !result) {
|
|
12
|
-
|
|
12
|
+
const fallbackMessage = error instanceof Error ? error.message : (0, ttag_1.c)('Error').t `Unknown error`;
|
|
13
|
+
const apiHttpError = new APIHTTPError(response.statusText || fallbackMessage, response.status);
|
|
14
|
+
apiHttpError.cause = error;
|
|
15
|
+
return apiHttpError;
|
|
13
16
|
}
|
|
14
17
|
const typedResult = result;
|
|
15
18
|
const [code, message, details] = [
|
|
@@ -28,7 +31,7 @@ function apiErrorFactory({ response, result }) {
|
|
|
28
31
|
: undefined;
|
|
29
32
|
switch (code) {
|
|
30
33
|
case 2501 /* ErrorCode.NOT_EXISTS */:
|
|
31
|
-
return new NotFoundAPIError(message, code);
|
|
34
|
+
return new NotFoundAPIError(message, code, details);
|
|
32
35
|
// ValidationError should be only when it is clearly user input error,
|
|
33
36
|
// otherwise it should be ServerError.
|
|
34
37
|
// Here we convert only general enough codes. Specific cases that are
|
|
@@ -76,7 +79,7 @@ class APICodeError extends errors_1.ServerError {
|
|
|
76
79
|
}
|
|
77
80
|
}
|
|
78
81
|
exports.APICodeError = APICodeError;
|
|
79
|
-
class NotFoundAPIError extends
|
|
82
|
+
class NotFoundAPIError extends errors_1.ValidationError {
|
|
80
83
|
name = 'NotFoundAPIError';
|
|
81
84
|
}
|
|
82
85
|
exports.NotFoundAPIError = NotFoundAPIError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/internal/apiService/errors.ts"],"names":[],"mappings":";;;AAKA,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/internal/apiService/errors.ts"],"names":[],"mappings":";;;AAKA,0CA2EC;AAhFD,+BAAyB;AAEzB,yCAA4D;AAG5D,SAAgB,eAAe,CAAC,EAC5B,QAAQ,EACR,MAAM,EACN,KAAK,GAKR;IACG,iEAAiE;IACjE,mEAAmE;IACnE,8BAA8B;IAC9B,IAAI,QAAQ,CAAC,MAAM,sCAA4B,IAAI,CAAC,MAAM,EAAE,CAAC;QACzD,MAAM,eAAe,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,eAAe,CAAC;QAC7F,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,IAAI,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/F,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,MAAM,WAAW,GAAG,MASnB,CAAC;IAEF,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG;QAC7B,WAAW,CAAC,IAAI,IAAI,CAAC;QACrB,WAAW,CAAC,KAAK,IAAI,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,eAAe;QAChD,WAAW,CAAC,OAAO;KACtB,CAAC;IAEF,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS;QAC/B,CAAC,CAAC;YACI,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,KAAK,EAAE,WAAW,CAAC,KAAK;SAC3B;QACH,CAAC,CAAC,SAAS,CAAC;IAEhB,QAAQ,IAAI,EAAE,CAAC;QACX;YACI,OAAO,IAAI,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,sEAAsE;QACtE,sCAAsC;QACtC,qEAAqE;QACrE,gEAAgE;QAChE,cAAc;QACd,wCAA6B;QAC7B,iDAAsC;QACtC,sEAA2D;QAC3D,yCAA8B;QAC9B,+CAAkC;QAClC,+CAAkC;QAClC,wDAA2C;QAC3C,+DAAkD;QAClD,sDAAyC;QACzC,sDAAyC;QACzC,mFAAsE;QACtE,8CAAiC;QACjC,6CAAgC;QAChC,0DAA6C;QAC7C,qDAAwC;QACxC,4DAA+C;QAC/C;YACI,OAAO,IAAI,wBAAe,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACvD;YACI,OAAO,IAAI,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;AACL,CAAC;AAED,MAAa,YAAa,SAAQ,oBAAW;IACzC,IAAI,GAAG,cAAc,CAAC;IAEN,UAAU,CAAS;IAEnC,YAAY,OAAe,EAAE,UAAkB;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;CACJ;AATD,oCASC;AAED,MAAa,YAAa,SAAQ,oBAAW;IACzC,IAAI,GAAG,cAAc,CAAC;IAEN,IAAI,CAAS;IAEb,KAAK,CAAU;IAE/B,YAAY,OAAe,EAAE,IAAY,EAAE,KAAc;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;CACJ;AAZD,oCAYC;AAED,MAAa,gBAAiB,SAAQ,wBAAe;IACjD,IAAI,GAAG,kBAAkB,CAAC;CAC7B;AAFD,4CAEC"}
|
|
@@ -70,7 +70,8 @@ describe('apiErrorFactory should return', () => {
|
|
|
70
70
|
it('NotFoundAPIError when code is ErrorCode.NOT_EXISTS', () => {
|
|
71
71
|
const error = (0, errors_1.apiErrorFactory)(mockAPIResponseAndResult({ code: 2501 /* ErrorCode.NOT_EXISTS */, message: 'Not found' }));
|
|
72
72
|
expect(error).toBeInstanceOf(errors.NotFoundAPIError);
|
|
73
|
-
|
|
73
|
+
expect(error.message).toBe('Not found');
|
|
74
|
+
expect(error.code).toBe(2501 /* ErrorCode.NOT_EXISTS */);
|
|
74
75
|
});
|
|
75
76
|
});
|
|
76
77
|
function expectAPICodeError(error, code, message) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.test.js","sourceRoot":"","sources":["../../../src/internal/apiService/errors.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAA2C;AAC3C,iDAAmC;AAGnC,SAAS,wBAAwB,CAAC,OAKjC;IACG,MAAM,EAAE,cAAc,GAAG,GAAG,EAAE,cAAc,GAAG,sBAAsB,EAAE,IAAI,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC;IAE/G,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC;IAE9G,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAChC,CAAC;AAED,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC1D,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,IAAA,wBAAe,EAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,CAAE,KAA6B,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;QACrF,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,IAAA,wBAAe,EAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC5C,MAAM,CAAE,KAA6B,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC7E,MAAM,KAAK,GAAG,IAAA,wBAAe,EACzB,wBAAwB,CAAC;YACrB,cAAc,EAAE,GAAG;YACnB,cAAc,EAAE,gBAAgB;YAChC,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,WAAW;SACvB,CAAC,CACL,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7C,MAAM,CAAE,KAA6B,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC7D,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,IAAA,wBAAe,EAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACpD,kBAAkB,CAAC,KAAK,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACvE,MAAM,KAAK,GAAG,IAAA,wBAAe,EAAC,wBAAwB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;QAChG,kBAAkB,CAAC,KAAK,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC1D,MAAM,KAAK,GAAG,IAAA,wBAAe,EAAC,wBAAwB,CAAC,EAAE,IAAI,iCAAsB,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QAC9G,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACtD,
|
|
1
|
+
{"version":3,"file":"errors.test.js","sourceRoot":"","sources":["../../../src/internal/apiService/errors.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { ProtonDriveTelemetry } from '../../interface';
|
|
|
2
2
|
import { DriveAPIService } from '../apiService';
|
|
3
3
|
import { DriveListener, EventSubscription, LatestEventIdProvider } from './interface';
|
|
4
4
|
import { SharesManager } from '../shares/manager';
|
|
5
|
-
export type { DriveEvent, DriveListener } from './interface';
|
|
5
|
+
export type { DriveEvent, DriveListener, EventSubscription } from './interface';
|
|
6
6
|
export { DriveEventType } from './interface';
|
|
7
7
|
/**
|
|
8
8
|
* Service for listening to drive events. The service is responsible for
|
|
@@ -18,11 +18,13 @@ class NodesCryptoCache {
|
|
|
18
18
|
}
|
|
19
19
|
async setNodeKeys(nodeUid, keys) {
|
|
20
20
|
const cacheUid = getCacheKey(nodeUid);
|
|
21
|
-
await this.driveCache.setEntity(cacheUid,
|
|
21
|
+
await this.driveCache.setEntity(cacheUid, {
|
|
22
|
+
nodeKeys: keys,
|
|
23
|
+
});
|
|
22
24
|
}
|
|
23
25
|
async getNodeKeys(nodeUid) {
|
|
24
26
|
const nodeKeysData = await this.driveCache.getEntity(getCacheKey(nodeUid));
|
|
25
|
-
if (!nodeKeysData.
|
|
27
|
+
if (!nodeKeysData.nodeKeys) {
|
|
26
28
|
try {
|
|
27
29
|
await this.removeNodeKeys([nodeUid]);
|
|
28
30
|
}
|
|
@@ -31,12 +33,9 @@ class NodesCryptoCache {
|
|
|
31
33
|
// and re-cache it. Setting it again should then fix the problem.
|
|
32
34
|
this.logger.warn(`Failed to remove corrupted node keys from the cache: ${removingError instanceof Error ? removingError.message : removingError}`);
|
|
33
35
|
}
|
|
34
|
-
throw new Error(`Failed to deserialize node keys
|
|
36
|
+
throw new Error(`Failed to deserialize node keys`);
|
|
35
37
|
}
|
|
36
|
-
return
|
|
37
|
-
...nodeKeysData,
|
|
38
|
-
passphrase: nodeKeysData.passphrase,
|
|
39
|
-
};
|
|
38
|
+
return nodeKeysData.nodeKeys;
|
|
40
39
|
}
|
|
41
40
|
async removeNodeKeys(nodeUids) {
|
|
42
41
|
const cacheUids = nodeUids.map(getCacheKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoCache.js","sourceRoot":"","sources":["../../../src/internal/nodes/cryptoCache.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,MAAa,gBAAgB;IAEb;IACA;IAFZ,YACY,MAAc,EACd,UAAkC;QADlC,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAwB;QAE1C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,IAAuB;QACtD,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cryptoCache.js","sourceRoot":"","sources":["../../../src/internal/nodes/cryptoCache.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,MAAa,gBAAgB;IAEb;IACA;IAFZ,YACY,MAAc,EACd,UAAkC;QADlC,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAwB;QAE1C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,IAAuB;QACtD,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE;YACtC,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe;QAC7B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,aAAsB,EAAE,CAAC;gBAC9B,6DAA6D;gBAC7D,iEAAiE;gBACjE,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,wDAAwD,aAAa,YAAY,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,CACnI,CAAC;YACN,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,YAAY,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAAkB;QACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;CACJ;AArCD,4CAqCC;AAED,SAAS,WAAW,CAAC,OAAe;IAChC,OAAO,YAAY,OAAO,EAAE,CAAC;AACjC,CAAC"}
|
|
@@ -14,10 +14,7 @@ describe('nodesCryptoCache', () => {
|
|
|
14
14
|
};
|
|
15
15
|
beforeEach(async () => {
|
|
16
16
|
memoryCache = new cache_1.MemoryCache();
|
|
17
|
-
await memoryCache.setEntity('nodeKeys-
|
|
18
|
-
key: 'privateKey',
|
|
19
|
-
sessionKey: 'sessionKey',
|
|
20
|
-
});
|
|
17
|
+
await memoryCache.setEntity('nodeKeys-missingProperties', {});
|
|
21
18
|
cache = new cryptoCache_1.NodesCryptoCache((0, logger_1.getMockLogger)(), memoryCache);
|
|
22
19
|
});
|
|
23
20
|
it('should store and retrieve keys', async () => {
|
|
@@ -81,14 +78,14 @@ describe('nodesCryptoCache', () => {
|
|
|
81
78
|
});
|
|
82
79
|
it('should throw an error when retrieving a bad keys and remove the key', async () => {
|
|
83
80
|
try {
|
|
84
|
-
await cache.getNodeKeys('
|
|
81
|
+
await cache.getNodeKeys('missingProperties');
|
|
85
82
|
throw new Error('Should have thrown an error');
|
|
86
83
|
}
|
|
87
84
|
catch (error) {
|
|
88
|
-
expect(`${error}`).toBe('Error: Failed to deserialize node keys
|
|
85
|
+
expect(`${error}`).toBe('Error: Failed to deserialize node keys');
|
|
89
86
|
}
|
|
90
87
|
try {
|
|
91
|
-
await memoryCache.getEntity('nodeKeys-
|
|
88
|
+
await memoryCache.getEntity('nodeKeys-missingProperties');
|
|
92
89
|
throw new Error('Should have thrown an error');
|
|
93
90
|
}
|
|
94
91
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoCache.test.js","sourceRoot":"","sources":["../../../src/internal/nodes/cryptoCache.test.ts"],"names":[],"mappings":";;AACA,uCAA0C;AAE1C,+CAAmD;AACnD,+CAAiD;AAEjD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,IAAI,WAA8C,CAAC;IACnD,IAAI,KAAuB,CAAC;IAE5B,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QACxC,OAAO,IAA6B,CAAC;IACzC,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QACxC,OAAO,IAA6B,CAAC;IACzC,CAAC,CAAC;IAEF,UAAU,CAAC,KAAK,IAAI,EAAE;QAClB,WAAW,GAAG,IAAI,mBAAW,EAAE,CAAC;QAChC,MAAM,WAAW,CAAC,SAAS,CAAC,4BAA4B,EAAE
|
|
1
|
+
{"version":3,"file":"cryptoCache.test.js","sourceRoot":"","sources":["../../../src/internal/nodes/cryptoCache.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ProtonDriveCryptoCache } from '../../interface';
|
|
1
|
+
import { Logger, ProtonDriveCryptoCache } from '../../interface';
|
|
2
2
|
import { DecryptedShareKey } from './interface';
|
|
3
3
|
/**
|
|
4
4
|
* Provides caching for share crypto material.
|
|
@@ -12,9 +12,10 @@ import { DecryptedShareKey } from './interface';
|
|
|
12
12
|
* only the root node, thus share cache is not needed.
|
|
13
13
|
*/
|
|
14
14
|
export declare class SharesCryptoCache {
|
|
15
|
+
private logger;
|
|
15
16
|
private driveCache;
|
|
16
|
-
constructor(driveCache: ProtonDriveCryptoCache);
|
|
17
|
+
constructor(logger: Logger, driveCache: ProtonDriveCryptoCache);
|
|
17
18
|
setShareKey(shareId: string, key: DecryptedShareKey): Promise<void>;
|
|
18
19
|
getShareKey(shareId: string): Promise<DecryptedShareKey>;
|
|
19
|
-
|
|
20
|
+
removeShareKeys(shareIds: string[]): Promise<void>;
|
|
20
21
|
}
|
|
@@ -13,23 +13,40 @@ exports.SharesCryptoCache = void 0;
|
|
|
13
13
|
* only the root node, thus share cache is not needed.
|
|
14
14
|
*/
|
|
15
15
|
class SharesCryptoCache {
|
|
16
|
+
logger;
|
|
16
17
|
driveCache;
|
|
17
|
-
constructor(driveCache) {
|
|
18
|
+
constructor(logger, driveCache) {
|
|
19
|
+
this.logger = logger;
|
|
18
20
|
this.driveCache = driveCache;
|
|
21
|
+
this.logger = logger;
|
|
19
22
|
this.driveCache = driveCache;
|
|
20
23
|
}
|
|
21
24
|
async setShareKey(shareId, key) {
|
|
22
|
-
await this.driveCache.setEntity(
|
|
25
|
+
await this.driveCache.setEntity(getCacheKey(shareId), {
|
|
26
|
+
shareKey: key,
|
|
27
|
+
});
|
|
23
28
|
}
|
|
24
29
|
async getShareKey(shareId) {
|
|
25
|
-
|
|
30
|
+
const nodeKeysData = await this.driveCache.getEntity(getCacheKey(shareId));
|
|
31
|
+
if (!nodeKeysData.shareKey) {
|
|
32
|
+
try {
|
|
33
|
+
await this.removeShareKeys([shareId]);
|
|
34
|
+
}
|
|
35
|
+
catch (removingError) {
|
|
36
|
+
// The node keys will not be returned, thus SDK will re-fetch
|
|
37
|
+
// and re-cache it. Setting it again should then fix the problem.
|
|
38
|
+
this.logger.warn(`Failed to remove corrupted node keys from the cache: ${removingError instanceof Error ? removingError.message : removingError}`);
|
|
39
|
+
}
|
|
40
|
+
throw new Error(`Failed to deserialize node keys`);
|
|
41
|
+
}
|
|
42
|
+
return nodeKeysData.shareKey;
|
|
26
43
|
}
|
|
27
|
-
async
|
|
28
|
-
await this.driveCache.removeEntities(shareIds.map(
|
|
44
|
+
async removeShareKeys(shareIds) {
|
|
45
|
+
await this.driveCache.removeEntities(shareIds.map(getCacheKey));
|
|
29
46
|
}
|
|
30
47
|
}
|
|
31
48
|
exports.SharesCryptoCache = SharesCryptoCache;
|
|
32
|
-
function
|
|
49
|
+
function getCacheKey(shareId) {
|
|
33
50
|
return `shareKey-${shareId}`;
|
|
34
51
|
}
|
|
35
52
|
//# sourceMappingURL=cryptoCache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoCache.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoCache.ts"],"names":[],"mappings":";;;AAGA;;;;;;;;;;GAUG;AACH,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"cryptoCache.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoCache.ts"],"names":[],"mappings":";;;AAGA;;;;;;;;;;GAUG;AACH,MAAa,iBAAiB;IAEd;IACA;IAFZ,YACY,MAAc,EACd,UAAkC;QADlC,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAwB;QAE1C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,GAAsB;QACrD,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YAClD,QAAQ,EAAE,GAAG;SAChB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe;QAC7B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,aAAsB,EAAE,CAAC;gBAC9B,6DAA6D;gBAC7D,iEAAiE;gBACjE,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,wDAAwD,aAAa,YAAY,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,CACnI,CAAC;YACN,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,YAAY,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAkB;QACpC,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AAnCD,8CAmCC;AAED,SAAS,WAAW,CAAC,OAAe;IAChC,OAAO,YAAY,OAAO,EAAE,CAAC;AACjC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const cache_1 = require("../../cache");
|
|
4
|
+
const logger_1 = require("../../tests/logger");
|
|
4
5
|
const cryptoCache_1 = require("./cryptoCache");
|
|
5
6
|
describe('sharesCryptoCache', () => {
|
|
6
7
|
let memoryCache;
|
|
@@ -13,7 +14,7 @@ describe('sharesCryptoCache', () => {
|
|
|
13
14
|
};
|
|
14
15
|
beforeEach(() => {
|
|
15
16
|
memoryCache = new cache_1.MemoryCache();
|
|
16
|
-
cache = new cryptoCache_1.SharesCryptoCache(memoryCache);
|
|
17
|
+
cache = new cryptoCache_1.SharesCryptoCache((0, logger_1.getMockLogger)(), memoryCache);
|
|
17
18
|
});
|
|
18
19
|
it('should store and retrieve keys', async () => {
|
|
19
20
|
const shareId = 'newShareId';
|
|
@@ -41,7 +42,7 @@ describe('sharesCryptoCache', () => {
|
|
|
41
42
|
const shareId = 'newShareId';
|
|
42
43
|
const keys = { key: generatePrivateKey('privateKey'), passphraseSessionKey: generateSessionKey('sessionKey') };
|
|
43
44
|
await cache.setShareKey(shareId, keys);
|
|
44
|
-
await cache.
|
|
45
|
+
await cache.removeShareKeys([shareId]);
|
|
45
46
|
try {
|
|
46
47
|
await cache.getShareKey(shareId);
|
|
47
48
|
throw new Error('Should have thrown an error');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoCache.test.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoCache.test.ts"],"names":[],"mappings":";;AACA,uCAA0C;AAE1C,+CAAkD;AAElD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,IAAI,WAA8C,CAAC;IACnD,IAAI,KAAwB,CAAC;IAE7B,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QACxC,OAAO,IAA6B,CAAC;IACzC,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QACxC,OAAO,IAA6B,CAAC;IACzC,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACZ,WAAW,GAAG,IAAI,mBAAW,EAAE,CAAC;QAChC,KAAK,GAAG,IAAI,+BAAiB,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cryptoCache.test.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoCache.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ const manager_1 = require("./manager");
|
|
|
18
18
|
function initSharesModule(telemetry, apiService, driveEntitiesCache, driveCryptoCache, account, crypto) {
|
|
19
19
|
const api = new apiService_1.SharesAPIService(apiService);
|
|
20
20
|
const cache = new cache_1.SharesCache(telemetry.getLogger('shares-cache'), driveEntitiesCache);
|
|
21
|
-
const cryptoCache = new cryptoCache_1.SharesCryptoCache(driveCryptoCache);
|
|
21
|
+
const cryptoCache = new cryptoCache_1.SharesCryptoCache(telemetry.getLogger('shares-cache'), driveCryptoCache);
|
|
22
22
|
const cryptoService = new cryptoService_1.SharesCryptoService(telemetry, crypto, account);
|
|
23
23
|
const sharesManager = new manager_1.SharesManager(telemetry.getLogger('shares'), api, cache, cryptoCache, cryptoService, account);
|
|
24
24
|
return sharesManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/shares/index.ts"],"names":[],"mappings":";;AAyBA,4CAqBC;AAtCD,6CAAgD;AAChD,+CAAkD;AAClD,mCAAsC;AACtC,mDAAsD;AACtD,uCAA0C;AAI1C;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAC5B,SAA+B,EAC/B,UAA2B,EAC3B,kBAA4C,EAC5C,gBAAwC,EACxC,OAA2B,EAC3B,MAAmB;IAEnB,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,mBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACvF,MAAM,WAAW,GAAG,IAAI,+BAAiB,CAAC,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/shares/index.ts"],"names":[],"mappings":";;AAyBA,4CAqBC;AAtCD,6CAAgD;AAChD,+CAAkD;AAClD,mCAAsC;AACtC,mDAAsD;AACtD,uCAA0C;AAI1C;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAC5B,SAA+B,EAC/B,UAA2B,EAC3B,kBAA4C,EAC5C,gBAAwC,EACxC,OAA2B,EAC3B,MAAmB;IAEnB,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,mBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACvF,MAAM,WAAW,GAAG,IAAI,+BAAiB,CAAC,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACjG,MAAM,aAAa,GAAG,IAAI,mCAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1E,MAAM,aAAa,GAAG,IAAI,uBAAa,CACnC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,EAC7B,GAAG,EACH,KAAK,EACL,WAAW,EACX,aAAa,EACb,OAAO,CACV,CAAC;IACF,OAAO,aAAa,CAAC;AACzB,CAAC"}
|
|
@@ -10,6 +10,7 @@ const crypto_1 = require("../../crypto");
|
|
|
10
10
|
const interface_1 = require("../../interface");
|
|
11
11
|
const validations_1 = require("../nodes/validations");
|
|
12
12
|
const errors_1 = require("../errors");
|
|
13
|
+
const errors_2 = require("../../errors");
|
|
13
14
|
// Version 2 of bcrypt with 2**10 rounds.
|
|
14
15
|
// https://en.wikipedia.org/wiki/Bcrypt#Description
|
|
15
16
|
const BCRYPT_PREFIX = '$2y$10$';
|
|
@@ -270,10 +271,11 @@ class SharingCryptoService {
|
|
|
270
271
|
async decryptBookmark(encryptedBookmark) {
|
|
271
272
|
// TODO: Signatures are not checked and not specified in the interface.
|
|
272
273
|
// In the future, we will need to add authorship verification.
|
|
274
|
+
let password;
|
|
273
275
|
let urlPassword;
|
|
274
276
|
let customPassword;
|
|
275
277
|
try {
|
|
276
|
-
|
|
278
|
+
password = await this.decryptBookmarkUrlPassword(encryptedBookmark);
|
|
277
279
|
const result = splitGeneratedAndCustomPassword(password);
|
|
278
280
|
urlPassword = result.password;
|
|
279
281
|
customPassword = (0, interface_1.resultOk)(result.customPassword);
|
|
@@ -290,7 +292,7 @@ class SharingCryptoService {
|
|
|
290
292
|
const url = (0, interface_1.resultOk)(`https://drive.proton.me/urls/${encryptedBookmark.tokenId}#${urlPassword}`);
|
|
291
293
|
let shareKey;
|
|
292
294
|
try {
|
|
293
|
-
shareKey = await this.decryptBookmarkKey(encryptedBookmark,
|
|
295
|
+
shareKey = await this.decryptBookmarkKey(encryptedBookmark, password);
|
|
294
296
|
}
|
|
295
297
|
catch (originalError) {
|
|
296
298
|
const error = originalError instanceof Error ? originalError : new Error((0, ttag_1.c)('Error').t `Unknown error`);
|
|
@@ -329,13 +331,13 @@ class SharingCryptoService {
|
|
|
329
331
|
});
|
|
330
332
|
const message = (0, errors_1.getErrorMessage)(error);
|
|
331
333
|
const errorMessage = (0, ttag_1.c)('Error').t `Failed to decrypt bookmark password: ${message}`;
|
|
332
|
-
throw new
|
|
334
|
+
throw new errors_2.DecryptionError(errorMessage, { cause: error });
|
|
333
335
|
}
|
|
334
336
|
}
|
|
335
|
-
async decryptBookmarkKey(encryptedBookmark,
|
|
337
|
+
async decryptBookmarkKey(encryptedBookmark, password) {
|
|
336
338
|
try {
|
|
337
339
|
// Use the password to decrypt the share key.
|
|
338
|
-
const { key: shareKey } = await this.driveCrypto.decryptKeyWithSrpPassword(
|
|
340
|
+
const { key: shareKey } = await this.driveCrypto.decryptKeyWithSrpPassword(password, encryptedBookmark.url.base64SharePasswordSalt, encryptedBookmark.share.armoredKey, encryptedBookmark.share.armoredPassphrase);
|
|
339
341
|
return shareKey;
|
|
340
342
|
}
|
|
341
343
|
catch (error) {
|
|
@@ -348,7 +350,7 @@ class SharingCryptoService {
|
|
|
348
350
|
});
|
|
349
351
|
const message = (0, errors_1.getErrorMessage)(error);
|
|
350
352
|
const errorMessage = (0, ttag_1.c)('Error').t `Failed to decrypt bookmark key: ${message}`;
|
|
351
|
-
throw new
|
|
353
|
+
throw new errors_2.DecryptionError(errorMessage, { cause: error });
|
|
352
354
|
}
|
|
353
355
|
}
|
|
354
356
|
async decryptBookmarkName(encryptedBookmark, shareKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/sharing/cryptoService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/sharing/cryptoService.ts"],"names":[],"mappings":"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"}
|