Load index from validated msix for unpackaged context

.github/actions/spelling/allow.txt

@@ -61,6 +61,7 @@ cmake
 cmdlet
 cmdlets
 cmp
+CMSG
 CNG
 cnt
 codepage
@@ -186,6 +187,9 @@ getline
 github
 githubusercontent
 globals
+HCCE
+hcertstore
+HCRYPTMSG
 hfile
 HGLOBAL
 HIDECANCEL
@@ -206,6 +210,7 @@ hstring
 html
 http
 https
+HWND
 Hyperlink
 IActivation
 IApplication
@@ -279,6 +284,7 @@ logsql
 logto
 LONGLONG
 LPCGUID
+LPCSTR
 LPVOID
 mailto
 MAJORVERSION
@@ -351,6 +357,7 @@ nuspec
 OAuth
 ODR
 ofstream
+Oid
 opencode
 opensource
 openxmlformats
@@ -382,6 +389,7 @@ PGP
 php
 PII
 pipssource
+PKCS
 placeholders
 png
 posix
@@ -492,6 +500,7 @@ src
 srwlock
 sscanf
 sstream
+STATEACTION
 STATFLAG
 STATSTG
 STDAPI
@@ -516,6 +525,7 @@ STRINGID
 STRINGIFY
 STRINGIZE
 stringstream
+STRSAFE
 strstr
 strtoll
 subcontext
@@ -639,6 +649,7 @@ winmeta
 winres
 winrt
 winsqlite
+WINTRUST
 wix
 wmain
 WNS
@@ -653,6 +664,7 @@ wrl
 WStr
 wstring
 wstringstream
+WTD
 www
 xamarin
 xaml

.github/actions/spelling/expect.txt

@@ -120,6 +120,7 @@ EXEHASH
 experimentalfeatures
 fcb
 fd
+fdw
 fedorapeople
 fileinuse
 fintimes
@@ -278,7 +279,9 @@ parametermap
 pathparts
 pathpaths
 Patil
+pb
 PCs
+pcwsz
 pdp
 PEGI
 pfn

src/AppInstallerCLICore/Workflows/MSStoreInstallerHandler.cpp

@@ -88,6 +88,7 @@ namespace AppInstaller::CLI::Workflow
             if (result.Status() == GetEntitlementStatus::Succeeded)
             {
                 context.Reporter.Info() << Resource::String::MSStoreInstallGetEntitlementSuccess << std::endl;
+                AICLI_LOG(CLI, Info, << "Get entitlement succeeded.");
             }
             else if (result.Status() == GetEntitlementStatus::NetworkError)
             {

src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj

@@ -71,7 +71,9 @@
     <Content Include="Images\StoreLogo.png" />
     <Content Include="Images\Wide310x150Logo.scale-200.png" />
     <None Include="Register-WingetdevAutoComplete.ps1" />
-    <PRIResource Include="Shared\Strings\en-us\winget.resw" />
+    <PRIResource Include="Shared\Strings\en-us\winget.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
     <PRIResource Include="shared\strings\de-DE\winget.resw" Condition="Exists('shared\strings\de-DE\winget.resw')" />
     <PRIResource Include="shared\strings\es-ES\winget.resw" Condition="Exists('shared\strings\es-ES\winget.resw')" />
     <PRIResource Include="shared\strings\fr-FR\winget.resw" Condition="Exists('shared\strings\fr-FR\winget.resw')" />

src/AppInstallerCLITests/AppInstallerCLITests.vcxproj

@@ -314,9 +314,15 @@
     <CopyFileToFolders Include="TestData\index.1.0.0.0.msix">
       <DeploymentContent>true</DeploymentContent>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\index.1.0.0.0.signed.msix">
+      <DeploymentContent>true</DeploymentContent>
+    </CopyFileToFolders>
     <CopyFileToFolders Include="TestData\index.2.0.0.0.msix">
       <DeploymentContent>true</DeploymentContent>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\index.2.0.0.0.signed.msix">
+      <DeploymentContent>true</DeploymentContent>
+    </CopyFileToFolders>
     <CopyFileToFolders Include="TestData\TestSignedApp.msix">
       <DeploymentContent>true</DeploymentContent>
     </CopyFileToFolders>

src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters

@@ -408,9 +408,15 @@
     <CopyFileToFolders Include="TestData\index.1.0.0.0.msix">
       <Filter>TestData</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\index.1.0.0.0.signed.msix">
+      <Filter>TestData</Filter>
+    </CopyFileToFolders>
     <CopyFileToFolders Include="TestData\index.2.0.0.0.msix">
       <Filter>TestData</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\index.2.0.0.0.signed.msix">
+      <Filter>TestData</Filter>
+    </CopyFileToFolders>
     <CopyFileToFolders Include="TestData\TestSignedApp.msix">
       <Filter>TestData</Filter>
     </CopyFileToFolders>

src/AppInstallerCLITests/MsixInfo.cpp

@@ -3,6 +3,7 @@
 #include "pch.h"
 #include "TestCommon.h"
 #include <AppInstallerMsixInfo.h>
+#include "AppInstallerDownloader.h"
 
 using namespace std::string_literals;
 using namespace std::string_view_literals;
@@ -11,6 +12,7 @@ using namespace AppInstaller;
 
 constexpr std::string_view s_MsixFile_1 = "index.1.0.0.0.msix";
 constexpr std::string_view s_MsixFile_2 = "index.2.0.0.0.msix";
+constexpr std::string_view s_MsixFileSigned_1 = "index.1.0.0.0.signed.msix";
 
 TEST_CASE("MsixInfo_GetPackageFamilyName", "[msixinfo]")
 {
@@ -23,33 +25,21 @@ TEST_CASE("MsixInfo_GetPackageFamilyName", "[msixinfo]")
     REQUIRE(expectedFullName == actualFullName);
 }
 
-TEST_CASE("MsixInfo_WriteManifestAndCompareToSelf", "[msixinfo]")
+TEST_CASE("MsixInfo_CompareToSelf", "[msixinfo]")
 {
     TestDataFile index(s_MsixFile_1);
     Msix::MsixInfo msix(index.GetPath().u8string());
 
-    TempFile manifest{ "msixtest_manifest"s, ".xml"s };
-    ProgressCallback callback;
-
-    msix.WriteManifestToFile(manifest, callback);
-
-    REQUIRE(!msix.IsNewerThan(manifest));
+    REQUIRE(!msix.IsNewerThan(index.GetPath().u8string()));
 }
 
-TEST_CASE("MsixInfo_WriteManifestAndCompareToOlder", "[msixinfo]")
+TEST_CASE("MsixInfo_CompareToOlder", "[msixinfo]")
 {
     TestDataFile index1(s_MsixFile_1);
-    Msix::MsixInfo msix1(index1.GetPath().u8string());
-
-    TempFile manifest{ "msixtest_manifest"s, ".xml"s };
-    ProgressCallback callback;
-
-    msix1.WriteManifestToFile(manifest, callback);
-
     TestDataFile index2(s_MsixFile_2);
     Msix::MsixInfo msix2(index2.GetPath().u8string());
 
-    REQUIRE(msix2.IsNewerThan(manifest));
+    REQUIRE(msix2.IsNewerThan(index1));
 }
 
 TEST_CASE("MsixInfo_WriteFile", "[msixinfo]")
@@ -64,3 +54,31 @@ TEST_CASE("MsixInfo_WriteFile", "[msixinfo]")
 
     REQUIRE(1 == std::filesystem::file_size(file));
 }
+
+TEST_CASE("MsixInfo_ValidateMsixTrustInfo", "[msixinfo]")
+{
+    TestDataFile notSigned{ s_MsixFile_1 };
+    REQUIRE_FALSE(Msix::ValidateMsixTrustInfo(notSigned));
+
+    TestDataFile testSigned{ s_MsixFileSigned_1 };
+
+    // Remove the cert if already trusted
+    bool certExistsBeforeTest = UninstallCertFromSignedPackage(testSigned);
+
+    REQUIRE_FALSE(Msix::ValidateMsixTrustInfo(testSigned));
+
+    // Add the cert to trusted
+    InstallCertFromSignedPackage(testSigned);
+    REQUIRE(Msix::ValidateMsixTrustInfo(testSigned));
+    REQUIRE_FALSE(Msix::ValidateMsixTrustInfo(testSigned, true));
+
+    TestCommon::TempFile microsoftSigned{ "testIndex"s, ".msix"s };
+    ProgressCallback callback;
+    Utility::Download("https://cdn.winget.microsoft.com/cache/source.msix", microsoftSigned.GetPath(), Utility::DownloadType::Index, callback);
+    REQUIRE(Msix::ValidateMsixTrustInfo(microsoftSigned, true));
+
+    if (!certExistsBeforeTest)
+    {
+        UninstallCertFromSignedPackage(testSigned);
+    }
+}

src/AppInstallerCLITests/PreIndexedPackageSource.cpp

@@ -23,12 +23,10 @@ namespace fs = std::filesystem;
 
 constexpr std::string_view s_RepositorySettings_UserSources = "usersources"sv;
 
-constexpr std::string_view s_MsixFile_1 = "index.1.0.0.0.msix";
-constexpr std::string_view s_MsixFile_2 = "index.2.0.0.0.msix";
-constexpr std::string_view s_Msix_FamilyName = "AppInstallerCLITestsFakeIndex_125rzkzqaqjwj";
-constexpr std::string_view s_AppxManifestFileName = "AppxManifest.xml"sv;
+constexpr std::string_view s_MsixFile_1 = "index.1.0.0.0.signed.msix";
+constexpr std::string_view s_MsixFile_2 = "index.2.0.0.0.signed.msix";
+constexpr std::string_view s_Msix_FamilyName = "AppInstallerCLITestsFakeIndex_8wekyb3d8bbwe";
 constexpr std::string_view s_IndexMsixName = "source.msix"sv;
-constexpr std::string_view s_IndexFileName = "index.db"sv;
 
 void CopyIndexFileToDirectory(const fs::path& from, const fs::path& to)
 {
@@ -71,6 +69,8 @@ TEST_CASE("PIPS_Add", "[pips]")
     TestDataFile index(s_MsixFile_1);
     CopyIndexFileToDirectory(index, dir);
 
+    bool shouldCleanCert = InstallCertFromSignedPackage(index);
+
     SourceDetails details;
     details.Name = "TestName";
     details.Type = AppInstaller::Repository::Microsoft::PreIndexedPackageSourceFactory::Type();
@@ -82,15 +82,15 @@ TEST_CASE("PIPS_Add", "[pips]")
     fs::path state = GetPathToFileDir();
     REQUIRE(fs::exists(state));
 
-    fs::path manifest = state;
-    manifest /= s_AppxManifestFileName;
-    REQUIRE(fs::exists(manifest));
-    REQUIRE(fs::file_size(manifest) > 0);
+    fs::path indexMsix = state;
+    indexMsix /= s_IndexMsixName;
+    REQUIRE(fs::exists(indexMsix));
+    REQUIRE(fs::file_size(indexMsix) > 0);
 
-    fs::path indexFile = state;
-    indexFile /= s_IndexFileName;
-    REQUIRE(fs::exists(indexFile));
-    REQUIRE(fs::file_size(indexFile) > 0);
+    if (shouldCleanCert)
+    {
+        UninstallCertFromSignedPackage(index);
+    }
 }
 
 TEST_CASE("PIPS_UpdateSameVersion", "[pips]")
@@ -101,6 +101,8 @@ TEST_CASE("PIPS_UpdateSameVersion", "[pips]")
     TestDataFile index(s_MsixFile_1);
     CopyIndexFileToDirectory(index, dir);
 
+    bool shouldCleanCert = InstallCertFromSignedPackage(index);
+
     SourceDetails details;
     details.Name = "TestName";
     details.Type = AppInstaller::Repository::Microsoft::PreIndexedPackageSourceFactory::Type();
@@ -117,6 +119,11 @@ TEST_CASE("PIPS_UpdateSameVersion", "[pips]")
 
     UpdateSource(details.Name, callback);
     REQUIRE(!progressCalled);
+
+    if (shouldCleanCert)
+    {
+        UninstallCertFromSignedPackage(index);
+    }
 }
 
 TEST_CASE("PIPS_UpdateNewVersion", "[pips]")
@@ -127,6 +134,8 @@ TEST_CASE("PIPS_UpdateNewVersion", "[pips]")
     TestDataFile indexMsix1(s_MsixFile_1);
     CopyIndexFileToDirectory(indexMsix1, dir);
 
+    bool shouldCleanCert = InstallCertFromSignedPackage(indexMsix1);
+
     SourceDetails details;
     details.Name = "TestName";
     details.Type = AppInstaller::Repository::Microsoft::PreIndexedPackageSourceFactory::Type();
@@ -138,13 +147,9 @@ TEST_CASE("PIPS_UpdateNewVersion", "[pips]")
     fs::path state = GetPathToFileDir();
     REQUIRE(fs::exists(state));
 
-    fs::path manifestPath = state;
-    manifestPath /= s_AppxManifestFileName;
-    std::string manifestContents1 = GetContents(manifestPath);
-
-    fs::path indexPath = state;
-    indexPath /= s_IndexFileName;
-    std::string indexContents1 = GetContents(indexPath);
+    fs::path indexMsix = state;
+    indexMsix /= s_IndexMsixName;
+    std::string indexContents1 = GetContents(indexMsix);
 
     TestDataFile indexMsix2(s_MsixFile_2);
     CopyIndexFileToDirectory(indexMsix2, dir);
@@ -155,11 +160,13 @@ TEST_CASE("PIPS_UpdateNewVersion", "[pips]")
     UpdateSource(details.Name, callback);
     REQUIRE(progressCalled);
 
-    std::string manifestContents2 = GetContents(manifestPath);
-    REQUIRE(manifestContents1 != manifestContents2);
-
-    std::string indexContents2 = GetContents(indexPath);
+    std::string indexContents2 = GetContents(indexMsix);
     REQUIRE(indexContents1 != indexContents2);
+
+    if (shouldCleanCert)
+    {
+        UninstallCertFromSignedPackage(indexMsix1);
+    }
 }
 
 TEST_CASE("PIPS_Remove", "[pips]")
@@ -170,6 +177,8 @@ TEST_CASE("PIPS_Remove", "[pips]")
     TestDataFile index(s_MsixFile_1);
     CopyIndexFileToDirectory(index, dir);
 
+    bool shouldCleanCert = InstallCertFromSignedPackage(index);
+
     SourceDetails details;
     details.Name = "TestName";
     details.Type = AppInstaller::Repository::Microsoft::PreIndexedPackageSourceFactory::Type();
@@ -181,14 +190,15 @@ TEST_CASE("PIPS_Remove", "[pips]")
     fs::path state = GetPathToFileDir();
     REQUIRE(fs::exists(state));
 
-    fs::path manifest = state;
-    manifest /= s_AppxManifestFileName;
-    REQUIRE(fs::exists(manifest));
-
-    fs::path indexFile = state;
-    indexFile /= s_IndexFileName;
-    REQUIRE(fs::exists(indexFile));
+    fs::path indexMsix = state;
+    indexMsix /= s_IndexMsixName;
+    REQUIRE(fs::exists(indexMsix));
 
     RemoveSource(details.Name, callback);
     REQUIRE(!fs::exists(state));
+
+    if (shouldCleanCert)
+    {
+        UninstallCertFromSignedPackage(index);
+    }
 }