Compare commits

...

5 Commits
v1.28 ... v1.33

Author SHA1 Message Date
Pete Batard
9beb231b78 Fix Windows 7 "Referer header" error
* Closes #44
* Also fix incorrect build number for Windows 11 22H2
2022-09-21 16:59:01 +01:00
Pete Batard
ce7cb583e5 Add Windows 11 22H2 builds 2022-09-20 22:57:29 +01:00
William Bulin
0287fe274e Fixed Windows 10/11 ISO downloads
* Closes #41
* Closes #42
2022-08-13 15:08:20 +01:00
Pete Batard
129e5d6f5c Disable Windows ISO downloads
* Per #41 Microsoft appear to have altered their website to make it hostile to our script.
* Considering that trying to troubleshoot this is likely to take a long while, and that I
  sure could use some help with it, add a notice about this whole mess...
2022-08-12 14:02:34 +01:00
Pete Batard
79bcf10633 Add Shell 2.2 22H1 download 2022-05-28 15:21:05 +01:00

View File

@@ -1,5 +1,5 @@
#
# Fido v1.28 - Feature ISO Downloader, for retail Windows images and UEFI Shell
# Fido v1.33 - Feature ISO Downloader, for retail Windows images and UEFI Shell
# Copyright © 2019-2022 Pete Batard <pete@akeo.ie>
# Command line support: Copyright © 2021 flx5
# ConvertTo-ImageSource: Copyright © 2016 Chris Carter
@@ -97,6 +97,11 @@ $ko = 0x20000
$WindowsVersions = @(
@(
@("Windows 11", "windows11"),
@(
"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),
@@ -273,6 +278,11 @@ $WindowsVersions = @(
),
@(
@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
@(
"22H1 (edk2-stable202205)",
@("Release", 0),
@("Debug", 1)
),
@(
"21H2 (edk2-stable202108)",
@("Release", 0),
@@ -577,7 +587,7 @@ $RequestData = @{}
# This GUID applies to all visitors, regardless of their locale
$RequestData["GetLangs"] = @("a8f8f489-4c7f-463a-9ca6-5cff94d8d041", "getskuinformationbyproductedition" )
# This GUID applies to visitors of the en-US download page. Other locales may get a different GUID.
$RequestData["GetLinks"] = @("a224afab-2097-4dfa-a2ba-463eb191a285", "GetProductDownloadLinksBySku" )
$RequestData["GetLinks"] = @("6e2a1789-ef16-4f27-a296-74ef7ef5d96b", "GetProductDownloadLinksBySku" )
# Create a semi-random Linux User-Agent string
$FirefoxVersion = Get-Random -Minimum 50 -Maximum 90
$FirefoxDate = Get-RandomDate
@@ -788,7 +798,18 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
try {
$Is64 = [Environment]::Is64BitOperatingSystem
$r = Invoke-WebRequest -Method Post -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
# Must add a referer for POST requests, else Microsoft's servers will deny them
$ref = "https://www.microsoft.com/software-download/windows11"
$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"
}
@@ -1151,8 +1172,8 @@ exit $ExitCode
# SIG # Begin signature block
# MIIkWQYJKoZIhvcNAQcCoIIkSjCCJEYCAQExDzANBglghkgBZQMEAgEFADB5Bgor
# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBoSxq+Hd/1vEWw
# eDHx62oJBEQcs5WswgIbrZDkJ0kMbKCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDUeFzYLyGc6jXF
# dBz+FBcylnkilIubS5cDHWoqJHxaM6CCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
# jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
# DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
# EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1255,23 +1276,23 @@ exit $ExitCode
# aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
# YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
# KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
# 9w0BCQQxIgQgougliXZ/wuYNXumkzCMK5FQDWgtAe8LnWlBrtqEiDKUwDQYJKoZI
# hvcNAQEBBQAEggIAdB3UX33Us43j1YraPmuCKRqvoTEJkn1Pcdo9ISeIxgLWpzNs
# LQEf8Ie2ocHG3z/Ae23xy1XnqSP4XUtkicRO+3QIIwJ50/BKig9/yZdO9nOmLSFt
# 3aBc1BqG5a4qvT+PYyGOmYKlZkp05XvH2ngdURa971Jv89Etqyks3km++S8dXb/C
# UNrBLp8B1VQ6UMdCvCSYu4H1VS4p2sCoLSwQnCuNZxU/TcdiYwsqeUPqG4PlxBYI
# TyZbj+HJdvX66M0SlrO7o0rD5QZbLGUNLyOJoG9gjRKoGW8p+E/djo2rDsbfKe2c
# X5aFUifm++aZ0dlW6hDdmi2DkAcdXHyW7XN3d1bjkoOTyn+ASftc9GYWqFJEUT6T
# SxS+9XYvhr6jFwMfggv8tP1DAJz8kKSbcfrNkujYXU3CtqXmpTUZm4+zT6XG3Qsd
# 71iRnjYwCu/gsKxE40nHvNJS0QQ87+Cm93P5AepJGg1/uk5i/FGh7bJ+XaOemMSm
# oMMaCthj+4rzcSZ9Emvyimb0IOlAKAUN/asAvknWh8LXHquxdrNWdRQlGofwA3ng
# TjTklBaQDJTO/hR09RIEmytyTKDSxZrUSfZZ+eZsOV835cPwHsxc5Hw0N79kSHIR
# LCOWfUHv/FN5er79XbsqLXEDQBIXtIPyRT5XFoPZhz+wQZs9++YaP4HFuDahgg49
# 9w0BCQQxIgQg4UMUZV9lRQzMprUkABF0BlPniTPJlUMtr+dcV+8/NxMwDQYJKoZI
# hvcNAQEBBQAEggIAEFuVP/hg/nQQ28s0nUKy36g+a1QFfQ/WY1IyP90JIZ/1+oO1
# 5Aid5+FpJKhjb/E8mXO+/ntoSwbKSq+0lBPTTmI/RFT755VZvh/DupxXaz2+pVZ5
# 1t818dt7jq1GqqWIXEJSUwyoYe5PXrC2G9HWr2umRG+p+yo+6j13etJLYL28TScA
# UgJt1sZdAcQ176c3zqVEAzs26AmVpmA47he0d8vLVD4X/HmGLf/eisAjedNe9sN5
# U2jecv09DdD3MZ8NEK01vDhpgd8M68oq6o1/5aB+EW2YwXQFcuQbbp4jcAtWDvTW
# xRG8znfZ6sZe0vmxkNImBSynON52ficdSqp/UYH6E655bLniO6AhLPGG16suDGM/
# DqG05IoVKsBqKtOJT1E08ShODjLt3or6x6XVn5WWbafnjB5NjBN9xZKPxR2gxE8H
# KzMvLhrT29SDpgXb1lQZ1364yRiFi6Ocv9VC53oOg3LuFUjThdFr+kFp+GyAzG3S
# 1PivyLVsxn4AYKNPawth1wYCVDxTY9D2nk6UsAxGrV6bD6SDnIUQTYj0u+dMZYjn
# zHjhqE8jAVcXARG3tixRyRo0GuOHgo7gAoNdwSV/qncmHVSayu42aMo0uq/m/uBG
# Un5TtSo2cxkiA/R+t0AQfkFycxh7xRsrZQEbpdINvd2uPzpSulWCQ44dJO6hgg49
# MIIOOQYKKwYBBAGCNwMDATGCDikwgg4lBgkqhkiG9w0BBwKggg4WMIIOEgIBAzEN
# MAsGCWCGSAFlAwQCATCCAQ8GCyqGSIb3DQEJEAEEoIH/BIH8MIH5AgEBBgtghkgB
# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCBTB2MCblEVgL/J2ueYihS9iXKxuE3P
# MMWV153b+fciBwIVALiTlFr3LDTvVG0F4tF8kixrLL9IGA8yMDIyMDEyNjIwNDY1
# N1owAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCAF0PPeYlamcvCFCNrLf6a2MOaNAL7G
# S1d7gX3YVhCWkgIVAMWb0uP+c1wcM05ZVfs1BbLIPXFTGA8yMDIyMDkyMTE1NTY0
# MVowAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
# IENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMTEw
# LwYDVQQDEyhTeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIFNpZ25lciAtIEcz
# oIIKizCCBTgwggQgoAMCAQICEHsFsdRJaFFE98mJ0pwZnRIwDQYJKoZIhvcNAQEL
@@ -1334,13 +1355,13 @@ exit $ExitCode
# BgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBU
# cnVzdCBOZXR3b3JrMSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1w
# aW5nIENBAhB71OWvuswHP6EBIwQiQU0SMAsGCWCGSAFlAwQCAaCBpDAaBgkqhkiG
# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDEyNjIwNDY1
# N1owLwYJKoZIhvcNAQkEMSIEIIK+PEpBx+mrb3vR20xkouo7+D6Z8F+IcfPB1ugk
# JhbkMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQCoRSQVcp2FKLwh5Jeuo/dOuM2o
# v7yiMYYR9A0CFHfd+zZsz6ZximV4fYH4BzGLH0Vn5snsupWXRuwXk7bm2Ge6q2cu
# HOltVpkhSv1VSnzaHshyecs9t/MZhjFoqsvUv15KJoKfGHL9f/Bu+jmjuGotnHrC
# HkFQ4iTtQwWnD5iq+yeWEo/0CIs+id586C2Q8cstv7xxVS3lut0xrEWkmKv0u/SW
# 2s09cxmBjlObmWGYcRAildr/g62TXlO6aOL4Zji04IDCOdXT9LfHZdEYHGY5L1mw
# mECqnRMYPbG3ZRwiMmsCQq9nhxNXtE9qYkjBBhr+YSPPmRljuAxe9KVZfXO8
# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDkyMTE1NTY0
# MVowLwYJKoZIhvcNAQkEMSIEILvZi3muWrod7K9kHyk/WE6ivgHJtSCXjde+vv8Z
# WiczMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQCmIEtfCe7GnEezhZmxNvjQG68a
# z9Ve9nQbbwqf+q4nHnkBo2GC0Yy/DxnX4guloxGcw/9DVwxzzC7ItJEG0qmAY0Pl
# bdDVLyldAwZYcY43LriCS80x5xLZQjkpPSQurs3uTcGbwkqno20XZdRMSvUYdI0K
# how//ZKXn9XcQGcvaCIGCzttS433m3khkILUiVvZNOqGERX6BqNjX5OX4QscK1uR
# kRKEPdL9WMIv3MX902bnnC8OqeuHcKcjdIuokzGfDYoGJe8aGOWTsScivdft+5Go
# C1W4KLv7+jEF0n05S0Sd/ebBFYM4Zq2EQVpj1KeLyrPHonZYwZGzbXpwRC3W
# SIG # End signature block