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] Offer to end running Cockatrice immediately when auto-close fails * [Installer] Keep the way out that costs nothing in the first prompt The prompt now offers to end Cockatrice, so what the deleted close-again text said has to survive in it: an instance the probe reports as waiting for an answer to a question of its own has been brought forward, and answering that window is the way out that ends nothing. Say so, and say where to go when Yes leaves it listed - Task Manager - so an end that cannot take effect does not loop on the same dialog. * [Installer] Bring the comments back in line with the code GuardCloseTried no longer counts closes, and the file header, CloseHolders and GuardAppsNotRunning still described an escalation after a second close, as did the probe's --end-holders note. * [Installer] End Oracle and Servatrice too when the guard's end answer is confirmed The guard's end answer only ever stopped cockatrice.exe, so an Oracle holding the card database or a Servatrice service kept the payload locked and the prompt came back with nothing left that could free it. The probe now ends every program the payload installs, services included: isPayloadProgram() - the list restart_manager_holders already used for its parent walk - decides the set, so a scanner holding a DLL or a program the user keeps in the install directory is still named and left to the user. A service is terminated rather than sent a stop through the SCM, which notices the process exit and marks it stopped afterwards. The guard prompt now says what ending costs: an unsaved deck, an unwritten setting, players on a running Servatrice, and an Oracle mid-way through the card database. It also keeps the notification-area hint, which the probe's "has no window to ask" answer depends on, and drops the claim that Oracle and Servatrice had been brought forward. * [Installer] Give every running-program prompt the same end-or-retry answers Four prompts meet a running program and each offered a different set: the guard ended it, the launcher wait only kept waiting, and the recovery prompt after a failed purge could only ask Cockatrice to close. With Oracle or Servatrice holding the files, that last one had no answer that could free anything - Yes and No both retried the purge and Cancel aborted an install whose old version was already gone. All four now follow the guard's shape: one automatic attempt, then a prompt whose Yes ends the programs it names and whose No retries, with Cancel to give up. - RecoverFromHolders closes once and purges before it asks anything, then offers EndHolders - the same end answer as the guard - instead of a close the user had to trigger himself. - WaitForLauncherToExit can end the launcher by pid, the one process it holds a pid for, rather than looping 60 s waits with Cancel as the only way out. - END_COST and AFTER_CLOSING_GUIDANCE are !defines, so the cost of ending and the guidance for the answers that end nothing read the same in every prompt. * [Installer] End the launcher through the handle it was waited on The "end it" answer used to look the launcher's pid up again after a dialog that can stay open as long as the user takes, so a pid that had been reused in the meantime - or a /PID= that was never the launcher - would be terminated instead. The handle the wait already holds names that process and cannot be handed to another, so the terminate answer now acts on it. PROCESS_TERMINATE is requested along with PROCESS_SYNCHRONIZE; when only the synchronize right is granted the launcher is still waited on and the answer falls back to asking it to close, instead of reporting a live launcher as gone and writing the payload over it. * [Installer] Say what the end answer ends, and report a failed end The prompt offered "end every program listed above", but EndHolders only ends the programs the payload installs: a scanner holding a payload DLL, or a service the Restart Manager names by its long name, was listed and then silently left alone, so Yes looked like it did nothing and the same dialog came back unchanged. The wording now says which programs Yes ends and that anything else has to be closed by hand, and the round after an end that did not free the files says so, so the same dialog no longer reappears word for word. The three prompts are one macro so they cannot drift apart again. The added sentences eat into the 1024 characters one NSIS string holds, so the holder line's budget drops from 400 to 320 characters to keep the longest message (cancel line included) inside it: 977 characters, measured against the worst case the probe can produce. --------- Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com> Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
93 lines
4.5 KiB
C++
93 lines
4.5 KiB
C++
#ifndef RESTART_MANAGER_HOLDERS_H
|
|
#define RESTART_MANAGER_HOLDERS_H
|
|
|
|
#include "holder_line.h"
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
/**
|
|
* @brief Lists the payload files, as full paths.
|
|
*
|
|
* The set is what the installer replaces and the purge removes: the three executables,
|
|
* qt.conf, every top-level DLL and everything below Plugins. A document, a log or a
|
|
* screenshot the user happens to have open in the install directory is not part of it,
|
|
* so it cannot be mistaken for a running instance and block an upgrade.
|
|
*
|
|
* Restart Manager refuses a directory with ERROR_ACCESS_DENIED, which is why the probe
|
|
* registers files and this has to name them first. Missing files and unreadable
|
|
* directories are skipped rather than reported, and the list is capped: this runs before
|
|
* the first page and on the abort path, and must not walk a tree of downloaded pictures.
|
|
*/
|
|
std::vector<std::wstring> collectPayloadFiles(const std::wstring &installDir);
|
|
|
|
/**
|
|
* @brief Whether @p imageName is one of the programs the payload installs.
|
|
*
|
|
* The single place that answers which images are Cockatrice's own, so the guard ends the
|
|
* same set it names. Matched case-insensitively on the image name alone: only holders are
|
|
* ever tested against it, and a holder is a process that has a payload file open or runs
|
|
* from the install directory.
|
|
*
|
|
* @param imageName the file name of a process image, empty when it could not be read.
|
|
*/
|
|
bool isPayloadProgram(const std::wstring &imageName);
|
|
|
|
/**
|
|
* @brief Names the applications and services that have one of @p files open or mapped.
|
|
*
|
|
* Restart Manager reports both a process that loaded one of the files as a module and
|
|
* one that merely holds a handle to it, and it reports services, which is the whole
|
|
* reason it is used instead of walking every process's module list.
|
|
*
|
|
* @param holders replaced with one entry per holder, in the order Windows reported them.
|
|
* @return 0 when the lookup ran, even if nothing is holding the files; otherwise the
|
|
* Win32 code of the Restart Manager call that failed.
|
|
*/
|
|
unsigned long findProcessesUsingFiles(const std::vector<std::wstring> &files, std::vector<Holder> &holders);
|
|
|
|
/**
|
|
* @brief Lists every process whose image lives in @p installDir, whether or not it has a
|
|
* payload file open.
|
|
*
|
|
* Restart Manager answers the question "who has this file open", and a running instance
|
|
* does not necessarily have one open: its own image and the modules it loaded are mapped
|
|
* into it, not opened by it, and RmGetList does not reliably report a mapping. That is
|
|
* the state the failed updates this probe exists for were in - every DLL still on disk,
|
|
* an instance running from the directory, and "nothing is holding them any more" as the
|
|
* answer - so an answer built on file handles alone cannot be the guard's authority.
|
|
*
|
|
* Reading the image path needs PROCESS_QUERY_LIMITED_INFORMATION and
|
|
* QueryFullProcessImageNameW, neither of which depends on the bitness of either process,
|
|
* so a 64-bit instance is named from this 32-bit stub. The comparison is on the
|
|
* directory, not on an image name, so a process that merely shares a name (an Oracle
|
|
* database server next to a Cockatrice install) is never named.
|
|
*
|
|
* @param installDir the directory being replaced, as a full path.
|
|
* @return one entry per process running from it, in snapshot order, without the processes
|
|
* named by askingProcessIds(); empty when the directory is empty or no process
|
|
* runs from it.
|
|
*/
|
|
std::vector<Holder> findProcessesRunningFrom(const std::wstring &installDir);
|
|
|
|
/**
|
|
* @brief The processes that must never be named as holders: the probe and the ones that
|
|
* started it.
|
|
*
|
|
* The installer or uninstaller doing the asking can legitimately run from the directory it
|
|
* is replacing - the old uninstaller is started with _?= so it stays in $INSTDIR, and an
|
|
* installer can be downloaded into the folder - and naming it asks the user to close the
|
|
* program that is asking. That cannot be answered: the close skips it, the end offer skips
|
|
* it, and the guard loops until the user cancels, which is what a run that named itself
|
|
* did.
|
|
*
|
|
* The walk up the parent chain stops at the first program the payload installs, because in
|
|
* an in-app update the installer's own parent is the Cockatrice instance being replaced -
|
|
* the one the guard exists to name.
|
|
*
|
|
* @return process ids, the probe first, then its ancestors while they are not payload
|
|
* programs; only the probe itself when the snapshot fails.
|
|
*/
|
|
std::vector<unsigned long> askingProcessIds();
|
|
|
|
#endif
|