Work around Microsoft's new ISO download countermeasures

* The Microsoft servers now use session Id whitelisting, so add querying
  of https://vlscppe.microsoft.com/tags with the session Id.
* Closes #52.
* Also harmonize/improve -replace calls
* Also make sure we use POST for the getskuinformationbyproductedition
  query (in case Microsoft add some more countermeasures).
* Also drop 'cmd /c' invocation in sign.sh since the cygwin people can't
  seem to get their act together there...

Fido.ps1

@@ -1,6 +1,6 @@
 #
-# Fido v1.35 - Feature ISO Downloader, for retail Windows images and UEFI Shell
-# Copyright © 2019-2022 Pete Batard <pete@akeo.ie>
+# Fido v1.39 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Copyright © 2019-2023 Pete Batard <pete@akeo.ie>
 # Command line support: Copyright © 2021 flx5
 # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
 #
@@ -45,7 +45,9 @@ param(
 	# (Optional) Only display the download URL [Toggles commandline mode]
 	[switch]$GetUrl = $False,
 	# (Optional) Increase verbosity
-	[switch]$Verbose = $False
+	[switch]$Verbose = $False,
+	# (Optional) Disable the progress bar
+	[switch]$DisableProgress = $False
 )
 #endregion
 
@@ -103,11 +105,6 @@ $WindowsVersions = @(
 			@("Windows 11 Home/Pro/Edu", 2370),
 			@("Windows 11 Home China ", ($zh + 2371))
 		),
-		@(
-			"22H2 (Build 22621.382 - 2022.09)",
-			@("Windows 11 Home/Pro/Edu", 2360),
-			@("Windows 11 Home China ", ($zh + 2361))
-		),
 		@(
 			"21H2 v1 (Build 22000.318 - 2021.11)",
 			@("Windows 11 Home/Pro/Edu", 2093),
@@ -121,12 +118,11 @@ $WindowsVersions = @(
 	),
 	@(
 		@("Windows 10", "Windows10ISO"),
-# Not yet enabled by Microsoft...
-#		@(
-#			"22H2 (Build 1904?.???? - 2022.10)",
-#			@("Windows 10 Home/Pro/Edu", 2377),
-#			@("Windows 10 Home China ", ($zh + 2378))
-#		),
+		@(
+			"22H2 (Build 19045.2006 - 2022.10)",
+			@("Windows 10 Home/Pro/Edu", 2377),
+			@("Windows 10 Home China ", ($zh + 2378))
+		),
 		@(
 			"21H2 (Build 19044.1288 - 2021.11)",
 			@("Windows 10 Home/Pro/Edu", 2084),
@@ -290,6 +286,11 @@ $WindowsVersions = @(
 	),
 	@(
 		@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
+		@(
+			"22H2 (edk2-stable202211)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
 		@(
 			"22H1 (edk2-stable202205)",
 			@("Release", 0),
@@ -498,7 +499,7 @@ function ConvertTo-ImageSource
 
 function Throw-Error([object]$Req, [string]$Alt)
 {
-	$Err = $(GetElementById -Request $r -Id "errorModalMessage").innerText
+	$Err = $(GetElementById -Request $Req -Id "errorModalMessage").innerText -replace "<[^>]+>" -replace "\s+", " "
 	if (-not $Err) {
 		$Err = $Alt
 	} else {
@@ -601,7 +602,7 @@ $RequestData["GetLangs"] = @("a8f8f489-4c7f-463a-9ca6-5cff94d8d041", "getskuinfo
 # This GUID applies to visitors of the en-US download page. Other locales may get a different GUID.
 $RequestData["GetLinks"] = @("6e2a1789-ef16-4f27-a296-74ef7ef5d96b", "GetProductDownloadLinksBySku" )
 # Create a semi-random Linux User-Agent string
-$FirefoxVersion = Get-Random -Minimum 50 -Maximum 90
+$FirefoxVersion = Get-Random -Minimum 90 -Maximum 110
 $FirefoxDate = Get-RandomDate
 $UserAgent = "Mozilla/5.0 (X11; Linux i586; rv:$FirefoxVersion.0) Gecko/$FirefoxDate Firefox/$FirefoxVersion.0"
 $Verbosity = 2
@@ -709,6 +710,9 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 	} elseif ($WindowsVersions[$SelectedVersion][0][1].StartsWith("UEFI_SHELL")) {
 		$languages += @(New-Object PsObject -Property @{ DisplayLanguage = "English (US)"; Language = "en-us"; Id = 0 })
 	} else {
+		# Microsoft download protection now requires the sessionId to be whitelisted through vlscppe.microsoft.com/tags
+		$url = "https://vlscppe.microsoft.com/tags?org_id=y6jn8c31&session_id=" + $SessionId
+		Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
 		$url = "https://www.microsoft.com/" + $QueryLocale + "/api/controls/contentinclude/html"
 		$url += "?pageId=" + $RequestData["GetLangs"][0]
 		$url += "&host=www.microsoft.com"
@@ -723,7 +727,7 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 
 		$script:SelectedIndex = 0
 		try {
-			$r = Invoke-WebRequest -UseBasicParsing -UserAgent $UserAgent -SessionVariable "Session" $url
+			$r = Invoke-WebRequest -Method Post -UseBasicParsing -UserAgent $UserAgent -SessionVariable "Session" $url
 			if ($r -match "errorModalMessage") {
 				Throw-Error -Req $r -Alt "Could not retrieve languages from server"
 			}
@@ -823,7 +827,15 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
 			$sr = New-Object System.IO.StreamReader($wr.GetResponse().GetResponseStream())
 			$r = $sr.ReadToEnd()
 			if ($r -match "errorModalMessage") {
-				Throw-Error -Req $r -Alt "Could not retrieve architectures from server"
+				$regex = New-Object Text.RegularExpressions.Regex '<p id="errorModalMessage">(.+?)<\/p>'
+				$m = $regex.Match($r)
+				# Make the typical error message returned by Microsoft's servers more presentable
+				$Alt = $m.Groups[1] -replace "<[^>]+>" -replace "\s+", " "
+				$Alt += " " + $SessionId
+				if (-not $Alt) {
+					$Alt = "Could not retrieve architectures from server"
+				}
+				Throw-Error -Req $r -Alt $Alt
 			}
 			$pattern = '(?s)(<input.*?></input>)'
 			ForEach-Object { [regex]::Matches($r, $pattern) } | ForEach-Object { $html += $_.Groups[1].value }
@@ -871,6 +883,9 @@ function Process-Download-Link([string]$Url)
 				$tmp_size = [uint64]::Parse($str_size)
 				$Size = Size-To-Human-Readable $tmp_size
 				Write-Host "Downloading '$File' ($Size)..."
+				if ($DisableProgress) {
+					$ProgressPreference = 'SilentlyContinue'
+				}
 				Invoke-WebRequest -UseBasicParsing -Uri $Url -OutFile $File
 			} else {
 				Write-Host Download Link: $Url
@@ -952,7 +967,7 @@ if ($Cmd) {
 			if (!$Ed -and $Verbosity -ge 1) {
 				Write-Host "No edition specified (-Ed). Defaulting to '$($edition.Edition)'."
 			}
-			$Selected += "," + $edition.Edition -replace "Windows [0-9\.]*", ""
+			$Selected += "," + $edition.Edition -replace "Windows [0-9\.]*"
 			$winEditionId = $edition.Id
 			break;
 		}
@@ -1188,8 +1203,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWQYJKoZIhvcNAQcCoIIkSjCCJEYCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBY/5IAG/GViBcd
-# 1JTY1vmyD3aBIuP9LO6GCK/ojLlAlKCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCB4DCsid0Hcotrs
+# wgTJd2lY28Qu5omAVl5T1mk2BP1C1qCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1292,23 +1307,23 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQgNcSdxNkDC+T0P75/9E4SzKGSNuqQIeqogrTBOhm8QicwDQYJKoZI
-# hvcNAQEBBQAEggIABeOCwDNendZb+8jZ1AhX5gYbY2KMZiCzIFV1XcegsgAkEaHx
-# k7nr6A8EePp1AApRrsD11l4Ldc13tIkcgE48FgT98yPqJVQdNm7eTgmNE/hbGW1v
-# fTX1SjBmeDgahx/XQszCMZ3c6+po7OQPbACt0ovzDXWnu5mQHuvqSrCw8G/uN/zb
-# N6uu6FlN+nM7MCPQkbf4x9IOWyfiVziUTmM8XO7JtySCt1oa49RtimRYYSbI2zZh
-# uiqrl4pmdB86g8atK4BhedU1g6fKp23Qk+qo+w8eHSGTfPrz5YsGQtpTgpZxp50T
-# pkcbj96entuv/hbj4Vn/j1xB0rwnQRCtGeSYgZMDYFIC8FHFz19TvlwAsDOGBTK/
-# Q2e1/yMctzT6YX6k5K7eIk0p6tWh1kqd6AZB+3kjJv52wJQ+cvaVgmI+hWoyQYJ6
-# O7gC0MG0d+ohF2YuUEyhBQRn+QJ/9u+g4KiFoqBTXr697viAIaTeY//hpbL1S1RI
-# IdDbAr063jxYOykSIhdydRWhrw01slvIKr1o13s/6iDgSPTRd723Wv3dld/I6w5/
-# zIoa+3PpyxoYb8RvP5eqgEAbHEteBc8KuNp55WaFUKb8K6UlHDHGsgAgcZboD2T5
-# 6N0FOz+v1Cznbsv0USQdynh4DQSAcIB9klcOkkoAlsgQH74k4EyusV/29iWhgg49
+# 9w0BCQQxIgQgZJjDDP2YWPPmGrEuHBNI0duArydubM/gmnG4BcpOG8cwDQYJKoZI
+# hvcNAQEBBQAEggIAeMyrcbmpsFeC8p7Hw21CgIxWszJ1tkiFmVcEuf5TU5NSUwYA
+# NsT/TaKGDc0mn313EiA3OM2yBwWdJFQsF0O87carfF3FXoKNU90f/IbyzhiOuGXo
+# sT2LeKGy57hdmi+j0pcf1DorfKKQ3XQ45RI1USCedKBxaC0ZVGl1PCHogtxxwvyG
+# tV5J90NS0ztTtuL2M2JCBobE6v7p6AWxkffzb97JygXY8yKc5E7XWuUEtU7Lkv6t
+# bARG9idcAi151yNkReF+iZh1ZrS7+awhnWqmzxJ1XTf2lvZObl7YfK7CekLtjxzO
+# M1Q1iLRzbIeMX8B9Z0S6TUtKDPAzWiIKUUWBaad/ojG3uZl7fA6WEgB2mt0CQNOG
+# UAre5uYpqTpvNXCksAYcjmYmQcd2NenXSq4gnIbiPQdFXl/AMpFE127Cd7R7H/vP
+# 6a4mbsfuPuQD9sHK79hGVl86iiCq00Jur3asfbV1RGKCJZTiQXzmXRaHD8Ce8a0h
+# 2PmukEnTDNJv1t3gKMojBmT7KDXS8v6idRXVnovGrf0+0WXOCau3nBWfBAZB8A8r
+# GUS0k9JyqilE6aAE8no59wqvXIDMKLLP6Br8czBcTIAaAoMAjvfJeYCsNJZH5ICz
+# wEPxpQyGLzL/Z2LzdNUFs+j9m1zQ7a4d2ln5G5vDa/Qbs5IwGm4PRix2tqyhgg49
 # MIIOOQYKKwYBBAGCNwMDATGCDikwgg4lBgkqhkiG9w0BBwKggg4WMIIOEgIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ8GCyqGSIb3DQEJEAEEoIH/BIH8MIH5AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCAmmVONt91+fvut9U75MR5SgbgybtGV
-# mK0CngIkWNBScQIVAPwPX0skCWZcVxSwVijYEseWntqDGA8yMDIyMTAwMTEyNTQ0
-# M1owAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCDJlO4Qu/KVPQXhqzZUwkQuxnuXzr+y
+# ALuw9uhTw5x50QIVAI5lXv0dlojOQ5uU1re1l1WZ0wZjGA8yMDIzMDEwODIyMDQ0
+# NFowAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
 # IENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMTEw
 # LwYDVQQDEyhTeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIFNpZ25lciAtIEcz
 # oIIKizCCBTgwggQgoAMCAQICEHsFsdRJaFFE98mJ0pwZnRIwDQYJKoZIhvcNAQEL
@@ -1371,13 +1386,13 @@ exit $ExitCode
 # BgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBU
 # cnVzdCBOZXR3b3JrMSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1w
 # aW5nIENBAhB71OWvuswHP6EBIwQiQU0SMAsGCWCGSAFlAwQCAaCBpDAaBgkqhkiG
-# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMTAwMTEyNTQ0
-# M1owLwYJKoZIhvcNAQkEMSIEIN6q/xtR2+ZALUnoqNXx196zuj9xFk7Ajyd8CrCr
-# WmI8MDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
-# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQAxZTurueFa0gsxsKPdVmcoAp3k
-# EEqW9x41BRlxKV1s0uqV1DEEozXmnJnoqSDm/bLx4xGTZujjPe2UrdOk5445lev8
-# JkIRwKJ+LmMb7DtzNkkNPvXi11PD4y/B7J0EVlQ0QCnU+CU8tW3GnAu28whQHk/X
-# 5Fs4jRIaxmBSrDspa3yGsrlqjUpmsF6tA5UEQi+fA5JmvVq6CpiUaXf9JGLQgfGz
-# zt8XVyLcXJEXMS1lA54z8R8XiJzrT9bOoHZxwSlRZswDAosfe3PAWbS9sKnatYCX
-# LgWGsxXn040/9cei5szi4Z4ltGUYI7gdNTYafRS/mCRbgfITpfzlpAzk07II
+# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIzMDEwODIyMDQ0
+# NFowLwYJKoZIhvcNAQkEMSIEIJCXdWNCvCOkl1MVXUM64ID5Hk3rlqG10XOEU4X6
+# lgIdMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
+# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQCIgN/3Y1woMyQD3RfjYoePc1VS
+# M3RbvhneaXXr6LSxRh/MJd04waviGo0j/8hdoMzmyDBTVJdGuY7K2jZGFg82y5H6
+# qQAcgkTT0KyXTkT6MwjBor1nRG5IY/20NXtXIOfN3KmRQnZy+lLH3rXguxEEFObw
+# DNHTB3sAAxaJdJQhKKqw1cuExubwLEzKbU+HFvNavyd3iTf3Free1eYQYmO5LliK
+# SYWJ4CbawK2qu0U/e5xznALGZ5NdJ3tZAFK3w0ZF0W9m6CfNW0TmjG6ae8RF4J+4
+# SWGCh2KrY4PVhyKxKiB3z5rCHYGkCrNJJdlOkoaUVBa/MQ+SildBrHvnhZZ1
 # SIG # End signature block

README.md

@@ -87,6 +87,7 @@ The options are:
    architecture as the one from the current system.
 - `GetUrl`: By default, the script attempts to automatically launch the download. But when using the `-GetUrl` switch,
    the script only displays the download URL, which can then be piped into another command or into a file.
+- `DisableProgress`: Disable progress report. This may speed up downloads when using the command line.
 
 Examples of a commandline download:
 

sign.sh

@@ -21,7 +21,7 @@ sign_file() {
 }
 
 # Update the Authenticode signature
-cmd.exe /c '"C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool" sign /v /sha1 3dbc3a2a0e9ce8803b422cfdbc60acd33164965d /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 Fido.ps1'
+MSYS2_ARG_CONV_EXCL='*' "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool" sign /v /sha1 3dbc3a2a0e9ce8803b422cfdbc60acd33164965d /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 Fido.ps1
 read -s -p "Enter pass phrase for `realpath $PRIVATE_KEY`: " PASSWORD
 echo
 # Confirm that the pass phrase is valid by trying to sign a dummy file