Use digest verification APIs for MSIX when available #4564
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
florelis
approved these changes
Jun 19, 2024
Comment on lines
+77
to
+101
| if (!options.ExpectedDigests.empty()) | ||
| { | ||
| // Must use API that supports digests | ||
| THROW_WIN32_IF(ERROR_NOT_SUPPORTED, !IsExpectedDigestsSupported()); | ||
|
|
||
| AddPackageOptions addPackageOptions; | ||
|
|
||
| for (const auto& digest : options.ExpectedDigests) | ||
| { | ||
| addPackageOptions.ExpectedDigests().Insert(Uri{ Utility::ConvertToUTF16(digest.first) }, digest.second); | ||
| } | ||
|
|
||
| return packageManager.AddPackageByUriAsync(uri, addPackageOptions); | ||
| } | ||
| else if (options.SkipReputationCheck) | ||
| { | ||
| return packageManager.AddPackageAsync( | ||
| uri, | ||
| nullptr, /*dependencyPackageUris*/ | ||
| DeploymentOptions::None, | ||
| nullptr, /*targetVolume*/ | ||
| nullptr, /*optionalAndRelatedPackageFamilyNames*/ | ||
| nullptr, /*optionalPackageUris*/ | ||
| nullptr /*relatedPackageUris*/); | ||
| } |
There was a problem hiding this comment.
Is there a reason to have these two branches separate? I would find it easier to understand if we had as few different calls to *AddPackage*Async()
Only reason I can think of is if AddPackageByUriAsync() wasn't available downlevel, but it goes back to 19041 which I think is the oldest supported version
There was a problem hiding this comment.
I don't want to remove it until we change the minimum version for the shipping package:
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22621.0"/>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change
When available (10.0.23504.0 according to MSDN), use the MSIX digest APIs to verify the package during streaming installation. When not available, download instead.
Validation
Manual installation successful, with logs indicating usage of digest. Manual installation with debugger memory change to invalidate the digest results in an error (although not the best error experience, it should also be extremely rare).
Existing regression tests should get some coverage as well.
Microsoft Reviewers: Open in CodeFlow