rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactored windows service "relauncher" (process watchdog), so that it's easier to understand.

This commit is contained in:
Nick Bolton 2013-10-14 16:29:02 +00:00
parent b9016bc1ae
commit 79ab428454
5 changed files with 216 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

270
src/lib/platform/CMSWindowsRelauncher.cpp
View File

@ -47,13 +47,15 @@ CMSWindowsRelauncher::CMSWindowsRelauncher(
CIpcLogOutputter& ipcLogOutputter) : CIpcLogOutputter& ipcLogOutputter) :
m_thread(NULL), m_thread(NULL),
m_autoDetectCommand(autoDetectCommand), m_autoDetectCommand(autoDetectCommand),
m_running(true), m_monitoring(true),
m_commandChanged(false), m_commandChanged(false),
m_stdOutWrite(NULL), m_stdOutWrite(NULL),
m_stdOutRead(NULL), m_stdOutRead(NULL),
m_ipcServer(ipcServer), m_ipcServer(ipcServer),
m_ipcLogOutputter(ipcLogOutputter), m_ipcLogOutputter(ipcLogOutputter),
m_elevateProcess(false) m_elevateProcess(false),
m_launched(false),
m_failures(0)
{ {
} }
@ -74,7 +76,7 @@ CMSWindowsRelauncher::startAsync()
void void
CMSWindowsRelauncher::stop() CMSWindowsRelauncher::stop()
{ {
m_running = false; m_monitoring = false;
m_thread->wait(5); m_thread->wait(5);
delete m_thread; delete m_thread;
@ -94,8 +96,8 @@ CMSWindowsRelauncher::duplicateProcessToken(HANDLE process, LPSECURITY_ATTRIBUTE
&sourceToken); &sourceToken);
if (!tokenRet) { if (!tokenRet) {
LOG((CLOG_ERR "could not open token, process handle: %d (error: %i)", process, GetLastError())); LOG((CLOG_ERR "could not open token, process handle: %d", process));
return NULL; throw XArch(new XArchEvalWindows());
} }
LOG((CLOG_DEBUG "got token %i, duplicating", sourceToken)); LOG((CLOG_DEBUG "got token %i, duplicating", sourceToken));
@ -106,9 +108,8 @@ CMSWindowsRelauncher::duplicateProcessToken(HANDLE process, LPSECURITY_ATTRIBUTE
SecurityImpersonation, TokenPrimary, &newToken); SecurityImpersonation, TokenPrimary, &newToken);
if (!duplicateRet) { if (!duplicateRet) {
LOG((CLOG_ERR "could not duplicate token %i (error: %i)", LOG((CLOG_ERR "could not duplicate token %i", sourceToken));
sourceToken, GetLastError())); throw XArch(new XArchEvalWindows());
return NULL;
} }
LOG((CLOG_DEBUG "duplicated, new token: %i", newToken)); LOG((CLOG_DEBUG "duplicated, new token: %i", newToken));
@ -128,13 +129,12 @@ CMSWindowsRelauncher::getUserToken(LPSECURITY_ATTRIBUTES security)
(m_elevateProcess ? "elevation required" : "at login screen"))); (m_elevateProcess ? "elevation required" : "at login screen")));
HANDLE process; HANDLE process;
if (m_session.isProcessInSession("winlogon.exe", &process)) { if (!m_session.isProcessInSession("winlogon.exe", &process)) {
throw XMSWindowsWatchdogError("cannot get user token without winlogon.exe");
}
return duplicateProcessToken(process, security); return duplicateProcessToken(process, security);
} }
else {
return NULL;
}
}
else { else {
LOG((CLOG_DEBUG "getting non-elevated token")); LOG((CLOG_DEBUG "getting non-elevated token"));
return m_session.getUserToken(security); return m_session.getUserToken(security);
@ -153,8 +153,6 @@ CMSWindowsRelauncher::mainLoop(void*)
sendSasFunc = (SendSas)GetProcAddress(sasLib, "SendSAS"); sendSasFunc = (SendSas)GetProcAddress(sasLib, "SendSAS");
} }
bool launched = false;
SECURITY_ATTRIBUTES saAttr; SECURITY_ATTRIBUTES saAttr;
saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
saAttr.bInheritHandle = TRUE; saAttr.bInheritHandle = TRUE;
@ -164,78 +162,15 @@ CMSWindowsRelauncher::mainLoop(void*)
throw XArch(new XArchEvalWindows()); throw XArch(new XArchEvalWindows());
} }
PROCESS_INFORMATION pi; ZeroMemory(&m_processInfo, sizeof(PROCESS_INFORMATION));
ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
int failures = 0; while (m_monitoring) {
while (m_running) { // relaunch if the process was running but has stopped unexpectedly.
if ((m_launched && !isProcessRunning()) || m_session.hasChanged() || m_commandChanged) {
HANDLE sendSasEvent = 0; std::string command = getCommand();
if (sasLib && sendSasFunc) { if (command.empty()) {
// can't we just create one event? seems weird creating a new
// event every second...
sendSasEvent = CreateEvent(NULL, FALSE, FALSE, "Global\\SendSAS");
}
m_session.updateNewSessionId();
bool running = false;
if (launched) {
DWORD exitCode;
GetExitCodeProcess(pi.hProcess, &exitCode);
running = (exitCode == STILL_ACTIVE);
if (!running) {
failures++;
LOG((CLOG_INFO "detected application not running, pid=%d, failures=%d", pi.dwProcessId, failures));
// increasing backoff period, maximum of 10 seconds.
int timeout = (failures * 2) < 10 ? (failures * 2) : 10;
LOG((CLOG_DEBUG "waiting, backoff period is %d seconds", timeout));
ARCH->sleep(timeout);
// double check, in case process started after we waited.
GetExitCodeProcess(pi.hProcess, &exitCode);
running = (exitCode == STILL_ACTIVE);
}
else {
// reset failures when running.
failures = 0;
}
}
// relaunch if it was running but has stopped unexpectedly.
bool stoppedRunning = (launched && !running);
if (stoppedRunning || m_session.hasChanged() || m_commandChanged) {
m_commandChanged = false;
if (launched) {
LOG((CLOG_DEBUG "closing existing process to make way for new one"));
shutdownProcess(pi.hProcess, pi.dwProcessId, 20);
launched = false;
}
// ok, this is now the active session (forget the old one if any)
m_session.updateActiveSession();
SECURITY_ATTRIBUTES sa;
ZeroMemory(&sa, sizeof(SECURITY_ATTRIBUTES));
HANDLE userToken = getUserToken(&sa);
if (userToken == NULL) {
// HACK: trigger retry mechanism.
launched = true;
continue;
}
std::string cmd = command();
if (cmd == "") {
// this appears on first launch when the user hasn't configured // this appears on first launch when the user hasn't configured
// anything yet, so don't show it as a warning, only show it as // anything yet, so don't show it as a warning, only show it as
// debug to devs to let them know why nothing happened. // debug to devs to let them know why nothing happened.
@ -243,8 +178,102 @@ CMSWindowsRelauncher::mainLoop(void*)
continue; continue;
} }
// in case reusing process info struct try {
ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); startProcess(command);
}
catch (XArch& e) {
LOG((CLOG_ERR "failed to launch, error: %s", e.what().c_str()));
m_launched = false;
continue;
}
catch (XSynergy& e) {
LOG((CLOG_ERR "failed to launch, error: %s", e.what()));
m_launched = false;
continue;
}
}
if (sendSasFunc != NULL) {
HANDLE sendSasEvent = CreateEvent(NULL, FALSE, FALSE, "Global\\SendSAS");
if (sendSasEvent != NULL) {
// use SendSAS event to wait for next session (timeout 1 second).
if (WaitForSingleObject(sendSasEvent, 1000) == WAIT_OBJECT_0) {
LOG((CLOG_DEBUG "calling SendSAS"));
sendSasFunc(FALSE);
}
CloseHandle(sendSasEvent);
continue;
}
}
// if the sas event failed, wait by sleeping.
ARCH->sleep(1);
}
if (m_launched) {
LOG((CLOG_DEBUG "terminated running process on exit"));
shutdownProcess(m_processInfo.hProcess, m_processInfo.dwProcessId, 20);
}
LOG((CLOG_DEBUG "relauncher main thread finished"));
}
bool
CMSWindowsRelauncher::isProcessRunning()
{
bool running;
if (m_launched) {
DWORD exitCode;
GetExitCodeProcess(m_processInfo.hProcess, &exitCode);
running = (exitCode == STILL_ACTIVE);
if (!running) {
m_failures++;
LOG((CLOG_INFO
"detected application not running, pid=%d, failures=%d",
m_processInfo.dwProcessId, m_failures));
// increasing backoff period, maximum of 10 seconds.
int timeout = (m_failures * 2) < 10 ? (m_failures * 2) : 10;
LOG((CLOG_DEBUG "waiting, backoff period is %d seconds", timeout));
ARCH->sleep(timeout);
// double check, in case process started after we waited.
GetExitCodeProcess(m_processInfo.hProcess, &exitCode);
running = (exitCode == STILL_ACTIVE);
}
else {
// reset failures when running.
m_failures = 0;
}
}
return running;
}
void
CMSWindowsRelauncher::startProcess(std::string& command)
{
m_commandChanged = false;
if (m_launched) {
LOG((CLOG_DEBUG "closing existing process to make way for new one"));
shutdownProcess(m_processInfo.hProcess, m_processInfo.dwProcessId, 20);
m_launched = false;
}
m_session.updateActiveSession();
SECURITY_ATTRIBUTES sa;
ZeroMemory(&sa, sizeof(SECURITY_ATTRIBUTES));
HANDLE userToken = getUserToken(&sa);
// clear, as we're reusing process info struct
ZeroMemory(&m_processInfo, sizeof(PROCESS_INFORMATION));
STARTUPINFO si; STARTUPINFO si;
ZeroMemory(&si, sizeof(STARTUPINFO)); ZeroMemory(&si, sizeof(STARTUPINFO));
@ -257,9 +286,8 @@ CMSWindowsRelauncher::mainLoop(void*)
LPVOID environment; LPVOID environment;
BOOL blockRet = CreateEnvironmentBlock(&environment, userToken, FALSE); BOOL blockRet = CreateEnvironmentBlock(&environment, userToken, FALSE);
if (!blockRet) { if (!blockRet) {
LOG((CLOG_ERR "could not create environment block (error: %i)", LOG((CLOG_ERR "could not create environment block"));
GetLastError())); throw XArch(new XArchEvalWindows);
continue;
} }
DWORD creationFlags = DWORD creationFlags =
@ -270,48 +298,26 @@ CMSWindowsRelauncher::mainLoop(void*)
// re-launch in current active user session // re-launch in current active user session
LOG((CLOG_INFO "starting new process")); LOG((CLOG_INFO "starting new process"));
BOOL createRet = CreateProcessAsUser( BOOL createRet = CreateProcessAsUser(
userToken, NULL, LPSTR(cmd.c_str()), userToken, NULL, LPSTR(command.c_str()),
&sa, NULL, TRUE, creationFlags, &sa, NULL, TRUE, creationFlags,
environment, NULL, &si, &pi); environment, NULL, &si, &m_processInfo);
DestroyEnvironmentBlock(environment); DestroyEnvironmentBlock(environment);
CloseHandle(userToken); CloseHandle(userToken);
if (!createRet) { if (!createRet) {
LOG((CLOG_ERR "could not launch (error: %i)", GetLastError())); LOG((CLOG_ERR "could not launch"));
continue; throw XArch(new XArchEvalWindows);
} }
else { else {
LOG((CLOG_DEBUG "launched in session %i (cmd: %s)", LOG((CLOG_DEBUG "started process, session=%i, command=%s",
m_session.getActiveSessionId(), cmd.c_str())); m_session.getActiveSessionId(), command.c_str()));
launched = true; m_launched = true;
} }
} }
if (sendSasEvent) {
// use SendSAS event to wait for next session.
if (WaitForSingleObject(sendSasEvent, 1000) == WAIT_OBJECT_0 && sendSasFunc) {
LOG((CLOG_DEBUG "calling SendSAS"));
sendSasFunc(FALSE);
}
CloseHandle(sendSasEvent);
}
else {
// check for session change every second.
ARCH->sleep(1);
}
}
if (launched) {
LOG((CLOG_DEBUG "terminated running process on exit"));
shutdownProcess(pi.hProcess, pi.dwProcessId, 20);
}
LOG((CLOG_DEBUG "relauncher main thread finished"));
}
void void
CMSWindowsRelauncher::command(const std::string& command, bool elevate) CMSWindowsRelauncher::setCommand(const std::string& command, bool elevate)
{ {
LOG((CLOG_INFO "service command updated")); LOG((CLOG_INFO "service command updated"));
m_command = command; m_command = command;
@ -320,7 +326,7 @@ CMSWindowsRelauncher::command(const std::string& command, bool elevate)
} }
std::string std::string
CMSWindowsRelauncher::command() const CMSWindowsRelauncher::getCommand() const
{ {
if (!m_autoDetectCommand) { if (!m_autoDetectCommand) {
return m_command; return m_command;
@ -351,7 +357,7 @@ CMSWindowsRelauncher::outputLoop(void*)
// +1 char for \0 // +1 char for \0
CHAR buffer[kOutputBufferSize + 1]; CHAR buffer[kOutputBufferSize + 1];
while (m_running) { while (m_monitoring) {
DWORD bytesRead; DWORD bytesRead;
BOOL success = ReadFile(m_stdOutRead, buffer, kOutputBufferSize, &bytesRead, NULL); BOOL success = ReadFile(m_stdOutRead, buffer, kOutputBufferSize, &bytesRead, NULL);
@ -377,16 +383,17 @@ CMSWindowsRelauncher::shutdownProcess(HANDLE handle, DWORD pid, int timeout)
{ {
DWORD exitCode; DWORD exitCode;
GetExitCodeProcess(handle, &exitCode); GetExitCodeProcess(handle, &exitCode);
if (exitCode != STILL_ACTIVE) if (exitCode != STILL_ACTIVE) {
return; return;
}
CIpcShutdownMessage shutdown; CIpcShutdownMessage shutdown;
m_ipcServer.send(shutdown, kIpcClientNode); m_ipcServer.send(shutdown, kIpcClientNode);
// wait for process to exit gracefully. // wait for process to exit gracefully.
double start = ARCH->time(); double start = ARCH->time();
while (true) while (true) {
{
GetExitCodeProcess(handle, &exitCode); GetExitCodeProcess(handle, &exitCode);
if (exitCode != STILL_ACTIVE) { if (exitCode != STILL_ACTIVE) {
// yay, we got a graceful shutdown. there should be no hook in use errors! // yay, we got a graceful shutdown. there should be no hook in use errors!
@ -417,9 +424,8 @@ CMSWindowsRelauncher::shutdownExistingProcesses()
// first we need to take a snapshot of the running processes // first we need to take a snapshot of the running processes
HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
if (snapshot == INVALID_HANDLE_VALUE) { if (snapshot == INVALID_HANDLE_VALUE) {
LOG((CLOG_ERR "could not get process snapshot (error: %i)", LOG((CLOG_ERR "could not get process snapshot"));
GetLastError())); throw XArch(new XArchEvalWindows);
return;
} }
PROCESSENTRY32 entry; PROCESSENTRY32 entry;
@ -429,9 +435,8 @@ CMSWindowsRelauncher::shutdownExistingProcesses()
// unlikely we can go any further // unlikely we can go any further
BOOL gotEntry = Process32First(snapshot, &entry); BOOL gotEntry = Process32First(snapshot, &entry);
if (!gotEntry) { if (!gotEntry) {
LOG((CLOG_ERR "could not get first process entry (error: %i)", LOG((CLOG_ERR "could not get first process entry"));
GetLastError())); throw XArch(new XArchEvalWindows);
return;
} }
// now just iterate until we can find winlogon.exe pid // now just iterate until we can find winlogon.exe pid
@ -457,9 +462,8 @@ CMSWindowsRelauncher::shutdownExistingProcesses()
if (err != ERROR_NO_MORE_FILES) { if (err != ERROR_NO_MORE_FILES) {
// only worry about error if it's not the end of the snapshot // only worry about error if it's not the end of the snapshot
LOG((CLOG_ERR "could not get subsiquent process entry (error: %i)", LOG((CLOG_ERR "could not get subsiquent process entry"));
GetLastError())); throw XArch(new XArchEvalWindows);
return;
} }
} }
} }

27
src/lib/platform/CMSWindowsRelauncher.h
View File

@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
// TODO: rename class to CMSWindowsWatchdog
#pragma once #pragma once
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -23,6 +25,7 @@
#include <Windows.h> #include <Windows.h>
#include <string> #include <string>
#include <list> #include <list>
#include "XSynergy.h"
class CThread; class CThread;
class CIpcLogOutputter; class CIpcLogOutputter;
@ -37,8 +40,8 @@ public:
virtual ~CMSWindowsRelauncher(); virtual ~CMSWindowsRelauncher();
void startAsync(); void startAsync();
std::string command() const; std::string getCommand() const;
void command(const std::string& command, bool elevate); void setCommand(const std::string& command, bool elevate);
void stop(); void stop();
private: private:
@ -48,12 +51,15 @@ private:
void shutdownExistingProcesses(); void shutdownExistingProcesses();
HANDLE duplicateProcessToken(HANDLE process, LPSECURITY_ATTRIBUTES security); HANDLE duplicateProcessToken(HANDLE process, LPSECURITY_ATTRIBUTES security);
HANDLE getUserToken(LPSECURITY_ATTRIBUTES security); HANDLE getUserToken(LPSECURITY_ATTRIBUTES security);
void startProcess(std::string& command);
bool isProcessRunning();
void sendSas();
private: private:
CThread* m_thread; CThread* m_thread;
bool m_autoDetectCommand; bool m_autoDetectCommand;
std::string m_command; std::string m_command;
bool m_running; bool m_monitoring;
bool m_commandChanged; bool m_commandChanged;
HANDLE m_stdOutWrite; HANDLE m_stdOutWrite;
HANDLE m_stdOutRead; HANDLE m_stdOutRead;
@ -62,4 +68,19 @@ private:
CIpcLogOutputter& m_ipcLogOutputter; CIpcLogOutputter& m_ipcLogOutputter;
bool m_elevateProcess; bool m_elevateProcess;
CMSWindowsSession m_session; CMSWindowsSession m_session;
bool m_launched;
PROCESS_INFORMATION m_processInfo;
int m_failures;
};
//! Relauncher error
/*!
An error occured in the process watchdog.
*/
class XMSWindowsWatchdogError : public XSynergy {
public:
XMSWindowsWatchdogError(const CString& msg) : XSynergy(msg) { }
// XBase overrides
virtual CString getWhat() const throw() { return what(); }
}; };

70
src/lib/platform/CMSWindowsSession.cpp
View File

@ -19,10 +19,11 @@
#include "CLog.h" #include "CLog.h"
#include <Tlhelp32.h> #include <Tlhelp32.h>
#include <Wtsapi32.h> #include <Wtsapi32.h>
#include "XSynergy.h"
#include "XArchWindows.h"
CMSWindowsSession::CMSWindowsSession() : CMSWindowsSession::CMSWindowsSession() :
m_sessionId(-1), m_activeSessionId(-1)
m_newSessionId(-1)
{ {
} }
@ -30,31 +31,14 @@ CMSWindowsSession::~CMSWindowsSession()
{ {
} }
DWORD bool
CMSWindowsSession::getSessionId()
{
return WTSGetActiveConsoleSessionId();
}
BOOL
CMSWindowsSession::isProcessInSession(const char* name, PHANDLE process = NULL) CMSWindowsSession::isProcessInSession(const char* name, PHANDLE process = NULL)
{
BOOL result = isProcessInSession_(name, process);
if (!result) {
LOG((CLOG_ERR "could not find winlogon in session %i", m_sessionId));
}
return result;
}
BOOL
CMSWindowsSession::isProcessInSession_(const char* name, PHANDLE process = NULL)
{ {
// first we need to take a snapshot of the running processes // first we need to take a snapshot of the running processes
HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
if (snapshot == INVALID_HANDLE_VALUE) { if (snapshot == INVALID_HANDLE_VALUE) {
LOG((CLOG_ERR "could not get process snapshot (error: %i)", LOG((CLOG_ERR "could not get process snapshot"));
GetLastError())); throw XArch(new XArchEvalWindows());
return 0;
} }
PROCESSENTRY32 entry; PROCESSENTRY32 entry;
@ -64,9 +48,8 @@ CMSWindowsSession::isProcessInSession_(const char* name, PHANDLE process = NULL)
// unlikely we can go any further // unlikely we can go any further
BOOL gotEntry = Process32First(snapshot, &entry); BOOL gotEntry = Process32First(snapshot, &entry);
if (!gotEntry) { if (!gotEntry) {
LOG((CLOG_ERR "could not get first process entry (error: %i)", LOG((CLOG_ERR "could not get first process entry"));
GetLastError())); throw XArch(new XArchEvalWindows());
return 0;
} }
// used to record process names for debug info // used to record process names for debug info
@ -84,13 +67,12 @@ CMSWindowsSession::isProcessInSession_(const char* name, PHANDLE process = NULL)
entry.th32ProcessID, &processSessionId); entry.th32ProcessID, &processSessionId);
if (!pidToSidRet) { if (!pidToSidRet) {
LOG((CLOG_ERR "could not get session id for process id %i (error: %i)", LOG((CLOG_ERR "could not get session id for process id %i", entry.th32ProcessID));
entry.th32ProcessID, GetLastError())); throw XArch(new XArchEvalWindows());
return 0;
} }
// only pay attention to processes in the active session // only pay attention to processes in the active session
if (processSessionId == m_sessionId) { if (processSessionId == m_activeSessionId) {
// store the names so we can record them for debug // store the names so we can record them for debug
nameList.push_back(entry.szExeFile); nameList.push_back(entry.szExeFile);
@ -109,9 +91,8 @@ CMSWindowsSession::isProcessInSession_(const char* name, PHANDLE process = NULL)
if (err != ERROR_NO_MORE_FILES) { if (err != ERROR_NO_MORE_FILES) {
// only worry about error if it's not the end of the snapshot // only worry about error if it's not the end of the snapshot
LOG((CLOG_ERR "could not get subsiquent process entry (error: %i)", LOG((CLOG_ERR "could not get next process entry"));
GetLastError())); throw XArch(new XArchEvalWindows());
return 0;
} }
} }
} }
@ -124,19 +105,20 @@ CMSWindowsSession::isProcessInSession_(const char* name, PHANDLE process = NULL)
} }
LOG((CLOG_DEBUG "processes in session %d: %s", LOG((CLOG_DEBUG "processes in session %d: %s",
m_sessionId, nameListJoin.c_str())); m_activeSessionId, nameListJoin.c_str()));
CloseHandle(snapshot); CloseHandle(snapshot);
if (pid) { if (pid) {
if (process != NULL) { if (process != NULL) {
// now get the process, which we'll use to get the process token. // now get the process, which we'll use to get the process token.
LOG((CLOG_DEBUG "found %s in session %i", name, m_sessionId)); LOG((CLOG_DEBUG "found %s in session %i", name, m_activeSessionId));
*process = OpenProcess(MAXIMUM_ALLOWED, FALSE, pid); *process = OpenProcess(MAXIMUM_ALLOWED, FALSE, pid);
} }
return true; return true;
} }
else { else {
LOG((CLOG_ERR "could not find %s in session %i", name, m_activeSessionId));
return false; return false;
} }
} }
@ -145,9 +127,9 @@ HANDLE
CMSWindowsSession::getUserToken(LPSECURITY_ATTRIBUTES security) CMSWindowsSession::getUserToken(LPSECURITY_ATTRIBUTES security)
{ {
HANDLE sourceToken; HANDLE sourceToken;
if (!WTSQueryUserToken(m_sessionId, &sourceToken)) { if (!WTSQueryUserToken(m_activeSessionId, &sourceToken)) {
LOG((CLOG_ERR "could not get token from session %d (error: %i)", m_sessionId, GetLastError())); LOG((CLOG_ERR "could not get token from session %d", m_activeSessionId));
return 0; throw XArch(new XArchEvalWindows);
} }
HANDLE newToken; HANDLE newToken;
@ -155,8 +137,8 @@ CMSWindowsSession::getUserToken(LPSECURITY_ATTRIBUTES security)
sourceToken, TOKEN_ASSIGN_PRIMARY | TOKEN_ALL_ACCESS, security, sourceToken, TOKEN_ASSIGN_PRIMARY | TOKEN_ALL_ACCESS, security,
SecurityImpersonation, TokenPrimary, &newToken)) { SecurityImpersonation, TokenPrimary, &newToken)) {
LOG((CLOG_ERR "could not duplicate token (error: %i)", GetLastError())); LOG((CLOG_ERR "could not duplicate token"));
return 0; throw XArch(new XArchEvalWindows);
} }
LOG((CLOG_DEBUG "duplicated, new token: %i", newToken)); LOG((CLOG_DEBUG "duplicated, new token: %i", newToken));
@ -166,17 +148,11 @@ CMSWindowsSession::getUserToken(LPSECURITY_ATTRIBUTES security)
BOOL BOOL
CMSWindowsSession::hasChanged() CMSWindowsSession::hasChanged()
{ {
return ((m_newSessionId != m_sessionId) && (m_newSessionId != -1)); return (m_activeSessionId != WTSGetActiveConsoleSessionId());
}
void
CMSWindowsSession::updateNewSessionId()
{
m_newSessionId = getSessionId();
} }
void void
CMSWindowsSession::updateActiveSession() CMSWindowsSession::updateActiveSession()
{ {
m_sessionId = m_newSessionId; m_activeSessionId = WTSGetActiveConsoleSessionId();
} }

27
src/lib/platform/CMSWindowsSession.h
View File

@ -25,31 +25,20 @@ public:
CMSWindowsSession(); CMSWindowsSession();
~CMSWindowsSession(); ~CMSWindowsSession();
//! Get session ID from Windows
/*!
This gets the physical session (the one the keyboard and
mouse is connected to), sometimes this returns -1.
*/
DWORD getSessionId();
BOOL isProcessInSession(const char* name, PHANDLE process);
HANDLE getUserToken(LPSECURITY_ATTRIBUTES security);
DWORD getActiveSessionId() { return m_sessionId; }
//! //!
/*! /*!
only enter here when id changes, and the session isn't -1, which Returns true if the session ID has changed since updateActiveSession was called.
may mean that there is no active session.
*/ */
BOOL hasChanged(); BOOL hasChanged();
void updateNewSessionId(); bool isProcessInSession(const char* name, PHANDLE process);
HANDLE getUserToken(LPSECURITY_ATTRIBUTES security);
DWORD getActiveSessionId() { return m_activeSessionId; }
void updateActiveSession(); void updateActiveSession();
private: private:
BOOL isProcessInSession_(const char* name, PHANDLE process); DWORD m_activeSessionId;
private:
DWORD m_sessionId;
DWORD m_newSessionId;
}; };

4
src/lib/synergy/CDaemonApp.cpp
View File

@ -229,7 +229,7 @@ CDaemonApp::mainLoop(bool logToFile)
bool elevate = ARCH->setting("Elevate") == "1"; bool elevate = ARCH->setting("Elevate") == "1";
if (command != "") { if (command != "") {
LOG((CLOG_INFO "using last known command: %s", command.c_str())); LOG((CLOG_INFO "using last known command: %s", command.c_str()));
m_relauncher->command(command, elevate); m_relauncher->setCommand(command, elevate);
} }
m_relauncher->startAsync(); m_relauncher->startAsync();
@ -334,7 +334,7 @@ CDaemonApp::handleIpcMessage(const CEvent& e, void*)
// tell the relauncher about the new command. this causes the // tell the relauncher about the new command. this causes the
// relauncher to stop the existing command and start the new // relauncher to stop the existing command and start the new
// command. // command.
m_relauncher->command(command, cm->elevate()); m_relauncher->setCommand(command, cm->elevate());
#endif #endif
break; break;
} }