Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tests for configure mixed elevation #4487

Merged
merged 14 commits into from
Jun 14, 2024
Merged

Add tests for configure mixed elevation #4487

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ca423d6
save work
ryfu-msft May 15, 2024
7c20b63
save work
ryfu-msft May 15, 2024
6567d09
add tests and hooks
ryfu-msft May 15, 2024
5222c89
try to get tests working
ryfu-msft May 16, 2024
25eb908
resolve merge conflicts
ryfu-msft May 20, 2024
5df2e77
try again
ryfu-msft May 20, 2024
03badf3
remove test and add category
ryfu-msft May 22, 2024
9ede148
fix out of proc tag
ryfu-msft May 22, 2024
65d249a
respond to feedback
ryfu-msft May 24, 2024
d62ac70
add resource to check PID
ryfu-msft May 31, 2024
ebc6498
address yao's comments
ryfu-msft Jun 4, 2024
fc1987c
fix
ryfu-msft Jun 4, 2024
4ed24dc
add inproc label and fix macro statements
ryfu-msft Jun 7, 2024
8481a79
fix definition
ryfu-msft Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix definition
  • Loading branch information
@ryfu-msft
ryfu-msft committed Jun 7, 2024
commit 8481a79e992ae5738c90b90599290c2c60cef5b4
12 changes: 6 additions & 6 deletions src/AppInstallerCLICore/ConfigurationDynamicRuntimeFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace AppInstaller::CLI::ConfigurationRemoting
{
namespace anonymous
{
#ifndef DISABLE_TEST_HOOKS
#ifndef AICLI_DISABLE_TEST_HOOKS
constexpr std::wstring_view EnableTestModeTestGuid = L"1e62d683-2999-44e7-81f7-6f8f35e8d731";
constexpr std::wstring_view ForceHighIntegrityLevelUnitsTestGuid = L"f698d20f-3584-4f28-bc75-28037e08e651";
constexpr std::wstring_view EnableRestrictedIntegrityLevelTestGuid = L"5cae3226-185f-4289-815c-3c089d238dc6";
Expand Down Expand Up @@ -48,7 +48,7 @@ namespace AppInstaller::CLI::ConfigurationRemoting

DynamicSetProcessor(IConfigurationSetProcessorFactory defaultRemoteFactory, IConfigurationSetProcessor defaultRemoteSetProcessor, const ConfigurationSet& configurationSet) : m_configurationSet(configurationSet)
{
#ifndef DISABLE_TEST_HOOKS
#ifndef AICLI_DISABLE_TEST_HOOKS
m_enableTestMode = GetConfigurationSetMetadataOverride(m_configurationSet, EnableTestModeTestGuid);
m_enableRestrictedIntegrityLevel = GetConfigurationSetMetadataOverride(m_configurationSet, EnableRestrictedIntegrityLevelTestGuid);
m_forceHighIntegrityLevelUnits = GetConfigurationSetMetadataOverride(m_configurationSet, ForceHighIntegrityLevelUnitsTestGuid);
Expand Down Expand Up @@ -87,7 +87,7 @@ namespace AppInstaller::CLI::ConfigurationRemoting
});

// Create set and unit processor for current unit.
#ifndef DISABLE_TEST_HOOKS
#ifndef AICLI_DISABLE_TEST_HOOKS
Security::IntegrityLevel requiredIntegrityLevel = m_forceHighIntegrityLevelUnits ? Security::IntegrityLevel::High : GetIntegrityLevelForUnit(unit);
#else
Security::IntegrityLevel requiredIntegrityLevel = GetIntegrityLevelForUnit(unit);
Expand All @@ -114,7 +114,7 @@ namespace AppInstaller::CLI::ConfigurationRemoting
}
else if (securityContextLower == L"restricted")
{
#ifndef DISABLE_TEST_HOOKS
#ifndef AICLI_DISABLE_TEST_HOOKS
if (m_enableRestrictedIntegrityLevel)
{
return Security::IntegrityLevel::Medium;
Expand Down Expand Up @@ -217,7 +217,7 @@ namespace AppInstaller::CLI::ConfigurationRemoting
if (integrityLevel == Security::IntegrityLevel::High)
{
bool useRunAs = true;
#ifndef DISABLE_TEST_HOOKS
#ifndef AICLI_DISABLE_TEST_HOOKS
useRunAs = !m_enableTestMode;
#endif

Expand All @@ -236,7 +236,7 @@ namespace AppInstaller::CLI::ConfigurationRemoting
ConfigurationSet m_configurationSet;
std::once_flag m_createUnitSetProcessorsOnce;

#ifndef DISABLE_TEST_HOOKS
#ifndef AICLI_DISABLE_TEST_HOOKS
bool m_enableTestMode = false;
bool m_enableRestrictedIntegrityLevel = false;
bool m_forceHighIntegrityLevelUnits = false;
Expand Down
Loading