Improve error reporting

* Now return the error message from the Microsoft server where possible (See #52)

Fido.ps1

@@ -1,6 +1,6 @@
 #
-# Fido v1.31 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Fido v1.38 - Feature ISO Downloader, for retail Windows images and UEFI Shell
-# Copyright © 2019-2022 Pete Batard <pete@akeo.ie>
+# 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
 
@@ -80,11 +82,12 @@ $code = @"
 
 if (!$Cmd) {
 	Write-Host Please Wait...
+	$Drawing_Assembly = "System.Drawing"
+	# PowerShell 7 altered the name of the Drawing assembly...
 	if ($host.version -ge "7.0") {
-		Add-Type -WarningAction Ignore -IgnoreWarnings -MemberDefinition $code -Namespace Gui -UsingNamespace System.Runtime, System.IO, System.Text, System.Drawing, System.Globalization -ReferencedAssemblies System.Drawing.Common -Name Utils -ErrorAction Stop
+		$Drawing_Assembly += ".Common"
-	} else {
-		Add-Type -MemberDefinition $code -Namespace Gui -UsingNamespace System.IO, System.Text, System.Drawing, System.Globalization -ReferencedAssemblies System.Drawing -Name Utils -ErrorAction Stop
 	}
+	Add-Type -ErrorAction Stop -WarningAction Ignore -IgnoreWarnings -MemberDefinition $code -Namespace Gui -UsingNamespace System.Runtime, System.IO, System.Text, System.Drawing, System.Globalization -ReferencedAssemblies $Drawing_Assembly -Name Utils
 	Add-Type -AssemblyName PresentationFramework
 	# Hide the powershell window: https://stackoverflow.com/a/27992426/1069307
 	[Gui.Utils]::ShowWindow(([System.Diagnostics.Process]::GetCurrentProcess() | Get-Process).MainWindowHandle, 0) | Out-Null
@@ -97,6 +100,11 @@ $ko = 0x20000
 $WindowsVersions = @(
 	@(
 		@("Windows 11", "windows11"),
+		@(
+			"22H2 v1 (Build 22621.525 - 2022.10)",
+			@("Windows 11 Home/Pro/Edu", 2370),
+			@("Windows 11 Home China ", ($zh + 2371))
+		),
 		@(
 			"21H2 v1 (Build 22000.318 - 2021.11)",
 			@("Windows 11 Home/Pro/Edu", 2093),
@@ -110,6 +118,11 @@ $WindowsVersions = @(
 	),
 	@(
 		@("Windows 10", "Windows10ISO"),
+		@(
+			"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),
@@ -273,6 +286,11 @@ $WindowsVersions = @(
 	),
 	@(
 		@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
+		@(
+			"22H2 (edk2-stable202211)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
 		@(
 			"22H1 (edk2-stable202205)",
 			@("Release", 0),
@@ -481,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 '<[^>]+>',''
 	if (-not $Err) {
 		$Err = $Alt
 	} else {
@@ -795,9 +813,25 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
 			$Is64 = [Environment]::Is64BitOperatingSystem
 			# Must add a referer for POST requests, else Microsoft's servers will deny them
 			$ref = "https://www.microsoft.com/software-download/windows11"
-			$r = Invoke-WebRequest -Method Post -Headers @{"Referer" = $ref} -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
+			$wr = [System.Net.WebRequest]::Create($url)
+			# Windows 7 PowerShell doesn't support 'Invoke-WebRequest -Headers @{"Referer" = $ref}'
+			# (produces "The 'Referer' header must be modified using the appropriate property or method")
+			# so we use StreamReader() with GetResponseStream() and do this whole gymkhana instead...
+			$wr.Method = "POST"
+			$wr.Referer = $ref
+			$wr.UserAgent = $UserAgent
+			$wr.ContentLength = 0
+			$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 '  Microsoft Support – Contact Us  ',' "Microsoft Support – Contact Us" ' -replace ' and$','.'
+				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 }
@@ -845,6 +879,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
@@ -946,6 +983,10 @@ if ($Cmd) {
 	}
 	if ($Lang -eq "List") {
 		Write-Host "Please select a Language (-Lang) for ${Selected}:"
+	} elseif ($Lang) {
+		# Escape parentheses so that they aren't interpreted as regex
+		$Lang = $Lang.replace('(', '\(')
+		$Lang = $Lang.replace(')', '\)')
 	}
 	$i = 0
 	foreach ($language in $languages) {
@@ -962,7 +1003,7 @@ if ($Cmd) {
 		}
 		$i++
 	}
-	if ($winLanguageId -eq $null -or $winLanguageName -eq $null) {
+	if (!$winLanguageId -or !$winLanguageName) {
 		if ($Lang -ne "List") {
 			Write-Host "Invalid Windows language provided."
 			Write-Host "Use '-Lang List' for a list of available languages or remove the option to use system default."
@@ -1158,8 +1199,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWAYJKoZIhvcNAQcCoIIkSTCCJEUCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAiZT+pEprxewVE
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCA8HBGUKpZF1hGq
-# +Vpi/MqR7ClFwopa4p2nE7rw5/vvS6CCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# 7vrEyB4Rxs5RjECuccksFkOHdV+pYqCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1262,22 +1303,22 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQg4dhURk9h2CUZOUvA++UydKpA1JdF0+LNfeUwXIsUntYwDQYJKoZI
+# 9w0BCQQxIgQg4hR7V8VVVF6zW/rpd848bxRgtdkoph/atS+BROPclkYwDQYJKoZI
-# hvcNAQEBBQAEggIAFd7shJs09KEtSAd3zed3GhVeYlyPkyE7cEPHqMgqYzmEICoU
+# hvcNAQEBBQAEggIAkoPzSU+w9U9Ua63aaYbulBie6w1F31pjiHg3B9mm10UIIZp7
-# mMvTtcHJMJ0QwGBHwSzqtAfXSzeLBjgHNSGjAKcFgDesQc3Af8Q09fRpw9C8sNGk
+# cb/B1JTMr+gUt4e8XvdxKm332Pwee3i21yOCYGX+ZOAqqJ58fu67mdz/BPep/Xc6
-# 93YtSymh9j0GzulCxUZrIR1F5sWqCIk0hci82UC2OZv6PMUU/rcGlqJHa2LxuRu4
+# Wk7O0lokWkJLfR3CYYjVxTo4Azg01zum1srJghYHGVN/sidOLqIz8DT50XFuUGyh
-# qarqbEI+9IiTQxgJf0OU7j5QeqrA+2HsRezxF9FHZGPKCrbiB1jpxgj4KSN8VZXK
+# 6oFoXn5mrVKr0nNPIqViT2nhuPVRy8D4IdpAauE9GP2zM4WtEuEIB7sLSRfkPAwk
-# h8Dek4RTkdzoGz57Euib6fLbeGhz0JTUmfV/ntH8vLyXE7jLnFF4TkOZqz4lxS/O
+# YYfkef9pNfbt0lZ0HogiTgiqbQzQnKT0BV9nhSCG8uvy475Gv/QhhfwMhN1wnrcc
-# 1XGyNy7JIcXGulJIApiWjUDlTf25iAmZgnsSE/bX9BaU/785/bbFdcM0TPMQdsfT
+# +Ird4u92p27K9nCnQOzQyfpNgIOlbFE4WEyjvOh+TblUG9IrGrMOMNrYGCiXl9oY
-# kRWWDGGAiOCGE1iqodmXGItdltJqwm20WOL8Gdp0SatXgeE+VUS5okaj5Pka0hF7
+# KudQ4JoUyXIhlo3vzyasE0fjQ8IyCowal+65TFiKJeo+aFFehfMlwc+KyLi8Xsm7
-# JDSECigbdr85wMBzWOtxJwF/QfhfswrpdgNCWPgnm0UNXXGRHo+xMeKLW3W9PmqE
+# UeayF5LPSrHS3Eexh7bMeI8XPENVsMf9fChyM7N4Fsoqu/LTOOzfOuvke6Y9S2/c
-# ApXLuwmwQlqd0MB9do6Ej9FR0VfF8lgbewrviUSrxNcQprjS4Bz10khnXa4MXbaD
+# e1Ds2Hn9RZ2r/OsdDBQRu6zf38PSRvnWUlSIBXLkAyvp6ZoenrxyyRzi3BBGTtKX
-# I9fO3qcZbf5l2WWZugcJ6ViUPGPy6l5uhFfeqFHNydfpCxNhvIHp9DOL4DeQYm7Q
+# aqTechxuEvTr4q2mPP+qOm2RFTtBevDnYZ6DyWKEW9DC0qpZR29XKfUuiA9CZFLR
-# aujoBd8SgE3PvAmGgrYl+XD3bHUfazweFfXIFmIfLAQuh2Ckxhwxkk9+FQ6hgg48
+# ABGbzlbaHQW0kAd2NgN6t1ODrfAPkoPD3NtnUVzKgFqhDBoHhZN+B0fAPzehgg48
 # MIIOOAYKKwYBBAGCNwMDATGCDigwgg4kBgkqhkiG9w0BBwKggg4VMIIOEQIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ4GCyqGSIb3DQEJEAEEoIH+BIH7MIH4AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCB+P2yrx7cKWTvcCTruQVFWqpmcXwUz
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCCL/oKmML+jTCp9vj9QbJ2uyoOANAMk
-# XmhaQNlqAtrkMQIUf2BkE0IGM0tE5oax6k7lml9bJDoYDzIwMjIwODEzMTQwODA1
+# 6Rzl4pUyVjSPXQIUceL18ZkiSTgFvzQDRP54gARBDMgYDzIwMjMwMTA2MjE0ODEz
 # WjADAgEeoIGGpIGDMIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMg
 # Q29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAv
 # BgNVBAMTKFN5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcgU2lnbmVyIC0gRzOg
@@ -1341,13 +1382,13 @@ exit $ExitCode
 # A1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRy
 # dXN0IE5ldHdvcmsxKDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBp
 # bmcgQ0ECEHvU5a+6zAc/oQEjBCJBTRIwCwYJYIZIAWUDBAIBoIGkMBoGCSqGSIb3
-# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjIwODEzMTQwODA1
+# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjMwMTA2MjE0ODEz
-# WjAvBgkqhkiG9w0BCQQxIgQgyzbGNEm17ASxjBAH4HbnUZ3Ej87pVzNjol1uN8+H
+# WjAvBgkqhkiG9w0BCQQxIgQgHSDSEiZ1z3yfLc/y0YCLnP2xwjdFHkPqw1Kcb6Qg
-# c8EwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
+# W7UwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
-# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAGSG7BMFr8SAjmFSZlHc+OotF88R
+# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAAFLpmKwrgrGCC8EcqevsD8KuZzC
-# eqD8KR5JpDeI+PibBbDKqakppSIAZiFpehkXM/FI9PZxoJ5FxsQXT5gMlYHpEyCY
+# Eslww0wvaj4c6Vb/fXlJUtHMhrUc5l6YjLN+P1CeHYozr0A7ElD/ZVDjQol8yyPJ
-# tC5uGLxrYodpgAbTMoxCvfn3HpgQr7rTec/pyiRSrqgOX3eKbKo2IQA8t7T8QO9o
+# WGS+c8mRxq8iYpBnuqyxpYahzUhYPLl3JIpm4NAk379R3xzpFe02aZKwULDhPukw
-# JNTGrQsXrURqKI1O8uBEdoqg85Pj0YbJkR3zwBs1kHKB7XixUHAPP75NpuBWRzpR
+# N0DNqmNUJj7YRxq56BbDN0Vw9HAAOWq02PXffqhUwS9vBUMBZDQjIxiBRdJdBGqn
-# Ivx+mqun1nYau9MT5bZG0oXb8U103KvHv0odFcLwhSJjvhj+73kxjPbxY3ays3mR
+# 1oaS25drZ1c+MmJL+Q3lpBYxKWzKs6DYX1M+p2bpxB9QU+x8FjHoFB0ogwwDKLGa
-# 64hcdC5EuagKt5hlBk+CveTvAW33MEuXSSFVgQ/PZVPt1iQ1WVZtPMY81BY=
+# z6G4Vq2oTrTkvc6qYYukUiOoxZX79IlkzrYtAkjLQY7nIZsF/oiP4rnAuew=
 # SIG # End signature block

README.md

@@ -1,5 +1,5 @@
-Fido: A PowerShell download script for Windows ISOs and UEFI Shell
+Fido: A PowerShell download script for Microsoft Windows and UEFI Shell ISOs
-==================================================================
+============================================================================
 
 [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 [![Github stats](https://img.shields.io/github/downloads/pbatard/Fido/total.svg?style=flat-square)](https://github.com/pbatard/Fido/releases)
@@ -9,12 +9,12 @@ Description
 
 Fido is a PowerShell script that is primarily designed to be used in [Rufus](https://github.com/pbatard/rufus), but that
 can also be used in standalone fashion, and whose purpose is to automate access to the official Microsoft Windows retail
-ISO download links as well as provide convenient access to bootable UEFI Shell images.
+ISO download links as well as provide convenient access to [bootable UEFI Shell images](https://github.com/pbatard/UEFI-Shell).
 
 This script exists because, while Microsoft does make retail ISO download links freely and publicly available (at least
-for Windows 8 and Windows 10), it only does so after actively forcing users to jump through a lot of unwarranted hoops,
+for Windows 8 through Windows 11), up until recent releases, most of these links were only available after forcing users
-that create an exceedingly counterproductive, if not downright unfriendly, consumer experience and that greatly detract
+to jump through a lot of unwarranted hoops that created an exceedingly counterproductive, if not downright unfriendly,
-from what people really want (direct access to ISO downloads).
+consumer experience, that greatly detracted from what people really want (direct access to ISO downloads).
 
 As to the reason one might want to download Windows __retail__ ISOs, as opposed to the ISOs that are generated by
 Microsoft's own Media Creation Tool (MCT), this is because using official retail ISOs is currently the only way to
@@ -42,16 +42,16 @@ License
 How it works
 ------------
 
-The script basically performs the same operation as one might perform when visiting either of the following URLs (that
+The script basically performs the same operation as one might perform when visiting the following URL (that is, in the
-is, provided that you have also changed your `User-Agent` browser string, since, when they detect that you are using a
+case of Windows 10, provided that you have also changed your `User-Agent` browser string, since, the Microsoft web
-version of Windows that is the same as the one you are trying to download, the Microsoft web servers at these addresses
+servers detect that you are using a version of Windows that is the same as the one you are trying to download, they
-redirect you __away__ from the pages that allow you to download retail ISOs):
+may redirect you __away__ from the page that allows you to obtain a direct ISO download link):
 
 https://www.microsoft.com/en-us/software-download
 
-After checking access to these URLs, to confirm that they are accessible, the script first queries the web API from the
+After checking basic access to the Microsoft software downloads website the script first queries the web API from the
 Microsoft servers, to request the language selection available for the version of Windows selected, and then requests
-the actual download links for all the architectures available for that language + version.
+the actual download links, for all the architectures available for that language + version.
 
 Requirements
 ------------
@@ -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: