mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
Some checks are pending
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (actions) (push) Waiting to run
Build Desktop / Configure (push) Waiting to run
Build Desktop / Debian 13 (push) Blocked by required conditions
Build Desktop / Debian 12 (push) Blocked by required conditions
Build Desktop / Fedora 44 (push) Blocked by required conditions
Build Desktop / Fedora 43 (push) Blocked by required conditions
Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Build Desktop / Arch (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 cover (push) Blocked by required conditions
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Build Desktop / macOS 14 (push) Blocked by required conditions
Build Desktop / macOS 15 (push) Blocked by required conditions
Build Desktop / macOS 26 Debug (push) Blocked by required conditions
Build Desktop / Windows 10 (push) Blocked by required conditions
Build Desktop / Prune caches (push) Waiting to run
Build Docker / Servatrice (arm) (push) Waiting to run
Build Docker / Servatrice (x86) (push) Waiting to run
Build Docker / Publish multi-platform Servatrice image (push) Blocked by required conditions
* [Installer] Check for running instances with the Restart Manager probe The running-instance guard was built on powershell.exe started from the 32-bit NSIS stub, which is the 32-bit Windows PowerShell: its Get-Process cannot read the path of a 64-bit process, so a running 64-bit Cockatrice was reported as not running, the update went ahead, and the purge then failed on the DLLs that instance still had mapped. Use tools/installer-holder-probe instead - the same Restart Manager lookup the abort path already had - before anything is replaced and in the uninstaller as well. It is bitness-agnostic, so the Sysnative and WMI fallbacks are gone. The guard looks only at the payload, asks Cockatrice to close once by itself (WM_CLOSE, the same request as the window's close button) and then offers close again / retry after closing by hand / cancel for whatever the close cannot reach - Oracle writes the card database in place, Servatrice has no window - without force-stopping anything. A failed purge offers the same close-and-retry, tries one last purge when nobody is named, and every dialog shows in every mode: a silent reinstall stays silent until something goes wrong. * [Installer] Name processes running from the install directory The running-instance guard answers from the Restart Manager, which reports who has a file open. A running instance does not have to have one open: its own image and the modules it loaded are mapped into it rather than opened by it, and a mapping is not reliably reported. That is the state the probe was added for - every DLL still on disk, an instance running from the directory, and "nothing is holding them any more" as the answer. A guard built on file handles alone is blind to exactly that instance, so it passes, the purge fails, the holder lookup after it names nobody either, and the install ends in a warning that no running program was found: no close is attempted and no retry is offered. A manual install with another instance open never asks it to close at all. Name every process whose image lives in the directory being replaced as well, with the same bitness-safe QueryFullProcessImageNameW the probe already uses to label its holders. The image lookup is listed first - it is the instance the user is asked to close - and the Restart Manager entries follow with the pids already named dropped, so the close still reaches everything that holds a file. A Restart Manager call that fails only makes the probe unable to answer when the image lookup named nobody either. Ask instead of dead-ending when the probe cannot answer at all: Retry checks again, Ignore carries on, Abort cancels, in the installer and the uninstaller alike, and the abort dialog says the check failed instead of claiming no running program was found. The Windows CI probe check covers the new lookup with a process started from the directory that holds no file open. * [Installer] Offer to wait again when the launcher has not exited A client that is still closing after 60 s is usually not hung: it is showing its own "quit anyway?" confirmation for an unsaved deck, an open game or a card database update, and the user is the one who has to answer it. The installer answered that with a plain warning and stopped, so the only way forward was to close Cockatrice by hand and run the update again - which on an in-app update means finding the downloaded installer. Ask instead: Retry brings the client to the front, asks it to close again (WM_CLOSE, nothing forced) and keeps waiting on its handle, Cancel stops as before. There is no "install anyway" answer because a live process has its image and Qt DLLs mapped, so writing the payload over them is the broken install this wait exists to prevent - and the guard that runs right after names the same process by its image path and stops there, so ignoring would only move the same question a moment later. * [Installer] Ask about a launcher that has not exited after ten seconds A minute of silence is a long time to sit in front of an installer that has no window yet, and the case it is waiting for is not a slow flush: a client that started an update exits in well under a second, so a minute means it is almost always showing its own "quit anyway?" confirmation with nobody looking at it. Wait ten seconds for the first question instead, and the full grace for the ones after it. The normal path is untouched - WaitForSingleObject returns as soon as the handle signals, so a client that exits in 200 ms still costs 200 ms - and answering the first question once does not turn into a stream of prompts while the user is in Cockatrice's window. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
137 lines
5.9 KiB
C++
137 lines
5.9 KiB
C++
#include "close_holders.h"
|
|
#include "holder_line.h"
|
|
#include "restart_manager_holders.h"
|
|
|
|
#include <algorithm>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <windows.h>
|
|
|
|
namespace
|
|
{
|
|
/// The installer sets this, the same variable the running-instance guard uses, instead
|
|
/// of passing the directory on the command line: a path with spaces, quotes or a
|
|
/// trailing backslash then never has to survive NSIS quoting or a command line.
|
|
constexpr wchar_t INSTALL_DIR_VARIABLE[] = L"COCKATRICE_GUARD_DIR";
|
|
|
|
/// How long the close mode waits for the instance it asked to exit before it reports the
|
|
/// process as still running. The installer measures the purge right after this call, so
|
|
/// the wait belongs here: it is the only place that holds a handle on the process whose
|
|
/// exit it is waiting for.
|
|
constexpr unsigned long CLOSE_WAIT_MILLISECONDS = 30000;
|
|
|
|
/// Exit codes the installer reads. "Something was found" is deliberately not 0, so an
|
|
/// answer of "nothing holds the files" stays distinguishable from a probe that failed.
|
|
/// In the close mode 1 means a close was actually sent and 0 that every holder was left
|
|
/// to the user, which is what the report line next to the code spells out. 3 is only for
|
|
/// a lookup that failed and named nobody: one that failed but still named a process
|
|
/// running from the directory is answered with that process.
|
|
enum ExitCode
|
|
{
|
|
EXIT_NO_HOLDERS = 0,
|
|
EXIT_HOLDERS_FOUND = 1,
|
|
EXIT_NOT_CONFIGURED = 2,
|
|
EXIT_PROBE_FAILED = 3,
|
|
};
|
|
|
|
/// The probe has two modes, selected by the first argument:
|
|
///
|
|
/// (none) name what holds the payload, one line, for the guard prompt and the
|
|
/// abort dialog/log
|
|
/// --close-holders bring the running Cockatrice forward, ask it to close, and wait for
|
|
/// it to exit, for the offer to close after a failed purge
|
|
///
|
|
/// Both answer from two lookups that cover each other's blind spot: the Restart Manager
|
|
/// names whoever has a payload file open, and every process running from the directory is
|
|
/// named as well, because a running instance holds its own image and the modules it
|
|
/// loaded as mappings rather than open files and the Restart Manager does not always
|
|
/// report those. Neither lookup alone is the guard's authority: an instance the file
|
|
/// handles do not name is exactly the case that left a half-replaced install behind.
|
|
bool closeModeRequested(int argumentCount, char **arguments)
|
|
{
|
|
return argumentCount > 1 && std::string(arguments[1]) == "--close-holders";
|
|
}
|
|
|
|
/// Writes one line to the pipe nsExec reads. Narrowed to ASCII on purpose: the bytes
|
|
/// come back to the installer as an ANSI string, so a non-ASCII process name would be
|
|
/// mojibake in the log; a '?' at least stays honest. Control characters are dropped
|
|
/// too, so a name can never forge a second log line.
|
|
void writeLine(const std::wstring &text)
|
|
{
|
|
std::string narrow;
|
|
narrow.reserve(text.size() + 2);
|
|
for (const wchar_t character : text) {
|
|
narrow.push_back(character >= 0x20 && character < 0x7F ? static_cast<char>(character) : '?');
|
|
}
|
|
narrow += "\r\n";
|
|
DWORD written = 0;
|
|
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), narrow.data(), static_cast<DWORD>(narrow.size()), &written, nullptr);
|
|
}
|
|
|
|
std::wstring installDirFromEnvironment()
|
|
{
|
|
for (DWORD size = MAX_PATH; size <= 32768U; size *= 2) {
|
|
std::vector<wchar_t> buffer(size);
|
|
const DWORD length = GetEnvironmentVariableW(INSTALL_DIR_VARIABLE, buffer.data(), size);
|
|
if (length == 0) {
|
|
return {};
|
|
}
|
|
if (length < size) {
|
|
return std::wstring(buffer.data(), length);
|
|
}
|
|
}
|
|
return {};
|
|
}
|
|
} // namespace
|
|
|
|
int main(int argumentCount, char **arguments)
|
|
{
|
|
const std::wstring installDir = installDirFromEnvironment();
|
|
if (installDir.empty()) {
|
|
writeLine(L"the probe was not given the install directory");
|
|
return EXIT_NOT_CONFIGURED;
|
|
}
|
|
|
|
// Processes running from the directory first: they are the instance the user is asked
|
|
// to close, and the Restart Manager may not name any of them (see
|
|
// findProcessesRunningFrom). The file holders follow, deduplicated by process, so an
|
|
// instance that both runs from the directory and holds a payload file is named once.
|
|
std::vector<Holder> holders = findProcessesRunningFrom(installDir);
|
|
std::vector<Holder> fileHolders;
|
|
const unsigned long error = findProcessesUsingFiles(collectPayloadFiles(installDir), fileHolders);
|
|
for (const Holder &holder : fileHolders) {
|
|
const bool alreadyNamed = std::any_of(holders.begin(), holders.end(), [&holder](const Holder &named) {
|
|
return named.processId == holder.processId;
|
|
});
|
|
if (!alreadyNamed) {
|
|
holders.push_back(holder);
|
|
}
|
|
}
|
|
|
|
// A failed lookup only makes the probe unable to answer when it also named nobody: with
|
|
// a process running from the directory the installer still knows what to close, and
|
|
// that is worth more to the guard than the code of the query that missed it.
|
|
if (error != ERROR_SUCCESS && holders.empty()) {
|
|
writeLine(L"the Restart Manager lookup failed with win32 error " + std::to_wstring(error));
|
|
return EXIT_PROBE_FAILED;
|
|
}
|
|
|
|
const bool closeMode = closeModeRequested(argumentCount, arguments);
|
|
if (holders.empty()) {
|
|
// No output in the naming mode: the installer words the "nothing is holding them"
|
|
// case, and it owns the message either way. The close mode says it itself, because
|
|
// its line is logged verbatim next to what it was asked to do.
|
|
if (closeMode) {
|
|
writeLine(L"nothing is holding the files");
|
|
}
|
|
return EXIT_NO_HOLDERS;
|
|
}
|
|
if (!closeMode) {
|
|
writeLine(formatHolders(holders));
|
|
return EXIT_HOLDERS_FOUND;
|
|
}
|
|
|
|
const CloseHoldersResult result = closeCockatriceHolders(holders, CLOSE_WAIT_MILLISECONDS);
|
|
writeLine(result.report);
|
|
return result.askedToClose > 0 ? EXIT_HOLDERS_FOUND : EXIT_NO_HOLDERS;
|
|
}
|