smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Improve logging and error handling for SendSAS function in Windows watchdog

Browse source
This commit is contained in:
Nick Bolton 2025-02-07 13:19:54 +00:00
parent 90e63e2e9e
commit 80cc323f5a
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/lib/platform/MSWindowsWatchdog.cpp
View file

@ -168,11 +168,17 @@ void MSWindowsWatchdog::mainLoop(void *)
LOG_DEBUG("starting main loop"); LOG_DEBUG("starting main loop");
shutdownExistingProcesses(); shutdownExistingProcesses();
// the SendSAS function is used to send a sas (secure attention sequence) to the
// winlogon process. this is used to switch to the login screen.
SendSas sendSasFunc = NULL; SendSas sendSasFunc = NULL;
HINSTANCE sasLib = LoadLibrary("sas.dll"); HINSTANCE sasLib = LoadLibrary("sas.dll");
if (sasLib) { if (sasLib) {
LOG((CLOG_DEBUG "loaded sas.dll, used to simulate ctrl-alt-del")); LOG_DEBUG("loaded sas.dll, used to simulate ctrl-alt-del");
sendSasFunc = (SendSas)GetProcAddress(sasLib, "SendSAS"); sendSasFunc = (SendSas)GetProcAddress(sasLib, "SendSAS");
if (!sendSasFunc) {
LOG_ERR("could not find SendSAS function in sas.dll");
throw XArch(new XArchEvalWindows());
}
} }
SECURITY_ATTRIBUTES saAttr; SECURITY_ATTRIBUTES saAttr;
@ -227,23 +233,20 @@ void MSWindowsWatchdog::mainLoop(void *)
LOG((CLOG_WARN "detected application not running, pid=%d", m_process->info().dwProcessId)); LOG((CLOG_WARN "detected application not running, pid=%d", m_process->info().dwProcessId));
} }
if (sendSasFunc != NULL) { HANDLE sendSasEvent = CreateEvent(NULL, FALSE, FALSE, "Global\\SendSAS");
if (sendSasEvent != NULL) {
HANDLE sendSasEvent = CreateEvent(NULL, FALSE, FALSE, "Global\\SendSAS"); // use SendSAS event to wait for next session (timeout 1 second).
if (sendSasEvent != NULL) { if (WaitForSingleObject(sendSasEvent, 1000) == WAIT_OBJECT_0) {
LOG_DEBUG("calling SendSAS from sas.dll");
// use SendSAS event to wait for next session (timeout 1 second). sendSasFunc(FALSE);
if (WaitForSingleObject(sendSasEvent, 1000) == WAIT_OBJECT_0) {
LOG((CLOG_DEBUG "calling SendSAS"));
sendSasFunc(FALSE);
}
CloseHandle(sendSasEvent);
continue;
} }
CloseHandle(sendSasEvent);
} else {
LOG((CLOG_ERR "could not create SendSAS event"));
} }
// if the sas event failed, wait by sleeping.
ARCH->sleep(1); ARCH->sleep(1);
} catch (std::exception &e) { } catch (std::exception &e) {