fix(autoupdate): Fix bug that 'WebClient' doesn't auto-extract 'gzip' (…

…ScoopInstaller#5901)
danyreyna · Apr 17, 2024 · 98cf8ae · 98cf8ae
1 parent 7054c9d
commit 98cf8ae
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@
 - **scoop-virustotal:** Fix the issue that escape character not available in PowerShell 5.1 ([#5870](https://github.com/ScoopInstaller/Scoop/issues/5870))
 - **decompress:** Use `wix.exe` in WiX Toolset v4+ as primary extractor of `Expand-DarkArchive()` ([#5871](https://github.com/ScoopInstaller/Scoop/issues/5871))
 - **shim:** Run JAR file from app's root directory ([#5872](https://github.com/ScoopInstaller/Scoop/issues/5872))
+- **autoupdate:** Fix bug that 'WebClient' doesn't auto-extract 'gzip' ([#5901](https://github.com/ScoopInstaller/Scoop/issues/5901))
 
 ### Performance Improvements
 

diff --git a/bin/checkver.ps1 b/bin/checkver.ps1
@@ -260,6 +260,7 @@ while ($in_progress -gt 0) {
     $in_progress--
 
     $state = $ev.SourceEventArgs.UserState
+    $result = $ev.SourceEventArgs.Result
     $app = $state.app
     $file = $state.file
     $json = $state.json
@@ -285,7 +286,13 @@ while ($in_progress -gt 0) {
         }
 
         if ($url) {
-            $page = (Get-Encoding($wc)).GetString($ev.SourceEventArgs.Result)
+            $ms = New-Object System.IO.MemoryStream
+            $ms.Write($result, 0, $result.Length)
+            $ms.Seek(0, 0) | Out-Null
+            if ($result[0] -eq 0x1F -and $result[1] -eq 0x8B) {
+                $ms = New-Object System.IO.Compression.GZipStream($ms, [System.IO.Compression.CompressionMode]::Decompress)
+            }
+            $page = (New-Object System.IO.StreamReader($ms, (Get-Encoding $wc))).ReadToEnd()
         }
         if ($script) {
             $page = Invoke-Command ([scriptblock]::Create($script -join "`r`n"))

diff --git a/lib/autoupdate.ps1 b/lib/autoupdate.ps1
@@ -37,7 +37,13 @@ function find_hash_in_textfile([String] $url, [Hashtable] $substitutions, [Strin
         $wc.Headers.Add('Referer', (strip_filename $url))
         $wc.Headers.Add('User-Agent', (Get-UserAgent))
         $data = $wc.DownloadData($url)
-        $hashfile = (Get-Encoding($wc)).GetString($data)
+        $ms = New-Object System.IO.MemoryStream
+        $ms.Write($data, 0, $data.Length)
+        $ms.Seek(0, 0) | Out-Null
+        if ($data[0] -eq 0x1F -and $data[1] -eq 0x8B) {
+            $ms = New-Object System.IO.Compression.GZipStream($ms, [System.IO.Compression.CompressionMode]::Decompress)
+        }
+        $hashfile = (New-Object System.IO.StreamReader($ms, (Get-Encoding $wc))).ReadToEnd()
     } catch [system.net.webexception] {
         Write-Host $_ -ForegroundColor DarkRed
         Write-Host "URL $url is not valid" -ForegroundColor DarkRed
@@ -93,7 +99,13 @@ function find_hash_in_json([String] $url, [Hashtable] $substitutions, [String] $
         $wc.Headers.Add('Referer', (strip_filename $url))
         $wc.Headers.Add('User-Agent', (Get-UserAgent))
         $data = $wc.DownloadData($url)
-        $json = (Get-Encoding($wc)).GetString($data)
+        $ms = New-Object System.IO.MemoryStream
+        $ms.Write($data, 0, $data.Length)
+        $ms.Seek(0, 0) | Out-Null
+        if ($data[0] -eq 0x1F -and $data[1] -eq 0x8B) {
+            $ms = New-Object System.IO.Compression.GZipStream($ms, [System.IO.Compression.CompressionMode]::Decompress)
+        }
+        $json = (New-Object System.IO.StreamReader($ms, (Get-Encoding $wc))).ReadToEnd()
     } catch [System.Net.WebException] {
         Write-Host $_ -ForegroundColor DarkRed
         Write-Host "URL $url is not valid" -ForegroundColor DarkRed
@@ -115,7 +127,13 @@ function find_hash_in_xml([String] $url, [Hashtable] $substitutions, [String] $x
         $wc.Headers.Add('Referer', (strip_filename $url))
         $wc.Headers.Add('User-Agent', (Get-UserAgent))
         $data = $wc.DownloadData($url)
-        $xml = [xml]((Get-Encoding($wc)).GetString($data))
+        $ms = New-Object System.IO.MemoryStream
+        $ms.Write($data, 0, $data.Length)
+        $ms.Seek(0, 0) | Out-Null
+        if ($data[0] -eq 0x1F -and $data[1] -eq 0x8B) {
+            $ms = New-Object System.IO.Compression.GZipStream($ms, [System.IO.Compression.CompressionMode]::Decompress)
+        }
+        $xml = [xml]((New-Object System.IO.StreamReader($ms, (Get-Encoding $wc))).ReadToEnd())
     } catch [system.net.webexception] {
         Write-Host $_ -ForegroundColor DarkRed
         Write-Host "URL $url is not valid" -ForegroundColor DarkRed