Support to Bypass Store Client App Policy When Called Through COM

doc/specs/#888 - Com Api.md

@@ -802,6 +802,8 @@ namespace Microsoft.Management.Deployment
         String LogOutputPath;
         /// Continues the install even if the hash in the catalog does not match the linked installer.
         Boolean AllowHashMismatch;
+        /// Allows Store installs when Store is disabled.
+        Boolean BypassStorePolicy;
         /// A string that will be passed to the installer. 
         /// IMPLEMENTATION NOTE: maps to "--override" in the winget cmd line
         String ReplacementInstallerArguments;

src/AppInstallerCLICore/ExecutionContext.h

@@ -64,6 +64,7 @@ namespace AppInstaller::CLI::Execution
         TreatSourceFailuresAsWarning = 0x8,
         ShowSearchResultsOnPartialFailure = 0x10,
         DisableInteractivity = 0x40,
+        BypassStorePolicy = 0x80,
     };
 
     DEFINE_ENUM_FLAG_OPERATORS(ContextFlag);

src/AppInstallerCLICore/Workflows/MSStoreInstallerHandler.cpp

@@ -115,6 +115,12 @@ namespace AppInstaller::CLI::Workflow
             }
             else if (result.Status() == GetEntitlementStatus::ServerError)
             {
+                bool bypassStorePolicy = WI_IsFlagSet(context.GetFlags(), Execution::ContextFlag::BypassStorePolicy);
+                if (bypassStorePolicy)
+                {
+                    // Entitlement fails because the store is disabled
+                    return true;
+                }
                 context.Reporter.Info() << Resource::String::MSStoreInstallGetEntitlementServerError << std::endl;
                 AICLI_LOG(CLI, Error, << "Get entitlement failed Server error. ProductId: " << Utility::ConvertToUTF8(productId));
             }
@@ -249,7 +255,9 @@ namespace AppInstaller::CLI::Workflow
 
         // Policy check
         AppInstallManager installManager;
-        if (installManager.IsStoreBlockedByPolicyAsync(s_StoreClientName, s_StoreClientPublisher).get())
+        bool bypassStorePolicy = WI_IsFlagSet(context.GetFlags(), Execution::ContextFlag::BypassStorePolicy);
+
+        if (installManager.IsStoreBlockedByPolicyAsync(s_StoreClientName, s_StoreClientPublisher).get() && !bypassStorePolicy)
         {
             context.Reporter.Error() << Resource::String::MSStoreStoreClientBlocked << std::endl;
             AICLI_LOG(CLI, Error, << "Store client is blocked by policy. MSStore execution failed.");

src/AppInstallerCLIE2ETests/Interop/InstallInterop.cs

@@ -599,5 +599,28 @@ public void GetApplicableInstaller()
             Assert.AreEqual(PackageInstallerScope.User, packageInstallerInfo.Scope);
             Assert.AreEqual("en-US", packageInstallerInfo.Locale);
         }
+
+        /// <summary>
+        /// Test install with BypassStorePolicy Enabled.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Test]
+        public async Task InstallMsixStoreBypass()
+        {
+            // Find package
+            var searchResult = this.FindOnePackage(this.testSource, PackageMatchField.Name, PackageFieldMatchOption.Equals, "AppInstallerTest.CatalogPackageMetadata");
+
+            // Configure installation
+            var installOptions = this.TestFactory.CreateInstallOptions();
+            installOptions.BypassStorePolicy = true;
+            installOptions.AcceptPackageAgreements = true;
+
+            // Install
+            var installResult = await this.packageManager.InstallPackageAsync(searchResult.CatalogPackage, installOptions);
+
+            // Assert
+            Assert.AreEqual(InstallResultStatus.DownloadError, installResult.Status);
+            Assert.False(TestCommon.VerifyTestMsixInstalledAndCleanup());
+        }
     }
 }

src/Microsoft.Management.Deployment/InstallOptions.cpp

@@ -76,6 +76,14 @@ namespace winrt::Microsoft::Management::Deployment::implementation
     {
         m_allowHashMismatch = value;
     }
+    bool InstallOptions::BypassStorePolicy()
+    {
+        return m_bypassStorePolicy;
+    }
+    void InstallOptions::BypassStorePolicy(bool value)
+    {
+        m_bypassStorePolicy = value;
+    }
     hstring InstallOptions::ReplacementInstallerArguments()
     {
         return hstring(m_replacementInstallerArguments);

src/Microsoft.Management.Deployment/InstallOptions.h

@@ -23,6 +23,8 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         void LogOutputPath(hstring const& value);
         bool AllowHashMismatch();
         void AllowHashMismatch(bool value);
+        bool BypassStorePolicy();
+        void BypassStorePolicy(bool value);
         hstring ReplacementInstallerArguments();
         void ReplacementInstallerArguments(hstring const& value);
         hstring AdditionalInstallerArguments();
@@ -47,6 +49,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         winrt::Microsoft::Management::Deployment::PackageInstallMode m_packageInstallMode = winrt::Microsoft::Management::Deployment::PackageInstallMode::Default;
         std::wstring m_logOutputPath = L"";
         bool m_allowHashMismatch = false;
+        bool m_bypassStorePolicy = false;
         std::wstring m_replacementInstallerArguments = L"";
         std::wstring m_additionalInstallerArguments = L"";
         std::wstring m_correlationData = L"";

src/Microsoft.Management.Deployment/PackageManager.cpp

@@ -349,6 +349,12 @@ namespace winrt::Microsoft::Management::Deployment::implementation
             {
                 context->Args.AddArg(Execution::Args::Type::HashOverride);
             }
+
+            if (options.BypassStorePolicy())
+            {
+                context->SetFlags(Execution::ContextFlag::BypassStorePolicy);
+            }
+
             if (options.Force())
             {
                 context->Args.AddArg(Execution::Args::Type::Force);

src/Microsoft.Management.Deployment/PackageManager.idl

@@ -817,6 +817,9 @@ namespace Microsoft.Management.Deployment
 
             /// Accept the package agreements required for installation.
             Boolean AcceptPackageAgreements;
+
+            /// Bypasses the Disabled Store Policy
+            Boolean BypassStorePolicy;
         }
     }
 

src/PowerShell/Microsoft.WinGet.Client/Commands/Common/BaseInstallCommand.cs

@@ -57,7 +57,13 @@ public string Location
         /// Gets or sets a value indicating whether to skip the installer hash validation check.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public SwitchParameter AllowHashMismatch { get; set; }
+        public SwitchParameter AllowHashMismatch { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to skip the installer hash validation check.
+        /// </summary>
+        [Parameter(ValueFromPipelineByPropertyName = true)]
+        public SwitchParameter BypassStorePolicy { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to continue upon non security related failures.
@@ -80,6 +86,7 @@ protected virtual InstallOptions GetInstallOptions(PackageVersionId version)
         {
             InstallOptions options = ComObjectFactory.Value.CreateInstallOptions();
             options.AllowHashMismatch = this.AllowHashMismatch.ToBool();
+            options.BypassStorePolicy = this.BypassStorePolicy.ToBool();
             options.Force = this.Force.ToBool();
             options.PackageInstallMode = this.Mode;
             if (version != null)