@protontech/drive-sdk 0.6.2 → 0.7.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/interface/index.d.ts +1 -0
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/nodes.d.ts +14 -10
- package/dist/interface/nodes.js +5 -8
- package/dist/interface/nodes.js.map +1 -1
- package/dist/interface/photos.d.ts +62 -0
- package/dist/interface/photos.js +3 -0
- package/dist/interface/photos.js.map +1 -0
- package/dist/internal/apiService/apiService.d.ts +2 -2
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/driveTypes.d.ts +1294 -517
- package/dist/internal/apiService/errors.js +4 -3
- package/dist/internal/apiService/errors.js.map +1 -1
- package/dist/internal/download/cryptoService.js +8 -6
- package/dist/internal/download/cryptoService.js.map +1 -1
- package/dist/internal/download/fileDownloader.d.ts +2 -1
- package/dist/internal/download/fileDownloader.js +6 -3
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/download/index.d.ts +1 -1
- package/dist/internal/download/index.js +3 -3
- package/dist/internal/download/index.js.map +1 -1
- package/dist/internal/errors.d.ts +1 -0
- package/dist/internal/errors.js +4 -0
- package/dist/internal/errors.js.map +1 -1
- package/dist/internal/nodes/apiService.d.ts +68 -16
- package/dist/internal/nodes/apiService.js +138 -85
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/apiService.test.js +7 -5
- package/dist/internal/nodes/apiService.test.js.map +1 -1
- package/dist/internal/nodes/cache.d.ts +16 -8
- package/dist/internal/nodes/cache.js +19 -5
- package/dist/internal/nodes/cache.js.map +1 -1
- package/dist/internal/nodes/cache.test.js +1 -0
- package/dist/internal/nodes/cache.test.js.map +1 -1
- package/dist/internal/nodes/cryptoReporter.d.ts +3 -3
- package/dist/internal/nodes/cryptoReporter.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +13 -22
- package/dist/internal/nodes/cryptoService.js +47 -16
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js +262 -17
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/events.d.ts +2 -2
- package/dist/internal/nodes/events.js.map +1 -1
- package/dist/internal/nodes/index.test.js +1 -0
- package/dist/internal/nodes/index.test.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +14 -3
- package/dist/internal/nodes/nodesAccess.d.ts +36 -20
- package/dist/internal/nodes/nodesAccess.js +54 -29
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.d.ts +34 -14
- package/dist/internal/nodes/nodesManagement.js +44 -31
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.test.js +60 -14
- package/dist/internal/nodes/nodesManagement.test.js.map +1 -1
- package/dist/internal/nodes/nodesRevisions.d.ts +2 -2
- package/dist/internal/nodes/nodesRevisions.js.map +1 -1
- package/dist/internal/photos/albums.d.ts +2 -2
- package/dist/internal/photos/albums.js.map +1 -1
- package/dist/internal/photos/index.d.ts +19 -3
- package/dist/internal/photos/index.js +38 -8
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +18 -9
- package/dist/internal/photos/nodes.d.ts +57 -0
- package/dist/internal/photos/nodes.js +165 -0
- package/dist/internal/photos/nodes.js.map +1 -0
- package/dist/internal/photos/timeline.d.ts +2 -2
- package/dist/internal/photos/timeline.js.map +1 -1
- package/dist/internal/photos/timeline.test.js.map +1 -1
- package/dist/internal/photos/upload.d.ts +2 -2
- package/dist/internal/photos/upload.js.map +1 -1
- package/dist/internal/sharingPublic/index.d.ts +6 -6
- package/dist/internal/sharingPublic/index.js +8 -7
- package/dist/internal/sharingPublic/index.js.map +1 -1
- package/dist/internal/sharingPublic/nodes.d.ts +16 -3
- package/dist/internal/sharingPublic/nodes.js +34 -2
- package/dist/internal/sharingPublic/nodes.js.map +1 -1
- package/dist/internal/sharingPublic/unauthApiService.d.ts +17 -0
- package/dist/internal/sharingPublic/unauthApiService.js +31 -0
- package/dist/internal/sharingPublic/unauthApiService.js.map +1 -0
- package/dist/internal/sharingPublic/unauthApiService.test.d.ts +1 -0
- package/dist/internal/sharingPublic/unauthApiService.test.js +27 -0
- package/dist/internal/sharingPublic/unauthApiService.test.js.map +1 -0
- package/dist/internal/upload/apiService.d.ts +4 -3
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/cryptoService.d.ts +8 -3
- package/dist/internal/upload/cryptoService.js +45 -9
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/fileUploader.test.js +1 -1
- package/dist/internal/upload/fileUploader.test.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +25 -13
- package/dist/internal/upload/manager.js +7 -4
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +5 -4
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/streamUploader.js +9 -4
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +8 -5
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/protonDriveClient.d.ts +11 -2
- package/dist/protonDriveClient.js +20 -4
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +8 -8
- package/dist/protonDrivePhotosClient.js +8 -9
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/protonDrivePublicLinkClient.d.ts +9 -2
- package/dist/protonDrivePublicLinkClient.js +16 -5
- package/dist/protonDrivePublicLinkClient.js.map +1 -1
- package/dist/transformers.d.ts +7 -2
- package/dist/transformers.js +37 -0
- package/dist/transformers.js.map +1 -1
- package/package.json +1 -1
- package/src/interface/index.ts +1 -0
- package/src/interface/nodes.ts +14 -11
- package/src/interface/photos.ts +67 -0
- package/src/internal/apiService/apiService.ts +2 -2
- package/src/internal/apiService/driveTypes.ts +1294 -517
- package/src/internal/apiService/errors.ts +5 -4
- package/src/internal/download/cryptoService.ts +13 -6
- package/src/internal/download/fileDownloader.ts +4 -2
- package/src/internal/download/index.ts +3 -0
- package/src/internal/errors.ts +4 -0
- package/src/internal/nodes/apiService.test.ts +7 -5
- package/src/internal/nodes/apiService.ts +210 -124
- package/src/internal/nodes/cache.test.ts +1 -0
- package/src/internal/nodes/cache.ts +32 -13
- package/src/internal/nodes/cryptoReporter.ts +3 -3
- package/src/internal/nodes/cryptoService.test.ts +380 -18
- package/src/internal/nodes/cryptoService.ts +77 -36
- package/src/internal/nodes/events.ts +2 -2
- package/src/internal/nodes/index.test.ts +1 -0
- package/src/internal/nodes/interface.ts +17 -2
- package/src/internal/nodes/nodesAccess.ts +99 -54
- package/src/internal/nodes/nodesManagement.test.ts +69 -14
- package/src/internal/nodes/nodesManagement.ts +94 -48
- package/src/internal/nodes/nodesRevisions.ts +3 -3
- package/src/internal/photos/albums.ts +2 -2
- package/src/internal/photos/index.ts +45 -3
- package/src/internal/photos/interface.ts +21 -9
- package/src/internal/photos/nodes.ts +233 -0
- package/src/internal/photos/timeline.test.ts +2 -2
- package/src/internal/photos/timeline.ts +2 -2
- package/src/internal/photos/upload.ts +3 -3
- package/src/internal/sharingPublic/index.ts +7 -3
- package/src/internal/sharingPublic/nodes.ts +43 -2
- package/src/internal/sharingPublic/unauthApiService.test.ts +29 -0
- package/src/internal/sharingPublic/unauthApiService.ts +32 -0
- package/src/internal/upload/apiService.ts +4 -3
- package/src/internal/upload/cryptoService.ts +73 -12
- package/src/internal/upload/fileUploader.test.ts +1 -1
- package/src/internal/upload/interface.ts +24 -13
- package/src/internal/upload/manager.test.ts +5 -4
- package/src/internal/upload/manager.ts +7 -4
- package/src/internal/upload/streamUploader.test.ts +8 -5
- package/src/internal/upload/streamUploader.ts +10 -4
- package/src/protonDriveClient.ts +27 -5
- package/src/protonDrivePhotosClient.ts +23 -23
- package/src/protonDrivePublicLinkClient.ts +19 -3
- package/src/transformers.ts +49 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,yCAAkF;
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DriveCrypto, PrivateKey, SessionKey } from '../../crypto';
|
|
2
|
-
import { Thumbnail } from '../../interface';
|
|
3
|
-
import { EncryptedBlock, EncryptedThumbnail, NodeCrypto, NodeRevisionDraftKeys, NodesService } from './interface';
|
|
2
|
+
import { Thumbnail, AnonymousUser } from '../../interface';
|
|
3
|
+
import { EncryptedBlock, EncryptedThumbnail, NodeCrypto, NodeCryptoSigningKeys, NodeRevisionDraftKeys, NodesService } from './interface';
|
|
4
4
|
export declare class UploadCryptoService {
|
|
5
5
|
protected driveCrypto: DriveCrypto;
|
|
6
6
|
protected nodesService: NodesService;
|
|
@@ -9,13 +9,18 @@ export declare class UploadCryptoService {
|
|
|
9
9
|
key: PrivateKey;
|
|
10
10
|
hashKey: Uint8Array;
|
|
11
11
|
}, name: string): Promise<NodeCrypto>;
|
|
12
|
+
getSigningKeysForExistingNode(uids: {
|
|
13
|
+
nodeUid: string;
|
|
14
|
+
parentNodeUid?: string;
|
|
15
|
+
}): Promise<NodeCryptoSigningKeys>;
|
|
16
|
+
private getSigningKeys;
|
|
12
17
|
encryptThumbnail(nodeRevisionDraftKeys: NodeRevisionDraftKeys, thumbnail: Thumbnail): Promise<EncryptedThumbnail>;
|
|
13
18
|
encryptBlock(verifyBlock: (encryptedBlock: Uint8Array) => Promise<{
|
|
14
19
|
verificationToken: Uint8Array;
|
|
15
20
|
}>, nodeRevisionDraftKeys: NodeRevisionDraftKeys, block: Uint8Array, index: number): Promise<EncryptedBlock>;
|
|
16
21
|
commitFile(nodeRevisionDraftKeys: NodeRevisionDraftKeys, manifest: Uint8Array, extendedAttributes?: string): Promise<{
|
|
17
22
|
armoredManifestSignature: string;
|
|
18
|
-
signatureEmail: string;
|
|
23
|
+
signatureEmail: string | AnonymousUser;
|
|
19
24
|
armoredExtendedAttributes?: string;
|
|
20
25
|
}>;
|
|
21
26
|
getContentKeyPacketSessionKey(nodeKey: PrivateKey, base64ContentKeyPacket: string): Promise<SessionKey>;
|
|
@@ -13,10 +13,13 @@ class UploadCryptoService {
|
|
|
13
13
|
this.nodesService = nodesService;
|
|
14
14
|
}
|
|
15
15
|
async generateFileCrypto(parentUid, parentKeys, name) {
|
|
16
|
-
const
|
|
16
|
+
const signingKeys = await this.getSigningKeys({ parentNodeUid: parentUid });
|
|
17
|
+
if (!signingKeys.nameAndPassphraseSigningKey) {
|
|
18
|
+
throw new Error('Cannot create new node without a name and passphrase signing key');
|
|
19
|
+
}
|
|
17
20
|
const [nodeKeys, { armoredNodeName }, hash] = await Promise.all([
|
|
18
|
-
this.driveCrypto.generateKey([parentKeys.key],
|
|
19
|
-
this.driveCrypto.encryptNodeName(name, undefined, parentKeys.key,
|
|
21
|
+
this.driveCrypto.generateKey([parentKeys.key], signingKeys.nameAndPassphraseSigningKey),
|
|
22
|
+
this.driveCrypto.encryptNodeName(name, undefined, parentKeys.key, signingKeys.nameAndPassphraseSigningKey),
|
|
20
23
|
this.driveCrypto.generateLookupHash(name, parentKeys.hashKey),
|
|
21
24
|
]);
|
|
22
25
|
const contentKey = await this.driveCrypto.generateContentKey(nodeKeys.decrypted.key);
|
|
@@ -27,11 +30,44 @@ class UploadCryptoService {
|
|
|
27
30
|
encryptedName: armoredNodeName,
|
|
28
31
|
hash,
|
|
29
32
|
},
|
|
30
|
-
|
|
33
|
+
signingKeys: {
|
|
34
|
+
email: signingKeys.email,
|
|
35
|
+
addressId: signingKeys.addressId,
|
|
36
|
+
nameAndPassphraseSigningKey: signingKeys.nameAndPassphraseSigningKey,
|
|
37
|
+
contentSigningKey: signingKeys.contentSigningKey || nodeKeys.decrypted.key,
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
async getSigningKeysForExistingNode(uids) {
|
|
42
|
+
const signingKeys = await this.getSigningKeys(uids);
|
|
43
|
+
if (!signingKeys.nameAndPassphraseSigningKey) {
|
|
44
|
+
throw new Error('Cannot get name and passphrase signing key for existing node');
|
|
45
|
+
}
|
|
46
|
+
if (!signingKeys.contentSigningKey) {
|
|
47
|
+
throw new Error('Cannot get content signing key for existing node');
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
email: signingKeys.email,
|
|
51
|
+
addressId: signingKeys.addressId,
|
|
52
|
+
nameAndPassphraseSigningKey: signingKeys.nameAndPassphraseSigningKey,
|
|
53
|
+
contentSigningKey: signingKeys.contentSigningKey,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
async getSigningKeys(uids) {
|
|
57
|
+
const signingKeys = await this.nodesService.getNodeSigningKeys(uids);
|
|
58
|
+
const email = signingKeys.type === 'userAddress' ? signingKeys.email : null;
|
|
59
|
+
const addressId = signingKeys.type === 'userAddress' ? signingKeys.addressId : null;
|
|
60
|
+
const nameAndPassphraseSigningKey = signingKeys.type === 'userAddress' ? signingKeys.key : signingKeys.parentNodeKey;
|
|
61
|
+
const contentSigningKey = signingKeys.type === 'userAddress' ? signingKeys.key : signingKeys.nodeKey;
|
|
62
|
+
return {
|
|
63
|
+
email,
|
|
64
|
+
addressId,
|
|
65
|
+
nameAndPassphraseSigningKey,
|
|
66
|
+
contentSigningKey,
|
|
31
67
|
};
|
|
32
68
|
}
|
|
33
69
|
async encryptThumbnail(nodeRevisionDraftKeys, thumbnail) {
|
|
34
|
-
const { encryptedData } = await this.driveCrypto.encryptThumbnailBlock(thumbnail.thumbnail, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.
|
|
70
|
+
const { encryptedData } = await this.driveCrypto.encryptThumbnailBlock(thumbnail.thumbnail, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
|
|
35
71
|
const digest = await crypto.subtle.digest('SHA-256', encryptedData);
|
|
36
72
|
return {
|
|
37
73
|
type: thumbnail.type,
|
|
@@ -42,7 +78,7 @@ class UploadCryptoService {
|
|
|
42
78
|
};
|
|
43
79
|
}
|
|
44
80
|
async encryptBlock(verifyBlock, nodeRevisionDraftKeys, block, index) {
|
|
45
|
-
const { encryptedData, armoredSignature } = await this.driveCrypto.encryptBlock(block, nodeRevisionDraftKeys.key, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.
|
|
81
|
+
const { encryptedData, armoredSignature } = await this.driveCrypto.encryptBlock(block, nodeRevisionDraftKeys.key, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
|
|
46
82
|
const digest = await crypto.subtle.digest('SHA-256', encryptedData);
|
|
47
83
|
const { verificationToken } = await verifyBlock(encryptedData);
|
|
48
84
|
return {
|
|
@@ -56,13 +92,13 @@ class UploadCryptoService {
|
|
|
56
92
|
};
|
|
57
93
|
}
|
|
58
94
|
async commitFile(nodeRevisionDraftKeys, manifest, extendedAttributes) {
|
|
59
|
-
const { armoredManifestSignature } = await this.driveCrypto.signManifest(manifest, nodeRevisionDraftKeys.
|
|
95
|
+
const { armoredManifestSignature } = await this.driveCrypto.signManifest(manifest, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
|
|
60
96
|
const { armoredExtendedAttributes } = extendedAttributes
|
|
61
|
-
? await this.driveCrypto.encryptExtendedAttributes(extendedAttributes, nodeRevisionDraftKeys.key, nodeRevisionDraftKeys.
|
|
97
|
+
? await this.driveCrypto.encryptExtendedAttributes(extendedAttributes, nodeRevisionDraftKeys.key, nodeRevisionDraftKeys.signingKeys.contentSigningKey)
|
|
62
98
|
: { armoredExtendedAttributes: undefined };
|
|
63
99
|
return {
|
|
64
100
|
armoredManifestSignature,
|
|
65
|
-
signatureEmail: nodeRevisionDraftKeys.
|
|
101
|
+
signatureEmail: nodeRevisionDraftKeys.signingKeys.email,
|
|
66
102
|
armoredExtendedAttributes,
|
|
67
103
|
};
|
|
68
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/upload/cryptoService.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAGzB,yCAA8C;
|
|
1
|
+
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/upload/cryptoService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileUploader.test.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fileUploader.test.js","sourceRoot":"","sources":["../../../src/internal/upload/fileUploader.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PrivateKey, SessionKey } from '../../crypto';
|
|
2
|
-
import { MetricVolumeType, ThumbnailType, Result, Revision } from '../../interface';
|
|
2
|
+
import { MetricVolumeType, ThumbnailType, Result, Revision, AnonymousUser } from '../../interface';
|
|
3
3
|
import { DecryptedNode } from '../nodes';
|
|
4
4
|
export type NodeRevisionDraft = {
|
|
5
5
|
nodeUid: string;
|
|
@@ -18,7 +18,7 @@ export type NodeRevisionDraft = {
|
|
|
18
18
|
export type NodeRevisionDraftKeys = {
|
|
19
19
|
key: PrivateKey;
|
|
20
20
|
contentKeyPacketSessionKey: SessionKey;
|
|
21
|
-
|
|
21
|
+
signingKeys: NodeCryptoSigningKeys;
|
|
22
22
|
};
|
|
23
23
|
export type NodeCrypto = {
|
|
24
24
|
nodeKeys: {
|
|
@@ -46,12 +46,13 @@ export type NodeCrypto = {
|
|
|
46
46
|
encryptedName: string;
|
|
47
47
|
hash: string;
|
|
48
48
|
};
|
|
49
|
-
|
|
49
|
+
signingKeys: NodeCryptoSigningKeys;
|
|
50
50
|
};
|
|
51
|
-
export type
|
|
52
|
-
email: string;
|
|
53
|
-
addressId: string;
|
|
54
|
-
|
|
51
|
+
export type NodeCryptoSigningKeys = {
|
|
52
|
+
email: string | AnonymousUser;
|
|
53
|
+
addressId: string | AnonymousUser;
|
|
54
|
+
nameAndPassphraseSigningKey: PrivateKey;
|
|
55
|
+
contentSigningKey: PrivateKey;
|
|
55
56
|
};
|
|
56
57
|
export type EncryptedBlockMetadata = {
|
|
57
58
|
encryptedSize: number;
|
|
@@ -91,12 +92,13 @@ export interface NodesService {
|
|
|
91
92
|
contentKeyPacketSessionKey?: SessionKey;
|
|
92
93
|
hashKey?: Uint8Array;
|
|
93
94
|
}>;
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
95
|
+
getNodeSigningKeys(uids: {
|
|
96
|
+
nodeUid: string;
|
|
97
|
+
parentNodeUid?: string;
|
|
98
|
+
} | {
|
|
99
|
+
nodeUid?: string;
|
|
100
|
+
parentNodeUid: string;
|
|
101
|
+
}): Promise<NodeSigningKeys>;
|
|
100
102
|
notifyChildCreated(nodeUid: string): Promise<void>;
|
|
101
103
|
notifyNodeChanged(nodeUid: string): Promise<void>;
|
|
102
104
|
}
|
|
@@ -115,6 +117,16 @@ export interface NodesServiceNode {
|
|
|
115
117
|
parentUid?: string;
|
|
116
118
|
activeRevision?: Result<Revision, Error>;
|
|
117
119
|
}
|
|
120
|
+
export type NodeSigningKeys = {
|
|
121
|
+
type: 'userAddress';
|
|
122
|
+
email: string;
|
|
123
|
+
addressId: string;
|
|
124
|
+
key: PrivateKey;
|
|
125
|
+
} | {
|
|
126
|
+
type: 'nodeKey';
|
|
127
|
+
nodeKey?: PrivateKey;
|
|
128
|
+
parentNodeKey?: PrivateKey;
|
|
129
|
+
};
|
|
118
130
|
/**
|
|
119
131
|
* Interface describing the dependencies to the shares module.
|
|
120
132
|
*/
|
|
@@ -40,7 +40,7 @@ class UploadManager {
|
|
|
40
40
|
nodeKeys: {
|
|
41
41
|
key: generatedNodeCrypto.nodeKeys.decrypted.key,
|
|
42
42
|
contentKeyPacketSessionKey: generatedNodeCrypto.contentKey.decrypted.contentKeyPacketSessionKey,
|
|
43
|
-
|
|
43
|
+
signingKeys: generatedNodeCrypto.signingKeys,
|
|
44
44
|
},
|
|
45
45
|
parentNodeKeys: {
|
|
46
46
|
hashKey: parentKeys.hashKey,
|
|
@@ -65,7 +65,7 @@ class UploadManager {
|
|
|
65
65
|
armoredNodePassphraseSignature: generatedNodeCrypto.nodeKeys.encrypted.armoredPassphraseSignature,
|
|
66
66
|
base64ContentKeyPacket: generatedNodeCrypto.contentKey.encrypted.base64ContentKeyPacket,
|
|
67
67
|
armoredContentKeyPacketSignature: generatedNodeCrypto.contentKey.encrypted.armoredContentKeyPacketSignature,
|
|
68
|
-
signatureEmail: generatedNodeCrypto.
|
|
68
|
+
signatureEmail: generatedNodeCrypto.signingKeys.email,
|
|
69
69
|
});
|
|
70
70
|
return result;
|
|
71
71
|
}
|
|
@@ -128,7 +128,10 @@ class UploadManager {
|
|
|
128
128
|
if (!node.activeRevision?.ok || !nodeKeys.contentKeyPacketSessionKey) {
|
|
129
129
|
throw new errors_1.ValidationError((0, ttag_1.c)('Error').t `Creating revisions in non-files is not allowed`);
|
|
130
130
|
}
|
|
131
|
-
const
|
|
131
|
+
const signingKeys = await this.cryptoService.getSigningKeysForExistingNode({
|
|
132
|
+
nodeUid,
|
|
133
|
+
parentNodeUid: node.parentUid,
|
|
134
|
+
});
|
|
132
135
|
const { nodeRevisionUid } = await this.apiService.createDraftRevision(nodeUid, {
|
|
133
136
|
currentRevisionUid: node.activeRevision.value.uid,
|
|
134
137
|
intendedUploadSize: metadata.expectedSize,
|
|
@@ -139,7 +142,7 @@ class UploadManager {
|
|
|
139
142
|
nodeKeys: {
|
|
140
143
|
key: nodeKeys.key,
|
|
141
144
|
contentKeyPacketSessionKey: nodeKeys.contentKeyPacketSessionKey,
|
|
142
|
-
|
|
145
|
+
signingKeys,
|
|
143
146
|
},
|
|
144
147
|
};
|
|
145
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAGzB,yCAAsF;AAEtF,oCAA0D;AAI1D,kCAAoD;AAEpD;;;;GAIG;AACH,MAAa,aAAa;IAKR;IACA;IACA;IACA;IAPJ,MAAM,CAAS;IAEzB,YACI,SAA+B,EACrB,UAA4B,EAC5B,aAAkC,EAClC,YAA0B,EAC1B,SAA6B;QAH7B,eAAU,GAAV,UAAU,CAAkB;QAC5B,kBAAa,GAAb,aAAa,CAAqB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,cAAS,GAAT,SAAS,CAAoB;QAEvC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,eAAuB,EAAE,IAAY,EAAE,QAAwB;QACjF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACxE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,wBAAe,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,8CAA8C,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnE,eAAe,EACf,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,EACpD,IAAI,CACP,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAC5D,eAAe,EACf,UAAU,CAAC,OAAO,EAClB,IAAI,EACJ,QAAQ,EACR,mBAAmB,CACtB,CAAC;QAEF,OAAO;YACH,OAAO;YACP,eAAe;YACf,QAAQ,EAAE;gBACN,GAAG,EAAE,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG;gBAC/C,0BAA0B,EAAE,mBAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,0BAA0B;gBAC/F,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ describe('UploadManager', () => {
|
|
|
43
43
|
encryptedName: 'newNode:encryptedName',
|
|
44
44
|
hash: 'newNode:hash',
|
|
45
45
|
},
|
|
46
|
-
|
|
46
|
+
signingKeys: {
|
|
47
47
|
email: 'signatureEmail',
|
|
48
48
|
},
|
|
49
49
|
}),
|
|
@@ -62,7 +62,8 @@ describe('UploadManager', () => {
|
|
|
62
62
|
hashKey: 'parentNode:hashKey',
|
|
63
63
|
key: 'parentNode:nodekey',
|
|
64
64
|
}),
|
|
65
|
-
|
|
65
|
+
getNodeSigningKeys: jest.fn().mockResolvedValue({
|
|
66
|
+
type: 'userAddress',
|
|
66
67
|
email: 'signatureEmail',
|
|
67
68
|
addressId: 'addressId',
|
|
68
69
|
}),
|
|
@@ -88,7 +89,7 @@ describe('UploadManager', () => {
|
|
|
88
89
|
nodeKeys: {
|
|
89
90
|
key: 'newNode:key',
|
|
90
91
|
contentKeyPacketSessionKey: 'newNode:ContentKeyPacketSessionKey',
|
|
91
|
-
|
|
92
|
+
signingKeys: {
|
|
92
93
|
email: 'signatureEmail',
|
|
93
94
|
},
|
|
94
95
|
},
|
|
@@ -138,7 +139,7 @@ describe('UploadManager', () => {
|
|
|
138
139
|
nodeKeys: {
|
|
139
140
|
key: 'newNode:key',
|
|
140
141
|
contentKeyPacketSessionKey: 'newNode:ContentKeyPacketSessionKey',
|
|
141
|
-
|
|
142
|
+
signingKeys: {
|
|
142
143
|
email: 'signatureEmail',
|
|
143
144
|
},
|
|
144
145
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.test.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.test.ts"],"names":[],"mappings":";;AAAA,yCAA+C;AAE/C,qDAAyD;AAKzD,uCAA0C;AAE1C,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,IAAI,SAA+B,CAAC;IACpC,IAAI,UAA4B,CAAC;IACjC,IAAI,aAAkC,CAAC;IACvC,IAAI,YAA0B,CAAC;IAE/B,IAAI,OAAsB,CAAC;IAE3B,MAAM,SAAS,GAAG,WAAW,CAAC;IAE9B,UAAU,CAAC,GAAG,EAAE;QACZ,SAAS,GAAG,IAAA,4BAAgB,GAAE,CAAC;QAC/B,gEAAgE;QAChE,UAAU,GAAG;YACT,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACrC,OAAO,EAAE,iBAAiB;gBAC1B,eAAe,EAAE,yBAAyB;aAC7C,CAAC;YACF,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE;YACtB,mBAAmB,EAAE,IAAI,CAAC,EAAE,EAAE;SACjC,CAAC;QACF,gEAAgE;QAChE,aAAa,GAAG;YACZ,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBAC5C,QAAQ,EAAE;oBACN,SAAS,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE;oBACjC,SAAS,EAAE;wBACP,UAAU,EAAE,oBAAoB;wBAChC,iBAAiB,EAAE,2BAA2B;wBAC9C,0BAA0B,EAAE,oCAAoC;qBACnE;iBACJ;gBACD,UAAU,EAAE;oBACR,SAAS,EAAE,EAAE,0BAA0B,EAAE,oCAAoC,EAAE;oBAC/E,SAAS,EAAE;wBACP,sBAAsB,EAAE,gCAAgC;wBACxD,gCAAgC,EAAE,0CAA0C;qBAC/E;iBACJ;gBACD,aAAa,EAAE;oBACX,aAAa,EAAE,uBAAuB;oBACtC,IAAI,EAAE,cAAc;iBACvB;gBACD,
|
|
1
|
+
{"version":3,"file":"manager.test.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -247,7 +247,7 @@ class StreamUploader {
|
|
|
247
247
|
}
|
|
248
248
|
async requestAndInitiateUpload(onProgress) {
|
|
249
249
|
this.logger.info(`Requesting upload tokens for ${this.encryptedBlocks.size} blocks`);
|
|
250
|
-
const uploadTokens = await this.apiService.requestBlockUpload(this.revisionDraft.nodeRevisionUid, this.revisionDraft.nodeKeys.
|
|
250
|
+
const uploadTokens = await this.apiService.requestBlockUpload(this.revisionDraft.nodeRevisionUid, this.revisionDraft.nodeKeys.signingKeys.addressId, {
|
|
251
251
|
contentBlocks: Array.from(this.encryptedBlocks.values().map((block) => ({
|
|
252
252
|
index: block.index,
|
|
253
253
|
encryptedSize: block.encryptedSize,
|
|
@@ -261,6 +261,11 @@ class StreamUploader {
|
|
|
261
261
|
hash: block.hash,
|
|
262
262
|
}))),
|
|
263
263
|
});
|
|
264
|
+
// If the upload was aborted while requesting next upload tokens,
|
|
265
|
+
// do not schedule any next upload.
|
|
266
|
+
if (this.isUploadAborted) {
|
|
267
|
+
throw this.error || new errors_1.AbortError();
|
|
268
|
+
}
|
|
264
269
|
for (const thumbnailToken of uploadTokens.thumbnailTokens) {
|
|
265
270
|
let encryptedThumbnail = this.encryptedThumbnails.get(thumbnailToken.type);
|
|
266
271
|
if (!encryptedThumbnail) {
|
|
@@ -317,7 +322,7 @@ class StreamUploader {
|
|
|
317
322
|
}
|
|
318
323
|
catch (error) {
|
|
319
324
|
// Do not retry or report anything if the upload was aborted.
|
|
320
|
-
if (error instanceof errors_1.AbortError) {
|
|
325
|
+
if (error instanceof errors_1.AbortError || this.isUploadAborted) {
|
|
321
326
|
throw error;
|
|
322
327
|
}
|
|
323
328
|
if (blockProgress !== 0) {
|
|
@@ -367,7 +372,7 @@ class StreamUploader {
|
|
|
367
372
|
}
|
|
368
373
|
catch (error) {
|
|
369
374
|
// Do not retry or report anything if the upload was aborted.
|
|
370
|
-
if (error instanceof errors_1.AbortError) {
|
|
375
|
+
if (error instanceof errors_1.AbortError || this.isUploadAborted) {
|
|
371
376
|
throw error;
|
|
372
377
|
}
|
|
373
378
|
if (blockProgress !== 0) {
|
|
@@ -377,7 +382,7 @@ class StreamUploader {
|
|
|
377
382
|
if ((error instanceof apiService_1.APIHTTPError && error.statusCode === 404 /* HTTPErrorCode.NOT_FOUND */) ||
|
|
378
383
|
error instanceof apiService_1.NotFoundAPIError) {
|
|
379
384
|
logger.warn(`Token expired, fetching new token and retrying`);
|
|
380
|
-
const uploadTokens = await this.apiService.requestBlockUpload(this.revisionDraft.nodeRevisionUid, this.revisionDraft.nodeKeys.
|
|
385
|
+
const uploadTokens = await this.apiService.requestBlockUpload(this.revisionDraft.nodeRevisionUid, this.revisionDraft.nodeKeys.signingKeys.addressId, {
|
|
381
386
|
contentBlocks: [
|
|
382
387
|
{
|
|
383
388
|
index: encryptedBlock.index,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/streamUploader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"streamUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/streamUploader.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,7 +85,9 @@ describe('StreamUploader', () => {
|
|
|
85
85
|
nodeRevisionUid: 'revisionUid',
|
|
86
86
|
nodeUid: 'nodeUid',
|
|
87
87
|
nodeKeys: {
|
|
88
|
-
|
|
88
|
+
signingKeys: {
|
|
89
|
+
addressId: 'addressId',
|
|
90
|
+
},
|
|
89
91
|
},
|
|
90
92
|
};
|
|
91
93
|
metadata = {
|
|
@@ -219,8 +221,9 @@ describe('StreamUploader', () => {
|
|
|
219
221
|
cryptoService.encryptBlock = jest.fn().mockImplementation(async function () {
|
|
220
222
|
throw new Error('Failed to encrypt block');
|
|
221
223
|
});
|
|
222
|
-
//
|
|
223
|
-
|
|
224
|
+
// Thumbnail are uploaded with the first content block. If the
|
|
225
|
+
// content block fails to encrypt, nothing is uploaded.
|
|
226
|
+
await verifyFailure('Failed to encrypt block', 0);
|
|
224
227
|
// 1 block + 1 retry, others are skipped
|
|
225
228
|
expect(cryptoService.encryptBlock).toHaveBeenCalledTimes(2);
|
|
226
229
|
});
|
|
@@ -306,7 +309,7 @@ describe('StreamUploader', () => {
|
|
|
306
309
|
await verifySuccess();
|
|
307
310
|
// 1 for first try + 1 for retry
|
|
308
311
|
expect(apiService.requestBlockUpload).toHaveBeenCalledTimes(2);
|
|
309
|
-
expect(apiService.requestBlockUpload).toHaveBeenCalledWith(revisionDraft.nodeRevisionUid, revisionDraft.nodeKeys.
|
|
312
|
+
expect(apiService.requestBlockUpload).toHaveBeenCalledWith(revisionDraft.nodeRevisionUid, revisionDraft.nodeKeys.signingKeys.addressId, {
|
|
310
313
|
contentBlocks: [
|
|
311
314
|
{
|
|
312
315
|
index: 2,
|
|
@@ -324,7 +327,7 @@ describe('StreamUploader', () => {
|
|
|
324
327
|
describe('verifyIntegrity', () => {
|
|
325
328
|
it('should report block verification error', async () => {
|
|
326
329
|
blockVerifier.verifyBlock = jest.fn().mockRejectedValue(new errors_1.IntegrityError('Block verification error'));
|
|
327
|
-
await verifyFailure('Block verification error',
|
|
330
|
+
await verifyFailure('Block verification error', 0);
|
|
328
331
|
expect(telemetry.logBlockVerificationError).toHaveBeenCalledWith(false);
|
|
329
332
|
});
|
|
330
333
|
it('should report block verification error when retry helped', async () => {
|