Work around the latest Microsoft server restrictions

* It looks like Microsoft are actively filtering our script by detecting our first request with the
  spoofed user-agent, so work around that.
* Also switch to using 'curl' instead of 'Invoke-WebRequest'. May break PowerShell 7.0, but I'm only
  concerned about Rufus usage for now.
* Also add timeouts on web requests.
* Closes #88.

Fido.ps1

@@ -1,5 +1,5 @@
 #
-# Fido v1.48 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Fido v1.55 - 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
@@ -97,6 +97,7 @@ $Signature = @{
 	ReferencedAssemblies = $Drawing_Assembly
 	ErrorAction          = "Stop"
 	WarningAction        = "Ignore"
+	IgnoreWarnings       = $true
 	MemberDefinition     = @"
 		[DllImport("shell32.dll", CharSet = CharSet.Auto, SetLastError = true, BestFitMapping = false, ThrowOnUnmappableChar = true)]
 		internal static extern int ExtractIconEx(string sFile, int iIndex, out IntPtr piLargeVersion, out IntPtr piSmallVersion, int amountIcons);
@@ -137,16 +138,16 @@ $WindowsVersions = @(
 	@(
 		@("Windows 11", "windows11"),
 		@(
-			"22H2 v2 (Build 22621.1702 - 2023.05)",
+			"23H2 v2 (Build 22631.2861 - 2023.12)",
-			@("Windows 11 Home/Pro/Edu", 2616),
+			@("Windows 11 Home/Pro/Edu", 2935),
-			@("Windows 11 Home China ", ($zh + 2617))
+			@("Windows 11 Home China ", ($zh + 2936))
 		)
 	),
 	@(
 		@("Windows 10", "Windows10ISO"),
 		@(
-			"22H2 (Build 19045.2006 - 2022.10)",
+			"22H2 v1 (Build 19045.2965 - 2023.05)",
-			@("Windows 10 Home/Pro/Edu", 2377),
+			@("Windows 10 Home/Pro/Edu", 2618),
 			@("Windows 10 Home China ", ($zh + 2378))
 		)
 	)
@@ -163,6 +164,16 @@ $WindowsVersions = @(
 	),
 	@(
 		@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
+		@(
+			"23H2 (edk2-stable202311)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
+		@(
+			"23H1 (edk2-stable202305)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
 		@(
 			"22H2 (edk2-stable202211)",
 			@("Release", 0),
@@ -426,6 +437,7 @@ function Get-RandomDate()
 
 #region Globals
 $ErrorActionPreference = "Stop"
+$DefaultTimeout = 30
 $dh = 58
 $Stage = 0
 $SelectedIndex = 0
@@ -497,8 +509,18 @@ function Check-Locale
 		if ($Verbosity -ge 2) {
 			Write-Host Querying $url
 		}
-		Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
+		# Looks Microsoft are filtering our script according to the first query it performs with the spoofed user agent.
+		# So, to continue this pointless cat and mouse game, we simply add an extra first query with the default user agent.
+		# Also: "Hi Microsoft. You sure have A LOT OF RESOURCES TO WASTE to have assigned folks of yours to cripple scripts
+		# that merely exist because you have chosen to make the user experience from your download website utterly subpar.
+		# And while I am glad senpai noticed me (UwU), I feel compelled to ask: Don't you guys have better things to do?"
+		curl -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 $url | Out-Null
+		curl -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
 	} catch {
+		# Of course PowerShell 7 had to BREAK $_.Exception.Status on timeouts...
+		if ($_.Exception.Status -eq "Timeout" -or $_.Exception.GetType().Name -eq "TaskCanceledException") {
+			Write-Host Operation Timed out
+		}
 		$script:QueryLocale = "en-US"
 	}
 }
@@ -553,7 +575,7 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 			Write-Host Querying $url
 		}
 		try {
-			Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
+			curl -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
 		} catch {
 			Error($_.Exception.Message)
 			return @()
@@ -572,7 +594,7 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 
 		$script:SelectedIndex = 0
 		try {
-			$r = Invoke-WebRequest -Method Post -UseBasicParsing -UserAgent $UserAgent -SessionVariable "Session" $url
+			$r = curl -Method Post -UseBasicParsing -TimeoutSec $DefaultTimeout -UserAgent $UserAgent -SessionVariable "Session" $url
 			if ($r -match "errorModalMessage") {
 				Throw-Error -Req $r -Alt "Could not retrieve languages from server"
 			}
@@ -662,7 +684,7 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
 			$Is64 = [Environment]::Is64BitOperatingSystem
 			# Must add a referer for this request, else Microsoft's servers will deny it
 			$ref = "https://www.microsoft.com/software-download/windows11"
-			$r = Invoke-WebRequest -Method Post -Headers @{ "Referer" = $ref } -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
+			$r = curl -Method Post -Headers @{ "Referer" = $ref } -UseBasicParsing -TimeoutSec $DefaultTimeout -UserAgent $UserAgent -WebSession $Session $url
 			if ($r -match "errorModalMessage") {
 				$Alt = [regex]::Match($r.Content, '<p id="errorModalMessage">(.+?)<\/p>').Groups[1].Value -replace "<[^>]+>" -replace "\s+", " " -replace "\?\?\?", "-"
 				$Alt = [System.Text.Encoding]::UTF8.GetString([byte[]][char[]]$Alt)
@@ -715,7 +737,7 @@ function Process-Download-Link([string]$Url)
 				$pattern = '.*\/(.*\.iso).*'
 				$File = [regex]::Match($Url, $pattern).Groups[1].Value
 				# PowerShell implicit conversions are iffy, so we need to force them...
-				$str_size = (Invoke-WebRequest -UseBasicParsing -Uri $Url -Method Head).Headers.'Content-Length'
+				$str_size = (curl -UseBasicParsing -TimeoutSec $DefaultTimeout -Uri $Url -Method Head).Headers.'Content-Length'
 				$tmp_size = [uint64]::Parse($str_size)
 				$Size = Size-To-Human-Readable $tmp_size
 				Write-Host "Downloading '$File' ($Size)..."
@@ -1048,8 +1070,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWAYJKoZIhvcNAQcCoIIkSTCCJEUCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAKGhYjDheH+4Sn
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBHf44+d5nlaax1
-# 5iG1+mYZH/3+X0FEa7Q/82dpZOd6k6CCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# zDK20N+s1BjbUkc/aTGHLUQuXBU9BqCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1152,22 +1174,22 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQgcYaUzPH3jsRKIrG/n3A3OFwAFKTe/NoG/ABSRewp+BcwDQYJKoZI
+# 9w0BCQQxIgQgqqe1F1mEJpX4dnl4MXR5prBRZLQto2sBRVwggJo/MmswDQYJKoZI
-# hvcNAQEBBQAEggIAgWLrOaqzYCqj9Gk2IzrDi+r0VVEGp6R0decBATAD75hVjuD1
+# hvcNAQEBBQAEggIAIV2/sxOW2vNsi2RIR5heiBkJXL9Cr3JkCA8XFvLfKwXe/ut9
-# beFLkz9oOUu2f0mfz9S81g3LZ4Bv4ppYHWpJbR8xtq1O3Rg3eseQmNZhbQ9uCx1K
+# mROkV8+DB5mDf3jngzXMtI07yx+hMuA/Lu9cJe2/DTBy4KQI8GC0JSVALVYrm2NU
-# mXGMMjCKu3WGfQfAF6XBJjLPkACa21DPTMqn5DHaEh3bosuaLZKhXkrAH6TvIAzU
+# XclHamxx7ab2MLtxX6tSB3fR1LY14oclKNMgdBu6sWF9vmTS5O/T3qEihKjtAdNZ
-# /YCFNJMQ+H4/GXe1oLSrauh/VXvvDZN4i3nEfisylrtLOI7e9G9w8g5rw0fGY8zr
+# qRTwgVvQHvK8YKN58uK7Vbu32Pd0j2Eik4oxmc70MXxFmCjIBB8ncdqCQFXG1Yb1
-# Lp+2HtoOvSMdHuuUH1Lrsv40rXc/Dp008fN87S27Rbs7SQ+iD5dyqfjcSMoOv28q
+# VO7zHeRa+Y0MRjQEa8KsPR9uD1luklRD6vg4iknGGmlc+Nmly44EeBpK7sRepF+e
-# JyL5svep2RAGsPysnkS3e1O7DJhQeNVs+QMuA88x6MmW8NG2Z9JkHr88E5RiSRff
+# i+kLEzw7IekZOUzLKJCjucWjS1NpJwAobz3aGqQBQ1UB0P8T3ewCx2XX54T8moqJ
-# 2WHd633xzoD4heMz+RbF8Fjcfpu+Vn17rWNBvw7USLHSjIQFie/aFp1JYvJu7Ydr
+# AfVM+ZqQV7X6FPBv6CrXD4wnRBIQ5dl6d0tzdFn2L5khY1HUEPGYpN/2l6BWtXjX
-# o/NAvnZQRwuoJfx7882RhzSx07oQX4M7CS0kMs6X+goTYOIvpx55rEQWi+Jcu2it
+# 0oi5ekkrRWwlRN4l3fY7fNfFoNet5RYjaGQ/i+w8pBaP2K5ww+VTm9nGSfl20DVp
-# BlMXcSUc2tdRy8VRqoBxSuHeE8ghnYWH/EAuFGCWFAlsgM8XUIlc6EFhCMGAi4sE
+# WFjT+tV758SPgC+fmLBmYd1FCIPZpY4OMSMa18d6lItom3t940LzSEprtiMy+36f
-# xVdAWFQcVBimp2zyneR+CPhqT3yobPAbZ3SYzjkcUA0gScvaaOgxBhMxKXzH/f8R
+# 6SZ2PxYWX1FeEH4lFoMEDwZnq+eyOEgzwYBYORaJBLp7kMByLl8llFZehQEN1LAt
-# BCxZZjJFt++r62RxEWmn7VcFnfm2YUIhDPkO+hcfRZC/Z7bId/D9blLy1GOhgg48
+# ej05ISFVCVTXdor6r+gehODD2vtAQzITU6wXHoV7Lql73bpb+InUDRQMIvmhgg48
 # MIIOOAYKKwYBBAGCNwMDATGCDigwgg4kBgkqhkiG9w0BBwKggg4VMIIOEQIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ4GCyqGSIb3DQEJEAEEoIH+BIH7MIH4AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCDo0n7/LkB+elhn+KS65PmM68p0YJCI
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCAvatjeRykuVBr5SLwlvgA58YXzCwoH
-# ONHaDWAROD/9tAIUUU8TBxq9v5aMjQKFe24ZtdTtxY4YDzIwMjMwNTIzMjMzMDI2
+# 9wFdhHo4uzpN1wIUPApJ6noKhPzZkCXyFW/KtK7iM8oYDzIwMjQwMjA3MTU1NDAy
 # WjADAgEeoIGGpIGDMIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMg
 # Q29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAv
 # BgNVBAMTKFN5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcgU2lnbmVyIC0gRzOg
@@ -1231,13 +1253,13 @@ exit $ExitCode
 # A1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRy
 # dXN0IE5ldHdvcmsxKDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBp
 # bmcgQ0ECEHvU5a+6zAc/oQEjBCJBTRIwCwYJYIZIAWUDBAIBoIGkMBoGCSqGSIb3
-# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjMwNTIzMjMzMDI2
+# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjQwMjA3MTU1NDAy
-# WjAvBgkqhkiG9w0BCQQxIgQgITXB9+hUZRvo8hu+No0lT5xxI5YCLlTcSst1GDff
+# WjAvBgkqhkiG9w0BCQQxIgQg570COHsaZPS9rjX6BejuZj8Sq+pKr21RdiXdWz3K
-# 2pAwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
+# O1MwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
-# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAFhLCYo/lz3YiK8qq+4DxI+DqU90
+# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAInhOfqTOXDdnHraAsocyn30sofK
-# eBdYlybdPg8ywxsPxI6lseTFL3/Lfsd9ajT9lXIB6kDQ4Hu3mPB5U2loiUnMJt76
+# m/jHs++YFntM7KV18KMzYmuDtWJlZf98q2LqryJ/4Lq9rwbR+F83GprDYWD7LnpW
-# ue52k2lnErcjZCuevWcTBE6k5akwO/acFQpIeWvbwULVb3Bgmn0ZughXWcMtf+k5
+# XI/GdSxdUDIO4BDQp6ckAbQ3uzh6DxtlsW9CCMIHdJpPpY5pjeI0Gv4YyGFPDgY+
-# zjJMoXtcB7o54QZ/V7QJLNHWUI/KChAJa2AbZcwdxS+YvAf8+y0cNgdowDJZNjYy
+# QC4d/95+yC3pUOqxMdeK5O0IHuHOF0iER+52doaqbnAPaA6s0UD1jkJKVk7SXej5
-# DLLy1WcrMEu53eaAopcfyBhZVRcmACjVptu4my7R4gbRoB8OH9c12sVwcFvg5xYa
+# YXa+0hI0Oseu6j1yaqkoFSV24uecmEh+xnfRvVM7dlltGsVJ5L1xLx396/7LW9Wr
-# 672w54LYIrEZIeKkGR6LxTv0NIEQUM/ChcSTZ3qjDe4iLg8cfuZ0a0sOF7A=
+# J8HxJBxc775T9RcpIMTzxPkrRfngY0e7+D13hVLyfmYNkC0OxuekJ7f16O8=
 # SIG # End signature block