@hot-updater/react-native 1.0.0-rc.1 → 1.0.0-rc.15
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/android/proguard-rules.pro +17 -2
- package/android/src/main/java/com/hotupdater/BuiltInAssetResolver.kt +286 -0
- package/android/src/main/java/com/hotupdater/BundleFileStorageService.kt +651 -637
- package/android/src/main/java/com/hotupdater/BundleMetadata.kt +10 -0
- package/android/src/main/java/com/hotupdater/HotUpdaterException.kt +0 -13
- package/android/src/main/java/com/hotupdater/HotUpdaterImpl.kt +10 -14
- package/android/src/main/java/com/hotupdater/HotUpdaterRecoveryManager.kt +37 -54
- package/android/src/main/java/com/hotupdater/HotUpdaterRecoveryState.kt +64 -0
- package/android/src/main/java/com/hotupdater/OkHttpDownloadService.kt +19 -0
- package/android/src/main/java/com/hotupdater/TarArchiveInputStream.kt +214 -375
- package/android/src/main/java/com/hotupdater/TarBrArchiveExtractor.kt +119 -0
- package/android/src/newarch/HotUpdater.kt +7 -9
- package/android/src/newarch/HotUpdaterModule.kt +40 -20
- package/android/src/oldarch/HotUpdater.kt +7 -9
- package/android/src/oldarch/HotUpdaterModule.kt +40 -20
- package/android/src/test/java/com/hotupdater/BundleFileStorageServiceTest.kt +1126 -74
- package/android/src/test/java/com/hotupdater/HotUpdaterImplTest.kt +4 -5
- package/android/src/test/java/com/hotupdater/HotUpdaterRecoveryStateTest.kt +97 -0
- package/android/src/test/java/com/hotupdater/PendingCrashRecoveryTest.kt +44 -0
- package/android/src/test/java/com/hotupdater/TarBrArchiveExtractorTest.kt +206 -0
- package/ios/HotUpdater/Internal/BrotliFileDecompressor.swift +167 -0
- package/ios/HotUpdater/Internal/BuiltInAssetResolver.swift +196 -0
- package/ios/HotUpdater/Internal/BundleFileStorageService.swift +773 -1016
- package/ios/HotUpdater/Internal/BundleMetadata.swift +5 -0
- package/ios/HotUpdater/Internal/FileUtilities.swift +64 -0
- package/ios/HotUpdater/Internal/HotUpdater-Bridging-Header.h +0 -1
- package/ios/HotUpdater/Internal/HotUpdater.mm +5 -27
- package/ios/HotUpdater/Internal/HotUpdaterImpl.swift +149 -51
- package/ios/HotUpdater/Internal/NotificationExtension.swift +0 -2
- package/ios/HotUpdater/Internal/TarArchiveExtractor.swift +182 -311
- package/ios/HotUpdater/Internal/URLSessionDownloadService.swift +13 -72
- package/ios/HotUpdater/Recovery/HotUpdaterRecovery.h +16 -0
- package/ios/HotUpdater/Recovery/HotUpdaterRecovery.mm +83 -0
- package/ios/HotUpdater/Recovery/HotUpdaterRecoveryHooks.mm +49 -0
- package/lib/commonjs/checkForUpdate.js +32 -23
- package/lib/commonjs/checkForUpdate.js.map +1 -1
- package/lib/commonjs/checkForUpdate.releaseCatalog.spec.js +97 -28
- package/lib/commonjs/checkForUpdate.releaseCatalog.spec.js.map +1 -1
- package/lib/commonjs/error.js +4 -13
- package/lib/commonjs/error.js.map +1 -1
- package/lib/commonjs/fetchJSON.js +9 -2
- package/lib/commonjs/fetchJSON.js.map +1 -1
- package/lib/commonjs/httpClient.js +46 -29
- package/lib/commonjs/httpClient.js.map +1 -1
- package/lib/commonjs/httpClient.spec.js +57 -5
- package/lib/commonjs/httpClient.spec.js.map +1 -1
- package/lib/commonjs/index.js +31 -14
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/index.spec.js +56 -11
- package/lib/commonjs/index.spec.js.map +1 -1
- package/lib/commonjs/native.js +15 -14
- package/lib/commonjs/native.js.map +1 -1
- package/lib/commonjs/native.spec.js +128 -22
- package/lib/commonjs/native.spec.js.map +1 -1
- package/lib/commonjs/{notifyAppReadyAnalytics.boundary.spec.js → notifyAppReadyInsights.boundary.spec.js} +28 -21
- package/lib/commonjs/notifyAppReadyInsights.boundary.spec.js.map +1 -0
- package/lib/commonjs/notifyAppReadyInsights.js +188 -0
- package/lib/commonjs/notifyAppReadyInsights.js.map +1 -0
- package/lib/commonjs/{notifyAppReadyAnalytics.spec.js → notifyAppReadyInsights.spec.js} +161 -29
- package/lib/commonjs/notifyAppReadyInsights.spec.js.map +1 -0
- package/lib/commonjs/{notifyAppReadyAnalytics.test-utils.js → notifyAppReadyInsights.test-utils.js} +3 -3
- package/lib/commonjs/notifyAppReadyInsights.test-utils.js.map +1 -0
- package/lib/commonjs/{notifyAppReadyAnalytics.transport.spec.js → notifyAppReadyInsights.transport.spec.js} +14 -7
- package/lib/commonjs/notifyAppReadyInsights.transport.spec.js.map +1 -0
- package/lib/commonjs/sdkVersion.js +1 -1
- package/lib/commonjs/sdkVersion.js.map +1 -1
- package/lib/commonjs/specs/NativeHotUpdater.js.map +1 -1
- package/lib/commonjs/store.js +3 -10
- package/lib/commonjs/store.js.map +1 -1
- package/lib/commonjs/store.notification.spec.js +12 -4
- package/lib/commonjs/store.notification.spec.js.map +1 -1
- package/lib/commonjs/store.spec.js +2 -136
- package/lib/commonjs/store.spec.js.map +1 -1
- package/lib/commonjs/wrap.js +11 -12
- package/lib/commonjs/wrap.js.map +1 -1
- package/lib/commonjs/wrap.spec.js +97 -25
- package/lib/commonjs/wrap.spec.js.map +1 -1
- package/lib/module/checkForUpdate.js +32 -23
- package/lib/module/checkForUpdate.js.map +1 -1
- package/lib/module/checkForUpdate.releaseCatalog.spec.js +97 -28
- package/lib/module/checkForUpdate.releaseCatalog.spec.js.map +1 -1
- package/lib/module/error.js +4 -13
- package/lib/module/error.js.map +1 -1
- package/lib/module/fetchJSON.js +7 -1
- package/lib/module/fetchJSON.js.map +1 -1
- package/lib/module/httpClient.js +48 -31
- package/lib/module/httpClient.js.map +1 -1
- package/lib/module/httpClient.spec.js +57 -5
- package/lib/module/httpClient.spec.js.map +1 -1
- package/lib/module/index.js +32 -15
- package/lib/module/index.js.map +1 -1
- package/lib/module/index.spec.js +56 -11
- package/lib/module/index.spec.js.map +1 -1
- package/lib/module/native.js +13 -12
- package/lib/module/native.js.map +1 -1
- package/lib/module/native.spec.js +128 -22
- package/lib/module/native.spec.js.map +1 -1
- package/lib/module/{notifyAppReadyAnalytics.boundary.spec.js → notifyAppReadyInsights.boundary.spec.js} +23 -16
- package/lib/module/notifyAppReadyInsights.boundary.spec.js.map +1 -0
- package/lib/module/notifyAppReadyInsights.js +181 -0
- package/lib/module/notifyAppReadyInsights.js.map +1 -0
- package/lib/module/{notifyAppReadyAnalytics.spec.js → notifyAppReadyInsights.spec.js} +153 -21
- package/lib/module/notifyAppReadyInsights.spec.js.map +1 -0
- package/lib/module/{notifyAppReadyAnalytics.test-utils.js → notifyAppReadyInsights.test-utils.js} +3 -3
- package/lib/module/notifyAppReadyInsights.test-utils.js.map +1 -0
- package/lib/module/{notifyAppReadyAnalytics.transport.spec.js → notifyAppReadyInsights.transport.spec.js} +11 -4
- package/lib/module/notifyAppReadyInsights.transport.spec.js.map +1 -0
- package/lib/module/sdkVersion.js +1 -1
- package/lib/module/sdkVersion.js.map +1 -1
- package/lib/module/specs/NativeHotUpdater.js.map +1 -1
- package/lib/module/store.js +3 -10
- package/lib/module/store.js.map +1 -1
- package/lib/module/store.notification.spec.js +12 -4
- package/lib/module/store.notification.spec.js.map +1 -1
- package/lib/module/store.spec.js +2 -136
- package/lib/module/store.spec.js.map +1 -1
- package/lib/module/wrap.js +11 -12
- package/lib/module/wrap.js.map +1 -1
- package/lib/module/wrap.spec.js +99 -25
- package/lib/module/wrap.spec.js.map +1 -1
- package/lib/typescript/commonjs/checkForUpdate.d.ts +2 -3
- package/lib/typescript/commonjs/checkForUpdate.d.ts.map +1 -1
- package/lib/typescript/commonjs/error.d.ts +4 -13
- package/lib/typescript/commonjs/error.d.ts.map +1 -1
- package/lib/typescript/commonjs/fetchJSON.d.ts +4 -0
- package/lib/typescript/commonjs/fetchJSON.d.ts.map +1 -1
- package/lib/typescript/commonjs/httpClient.d.ts +6 -6
- package/lib/typescript/commonjs/httpClient.d.ts.map +1 -1
- package/lib/typescript/commonjs/index.d.ts +4 -7
- package/lib/typescript/commonjs/index.d.ts.map +1 -1
- package/lib/typescript/commonjs/native.d.ts +5 -9
- package/lib/typescript/commonjs/native.d.ts.map +1 -1
- package/lib/typescript/commonjs/notifyAppReadyInsights.d.ts +25 -0
- package/lib/typescript/commonjs/notifyAppReadyInsights.d.ts.map +1 -0
- package/lib/typescript/commonjs/notifyAppReadyInsights.test-utils.d.ts +8 -0
- package/lib/typescript/commonjs/notifyAppReadyInsights.test-utils.d.ts.map +1 -0
- package/lib/typescript/commonjs/sdkVersion.d.ts +1 -1
- package/lib/typescript/commonjs/sdkVersion.d.ts.map +1 -1
- package/lib/typescript/commonjs/specs/NativeHotUpdater.d.ts +8 -35
- package/lib/typescript/commonjs/specs/NativeHotUpdater.d.ts.map +1 -1
- package/lib/typescript/commonjs/store.d.ts +1 -3
- package/lib/typescript/commonjs/store.d.ts.map +1 -1
- package/lib/typescript/commonjs/wrap.types.d.ts +5 -8
- package/lib/typescript/commonjs/wrap.types.d.ts.map +1 -1
- package/lib/typescript/module/checkForUpdate.d.ts +2 -3
- package/lib/typescript/module/checkForUpdate.d.ts.map +1 -1
- package/lib/typescript/module/error.d.ts +4 -13
- package/lib/typescript/module/error.d.ts.map +1 -1
- package/lib/typescript/module/fetchJSON.d.ts +4 -0
- package/lib/typescript/module/fetchJSON.d.ts.map +1 -1
- package/lib/typescript/module/httpClient.d.ts +6 -6
- package/lib/typescript/module/httpClient.d.ts.map +1 -1
- package/lib/typescript/module/index.d.ts +4 -7
- package/lib/typescript/module/index.d.ts.map +1 -1
- package/lib/typescript/module/native.d.ts +5 -9
- package/lib/typescript/module/native.d.ts.map +1 -1
- package/lib/typescript/module/notifyAppReadyInsights.d.ts +25 -0
- package/lib/typescript/module/notifyAppReadyInsights.d.ts.map +1 -0
- package/lib/typescript/module/notifyAppReadyInsights.test-utils.d.ts +8 -0
- package/lib/typescript/module/notifyAppReadyInsights.test-utils.d.ts.map +1 -0
- package/lib/typescript/module/sdkVersion.d.ts +1 -1
- package/lib/typescript/module/sdkVersion.d.ts.map +1 -1
- package/lib/typescript/module/specs/NativeHotUpdater.d.ts +8 -35
- package/lib/typescript/module/specs/NativeHotUpdater.d.ts.map +1 -1
- package/lib/typescript/module/store.d.ts +1 -3
- package/lib/typescript/module/store.d.ts.map +1 -1
- package/lib/typescript/module/wrap.types.d.ts +5 -8
- package/lib/typescript/module/wrap.types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/checkForUpdate.releaseCatalog.spec.ts +137 -61
- package/src/checkForUpdate.ts +35 -29
- package/src/error.ts +4 -14
- package/src/fetchJSON.ts +12 -1
- package/src/httpClient.spec.ts +70 -5
- package/src/httpClient.ts +78 -64
- package/src/index.spec.ts +59 -11
- package/src/index.ts +41 -17
- package/src/native.spec.ts +133 -22
- package/src/native.ts +21 -32
- package/src/{notifyAppReadyAnalytics.boundary.spec.ts → notifyAppReadyInsights.boundary.spec.ts} +25 -17
- package/src/{notifyAppReadyAnalytics.spec.ts → notifyAppReadyInsights.spec.ts} +141 -22
- package/src/{notifyAppReadyAnalytics.test-utils.ts → notifyAppReadyInsights.test-utils.ts} +4 -4
- package/src/{notifyAppReadyAnalytics.transport.spec.ts → notifyAppReadyInsights.transport.spec.ts} +13 -5
- package/src/notifyAppReadyInsights.ts +293 -0
- package/src/sdkVersion.ts +1 -1
- package/src/specs/NativeHotUpdater.ts +8 -36
- package/src/store.notification.spec.ts +13 -3
- package/src/store.spec.ts +0 -157
- package/src/store.ts +2 -23
- package/src/wrap.spec.ts +109 -31
- package/src/wrap.tsx +11 -11
- package/src/wrap.types.ts +5 -8
- package/android/src/main/java/com/hotupdater/DecompressService.kt +0 -89
- package/android/src/main/java/com/hotupdater/DecompressionStrategy.kt +0 -26
- package/android/src/main/java/com/hotupdater/TarBrDecompressionStrategy.kt +0 -117
- package/android/src/main/java/com/hotupdater/TarGzDecompressionStrategy.kt +0 -117
- package/android/src/main/java/com/hotupdater/ZipDecompressionStrategy.kt +0 -192
- package/android/src/test/java/com/hotupdater/TarArchiveInputStreamTest.kt +0 -68
- package/ios/HotUpdater/Internal/ArchiveExtractionUtilities.swift +0 -178
- package/ios/HotUpdater/Internal/DecompressService.swift +0 -112
- package/ios/HotUpdater/Internal/DecompressionStrategy.swift +0 -22
- package/ios/HotUpdater/Internal/StreamingTarArchiveExtractor.swift +0 -370
- package/ios/HotUpdater/Internal/TarBrDecompressionStrategy.swift +0 -39
- package/ios/HotUpdater/Internal/TarGzDecompressionStrategy.swift +0 -59
- package/ios/HotUpdater/Internal/ZipArchiveExtractor.swift +0 -482
- package/ios/HotUpdater/Internal/ZipDecompressionStrategy.swift +0 -56
- package/lib/commonjs/notifyAppReadyAnalytics.boundary.spec.js.map +0 -1
- package/lib/commonjs/notifyAppReadyAnalytics.js +0 -133
- package/lib/commonjs/notifyAppReadyAnalytics.js.map +0 -1
- package/lib/commonjs/notifyAppReadyAnalytics.spec.js.map +0 -1
- package/lib/commonjs/notifyAppReadyAnalytics.test-utils.js.map +0 -1
- package/lib/commonjs/notifyAppReadyAnalytics.transport.spec.js.map +0 -1
- package/lib/module/notifyAppReadyAnalytics.boundary.spec.js.map +0 -1
- package/lib/module/notifyAppReadyAnalytics.js +0 -128
- package/lib/module/notifyAppReadyAnalytics.js.map +0 -1
- package/lib/module/notifyAppReadyAnalytics.spec.js.map +0 -1
- package/lib/module/notifyAppReadyAnalytics.test-utils.js.map +0 -1
- package/lib/module/notifyAppReadyAnalytics.transport.spec.js.map +0 -1
- package/lib/typescript/commonjs/notifyAppReadyAnalytics.d.ts +0 -13
- package/lib/typescript/commonjs/notifyAppReadyAnalytics.d.ts.map +0 -1
- package/lib/typescript/commonjs/notifyAppReadyAnalytics.test-utils.d.ts +0 -8
- package/lib/typescript/commonjs/notifyAppReadyAnalytics.test-utils.d.ts.map +0 -1
- package/lib/typescript/module/notifyAppReadyAnalytics.d.ts +0 -13
- package/lib/typescript/module/notifyAppReadyAnalytics.d.ts.map +0 -1
- package/lib/typescript/module/notifyAppReadyAnalytics.test-utils.d.ts +0 -8
- package/lib/typescript/module/notifyAppReadyAnalytics.test-utils.d.ts.map +0 -1
- package/src/notifyAppReadyAnalytics.ts +0 -194
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
package com.hotupdater
|
|
2
|
-
|
|
3
|
-
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
|
|
4
|
-
import org.junit.Assert.assertArrayEquals
|
|
5
|
-
import org.junit.Assert.assertEquals
|
|
6
|
-
import org.junit.Assert.assertNull
|
|
7
|
-
import org.junit.Assert.assertThrows
|
|
8
|
-
import org.junit.Test
|
|
9
|
-
import java.io.ByteArrayInputStream
|
|
10
|
-
import java.io.ByteArrayOutputStream
|
|
11
|
-
import org.apache.commons.compress.archivers.tar.TarArchiveEntry as CommonsTarArchiveEntry
|
|
12
|
-
|
|
13
|
-
class TarArchiveInputStreamTest {
|
|
14
|
-
@Test
|
|
15
|
-
fun `reads a long basename from a POSIX PAX header`() {
|
|
16
|
-
val path = "raw/${"long-name-".repeat(14)}asset.bmp"
|
|
17
|
-
val contents = "pax asset".toByteArray()
|
|
18
|
-
val archive = createPaxArchive(path, contents)
|
|
19
|
-
|
|
20
|
-
TarArchiveInputStream(ByteArrayInputStream(archive)).use { tar ->
|
|
21
|
-
val entry = tar.getNextEntry()
|
|
22
|
-
|
|
23
|
-
assertEquals(path, entry?.name)
|
|
24
|
-
assertArrayEquals(contents, tar.readBytes())
|
|
25
|
-
assertNull(tar.getNextEntry())
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
@Test
|
|
30
|
-
fun `rejects path traversal from a POSIX PAX header`() {
|
|
31
|
-
val path = "../${"long-name-".repeat(14)}asset.bmp"
|
|
32
|
-
val archive =
|
|
33
|
-
createPaxArchive(
|
|
34
|
-
path = path,
|
|
35
|
-
contents = "malicious".toByteArray(),
|
|
36
|
-
headerPath = "safe.bmp",
|
|
37
|
-
)
|
|
38
|
-
|
|
39
|
-
val error =
|
|
40
|
-
assertThrows(SecurityException::class.java) {
|
|
41
|
-
TarArchiveInputStream(ByteArrayInputStream(archive)).use { tar ->
|
|
42
|
-
tar.getNextEntry()
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
assertEquals("Path traversal detected: $path", error.message)
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
private fun createPaxArchive(
|
|
50
|
-
path: String,
|
|
51
|
-
contents: ByteArray,
|
|
52
|
-
headerPath: String = path,
|
|
53
|
-
): ByteArray {
|
|
54
|
-
val output = ByteArrayOutputStream()
|
|
55
|
-
TarArchiveOutputStream(output).use { tar ->
|
|
56
|
-
tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX)
|
|
57
|
-
val entry =
|
|
58
|
-
CommonsTarArchiveEntry(headerPath).apply {
|
|
59
|
-
size = contents.size.toLong()
|
|
60
|
-
if (path != headerPath) addPaxHeader("path", path)
|
|
61
|
-
}
|
|
62
|
-
tar.putArchiveEntry(entry)
|
|
63
|
-
tar.write(contents)
|
|
64
|
-
tar.closeArchiveEntry()
|
|
65
|
-
}
|
|
66
|
-
return output.toByteArray()
|
|
67
|
-
}
|
|
68
|
-
}
|
|
@@ -1,178 +0,0 @@
|
|
|
1
|
-
import Foundation
|
|
2
|
-
|
|
3
|
-
enum ArchiveExtractionUtilities {
|
|
4
|
-
static let bufferSize = 64 * 1024
|
|
5
|
-
|
|
6
|
-
static func readUpToCount(from handle: FileHandle, count: Int) throws -> Data? {
|
|
7
|
-
guard count >= 0 else {
|
|
8
|
-
throw NSError(
|
|
9
|
-
domain: "ArchiveExtractionUtilities",
|
|
10
|
-
code: 5,
|
|
11
|
-
userInfo: [NSLocalizedDescriptionKey: "Invalid read size: \(count)"]
|
|
12
|
-
)
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
if count == 0 {
|
|
16
|
-
return Data()
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
if #available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *) {
|
|
20
|
-
return try handle.read(upToCount: count)
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
return handle.readData(ofLength: count)
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
static func readExactly(from handle: FileHandle, count: Int) throws -> Data {
|
|
27
|
-
guard count >= 0 else {
|
|
28
|
-
throw NSError(
|
|
29
|
-
domain: "ArchiveExtractionUtilities",
|
|
30
|
-
code: 1,
|
|
31
|
-
userInfo: [NSLocalizedDescriptionKey: "Invalid read size: \(count)"]
|
|
32
|
-
)
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
if count == 0 {
|
|
36
|
-
return Data()
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
guard let data = try readUpToCount(from: handle, count: count), data.count == count else {
|
|
40
|
-
throw NSError(
|
|
41
|
-
domain: "ArchiveExtractionUtilities",
|
|
42
|
-
code: 2,
|
|
43
|
-
userInfo: [NSLocalizedDescriptionKey: "Unexpected end of archive while reading \(count) bytes"]
|
|
44
|
-
)
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
return data
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
static func currentOffset(for handle: FileHandle) -> UInt64 {
|
|
51
|
-
if #available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *) {
|
|
52
|
-
return (try? handle.offset()) ?? 0
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
return handle.offsetInFile
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
static func seek(_ handle: FileHandle, to offset: UInt64) throws {
|
|
59
|
-
if #available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *) {
|
|
60
|
-
try handle.seek(toOffset: offset)
|
|
61
|
-
return
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
handle.seek(toFileOffset: offset)
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
static func skipBytes(_ byteCount: UInt64, in handle: FileHandle) throws {
|
|
68
|
-
guard byteCount > 0 else {
|
|
69
|
-
return
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
let offset = currentOffset(for: handle)
|
|
73
|
-
let (targetOffset, overflowed) = offset.addingReportingOverflow(byteCount)
|
|
74
|
-
|
|
75
|
-
guard !overflowed else {
|
|
76
|
-
throw NSError(
|
|
77
|
-
domain: "ArchiveExtractionUtilities",
|
|
78
|
-
code: 6,
|
|
79
|
-
userInfo: [NSLocalizedDescriptionKey: "Archive offset overflow while skipping \(byteCount) bytes from offset \(offset)"]
|
|
80
|
-
)
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
try seek(handle, to: targetOffset)
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
static func normalizedRelativePath(from rawPath: String) -> String? {
|
|
87
|
-
let candidate = rawPath.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
88
|
-
guard !candidate.isEmpty,
|
|
89
|
-
!candidate.contains("\0"),
|
|
90
|
-
!candidate.contains("\\"),
|
|
91
|
-
!candidate.hasPrefix("/"),
|
|
92
|
-
candidate.range(of: #"^[A-Za-z]:"#, options: .regularExpression) == nil
|
|
93
|
-
else {
|
|
94
|
-
return nil
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
let components = candidate
|
|
98
|
-
.split(separator: "/")
|
|
99
|
-
.map(String.init)
|
|
100
|
-
|
|
101
|
-
guard !components.isEmpty else {
|
|
102
|
-
return nil
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
guard components.count == candidate.split(separator: "/", omittingEmptySubsequences: false).count,
|
|
106
|
-
!components.contains(".."),
|
|
107
|
-
!components.contains(".") else {
|
|
108
|
-
return nil
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
return components.joined(separator: "/")
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
static func extractionURL(for relativePath: String, destinationRoot: String) throws -> URL {
|
|
115
|
-
let rootURL = URL(fileURLWithPath: destinationRoot, isDirectory: true)
|
|
116
|
-
let targetURL = rootURL.appendingPathComponent(relativePath)
|
|
117
|
-
let standardizedRoot = rootURL.standardizedFileURL.path
|
|
118
|
-
let standardizedTarget = targetURL.standardizedFileURL.path
|
|
119
|
-
|
|
120
|
-
guard standardizedTarget == standardizedRoot ||
|
|
121
|
-
standardizedTarget.hasPrefix(standardizedRoot + "/") else {
|
|
122
|
-
throw NSError(
|
|
123
|
-
domain: "ArchiveExtractionUtilities",
|
|
124
|
-
code: 3,
|
|
125
|
-
userInfo: [NSLocalizedDescriptionKey: "Path traversal attempt detected: \(relativePath)"]
|
|
126
|
-
)
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
return targetURL
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
static func ensureDirectory(at url: URL, fileManager: FileManager = .default) throws {
|
|
133
|
-
var isDirectory = ObjCBool(false)
|
|
134
|
-
if fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory) {
|
|
135
|
-
if isDirectory.boolValue {
|
|
136
|
-
return
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
try fileManager.removeItem(at: url)
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
try fileManager.createDirectory(at: url, withIntermediateDirectories: true, attributes: nil)
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
static func createOutputFile(at url: URL, fileManager: FileManager = .default) throws -> FileHandle {
|
|
146
|
-
try ensureDirectory(at: url.deletingLastPathComponent(), fileManager: fileManager)
|
|
147
|
-
|
|
148
|
-
if fileManager.fileExists(atPath: url.path) {
|
|
149
|
-
try fileManager.removeItem(at: url)
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
guard fileManager.createFile(atPath: url.path, contents: nil) else {
|
|
153
|
-
throw NSError(
|
|
154
|
-
domain: "ArchiveExtractionUtilities",
|
|
155
|
-
code: 4,
|
|
156
|
-
userInfo: [NSLocalizedDescriptionKey: "Failed to create output file at \(url.path)"]
|
|
157
|
-
)
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
return try FileHandle(forWritingTo: url)
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
extension Data {
|
|
165
|
-
func archiveUInt16LE(at offset: Int) -> UInt16 {
|
|
166
|
-
let byte0 = UInt16(self[offset])
|
|
167
|
-
let byte1 = UInt16(self[offset + 1]) << 8
|
|
168
|
-
return byte0 | byte1
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
func archiveUInt32LE(at offset: Int) -> UInt32 {
|
|
172
|
-
let byte0 = UInt32(self[offset])
|
|
173
|
-
let byte1 = UInt32(self[offset + 1]) << 8
|
|
174
|
-
let byte2 = UInt32(self[offset + 2]) << 16
|
|
175
|
-
let byte3 = UInt32(self[offset + 3]) << 24
|
|
176
|
-
return byte0 | byte1 | byte2 | byte3
|
|
177
|
-
}
|
|
178
|
-
}
|
|
@@ -1,112 +0,0 @@
|
|
|
1
|
-
import Foundation
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* Unified decompression service that uses Strategy pattern to handle multiple compression formats.
|
|
5
|
-
* Automatically detects format by trying each strategy's validation and delegates to appropriate decompression strategy.
|
|
6
|
-
*/
|
|
7
|
-
class DecompressService {
|
|
8
|
-
/// Strategies with reliable file signatures that can be validated cheaply.
|
|
9
|
-
private let signatureStrategies: [DecompressionStrategy]
|
|
10
|
-
/// TAR.BR has no reliable magic bytes, so it is attempted as the final fallback.
|
|
11
|
-
private let tarBrStrategy: DecompressionStrategy
|
|
12
|
-
|
|
13
|
-
init() {
|
|
14
|
-
// Order matters: Try ZIP first (clear magic bytes), then TAR.GZ (GZIP magic bytes).
|
|
15
|
-
// TAR.BR is attempted only after signature-based formats are ruled out.
|
|
16
|
-
self.signatureStrategies = [
|
|
17
|
-
ZipDecompressionStrategy(),
|
|
18
|
-
TarGzDecompressionStrategy()
|
|
19
|
-
]
|
|
20
|
-
self.tarBrStrategy = TarBrDecompressionStrategy()
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* Extracts a compressed file to the destination directory.
|
|
25
|
-
* Automatically detects compression format by trying each strategy's validation.
|
|
26
|
-
* @param file Path to the compressed file
|
|
27
|
-
* @param destination Path to the destination directory
|
|
28
|
-
* @param progressHandler Callback for progress updates (0.0 - 1.0)
|
|
29
|
-
* @throws Error if decompression fails or no valid strategy found
|
|
30
|
-
*/
|
|
31
|
-
func unzip(file: String, to destination: String, progressHandler: @escaping (Double) -> Void) throws {
|
|
32
|
-
// Collect file information for better error messages
|
|
33
|
-
let fileURL = URL(fileURLWithPath: file)
|
|
34
|
-
let fileName = fileURL.lastPathComponent
|
|
35
|
-
let fileSize = (try? FileManager.default.attributesOfItem(atPath: file)[.size] as? UInt64) ?? 0
|
|
36
|
-
|
|
37
|
-
// Try each signature-based strategy first.
|
|
38
|
-
for strategy in signatureStrategies {
|
|
39
|
-
if strategy.isValid(file: file) {
|
|
40
|
-
NSLog("[DecompressService] Using strategy for \(fileName)")
|
|
41
|
-
try strategy.decompress(file: file, to: destination, progressHandler: progressHandler)
|
|
42
|
-
return
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
NSLog("[DecompressService] No ZIP/TAR.GZ signature matched for \(fileName), trying TAR.BR fallback")
|
|
47
|
-
|
|
48
|
-
do {
|
|
49
|
-
try tarBrStrategy.decompress(file: file, to: destination, progressHandler: progressHandler)
|
|
50
|
-
NSLog("[DecompressService] Using TAR.BR fallback for \(fileName)")
|
|
51
|
-
return
|
|
52
|
-
} catch {
|
|
53
|
-
let invalidArchiveError = createInvalidArchiveError(
|
|
54
|
-
fileName: fileName,
|
|
55
|
-
fileSize: fileSize,
|
|
56
|
-
underlyingError: error
|
|
57
|
-
)
|
|
58
|
-
NSLog("[DecompressService] \(invalidArchiveError.localizedDescription)")
|
|
59
|
-
throw invalidArchiveError
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
/**
|
|
64
|
-
* Extracts a compressed file to the destination directory (without progress tracking).
|
|
65
|
-
* @param file Path to the compressed file
|
|
66
|
-
* @param destination Path to the destination directory
|
|
67
|
-
* @throws Error if decompression fails or no valid strategy found
|
|
68
|
-
*/
|
|
69
|
-
func unzip(file: String, to destination: String) throws {
|
|
70
|
-
try unzip(file: file, to: destination, progressHandler: { _ in })
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
/**
|
|
74
|
-
* Validates if a file matches one of the signature-based archive formats.
|
|
75
|
-
* @param file Path to the file to validate
|
|
76
|
-
* @return true if the file is valid for any strategy
|
|
77
|
-
*/
|
|
78
|
-
func isValid(file: String) -> Bool {
|
|
79
|
-
for strategy in signatureStrategies {
|
|
80
|
-
if strategy.isValid(file: file) {
|
|
81
|
-
return true
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
NSLog("[DecompressService] No ZIP/TAR.GZ signature matched for file: \(file). TAR.BR is handled during extraction fallback.")
|
|
85
|
-
return false
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
private func createInvalidArchiveError(fileName: String, fileSize: UInt64, underlyingError: Error? = nil) -> NSError {
|
|
89
|
-
let errorMessage = """
|
|
90
|
-
The downloaded bundle file is not a valid compressed archive: \(fileName) (\(fileSize) bytes)
|
|
91
|
-
|
|
92
|
-
Supported formats:
|
|
93
|
-
- ZIP archives (.zip)
|
|
94
|
-
- GZIP compressed TAR archives (.tar.gz)
|
|
95
|
-
- Brotli compressed TAR archives (.tar.br)
|
|
96
|
-
"""
|
|
97
|
-
|
|
98
|
-
var userInfo: [String: Any] = [
|
|
99
|
-
NSLocalizedDescriptionKey: errorMessage
|
|
100
|
-
]
|
|
101
|
-
|
|
102
|
-
if let underlyingError {
|
|
103
|
-
userInfo[NSUnderlyingErrorKey] = underlyingError
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
return NSError(
|
|
107
|
-
domain: "DecompressService",
|
|
108
|
-
code: 1,
|
|
109
|
-
userInfo: userInfo
|
|
110
|
-
)
|
|
111
|
-
}
|
|
112
|
-
}
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import Foundation
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* Protocol for decompression strategies
|
|
5
|
-
*/
|
|
6
|
-
protocol DecompressionStrategy {
|
|
7
|
-
/**
|
|
8
|
-
* Validates if a file can be decompressed by this strategy
|
|
9
|
-
* @param file Path to the file to validate
|
|
10
|
-
* @return true if the file is valid for this strategy
|
|
11
|
-
*/
|
|
12
|
-
func isValid(file: String) -> Bool
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* Decompresses a file to the destination directory
|
|
16
|
-
* @param file Path to the compressed file
|
|
17
|
-
* @param destination Path to the destination directory
|
|
18
|
-
* @param progressHandler Callback for progress updates (0.0 - 1.0)
|
|
19
|
-
* @throws Error if decompression fails
|
|
20
|
-
*/
|
|
21
|
-
func decompress(file: String, to destination: String, progressHandler: @escaping (Double) -> Void) throws
|
|
22
|
-
}
|