Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 02:06:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Peek]Create Setting to run not elevated (#26308)

Browse Source 
* [Peek]Create Setting to run not elevated

* Optionally add access permissions to the handles
This commit is contained in:
Jaime Bernardo
2023-05-25 17:39:52 +01:00
committed by GitHub
parent 4560abe557
commit 42e707966d
7 changed files with 105 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/modules/peek/peek/dllmain.cpp
View File

@@ -9,6 +9,7 @@
#include <atlbase.h>
#include <exdisp.h>
#include <comdef.h>
#include <common/utils/elevation.h>
extern "C" IMAGE_DOS_HEADER __ImageBase;
@@ -40,6 +41,7 @@ namespace
const wchar_t JSON_KEY_SHIFT[] = L"shift";
const wchar_t JSON_KEY_CODE[] = L"code";
const wchar_t JSON_KEY_ACTIVATION_SHORTCUT[] = L"ActivationShortcut";
const wchar_t JSON_KEY_ALWAYS_RUN_NOT_ELEVATED[] = L"AlwaysRunNotElevated";
}
// The PowerToy name that will be shown in the settings.
@@ -56,7 +58,10 @@ private:
Hotkey m_hotkey;
HANDLE m_hProcess;
// If we should always try to run Peek non-elevated.
bool m_alwaysRunNotElevated = true;
HANDLE m_hProcess = 0;
HANDLE m_hInvokeEvent;
@@ -89,22 +94,32 @@ private:
}
catch (...)
{
Logger::error("Failed to initialize Peek start settings");
Logger::error("Failed to initialize Peek hotkey settings");
set_default_settings();
set_default_key_settings();
}
try
{
auto jsonAlwaysRunNotElevatedObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_ALWAYS_RUN_NOT_ELEVATED);
m_alwaysRunNotElevated = jsonAlwaysRunNotElevatedObject.GetNamedBoolean(L"value");
}
catch (...)
{
Logger::error("Failed to initialize Always Run Not Elevated option. Setting to default.");
m_alwaysRunNotElevated = true;
}
}
else
{
Logger::info("Peek settings are empty");
set_default_settings();
set_default_key_settings();
}
}
void set_default_settings()
void set_default_key_settings()
{
Logger::info("Peek is going to use default settings");
Logger::info("Peek is going to use default key settings");
m_hotkey.win = false;
m_hotkey.alt = false;
m_hotkey.shift = false;
@@ -236,6 +251,10 @@ private:
bool is_viewer_running()
{
if (m_hProcess == 0)
{
return false;
}
return WaitForSingleObject(m_hProcess, 0) == WAIT_TIMEOUT;
}
@@ -248,24 +267,43 @@ private:
std::wstring executable_args = L"";
executable_args.append(std::to_wstring(powertoys_pid));
SHELLEXECUTEINFOW sei{ sizeof(sei) };
sei.fMask = { SEE_MASK_NOCLOSEPROCESS };
sei.lpVerb = L"open";
sei.lpFile = L"modules\\Peek\\Powertoys.Peek.UI.exe";
sei.nShow = SW_SHOWNORMAL;
sei.lpParameters = executable_args.data();
if (ShellExecuteExW(&sei))
if (m_alwaysRunNotElevated && is_process_elevated(false))
{
Logger::trace("Successfully started the PeekViewer process");
Logger::trace("Starting Peek non elevated from elevated process");
const auto modulePath = get_module_folderpath();
std::wstring runExecutablePath = modulePath;
runExecutablePath += L"\\modules\\Peek\\PowerToys.Peek.UI.exe";
std::optional<ProcessInfo> processStartedInfo = RunNonElevatedFailsafe(runExecutablePath, executable_args, modulePath, PROCESS_QUERY_INFORMATION | SYNCHRONIZE | PROCESS_TERMINATE);
if (processStartedInfo.has_value())
{
m_hProcess = processStartedInfo.value().processHandle.release();
}
else
{
Logger::error(L"PeekViewer failed to start not elevated.");
}
}
else
{
Logger::error(L"PeekViewer failed to start. {}", get_last_error_or_default(GetLastError()));
}
SHELLEXECUTEINFOW sei{ sizeof(sei) };
m_hProcess = sei.hProcess;
sei.fMask = { SEE_MASK_NOCLOSEPROCESS };
sei.lpVerb = L"open";
sei.lpFile = L"modules\\Peek\\PowerToys.Peek.UI.exe";
sei.nShow = SW_SHOWNORMAL;
sei.lpParameters = executable_args.data();
if (ShellExecuteExW(&sei))
{
Logger::trace("Successfully started the PeekViewer process");
}
else
{
Logger::error(L"PeekViewer failed to start. {}", get_last_error_or_default(GetLastError()));
}
m_hProcess = sei.hProcess;
}
}
public:
@@ -355,7 +393,14 @@ public:
if (m_enabled)
{
ResetEvent(m_hInvokeEvent);
TerminateProcess(m_hProcess, 1);
auto result = TerminateProcess(m_hProcess, 1);
if (result == 0)
{
int error = GetLastError();
Logger::trace("Couldn't terminate the process. Last error: {}", error);
}
CloseHandle(m_hProcess);
m_hProcess = 0;
}
m_enabled = false;

2
src/modules/peek/peek/peek.vcxproj
View File

@@ -62,6 +62,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
</ImportGroup>
<Import Project="..\..\..\..\deps\spdlog.props" />
<ImportGroup Label="ExtensionTargets">
@@ -72,5 +73,6 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
</Target>
</Project>