Switch back to using 'Invoke-WebRequest' instead of 'curl'

* Closes #91.
Add UEFI Shell 24H1 ISO downloads
2025-09-16 22:28:02 +02:00 · 2024-06-18 12:08:48 +01:00 · 2024-05-30 13:16:38 +01:00 · 2024-02-07 15:55:59 +00:00 · 2023-12-19 10:27:44 +00:00 · 2023-11-25 17:55:01 +00:00
1 changed files with 64 additions and 37 deletions
--- a/Fido.ps1
+++ b/Fido.ps1
@@ -1,6 +1,6 @@
 #
-# Fido v1.48 - Feature ISO Downloader, for retail Windows images and UEFI Shell
-# Copyright © 2019-2023 Pete Batard <pete@akeo.ie>
+# Fido v1.57 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Copyright © 2019-2024 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)",
-			@("Windows 11 Home/Pro/Edu", 2616),
-			@("Windows 11 Home China ", ($zh + 2617))
+			"23H2 v2 (Build 22631.2861 - 2023.12)",
+			@("Windows 11 Home/Pro/Edu", 2935),
+			@("Windows 11 Home China ", ($zh + 2936))
 		)
 	),
 	@(
 		@("Windows 10", "Windows10ISO"),
 		@(
-			"22H2 (Build 19045.2006 - 2022.10)",
-			@("Windows 10 Home/Pro/Edu", 2377),
+			"22H2 v1 (Build 19045.2965 - 2023.05)",
+			@("Windows 10 Home/Pro/Edu", 2618),
 			@("Windows 10 Home China ", ($zh + 2378))
 		)
 	)
@@ -163,6 +164,21 @@ $WindowsVersions = @(
 	),
 	@(
 		@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
+		@(
+			"24H1 (edk2-stable202405)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
+		@(
+			"23H2 (edk2-stable202311)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
+		@(
+			"23H1 (edk2-stable202305)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
 		@(
 			"22H2 (edk2-stable202211)",
 			@("Release", 0),
@@ -426,6 +442,7 @@ function Get-RandomDate()

 #region Globals
 $ErrorActionPreference = "Stop"
+$DefaultTimeout = 30
 $dh = 58
 $Stage = 0
 $SelectedIndex = 0
@@ -497,8 +514,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?"
+		Invoke-WebRequest -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 $url | Out-Null
+		Invoke-WebRequest -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 +580,7 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 			Write-Host Querying $url
 		}
 		try {
-			Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
+			Invoke-WebRequest -UseBasicParsing -TimeoutSec $DefaultTimeout -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
 		} catch {
 			Error($_.Exception.Message)
 			return @()
@@ -572,7 +599,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 = Invoke-WebRequest -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 +689,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 = Invoke-WebRequest -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 +742,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 = (Invoke-WebRequest -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 +1075,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWAYJKoZIhvcNAQcCoIIkSTCCJEUCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAKGhYjDheH+4Sn
-# 5iG1+mYZH/3+X0FEa7Q/82dpZOd6k6CCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCB6/hZgyGy5PCvt
+# gCtQT/nZSZCBsJLelhii59nr9meeYqCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1152,22 +1179,22 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQgcYaUzPH3jsRKIrG/n3A3OFwAFKTe/NoG/ABSRewp+BcwDQYJKoZI
-# hvcNAQEBBQAEggIAgWLrOaqzYCqj9Gk2IzrDi+r0VVEGp6R0decBATAD75hVjuD1
-# beFLkz9oOUu2f0mfz9S81g3LZ4Bv4ppYHWpJbR8xtq1O3Rg3eseQmNZhbQ9uCx1K
-# mXGMMjCKu3WGfQfAF6XBJjLPkACa21DPTMqn5DHaEh3bosuaLZKhXkrAH6TvIAzU
-# /YCFNJMQ+H4/GXe1oLSrauh/VXvvDZN4i3nEfisylrtLOI7e9G9w8g5rw0fGY8zr
-# Lp+2HtoOvSMdHuuUH1Lrsv40rXc/Dp008fN87S27Rbs7SQ+iD5dyqfjcSMoOv28q
-# JyL5svep2RAGsPysnkS3e1O7DJhQeNVs+QMuA88x6MmW8NG2Z9JkHr88E5RiSRff
-# 2WHd633xzoD4heMz+RbF8Fjcfpu+Vn17rWNBvw7USLHSjIQFie/aFp1JYvJu7Ydr
-# o/NAvnZQRwuoJfx7882RhzSx07oQX4M7CS0kMs6X+goTYOIvpx55rEQWi+Jcu2it
-# BlMXcSUc2tdRy8VRqoBxSuHeE8ghnYWH/EAuFGCWFAlsgM8XUIlc6EFhCMGAi4sE
-# xVdAWFQcVBimp2zyneR+CPhqT3yobPAbZ3SYzjkcUA0gScvaaOgxBhMxKXzH/f8R
-# BCxZZjJFt++r62RxEWmn7VcFnfm2YUIhDPkO+hcfRZC/Z7bId/D9blLy1GOhgg48
+# 9w0BCQQxIgQgjGvMX1KUGmTAG0n1x4MezO453CpVTtVYSdFxGu+1e6MwDQYJKoZI
+# hvcNAQEBBQAEggIALNCfDs1MxfpLMhXG2grYBt5l4UBrnaQ04a5lZHAUU1X7BmwS
+# gr21XmYKQRq82gwawyhq/ZRDpb4ba2Z7IQN7IRH0IBgZVwUeBE9ZEyYGQehLdF1Y
+# Q7F2rPODSEdrneR00+KTwN1+DSTNX213LRwjwV0f5Ieu5Bd4CelFpApkxkYcuybM
+# JSzkXnQOFm06ArNrwTKmlDXvLBKtgUyxsL3oT9xASqBGJx6i/SBbzKjyqD7+aVzq
+# COXgJCxAO5Wx2DHK+DUfvDfQy/NQ69icRm2AoMTxPI/by8sUbzYTK3dw/wCEQWnJ
+# ijVxnyUE98OsYejFtCxmpJzq3ST9+TTMXjHQyqztnxTIlGGGVw9aPqK9FHYpclgj
+# HeT9LWreOdkA4VCdxKYhh0vG7RKPyQzZLSC1BRY4Y8iLWupDPTEfP8LZeE0XeLaO
+# McSggDRzz+AKbraqn9LWRF4MRAW3V4Aa8tT1LPm4fT1N2mt7r9aNyYcaqMWs5/TR
+# 9vohkS8lbV5+QX5cDC8n1VborV9QzLM/mPXK/4PSoVuRLVHkZ9FLMRpEf/pBJ7nY
+# HhXeS2HZ1CAp0xGqj6CUtu0+808D0u07HA4ic4WOdzSfVvgYyCJ4BXg0xVoHR0tf
+# ox7Xa1FVa0hq7q6i4+tHC8AQl1LDodec1qrrL1ULEK8kU+x9JZuwm/OqIU2hgg48
 # MIIOOAYKKwYBBAGCNwMDATGCDigwgg4kBgkqhkiG9w0BBwKggg4VMIIOEQIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ4GCyqGSIb3DQEJEAEEoIH+BIH7MIH4AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCDo0n7/LkB+elhn+KS65PmM68p0YJCI
-# ONHaDWAROD/9tAIUUU8TBxq9v5aMjQKFe24ZtdTtxY4YDzIwMjMwNTIzMjMzMDI2
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCCpTBNKrwFwdHYx5MKSLOIsjhyUcRDn
+# ors0b8ClDUtZzwIUGHuZJSxXXydSQjJMKzqMARfqbXIYDzIwMjQwNjE4MTEwNzQ1
 # WjADAgEeoIGGpIGDMIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMg
 # Q29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAv
 # BgNVBAMTKFN5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcgU2lnbmVyIC0gRzOg
@@ -1231,13 +1258,13 @@ exit $ExitCode
 # A1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRy
 # dXN0IE5ldHdvcmsxKDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBp
 # bmcgQ0ECEHvU5a+6zAc/oQEjBCJBTRIwCwYJYIZIAWUDBAIBoIGkMBoGCSqGSIb3
-# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjMwNTIzMjMzMDI2
-# WjAvBgkqhkiG9w0BCQQxIgQgITXB9+hUZRvo8hu+No0lT5xxI5YCLlTcSst1GDff
-# 2pAwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
-# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAFhLCYo/lz3YiK8qq+4DxI+DqU90
-# eBdYlybdPg8ywxsPxI6lseTFL3/Lfsd9ajT9lXIB6kDQ4Hu3mPB5U2loiUnMJt76
-# ue52k2lnErcjZCuevWcTBE6k5akwO/acFQpIeWvbwULVb3Bgmn0ZughXWcMtf+k5
-# zjJMoXtcB7o54QZ/V7QJLNHWUI/KChAJa2AbZcwdxS+YvAf8+y0cNgdowDJZNjYy
-# DLLy1WcrMEu53eaAopcfyBhZVRcmACjVptu4my7R4gbRoB8OH9c12sVwcFvg5xYa
-# 672w54LYIrEZIeKkGR6LxTv0NIEQUM/ChcSTZ3qjDe4iLg8cfuZ0a0sOF7A=
+# DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjQwNjE4MTEwNzQ1
+# WjAvBgkqhkiG9w0BCQQxIgQgaLj4rStyAc4gYIJwBDnf1sEWzST3OsOyweYfm5EZ
+# XRswNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQgxHTOdgB9AjlODaXk3nwUxoD54oIB
+# PP72U+9dtx/fYfgwCwYJKoZIhvcNAQEBBIIBAIeZ3ykedA8RCnxesyKjJCB1j97D
+# 4CzvrQzrWlYg+D/A/4QuYXiCirn0q2ONq61EmH6c/zqC4vRwsGfVGFkQqb9GeC0e
+# JAxqubqBcqdN3aTGdjEkv7BQmxi3OLjcTgS0nsQrkPQD46YOX2Mtx2pt8LqsRKyi
+# bhhN6WG40hrUnOQFts6pcL6PhFSth7xMh6h/LW9x20R2HBpzvRi8xmK80H7NPH4v
+# optllo3Cu6xzp1RSDcsbaCx7YopMjIJbqIQf11YMvE52beHFZnZPz1tTPZaNqzvb
+# Ln1K6LDZP6Zpw9OUvDR2UIRCBCLkw/CYWFx75OpbQgNBoDnZKsdjj1x5WgI=
 # SIG # End signature block
Author	SHA1	Message	Date
Pete Batard	f55fd2932c	Switch back to using 'Invoke-WebRequest' instead of 'curl' * Closes #91.	2024-06-18 12:08:48 +01:00
Pete Batard	06a14ba11c	Add UEFI Shell 24H1 ISO downloads	2024-05-30 13:16:38 +01:00
Pete Batard	4e6f25f351	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.	2024-02-07 15:55:59 +00:00
Pete Batard	d43d7aeee3	Add Windows 11 23H2 v2 downloads * With thanks to @ave9858. * Closes #83.	2023-12-19 10:27:44 +00:00
Pete Batard	d8b2d24242	Add UEFI Shell 23H2 ISO downloads * Also fix Windows 11 23H2 build version since Microsoft are UTTERLY USELESS at providing an accurate product version number in the .wim's XML versioning files they are in bloody charge of populating...	2023-11-25 17:55:01 +00:00
Pete Batard	903cae2f00	Add Windows 11 23H2 downloads * Replaces Windows 11 22H2, since past history indicates that Microsoft is not going to keep the Windows 11 22H2 ISOs available for much longer. * Note that Microsoft has no plans to ever release a Windows 10 23H2. * Closes #76.	2023-10-31 19:23:43 +01:00
Pete Batard	5d4a4d7d14	Fix a regression with IgnoreWarnings * Commit `1d88deac7c` removed the IgnoreWarnings flag which was needed as a fix for pbatard/rufus#2030. * Contributed by @Tom-EllisEVENTS. * Closes pbatard/rufus#2315.	2023-09-08 18:35:53 +01:00
Pete Batard	4a694421af	Add UEFI Shell 2.2 23H1 download	2023-06-06 13:49:50 +01:00
Pete Batard	15a1a5923d	Add Windows 10 22H2 v1 downloads * Closes #72	2023-05-25 00:07:45 +01:00