Ship Windows x64 through a separately signed official GNU release channel
This commit is contained in:
@@ -5,7 +5,7 @@ param(
|
||||
[Parameter(Mandatory)][Uri]$BootstrapBase,
|
||||
[Security.SecureString]$EnrollmentToken,
|
||||
[ValidateSet('x86_64-pc-windows-msvc','x86_64-pc-windows-gnu')]
|
||||
[string]$Platform = 'x86_64-pc-windows-msvc'
|
||||
[string]$Platform = 'x86_64-pc-windows-gnu'
|
||||
)
|
||||
$ErrorActionPreference = 'Stop'
|
||||
Set-StrictMode -Version Latest
|
||||
|
||||
@@ -42,7 +42,13 @@ pub(super) async fn publish_missing(
|
||||
if exists {
|
||||
continue;
|
||||
}
|
||||
let path = distribution.join(format!("{name}.json"));
|
||||
let path = if platform == Platform::WindowsGnuX64
|
||||
&& std::env::var_os("RMM_AGENT_UPDATE_WINDOWS_GNU_OFFICIAL_KEYRING_FILE").is_some()
|
||||
{
|
||||
distribution.join(format!("{name}-official.json"))
|
||||
} else {
|
||||
distribution.join(format!("{name}.json"))
|
||||
};
|
||||
if !path
|
||||
.try_exists()
|
||||
.map_err(|_| fail("STARTER_CONFIGURATION"))?
|
||||
@@ -64,7 +70,7 @@ pub(super) async fn publish_missing(
|
||||
continue;
|
||||
}
|
||||
let package: Starter = serde_json::from_slice(&protected_file(&path, 65536)?)?;
|
||||
let manifest = verify_signed_envelope(&package.envelope, platform, None)?;
|
||||
let manifest = verify_envelope(&package.envelope, None)?;
|
||||
if manifest.platform != platform {
|
||||
return Err(invalid());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user