autoupdate: Fix base64 hash extraction

ScoopInstaller · Sep 10, 2018 · 98afb99 · 98afb99
1 parent 7b5e551
commit 98afb99
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/lib/autoupdate.ps1 b/lib/autoupdate.ps1
@@ -57,10 +57,13 @@ function find_hash_in_textfile([String] $url, [String] $basename, [String] $rege
 
     # convert base64 encoded hash values
     if ($hash -match '^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{4})$') {
-        try {
-            $hash = ([System.Convert]::FromBase64String($matches[0]) | ForEach-Object { $_.ToString('x2') }) -join ''
-        } catch {
-            $hash = $hash
+        $base64 = $matches[0]
+        if(!($hash -match "^([a-fA-F0-9]{40,128})$")) {
+            try {
+                $hash = ([System.Convert]::FromBase64String($base64) | ForEach-Object { $_.ToString('x2') }) -join ''
+            } catch {
+                $hash = $hash
+            }
         }
     }