Create a task

microsoft · Oct 14, 2024 · 0ac0ab4 · 0ac0ab4
1 parent caa13c2
commit 0ac0ab4
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/src/AppInstallerCLICore/Commands/ConfigureCommand.cpp b/src/AppInstallerCLICore/Commands/ConfigureCommand.cpp
@@ -8,7 +8,6 @@
 #include "ConfigureValidateCommand.h"
 #include "ConfigureExportCommand.h"
 #include "Workflows/ConfigurationFlow.h"
-#include "Workflows/SmartScreenFlow.h"
 #include "Workflows/MSStoreInstallerHandler.h"
 #include "ConfigurationCommon.h"
 
@@ -78,7 +77,6 @@ namespace AppInstaller::CLI
             context <<
                 VerifyIsFullPackage <<
                 VerifyFileOrUri(Execution::Args::Type::ConfigurationFile) <<
-                EvaluateUri <<
                 CreateConfigurationProcessor <<
                 OpenConfigurationSet <<
                 ShowConfigurationSet <<

diff --git a/src/AppInstallerCLICore/Commands/DownloadCommand.cpp b/src/AppInstallerCLICore/Commands/DownloadCommand.cpp
@@ -5,7 +5,6 @@
 #include "Workflows/DownloadFlow.h"
 #include "Workflows/InstallFlow.h"
 #include "Workflows/PromptFlow.h"
-#include "Workflows/SmartScreenFlow.h"
 #include "Resources.h"
 #include <AppInstallerRuntime.h>
 #include <winget/ManifestCommon.h>
@@ -105,7 +104,6 @@ namespace AppInstaller::CLI
             Workflow::ReportIdentityAndInstallationDisclaimer <<
             Workflow::ShowPromptsForSinglePackage(/* ensureAcceptance */ true) <<
             Workflow::DownloadPackageDependencies <<
-            Workflow::EvaluateUri <<
             Workflow::DownloadInstaller;
     }
 }
diff --git a/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp b/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 #include "pch.h"
 #include "ConfigurationFlow.h"
+#include "SmartScreenFlow.h"
 #include "PromptFlow.h"
 #include "TableOutput.h"
 #include "Public/ConfigurationSetProcessorFactoryRemoting.h"
@@ -1300,6 +1301,7 @@ namespace AppInstaller::CLI::Workflow
 
     void CreateConfigurationProcessor(Context& context)
     {
+        context << ExecuteSmartScreen(true);
         auto progressScope = context.Reporter.BeginAsyncProgress(true);
         progressScope->Callback().SetProgressMessage(Resource::String::ConfigurationInitializing());
 

diff --git a/src/AppInstallerCLICore/Workflows/DownloadFlow.cpp b/src/AppInstallerCLICore/Workflows/DownloadFlow.cpp
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 #include "pch.h"
 #include "DownloadFlow.h"
+#include "SmartScreenFlow.h"
 #include "MSStoreInstallerHandler.h"
 #include <winget/Filesystem.h>
 #include <AppInstallerDeployment.h>
@@ -208,6 +209,7 @@ namespace AppInstaller::CLI::Workflow
         }
 
         bool installerDownloadOnly = WI_IsFlagSet(context.GetFlags(), Execution::ContextFlag::InstallerDownloadOnly);
+        context << ExecuteSmartScreen(false);
 
         // CheckForExistingInstaller will set the InstallerPath if found
         if (!context.Contains(Execution::Data::InstallerPath))

diff --git a/src/AppInstallerCLICore/Workflows/SmartScreenFlow.cpp b/src/AppInstallerCLICore/Workflows/SmartScreenFlow.cpp
@@ -115,10 +115,9 @@ namespace AppInstaller::CLI::Workflow
         return S_OK;
     }
 
-    void EvaluateUri(Execution::Context& context)
+    void ExecuteSmartScreen::operator()(Execution::Context& context) const
     {
-        // DSC
-        if (context.Args.Contains(Execution::Args::Type::ConfigurationFile))
+        if (m_isConfigurationFlow)
         {
             auto uriValidation = EvaluateConfigurationUri(context);
             if(FAILED(uriValidation))

diff --git a/src/AppInstallerCLICore/Workflows/SmartScreenFlow.h b/src/AppInstallerCLICore/Workflows/SmartScreenFlow.h
@@ -5,6 +5,19 @@
 
 namespace AppInstaller::CLI::Workflow
 {
-    void EvaluateUri(Execution::Context& context);
+    // Composite flow that chooses what to do based on whether or not the
+    // configuration flow is being run.
+    // Required Args: None
+    // Inputs: IsConfigurationFlow
+    // Outputs: None
+    struct ExecuteSmartScreen : public WorkflowTask
+    {
+        ExecuteSmartScreen(bool isConfigurationFlow) : WorkflowTask("ExecuteSmartScreen"), m_isConfigurationFlow(isConfigurationFlow) {}
+
+        void operator()(Execution::Context& context) const override;
+
+    private:
+        bool m_isConfigurationFlow;
+    };
 }
 
diff --git a/src/Internal/UriValidation/UriValidation.cpp b/src/Internal/UriValidation/UriValidation.cpp
@@ -21,6 +21,7 @@ namespace AppInstaller::UriValidation
     UriValidationResult ValidateUri(const std::string& uri)
     {
 #ifndef AICLI_DISABLE_TEST_HOOKS
+        // For testing purposes, block all URIs that end with "/block"
         if (EndsWith(uri, "/block"))
         {
             return UriValidationResult(UriValidationDecision::Block, std::string());