@protontech/drive-sdk 0.1.0 → 0.1.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/cache/memoryCache.js +0 -1
- package/dist/cache/memoryCache.js.map +1 -1
- package/dist/cache/memoryCache.test.js +2 -4
- package/dist/cache/memoryCache.test.js.map +1 -1
- package/dist/cache/nullCache.js +0 -1
- package/dist/cache/nullCache.js.map +1 -1
- package/dist/crypto/driveCrypto.d.ts +2 -5
- package/dist/crypto/driveCrypto.js +7 -12
- package/dist/crypto/driveCrypto.js.map +1 -1
- package/dist/crypto/driveCrypto.test.js +14 -14
- package/dist/crypto/openPGPCrypto.js +3 -3
- package/dist/crypto/openPGPCrypto.js.map +1 -1
- package/dist/diagnostic/eventsGenerator.js +1 -1
- package/dist/diagnostic/eventsGenerator.js.map +1 -1
- package/dist/diagnostic/httpClient.d.ts +1 -1
- package/dist/diagnostic/httpClient.js.map +1 -1
- package/dist/diagnostic/index.d.ts +3 -3
- package/dist/diagnostic/index.js.map +1 -1
- package/dist/diagnostic/integrityVerificationStream.js +1 -1
- package/dist/diagnostic/integrityVerificationStream.js.map +1 -1
- package/dist/diagnostic/interface.d.ts +2 -2
- package/dist/diagnostic/sdkDiagnostic.d.ts +3 -3
- package/dist/diagnostic/sdkDiagnostic.js +8 -2
- package/dist/diagnostic/sdkDiagnostic.js.map +1 -1
- package/dist/diagnostic/sdkDiagnosticFull.d.ts +4 -4
- package/dist/diagnostic/sdkDiagnosticFull.js.map +1 -1
- package/dist/diagnostic/telemetry.js.map +1 -1
- package/dist/diagnostic/zipGenerators.js +2 -2
- package/dist/diagnostic/zipGenerators.js.map +1 -1
- package/dist/diagnostic/zipGenerators.test.js +1 -1
- package/dist/diagnostic/zipGenerators.test.js.map +1 -1
- package/dist/interface/events.d.ts +2 -4
- package/dist/interface/events.js.map +1 -1
- package/dist/interface/index.d.ts +5 -5
- package/dist/interface/index.js +0 -1
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/result.js.map +1 -1
- package/dist/interface/sharing.d.ts +1 -0
- package/dist/interface/sharing.js.map +1 -1
- package/dist/interface/telemetry.js +0 -8
- package/dist/interface/telemetry.js.map +1 -1
- package/dist/interface/thumbnail.js.map +1 -1
- package/dist/interface/upload.d.ts +1 -1
- package/dist/internal/apiService/apiService.d.ts +1 -1
- package/dist/internal/apiService/apiService.js +7 -11
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/apiService.test.js +55 -48
- package/dist/internal/apiService/apiService.test.js.map +1 -1
- package/dist/internal/apiService/coreTypes.d.ts +2356 -2356
- package/dist/internal/apiService/driveTypes.d.ts +1680 -1680
- package/dist/internal/apiService/errors.js +14 -8
- package/dist/internal/apiService/errors.js.map +1 -1
- package/dist/internal/apiService/errors.test.js +17 -12
- package/dist/internal/apiService/errors.test.js.map +1 -1
- package/dist/internal/apiService/transformers.d.ts +1 -1
- package/dist/internal/apiService/transformers.js +1 -1
- package/dist/internal/asyncIteratorMap.test.js +2 -2
- package/dist/internal/asyncIteratorMap.test.js.map +1 -1
- package/dist/internal/asyncIteratorRace.d.ts +13 -0
- package/dist/internal/asyncIteratorRace.js +59 -0
- package/dist/internal/asyncIteratorRace.js.map +1 -0
- package/dist/internal/asyncIteratorRace.test.d.ts +1 -0
- package/dist/internal/asyncIteratorRace.test.js +119 -0
- package/dist/internal/asyncIteratorRace.test.js.map +1 -0
- package/dist/internal/batch.d.ts +1 -0
- package/dist/internal/batch.js +12 -0
- package/dist/internal/batch.js.map +1 -0
- package/dist/internal/batch.test.d.ts +1 -0
- package/dist/internal/batch.test.js +41 -0
- package/dist/internal/batch.test.js.map +1 -0
- package/dist/internal/batchLoading.js.map +1 -1
- package/dist/internal/batchLoading.test.js +13 -13
- package/dist/internal/batchLoading.test.js.map +1 -1
- package/dist/internal/devices/apiService.d.ts +3 -3
- package/dist/internal/devices/apiService.js +2 -2
- package/dist/internal/devices/apiService.js.map +1 -1
- package/dist/internal/devices/cryptoService.js +1 -2
- package/dist/internal/devices/cryptoService.js.map +1 -1
- package/dist/internal/devices/index.d.ts +5 -5
- package/dist/internal/devices/index.js.map +1 -1
- package/dist/internal/devices/interface.d.ts +3 -3
- package/dist/internal/devices/manager.js +2 -2
- package/dist/internal/devices/manager.js.map +1 -1
- package/dist/internal/devices/manager.test.js +38 -7
- package/dist/internal/devices/manager.test.js.map +1 -1
- package/dist/internal/download/apiService.d.ts +4 -4
- package/dist/internal/download/apiService.js +0 -1
- package/dist/internal/download/apiService.js.map +1 -1
- package/dist/internal/download/cryptoService.d.ts +4 -4
- package/dist/internal/download/cryptoService.js +6 -5
- package/dist/internal/download/cryptoService.js.map +1 -1
- package/dist/internal/download/fileDownloader.d.ts +4 -4
- package/dist/internal/download/fileDownloader.js +3 -2
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/download/fileDownloader.test.js +1 -1
- package/dist/internal/download/fileDownloader.test.js.map +1 -1
- package/dist/internal/download/index.d.ts +5 -5
- package/dist/internal/download/index.js +5 -5
- package/dist/internal/download/index.js.map +1 -1
- package/dist/internal/download/interface.d.ts +3 -4
- package/dist/internal/download/telemetry.d.ts +3 -3
- package/dist/internal/download/telemetry.js +4 -2
- package/dist/internal/download/telemetry.js.map +1 -1
- package/dist/internal/download/telemetry.test.js +8 -8
- package/dist/internal/download/telemetry.test.js.map +1 -1
- package/dist/internal/download/thumbnailDownloader.d.ts +4 -4
- package/dist/internal/download/thumbnailDownloader.js +6 -6
- package/dist/internal/download/thumbnailDownloader.js.map +1 -1
- package/dist/internal/download/thumbnailDownloader.test.js.map +1 -1
- package/dist/internal/errors.d.ts +1 -1
- package/dist/internal/errors.js +1 -3
- package/dist/internal/errors.js.map +1 -1
- package/dist/internal/events/apiService.d.ts +2 -2
- package/dist/internal/events/apiService.js +9 -5
- package/dist/internal/events/apiService.js.map +1 -1
- package/dist/internal/events/coreEventManager.d.ts +3 -3
- package/dist/internal/events/coreEventManager.js.map +1 -1
- package/dist/internal/events/coreEventManager.test.js +14 -14
- package/dist/internal/events/eventManager.d.ts +1 -1
- package/dist/internal/events/eventManager.js +0 -1
- package/dist/internal/events/eventManager.js.map +1 -1
- package/dist/internal/events/eventManager.test.js +34 -25
- package/dist/internal/events/eventManager.test.js.map +1 -1
- package/dist/internal/events/index.d.ts +6 -6
- package/dist/internal/events/index.js.map +1 -1
- package/dist/internal/events/interface.d.ts +1 -1
- package/dist/internal/events/interface.js +0 -1
- package/dist/internal/events/interface.js.map +1 -1
- package/dist/internal/events/volumeEventManager.d.ts +3 -3
- package/dist/internal/events/volumeEventManager.js.map +1 -1
- package/dist/internal/events/volumeEventManager.test.js +55 -55
- package/dist/internal/events/volumeEventManager.test.js.map +1 -1
- package/dist/internal/nodes/apiService.d.ts +4 -3
- package/dist/internal/nodes/apiService.js +36 -15
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/apiService.test.js +60 -41
- package/dist/internal/nodes/apiService.test.js.map +1 -1
- package/dist/internal/nodes/cache.d.ts +5 -5
- package/dist/internal/nodes/cache.js +14 -7
- package/dist/internal/nodes/cache.js.map +1 -1
- package/dist/internal/nodes/cache.test.js +31 -9
- package/dist/internal/nodes/cache.test.js.map +1 -1
- package/dist/internal/nodes/cryptoCache.d.ts +2 -2
- package/dist/internal/nodes/cryptoCache.js.map +1 -1
- package/dist/internal/nodes/cryptoCache.test.js +24 -4
- package/dist/internal/nodes/cryptoCache.test.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +3 -3
- package/dist/internal/nodes/cryptoService.js +11 -17
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js +320 -241
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/events.d.ts +3 -3
- package/dist/internal/nodes/events.js.map +1 -1
- package/dist/internal/nodes/events.test.js +27 -21
- package/dist/internal/nodes/events.test.js.map +1 -1
- package/dist/internal/nodes/extendedAttributes.d.ts +1 -1
- package/dist/internal/nodes/extendedAttributes.js +3 -1
- package/dist/internal/nodes/extendedAttributes.js.map +1 -1
- package/dist/internal/nodes/extendedAttributes.test.js +7 -10
- package/dist/internal/nodes/extendedAttributes.test.js.map +1 -1
- package/dist/internal/nodes/index.d.ts +10 -10
- package/dist/internal/nodes/index.js.map +1 -1
- package/dist/internal/nodes/index.test.d.ts +1 -0
- package/dist/internal/nodes/index.test.js +106 -0
- package/dist/internal/nodes/index.test.js.map +1 -0
- package/dist/internal/nodes/interface.d.ts +2 -2
- package/dist/internal/nodes/nodesAccess.d.ts +7 -7
- package/dist/internal/nodes/nodesAccess.js +28 -16
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesAccess.test.js +39 -13
- package/dist/internal/nodes/nodesAccess.test.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.d.ts +6 -6
- package/dist/internal/nodes/nodesManagement.js +9 -7
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.test.js +9 -9
- package/dist/internal/nodes/nodesManagement.test.js.map +1 -1
- package/dist/internal/nodes/nodesRevisions.d.ts +4 -4
- package/dist/internal/nodes/nodesRevisions.js.map +1 -1
- package/dist/internal/photos/albums.d.ts +3 -3
- package/dist/internal/photos/albums.js.map +1 -1
- package/dist/internal/photos/apiService.d.ts +1 -1
- package/dist/internal/photos/apiService.js +3 -6
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/cache.d.ts +1 -1
- package/dist/internal/photos/index.d.ts +5 -5
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +2 -2
- package/dist/internal/photos/photosTimeline.d.ts +3 -3
- package/dist/internal/photos/photosTimeline.js +1 -2
- package/dist/internal/photos/photosTimeline.js.map +1 -1
- package/dist/internal/sdkEvents.d.ts +1 -1
- package/dist/internal/sdkEvents.js +2 -7
- package/dist/internal/sdkEvents.js.map +1 -1
- package/dist/internal/sdkEvents.test.js +8 -8
- package/dist/internal/shares/apiService.d.ts +2 -2
- package/dist/internal/shares/apiService.js +5 -3
- package/dist/internal/shares/apiService.js.map +1 -1
- package/dist/internal/shares/cache.d.ts +2 -2
- package/dist/internal/shares/cache.js +12 -6
- package/dist/internal/shares/cache.js.map +1 -1
- package/dist/internal/shares/cache.test.js.map +1 -1
- package/dist/internal/shares/cryptoCache.d.ts +2 -2
- package/dist/internal/shares/cryptoCache.test.js +8 -2
- package/dist/internal/shares/cryptoCache.test.js.map +1 -1
- package/dist/internal/shares/cryptoService.d.ts +3 -3
- package/dist/internal/shares/cryptoService.js.map +1 -1
- package/dist/internal/shares/cryptoService.test.js +42 -42
- package/dist/internal/shares/cryptoService.test.js.map +1 -1
- package/dist/internal/shares/index.d.ts +4 -4
- package/dist/internal/shares/index.js.map +1 -1
- package/dist/internal/shares/interface.d.ts +2 -2
- package/dist/internal/shares/manager.d.ts +7 -7
- package/dist/internal/shares/manager.js.map +1 -1
- package/dist/internal/shares/manager.test.js +71 -63
- package/dist/internal/shares/manager.test.js.map +1 -1
- package/dist/internal/sharing/apiService.d.ts +4 -4
- package/dist/internal/sharing/apiService.js +4 -3
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/sharing/cache.d.ts +1 -1
- package/dist/internal/sharing/cache.test.js +33 -33
- package/dist/internal/sharing/cryptoService.d.ts +3 -3
- package/dist/internal/sharing/cryptoService.js +3 -5
- package/dist/internal/sharing/cryptoService.js.map +1 -1
- package/dist/internal/sharing/cryptoService.test.js +39 -39
- package/dist/internal/sharing/cryptoService.test.js.map +1 -1
- package/dist/internal/sharing/events.d.ts +4 -4
- package/dist/internal/sharing/events.js +0 -1
- package/dist/internal/sharing/events.js.map +1 -1
- package/dist/internal/sharing/events.test.js +39 -40
- package/dist/internal/sharing/events.test.js.map +1 -1
- package/dist/internal/sharing/index.d.ts +6 -6
- package/dist/internal/sharing/index.js.map +1 -1
- package/dist/internal/sharing/interface.d.ts +5 -4
- package/dist/internal/sharing/sharingAccess.d.ts +6 -6
- package/dist/internal/sharing/sharingAccess.js +8 -4
- package/dist/internal/sharing/sharingAccess.js.map +1 -1
- package/dist/internal/sharing/sharingAccess.test.js +45 -39
- package/dist/internal/sharing/sharingAccess.test.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.d.ts +4 -4
- package/dist/internal/sharing/sharingManagement.js +5 -7
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +297 -248
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/uids.js.map +1 -1
- package/dist/internal/upload/apiService.d.ts +3 -3
- package/dist/internal/upload/apiService.js +1 -1
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/blockVerifier.d.ts +3 -3
- package/dist/internal/upload/blockVerifier.js +1 -1
- package/dist/internal/upload/blockVerifier.js.map +1 -1
- package/dist/internal/upload/chunkStreamReader.test.js +6 -6
- package/dist/internal/upload/cryptoService.d.ts +4 -4
- package/dist/internal/upload/cryptoService.js +4 -4
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/digests.js.map +1 -1
- package/dist/internal/upload/fileUploader.d.ts +6 -6
- package/dist/internal/upload/fileUploader.js.map +1 -1
- package/dist/internal/upload/fileUploader.test.js.map +1 -1
- package/dist/internal/upload/index.d.ts +5 -5
- package/dist/internal/upload/index.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +3 -3
- package/dist/internal/upload/manager.d.ts +4 -4
- package/dist/internal/upload/manager.js +7 -5
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +137 -123
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/streamUploader.d.ts +6 -6
- package/dist/internal/upload/streamUploader.js +8 -6
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +16 -11
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/internal/upload/telemetry.d.ts +3 -3
- package/dist/internal/upload/telemetry.js +5 -3
- package/dist/internal/upload/telemetry.js.map +1 -1
- package/dist/internal/upload/telemetry.test.js +8 -8
- package/dist/internal/upload/telemetry.test.js.map +1 -1
- package/dist/protonDriveClient.d.ts +8 -8
- package/dist/protonDriveClient.js +12 -9
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/telemetry.js +18 -15
- package/dist/telemetry.js.map +1 -1
- package/dist/tests/logger.js.map +1 -1
- package/dist/tests/telemetry.d.ts +1 -1
- package/dist/transformers.js +4 -2
- package/dist/transformers.js.map +1 -1
- package/package.json +1 -1
- package/src/cache/interface.ts +22 -22
- package/src/cache/memoryCache.test.ts +7 -7
- package/src/cache/memoryCache.ts +4 -4
- package/src/cache/nullCache.ts +1 -1
- package/src/config.ts +5 -5
- package/src/crypto/driveCrypto.test.ts +15 -15
- package/src/crypto/driveCrypto.ts +120 -156
- package/src/crypto/hmac.ts +1 -1
- package/src/crypto/interface.ts +63 -72
- package/src/crypto/openPGPCrypto.ts +74 -94
- package/src/crypto/utils.ts +1 -1
- package/src/diagnostic/eventsGenerator.ts +2 -2
- package/src/diagnostic/httpClient.ts +6 -2
- package/src/diagnostic/index.ts +12 -10
- package/src/diagnostic/integrityVerificationStream.ts +3 -4
- package/src/diagnostic/interface.ts +81 -81
- package/src/diagnostic/sdkDiagnostic.ts +35 -24
- package/src/diagnostic/sdkDiagnosticFull.ts +16 -19
- package/src/diagnostic/telemetry.ts +4 -1
- package/src/diagnostic/zipGenerators.test.ts +1 -1
- package/src/diagnostic/zipGenerators.ts +3 -3
- package/src/errors.ts +21 -21
- package/src/index.ts +3 -3
- package/src/interface/account.ts +10 -10
- package/src/interface/author.ts +6 -6
- package/src/interface/config.ts +4 -4
- package/src/interface/devices.ts +6 -6
- package/src/interface/download.ts +12 -9
- package/src/interface/events.ts +45 -39
- package/src/interface/httpClient.ts +11 -11
- package/src/interface/index.ts +76 -19
- package/src/interface/nodes.ts +47 -49
- package/src/interface/result.ts +1 -3
- package/src/interface/sharing.ts +60 -57
- package/src/interface/telemetry.ts +74 -74
- package/src/interface/thumbnail.ts +5 -6
- package/src/interface/upload.ts +20 -12
- package/src/internal/apiService/apiService.test.ts +109 -76
- package/src/internal/apiService/apiService.ts +40 -26
- package/src/internal/apiService/coreTypes.ts +2474 -2463
- package/src/internal/apiService/driveTypes.ts +1868 -1822
- package/src/internal/apiService/errorCodes.ts +4 -4
- package/src/internal/apiService/errors.test.ts +25 -23
- package/src/internal/apiService/errors.ts +15 -9
- package/src/internal/apiService/index.ts +1 -1
- package/src/internal/apiService/transformers.ts +2 -2
- package/src/internal/asyncIteratorMap.test.ts +4 -4
- package/src/internal/asyncIteratorMap.ts +1 -1
- package/src/internal/asyncIteratorRace.test.ts +149 -0
- package/src/internal/asyncIteratorRace.ts +79 -0
- package/src/internal/batch.test.ts +50 -0
- package/src/internal/batch.ts +9 -0
- package/src/internal/batchLoading.test.ts +13 -14
- package/src/internal/batchLoading.ts +8 -8
- package/src/internal/devices/apiService.ts +58 -51
- package/src/internal/devices/cryptoService.ts +22 -17
- package/src/internal/devices/index.ts +17 -10
- package/src/internal/devices/interface.ts +21 -12
- package/src/internal/devices/manager.test.ts +40 -9
- package/src/internal/devices/manager.ts +3 -3
- package/src/internal/download/apiService.ts +66 -49
- package/src/internal/download/cryptoService.ts +34 -18
- package/src/internal/download/fileDownloader.test.ts +25 -9
- package/src/internal/download/fileDownloader.ts +36 -18
- package/src/internal/download/index.ts +19 -19
- package/src/internal/download/interface.ts +19 -20
- package/src/internal/download/queue.ts +3 -3
- package/src/internal/download/telemetry.test.ts +11 -11
- package/src/internal/download/telemetry.ts +24 -14
- package/src/internal/download/thumbnailDownloader.test.ts +11 -6
- package/src/internal/download/thumbnailDownloader.ts +43 -32
- package/src/internal/errors.ts +7 -5
- package/src/internal/events/apiService.ts +30 -17
- package/src/internal/events/coreEventManager.test.ts +18 -18
- package/src/internal/events/coreEventManager.ts +9 -6
- package/src/internal/events/eventManager.test.ts +51 -46
- package/src/internal/events/eventManager.ts +6 -5
- package/src/internal/events/index.ts +24 -14
- package/src/internal/events/interface.ts +47 -39
- package/src/internal/events/volumeEventManager.test.ts +61 -65
- package/src/internal/events/volumeEventManager.ts +18 -9
- package/src/internal/nodes/apiService.test.ts +197 -147
- package/src/internal/nodes/apiService.ts +288 -174
- package/src/internal/nodes/cache.test.ts +48 -20
- package/src/internal/nodes/cache.ts +60 -44
- package/src/internal/nodes/cryptoCache.test.ts +34 -14
- package/src/internal/nodes/cryptoCache.ts +10 -5
- package/src/internal/nodes/cryptoService.test.ts +492 -351
- package/src/internal/nodes/cryptoService.ts +170 -88
- package/src/internal/nodes/events.test.ts +38 -28
- package/src/internal/nodes/events.ts +7 -5
- package/src/internal/nodes/extendedAttributes.test.ts +28 -24
- package/src/internal/nodes/extendedAttributes.ts +20 -15
- package/src/internal/nodes/index.test.ts +133 -0
- package/src/internal/nodes/index.ts +27 -15
- package/src/internal/nodes/interface.ts +42 -29
- package/src/internal/nodes/nodesAccess.test.ts +124 -58
- package/src/internal/nodes/nodesAccess.ts +73 -49
- package/src/internal/nodes/nodesManagement.test.ts +32 -31
- package/src/internal/nodes/nodesManagement.ts +39 -32
- package/src/internal/nodes/nodesRevisions.ts +7 -7
- package/src/internal/nodes/validations.ts +2 -2
- package/src/internal/photos/albums.ts +5 -5
- package/src/internal/photos/apiService.ts +4 -7
- package/src/internal/photos/cache.ts +1 -1
- package/src/internal/photos/index.ts +8 -8
- package/src/internal/photos/interface.ts +2 -2
- package/src/internal/photos/photosTimeline.ts +4 -5
- package/src/internal/sdkEvents.test.ts +10 -10
- package/src/internal/sdkEvents.ts +5 -13
- package/src/internal/shares/apiService.ts +44 -33
- package/src/internal/shares/cache.test.ts +6 -4
- package/src/internal/shares/cache.ts +21 -12
- package/src/internal/shares/cryptoCache.test.ts +17 -11
- package/src/internal/shares/cryptoCache.ts +4 -4
- package/src/internal/shares/cryptoService.test.ts +72 -74
- package/src/internal/shares/cryptoService.ts +48 -23
- package/src/internal/shares/index.ts +23 -11
- package/src/internal/shares/interface.ts +8 -8
- package/src/internal/shares/manager.test.ts +88 -80
- package/src/internal/shares/manager.ts +19 -19
- package/src/internal/sharing/apiService.ts +282 -175
- package/src/internal/sharing/cache.test.ts +35 -35
- package/src/internal/sharing/cache.ts +2 -2
- package/src/internal/sharing/cryptoService.test.ts +58 -46
- package/src/internal/sharing/cryptoService.ts +121 -84
- package/src/internal/sharing/events.test.ts +45 -49
- package/src/internal/sharing/events.ts +9 -6
- package/src/internal/sharing/index.ts +22 -11
- package/src/internal/sharing/interface.ts +40 -40
- package/src/internal/sharing/sharingAccess.test.ts +71 -65
- package/src/internal/sharing/sharingAccess.ts +39 -21
- package/src/internal/sharing/sharingManagement.test.ts +398 -298
- package/src/internal/sharing/sharingManagement.ts +138 -65
- package/src/internal/uids.ts +1 -1
- package/src/internal/upload/apiService.ts +167 -117
- package/src/internal/upload/blockVerifier.ts +8 -6
- package/src/internal/upload/chunkStreamReader.test.ts +7 -7
- package/src/internal/upload/cryptoService.ts +42 -36
- package/src/internal/upload/digests.ts +2 -2
- package/src/internal/upload/fileUploader.test.ts +15 -3
- package/src/internal/upload/fileUploader.ts +39 -17
- package/src/internal/upload/index.ts +13 -14
- package/src/internal/upload/interface.ts +78 -78
- package/src/internal/upload/manager.test.ts +170 -153
- package/src/internal/upload/manager.ts +59 -35
- package/src/internal/upload/queue.ts +3 -3
- package/src/internal/upload/streamUploader.test.ts +40 -26
- package/src/internal/upload/streamUploader.ts +87 -69
- package/src/internal/upload/telemetry.test.ts +11 -11
- package/src/internal/upload/telemetry.ts +25 -15
- package/src/internal/wait.test.ts +1 -1
- package/src/internal/wait.ts +3 -3
- package/src/protonDriveClient.ts +121 -39
- package/src/protonDrivePhotosClient.ts +16 -10
- package/src/telemetry.ts +60 -52
- package/src/tests/logger.ts +1 -1
- package/src/tests/telemetry.ts +2 -2
- package/src/transformers.ts +27 -21
- package/src/version.ts +0 -1
|
@@ -1,20 +1,29 @@
|
|
|
1
|
-
import { DriveAPIService, drivePaths } from
|
|
2
|
-
import { makeMemberUid } from
|
|
3
|
-
import { EncryptedShare, EncryptedRootShare, EncryptedShareCrypto, ShareType } from
|
|
4
|
-
|
|
5
|
-
type PostCreateVolumeRequest = Extract<
|
|
1
|
+
import { DriveAPIService, drivePaths } from '../apiService';
|
|
2
|
+
import { makeMemberUid } from '../uids';
|
|
3
|
+
import { EncryptedShare, EncryptedRootShare, EncryptedShareCrypto, ShareType } from './interface';
|
|
4
|
+
|
|
5
|
+
type PostCreateVolumeRequest = Extract<
|
|
6
|
+
drivePaths['/drive/volumes']['post']['requestBody'],
|
|
7
|
+
{ content: object }
|
|
8
|
+
>['content']['application/json'];
|
|
6
9
|
type PostCreateVolumeResponse = drivePaths['/drive/volumes']['post']['responses']['200']['content']['application/json'];
|
|
7
10
|
|
|
8
|
-
type PostCreateShareRequest = Extract<
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
type
|
|
11
|
+
type PostCreateShareRequest = Extract<
|
|
12
|
+
drivePaths['/drive/volumes/{volumeID}/shares']['post']['requestBody'],
|
|
13
|
+
{ content: object }
|
|
14
|
+
>['content']['application/json'];
|
|
15
|
+
type PostCreateShareResponse =
|
|
16
|
+
drivePaths['/drive/volumes/{volumeID}/shares']['post']['responses']['200']['content']['application/json'];
|
|
17
|
+
|
|
18
|
+
type GetMyFilesResponse =
|
|
19
|
+
drivePaths['/drive/v2/shares/my-files']['get']['responses']['200']['content']['application/json'];
|
|
20
|
+
type GetVolumeResponse =
|
|
21
|
+
drivePaths['/drive/volumes/{volumeID}']['get']['responses']['200']['content']['application/json'];
|
|
13
22
|
type GetShareResponse = drivePaths['/drive/shares/{shareID}']['get']['responses']['200']['content']['application/json'];
|
|
14
23
|
|
|
15
24
|
/**
|
|
16
25
|
* Provides API communication for fetching shares and creating volumes.
|
|
17
|
-
*
|
|
26
|
+
*
|
|
18
27
|
* The service is responsible for transforming local objects to API payloads
|
|
19
28
|
* and vice versa. It should not contain any business logic.
|
|
20
29
|
*/
|
|
@@ -44,7 +53,7 @@ export class SharesAPIService {
|
|
|
44
53
|
const response = await this.apiService.get<GetVolumeResponse>(`drive/volumes/${volumeId}`);
|
|
45
54
|
return {
|
|
46
55
|
shareId: response.Volume.Share.ShareID,
|
|
47
|
-
}
|
|
56
|
+
};
|
|
48
57
|
}
|
|
49
58
|
|
|
50
59
|
async getShare(shareId: string): Promise<EncryptedShare> {
|
|
@@ -54,11 +63,11 @@ export class SharesAPIService {
|
|
|
54
63
|
|
|
55
64
|
/**
|
|
56
65
|
* Returns root share with address key.
|
|
57
|
-
*
|
|
66
|
+
*
|
|
58
67
|
* This function provides access to root shares that provides access
|
|
59
68
|
* to node tree via address key. For this reason, caller must use this
|
|
60
69
|
* only when it is clear the shareId is root share.
|
|
61
|
-
*
|
|
70
|
+
*
|
|
62
71
|
* @throws Error when share is not root share.
|
|
63
72
|
*/
|
|
64
73
|
async getRootShare(shareId: string): Promise<EncryptedRootShare> {
|
|
@@ -76,17 +85,17 @@ export class SharesAPIService {
|
|
|
76
85
|
|
|
77
86
|
async createVolume(
|
|
78
87
|
share: {
|
|
79
|
-
addressId: string
|
|
80
|
-
addressKeyId: string
|
|
88
|
+
addressId: string;
|
|
89
|
+
addressKeyId: string;
|
|
81
90
|
} & EncryptedShareCrypto,
|
|
82
91
|
node: {
|
|
83
|
-
encryptedName: string
|
|
84
|
-
armoredKey: string
|
|
85
|
-
armoredPassphrase: string
|
|
86
|
-
armoredPassphraseSignature: string
|
|
87
|
-
armoredHashKey: string
|
|
92
|
+
encryptedName: string;
|
|
93
|
+
armoredKey: string;
|
|
94
|
+
armoredPassphrase: string;
|
|
95
|
+
armoredPassphraseSignature: string;
|
|
96
|
+
armoredHashKey: string;
|
|
88
97
|
},
|
|
89
|
-
): Promise<{ volumeId: string
|
|
98
|
+
): Promise<{ volumeId: string; shareId: string; rootNodeId: string }> {
|
|
90
99
|
const response = await this.apiService.post<
|
|
91
100
|
// Volume & share names are deprecated.
|
|
92
101
|
Omit<PostCreateVolumeRequest, 'VolumeName' | 'ShareName'>,
|
|
@@ -108,19 +117,19 @@ export class SharesAPIService {
|
|
|
108
117
|
volumeId: response.Volume.ID,
|
|
109
118
|
shareId: response.Volume.Share.ShareID,
|
|
110
119
|
rootNodeId: response.Volume.Share.LinkID,
|
|
111
|
-
}
|
|
120
|
+
};
|
|
112
121
|
}
|
|
113
122
|
|
|
114
123
|
async createShare(
|
|
115
124
|
volumeId: string,
|
|
116
125
|
share: {
|
|
117
|
-
addressId: string
|
|
126
|
+
addressId: string;
|
|
118
127
|
} & EncryptedShareCrypto,
|
|
119
128
|
node: {
|
|
120
|
-
nodeId: string
|
|
121
|
-
encryptedName: string
|
|
122
|
-
nameKeyPacket: string
|
|
123
|
-
passphraseKeyPacket: string
|
|
129
|
+
nodeId: string;
|
|
130
|
+
encryptedName: string;
|
|
131
|
+
nameKeyPacket: string;
|
|
132
|
+
passphraseKeyPacket: string;
|
|
124
133
|
},
|
|
125
134
|
): Promise<{ shareId: string }> {
|
|
126
135
|
const response = await this.apiService.post<
|
|
@@ -139,7 +148,7 @@ export class SharesAPIService {
|
|
|
139
148
|
|
|
140
149
|
return {
|
|
141
150
|
shareId: response.Share.ID,
|
|
142
|
-
}
|
|
151
|
+
};
|
|
143
152
|
}
|
|
144
153
|
}
|
|
145
154
|
|
|
@@ -149,15 +158,17 @@ function convertSharePayload(response: GetShareResponse): EncryptedShare {
|
|
|
149
158
|
shareId: response.ShareID,
|
|
150
159
|
rootNodeId: response.LinkID,
|
|
151
160
|
creatorEmail: response.Creator,
|
|
152
|
-
creationTime: response.CreateTime ? new Date(response.CreateTime*1000) : undefined,
|
|
161
|
+
creationTime: response.CreateTime ? new Date(response.CreateTime * 1000) : undefined,
|
|
153
162
|
encryptedCrypto: {
|
|
154
163
|
armoredKey: response.Key,
|
|
155
164
|
armoredPassphrase: response.Passphrase,
|
|
156
165
|
armoredPassphraseSignature: response.PassphraseSignature,
|
|
157
166
|
},
|
|
158
|
-
membership: response.Memberships?.[0]
|
|
159
|
-
|
|
160
|
-
|
|
167
|
+
membership: response.Memberships?.[0]
|
|
168
|
+
? {
|
|
169
|
+
memberUid: makeMemberUid(response.ShareID, response.Memberships[0].MemberID),
|
|
170
|
+
}
|
|
171
|
+
: undefined,
|
|
161
172
|
type: convertShareTypeNumberToEnum(response.Type),
|
|
162
173
|
};
|
|
163
174
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { MemoryCache } from
|
|
2
|
-
import { getMockLogger } from
|
|
3
|
-
import { SharesCache } from
|
|
1
|
+
import { MemoryCache } from '../../cache';
|
|
2
|
+
import { getMockLogger } from '../../tests/logger';
|
|
3
|
+
import { SharesCache } from './cache';
|
|
4
4
|
|
|
5
5
|
describe('sharesCache', () => {
|
|
6
6
|
let memoryCache: MemoryCache<string>;
|
|
@@ -45,7 +45,9 @@ describe('sharesCache', () => {
|
|
|
45
45
|
await cache.getVolume('badObject');
|
|
46
46
|
fail('Should have thrown an error');
|
|
47
47
|
} catch (error) {
|
|
48
|
-
expect(`${error}`).toBe(
|
|
48
|
+
expect(`${error}`).toBe(
|
|
49
|
+
'Error: Failed to deserialize volume: Unexpected token \'a\', \"aaa\" is not valid JSON',
|
|
50
|
+
);
|
|
49
51
|
}
|
|
50
52
|
|
|
51
53
|
try {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ProtonDriveEntitiesCache, Logger } from
|
|
2
|
-
import { getErrorMessage } from
|
|
3
|
-
import { Volume } from
|
|
1
|
+
import { ProtonDriveEntitiesCache, Logger } from '../../interface';
|
|
2
|
+
import { getErrorMessage } from '../errors';
|
|
3
|
+
import { Volume } from './interface';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* Provides caching for shares and volume metadata.
|
|
@@ -10,7 +10,10 @@ import { Volume } from "./interface";
|
|
|
10
10
|
* This is only intended for the owner's main volume. There is no cache invalidation.
|
|
11
11
|
*/
|
|
12
12
|
export class SharesCache {
|
|
13
|
-
constructor(
|
|
13
|
+
constructor(
|
|
14
|
+
private logger: Logger,
|
|
15
|
+
private driveCache: ProtonDriveEntitiesCache,
|
|
16
|
+
) {
|
|
14
17
|
this.logger = logger;
|
|
15
18
|
this.driveCache = driveCache;
|
|
16
19
|
}
|
|
@@ -51,14 +54,20 @@ function serializeVolume(volume: Volume) {
|
|
|
51
54
|
}
|
|
52
55
|
|
|
53
56
|
function deserializeVolume(shareData: string): Volume {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
!volume ||
|
|
57
|
-
|
|
58
|
-
!volume.
|
|
59
|
-
|
|
60
|
-
!volume.
|
|
61
|
-
|
|
57
|
+
const volume = JSON.parse(shareData);
|
|
58
|
+
if (
|
|
59
|
+
!volume ||
|
|
60
|
+
typeof volume !== 'object' ||
|
|
61
|
+
!volume.volumeId ||
|
|
62
|
+
typeof volume.volumeId !== 'string' ||
|
|
63
|
+
!volume.shareId ||
|
|
64
|
+
typeof volume.shareId !== 'string' ||
|
|
65
|
+
!volume.rootNodeId ||
|
|
66
|
+
typeof volume.rootNodeId !== 'string' ||
|
|
67
|
+
!volume.creatorEmail ||
|
|
68
|
+
typeof volume.creatorEmail !== 'string' ||
|
|
69
|
+
!volume.addressId ||
|
|
70
|
+
typeof volume.addressId !== 'string'
|
|
62
71
|
) {
|
|
63
72
|
throw new Error('Invalid volume data');
|
|
64
73
|
}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { PrivateKey, SessionKey } from
|
|
2
|
-
import { MemoryCache } from
|
|
3
|
-
import { CachedCryptoMaterial } from
|
|
4
|
-
import { SharesCryptoCache } from
|
|
1
|
+
import { PrivateKey, SessionKey } from '../../crypto';
|
|
2
|
+
import { MemoryCache } from '../../cache';
|
|
3
|
+
import { CachedCryptoMaterial } from '../../interface';
|
|
4
|
+
import { SharesCryptoCache } from './cryptoCache';
|
|
5
5
|
|
|
6
6
|
describe('sharesCryptoCache', () => {
|
|
7
7
|
let memoryCache: MemoryCache<CachedCryptoMaterial>;
|
|
8
8
|
let cache: SharesCryptoCache;
|
|
9
9
|
|
|
10
10
|
const generatePrivateKey = (name: string) => {
|
|
11
|
-
return name as unknown as PrivateKey
|
|
12
|
-
}
|
|
11
|
+
return name as unknown as PrivateKey;
|
|
12
|
+
};
|
|
13
13
|
|
|
14
14
|
const generateSessionKey = (name: string) => {
|
|
15
|
-
return name as unknown as SessionKey
|
|
16
|
-
}
|
|
15
|
+
return name as unknown as SessionKey;
|
|
16
|
+
};
|
|
17
17
|
|
|
18
18
|
beforeEach(() => {
|
|
19
19
|
memoryCache = new MemoryCache();
|
|
@@ -32,8 +32,14 @@ describe('sharesCryptoCache', () => {
|
|
|
32
32
|
|
|
33
33
|
it('should replace and retrieve new keys', async () => {
|
|
34
34
|
const shareId = 'newShareId';
|
|
35
|
-
const keys1 = {
|
|
36
|
-
|
|
35
|
+
const keys1 = {
|
|
36
|
+
key: generatePrivateKey('privateKey1'),
|
|
37
|
+
passphraseSessionKey: generateSessionKey('sessionKey1'),
|
|
38
|
+
};
|
|
39
|
+
const keys2 = {
|
|
40
|
+
key: generatePrivateKey('privateKey2'),
|
|
41
|
+
passphraseSessionKey: generateSessionKey('sessionKey2'),
|
|
42
|
+
};
|
|
37
43
|
|
|
38
44
|
await cache.setShareKey(shareId, keys1);
|
|
39
45
|
await cache.setShareKey(shareId, keys2);
|
|
@@ -67,4 +73,4 @@ describe('sharesCryptoCache', () => {
|
|
|
67
73
|
expect(`${error}`).toBe('Error: Entity not found');
|
|
68
74
|
}
|
|
69
75
|
});
|
|
70
|
-
});
|
|
76
|
+
});
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { ProtonDriveCryptoCache } from
|
|
2
|
-
import { DecryptedShareKey } from
|
|
1
|
+
import { ProtonDriveCryptoCache } from '../../interface';
|
|
2
|
+
import { DecryptedShareKey } from './interface';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Provides caching for share crypto material.
|
|
6
|
-
*
|
|
6
|
+
*
|
|
7
7
|
* The cache is responsible for serialising and deserialising share
|
|
8
8
|
* crypto material.
|
|
9
|
-
*
|
|
9
|
+
*
|
|
10
10
|
* The share crypto materials are cached so the updates to the root
|
|
11
11
|
* nodes can be decrypted without the need to fetch the share keys
|
|
12
12
|
* from the server again. Otherwise the rest of the tree requires
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { DriveCrypto, PrivateKey, SessionKey, VERIFICATION_STATUS } from
|
|
2
|
-
import { ProtonDriveAccount, ProtonDriveTelemetry } from
|
|
3
|
-
import { getMockTelemetry } from
|
|
4
|
-
import { EncryptedRootShare, ShareType } from
|
|
5
|
-
import { SharesCryptoService } from
|
|
1
|
+
import { DriveCrypto, PrivateKey, SessionKey, VERIFICATION_STATUS } from '../../crypto';
|
|
2
|
+
import { ProtonDriveAccount, ProtonDriveTelemetry } from '../../interface';
|
|
3
|
+
import { getMockTelemetry } from '../../tests/telemetry';
|
|
4
|
+
import { EncryptedRootShare, ShareType } from './interface';
|
|
5
|
+
import { SharesCryptoService } from './cryptoService';
|
|
6
6
|
|
|
7
|
-
describe(
|
|
7
|
+
describe('SharesCryptoService', () => {
|
|
8
8
|
let telemetry: ProtonDriveTelemetry;
|
|
9
9
|
let driveCrypto: DriveCrypto;
|
|
10
10
|
let account: ProtonDriveAccount;
|
|
@@ -14,89 +14,89 @@ describe("SharesCryptoService", () => {
|
|
|
14
14
|
telemetry = getMockTelemetry();
|
|
15
15
|
// @ts-expect-error No need to implement all methods for mocking
|
|
16
16
|
driveCrypto = {
|
|
17
|
-
decryptKey: jest.fn(async () =>
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
17
|
+
decryptKey: jest.fn(async () =>
|
|
18
|
+
Promise.resolve({
|
|
19
|
+
passphrase: 'pass',
|
|
20
|
+
key: 'decryptedKey' as unknown as PrivateKey,
|
|
21
|
+
passphraseSessionKey: 'sessionKey' as unknown as SessionKey,
|
|
22
|
+
verified: VERIFICATION_STATUS.SIGNED_AND_VALID,
|
|
23
|
+
}),
|
|
24
|
+
),
|
|
23
25
|
};
|
|
24
26
|
account = {
|
|
25
27
|
// @ts-expect-error No need to implement full response for mocking
|
|
26
28
|
getOwnAddress: jest.fn(async () => ({
|
|
27
|
-
keys: [{ key:
|
|
29
|
+
keys: [{ key: 'addressKey' as unknown as PrivateKey }],
|
|
28
30
|
})),
|
|
29
31
|
getPublicKeys: jest.fn(async () => []),
|
|
30
32
|
};
|
|
31
33
|
cryptoService = new SharesCryptoService(telemetry, driveCrypto, account);
|
|
32
34
|
});
|
|
33
35
|
|
|
34
|
-
it(
|
|
35
|
-
const result = await cryptoService.decryptRootShare(
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
} as EncryptedRootShare,
|
|
47
|
-
);
|
|
36
|
+
it('should decrypt root share', async () => {
|
|
37
|
+
const result = await cryptoService.decryptRootShare({
|
|
38
|
+
shareId: 'shareId',
|
|
39
|
+
addressId: 'addressId',
|
|
40
|
+
creatorEmail: 'signatureEmail',
|
|
41
|
+
encryptedCrypto: {
|
|
42
|
+
armoredKey: 'armoredKey',
|
|
43
|
+
armoredPassphrase: 'armoredPassphrase',
|
|
44
|
+
armoredPassphraseSignature: 'armoredPassphraseSignature',
|
|
45
|
+
},
|
|
46
|
+
type: ShareType.Main,
|
|
47
|
+
} as EncryptedRootShare);
|
|
48
48
|
|
|
49
49
|
expect(result).toMatchObject({
|
|
50
50
|
share: {
|
|
51
|
-
shareId:
|
|
52
|
-
author: { ok: true, value:
|
|
51
|
+
shareId: 'shareId',
|
|
52
|
+
author: { ok: true, value: 'signatureEmail' },
|
|
53
53
|
},
|
|
54
54
|
key: {
|
|
55
|
-
key:
|
|
56
|
-
passphraseSessionKey:
|
|
55
|
+
key: 'decryptedKey',
|
|
56
|
+
passphraseSessionKey: 'sessionKey',
|
|
57
57
|
},
|
|
58
58
|
});
|
|
59
59
|
|
|
60
|
-
expect(account.getOwnAddress).toHaveBeenCalledWith(
|
|
61
|
-
expect(account.getPublicKeys).toHaveBeenCalledWith(
|
|
60
|
+
expect(account.getOwnAddress).toHaveBeenCalledWith('addressId');
|
|
61
|
+
expect(account.getPublicKeys).toHaveBeenCalledWith('signatureEmail');
|
|
62
62
|
expect(telemetry.logEvent).not.toHaveBeenCalled();
|
|
63
63
|
});
|
|
64
64
|
|
|
65
|
-
it(
|
|
66
|
-
driveCrypto.decryptKey = jest.fn(async () =>
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
const result = await cryptoService.decryptRootShare(
|
|
74
|
-
{
|
|
75
|
-
shareId: "shareId",
|
|
76
|
-
addressId: "addressId",
|
|
77
|
-
creatorEmail: "signatureEmail",
|
|
78
|
-
encryptedCrypto: {
|
|
79
|
-
armoredKey: "armoredKey",
|
|
80
|
-
armoredPassphrase: "armoredPassphrase",
|
|
81
|
-
armoredPassphraseSignature: "armoredPassphraseSignature",
|
|
82
|
-
},
|
|
83
|
-
type: ShareType.Main,
|
|
84
|
-
} as EncryptedRootShare,
|
|
65
|
+
it('should decrypt root share with signiture verification error', async () => {
|
|
66
|
+
driveCrypto.decryptKey = jest.fn(async () =>
|
|
67
|
+
Promise.resolve({
|
|
68
|
+
passphrase: 'pass',
|
|
69
|
+
key: 'decryptedKey' as unknown as PrivateKey,
|
|
70
|
+
passphraseSessionKey: 'sessionKey' as unknown as SessionKey,
|
|
71
|
+
verified: VERIFICATION_STATUS.NOT_SIGNED,
|
|
72
|
+
}),
|
|
85
73
|
);
|
|
86
74
|
|
|
75
|
+
const result = await cryptoService.decryptRootShare({
|
|
76
|
+
shareId: 'shareId',
|
|
77
|
+
addressId: 'addressId',
|
|
78
|
+
creatorEmail: 'signatureEmail',
|
|
79
|
+
encryptedCrypto: {
|
|
80
|
+
armoredKey: 'armoredKey',
|
|
81
|
+
armoredPassphrase: 'armoredPassphrase',
|
|
82
|
+
armoredPassphraseSignature: 'armoredPassphraseSignature',
|
|
83
|
+
},
|
|
84
|
+
type: ShareType.Main,
|
|
85
|
+
} as EncryptedRootShare);
|
|
86
|
+
|
|
87
87
|
expect(result).toMatchObject({
|
|
88
88
|
share: {
|
|
89
|
-
shareId:
|
|
90
|
-
author: { ok: false, error: { claimedAuthor:
|
|
89
|
+
shareId: 'shareId',
|
|
90
|
+
author: { ok: false, error: { claimedAuthor: 'signatureEmail', error: 'Missing signature' } },
|
|
91
91
|
},
|
|
92
92
|
key: {
|
|
93
|
-
key:
|
|
94
|
-
passphraseSessionKey:
|
|
93
|
+
key: 'decryptedKey',
|
|
94
|
+
passphraseSessionKey: 'sessionKey',
|
|
95
95
|
},
|
|
96
96
|
});
|
|
97
97
|
|
|
98
|
-
expect(account.getOwnAddress).toHaveBeenCalledWith(
|
|
99
|
-
expect(account.getPublicKeys).toHaveBeenCalledWith(
|
|
98
|
+
expect(account.getOwnAddress).toHaveBeenCalledWith('addressId');
|
|
99
|
+
expect(account.getPublicKeys).toHaveBeenCalledWith('signatureEmail');
|
|
100
100
|
expect(telemetry.logEvent).toHaveBeenCalledWith({
|
|
101
101
|
eventName: 'verificationError',
|
|
102
102
|
volumeType: 'own_volume',
|
|
@@ -106,23 +106,21 @@ describe("SharesCryptoService", () => {
|
|
|
106
106
|
});
|
|
107
107
|
});
|
|
108
108
|
|
|
109
|
-
it(
|
|
110
|
-
const error = new Error(
|
|
109
|
+
it('should handle decrypt issue of root share', async () => {
|
|
110
|
+
const error = new Error('Decryption error');
|
|
111
111
|
driveCrypto.decryptKey = jest.fn(async () => Promise.reject(error));
|
|
112
112
|
|
|
113
|
-
const result = cryptoService.decryptRootShare(
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
} as EncryptedRootShare,
|
|
125
|
-
);
|
|
113
|
+
const result = cryptoService.decryptRootShare({
|
|
114
|
+
shareId: 'shareId',
|
|
115
|
+
addressId: 'addressId',
|
|
116
|
+
creatorEmail: 'signatureEmail',
|
|
117
|
+
encryptedCrypto: {
|
|
118
|
+
armoredKey: 'armoredKey',
|
|
119
|
+
armoredPassphrase: 'armoredPassphrase',
|
|
120
|
+
armoredPassphraseSignature: 'armoredPassphraseSignature',
|
|
121
|
+
},
|
|
122
|
+
type: ShareType.Main,
|
|
123
|
+
} as EncryptedRootShare);
|
|
126
124
|
|
|
127
125
|
await expect(result).rejects.toThrow(error);
|
|
128
126
|
|
|
@@ -1,16 +1,31 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import {
|
|
2
|
+
ProtonDriveAccount,
|
|
3
|
+
resultOk,
|
|
4
|
+
resultError,
|
|
5
|
+
Result,
|
|
6
|
+
UnverifiedAuthorError,
|
|
7
|
+
ProtonDriveTelemetry,
|
|
8
|
+
Logger,
|
|
9
|
+
MetricVolumeType,
|
|
10
|
+
} from '../../interface';
|
|
11
|
+
import { DriveCrypto, PrivateKey, VERIFICATION_STATUS } from '../../crypto';
|
|
12
|
+
import { getVerificationMessage } from '../errors';
|
|
13
|
+
import {
|
|
14
|
+
EncryptedRootShare,
|
|
15
|
+
DecryptedRootShare,
|
|
16
|
+
EncryptedShareCrypto,
|
|
17
|
+
DecryptedShareKey,
|
|
18
|
+
ShareType,
|
|
19
|
+
} from './interface';
|
|
5
20
|
|
|
6
21
|
/**
|
|
7
22
|
* Provides crypto operations for share keys.
|
|
8
|
-
*
|
|
23
|
+
*
|
|
9
24
|
* The share crypto service is responsible for encrypting and decrypting share
|
|
10
25
|
* keys. It should export high-level actions only, such as "decrypt share"
|
|
11
26
|
* instead of low-level operations like "decrypt share passphrase". Low-level
|
|
12
27
|
* operations should be kept private to the module.
|
|
13
|
-
*
|
|
28
|
+
*
|
|
14
29
|
* The service owns the logic to switch between old and new crypto model.
|
|
15
30
|
*/
|
|
16
31
|
export class SharesCryptoService {
|
|
@@ -19,7 +34,11 @@ export class SharesCryptoService {
|
|
|
19
34
|
private reportedDecryptionErrors = new Set<string>();
|
|
20
35
|
private reportedVerificationErrors = new Set<string>();
|
|
21
36
|
|
|
22
|
-
constructor(
|
|
37
|
+
constructor(
|
|
38
|
+
private telemetry: ProtonDriveTelemetry,
|
|
39
|
+
private driveCrypto: DriveCrypto,
|
|
40
|
+
private account: ProtonDriveAccount,
|
|
41
|
+
) {
|
|
23
42
|
this.telemetry = telemetry;
|
|
24
43
|
this.logger = telemetry.getLogger('shares-crypto');
|
|
25
44
|
this.driveCrypto = driveCrypto;
|
|
@@ -27,16 +46,21 @@ export class SharesCryptoService {
|
|
|
27
46
|
}
|
|
28
47
|
|
|
29
48
|
async generateVolumeBootstrap(addressKey: PrivateKey): Promise<{
|
|
30
|
-
shareKey: { encrypted: EncryptedShareCrypto
|
|
49
|
+
shareKey: { encrypted: EncryptedShareCrypto; decrypted: DecryptedShareKey };
|
|
31
50
|
rootNode: {
|
|
32
|
-
key: { encrypted: EncryptedShareCrypto
|
|
33
|
-
encryptedName: string
|
|
34
|
-
armoredHashKey: string
|
|
35
|
-
}
|
|
51
|
+
key: { encrypted: EncryptedShareCrypto; decrypted: DecryptedShareKey };
|
|
52
|
+
encryptedName: string;
|
|
53
|
+
armoredHashKey: string;
|
|
54
|
+
};
|
|
36
55
|
}> {
|
|
37
56
|
const shareKey = await this.driveCrypto.generateKey([addressKey], addressKey);
|
|
38
57
|
const rootNodeKey = await this.driveCrypto.generateKey([shareKey.decrypted.key], addressKey);
|
|
39
|
-
const { armoredNodeName } = await this.driveCrypto.encryptNodeName(
|
|
58
|
+
const { armoredNodeName } = await this.driveCrypto.encryptNodeName(
|
|
59
|
+
'root',
|
|
60
|
+
undefined,
|
|
61
|
+
shareKey.decrypted.key,
|
|
62
|
+
addressKey,
|
|
63
|
+
);
|
|
40
64
|
const { armoredHashKey } = await this.driveCrypto.generateHashKey(rootNodeKey.decrypted.key);
|
|
41
65
|
return {
|
|
42
66
|
shareKey,
|
|
@@ -45,10 +69,10 @@ export class SharesCryptoService {
|
|
|
45
69
|
encryptedName: armoredNodeName,
|
|
46
70
|
armoredHashKey,
|
|
47
71
|
},
|
|
48
|
-
}
|
|
72
|
+
};
|
|
49
73
|
}
|
|
50
74
|
|
|
51
|
-
async decryptRootShare(share: EncryptedRootShare): Promise<{ share: DecryptedRootShare
|
|
75
|
+
async decryptRootShare(share: EncryptedRootShare): Promise<{ share: DecryptedRootShare; key: DecryptedShareKey }> {
|
|
52
76
|
const { keys: addressKeys } = await this.account.getOwnAddress(share.addressId);
|
|
53
77
|
const addressPublicKeys = await this.account.getPublicKeys(share.creatorEmail);
|
|
54
78
|
|
|
@@ -60,7 +84,7 @@ export class SharesCryptoService {
|
|
|
60
84
|
share.encryptedCrypto.armoredPassphraseSignature,
|
|
61
85
|
addressKeys.map(({ key }) => key),
|
|
62
86
|
addressPublicKeys,
|
|
63
|
-
)
|
|
87
|
+
);
|
|
64
88
|
key = result.key;
|
|
65
89
|
passphraseSessionKey = result.passphraseSessionKey;
|
|
66
90
|
verified = result.verified;
|
|
@@ -69,12 +93,13 @@ export class SharesCryptoService {
|
|
|
69
93
|
throw error;
|
|
70
94
|
}
|
|
71
95
|
|
|
72
|
-
const author: Result<string, UnverifiedAuthorError> =
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
96
|
+
const author: Result<string, UnverifiedAuthorError> =
|
|
97
|
+
verified === VERIFICATION_STATUS.SIGNED_AND_VALID
|
|
98
|
+
? resultOk(share.creatorEmail)
|
|
99
|
+
: resultError({
|
|
100
|
+
claimedAuthor: share.creatorEmail,
|
|
101
|
+
error: getVerificationMessage(verified),
|
|
102
|
+
});
|
|
78
103
|
|
|
79
104
|
if (!author.ok) {
|
|
80
105
|
await this.reportVerificationError(share);
|
|
@@ -89,7 +114,7 @@ export class SharesCryptoService {
|
|
|
89
114
|
key,
|
|
90
115
|
passphraseSessionKey,
|
|
91
116
|
},
|
|
92
|
-
}
|
|
117
|
+
};
|
|
93
118
|
}
|
|
94
119
|
|
|
95
120
|
private reportDecryptionError(share: EncryptedRootShare, error?: unknown) {
|