mirror of
https://github.com/es3n1n/defendnot.git
synced 2026-08-02 10:32:01 +00:00
Merge pull request #31 from es3n1n/wsc-manual-start
feat(loader): start wscsvc manually if needed
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
#include "util/scm.hpp"
|
#include "util/scm.hpp"
|
||||||
|
|
||||||
#include <format>
|
#include <format>
|
||||||
|
#include <print>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
namespace loader {
|
namespace loader {
|
||||||
@@ -14,13 +15,33 @@ namespace loader {
|
|||||||
|
|
||||||
auto service = manager.get_service(L"wscsvc");
|
auto service = manager.get_service(L"wscsvc");
|
||||||
if (!service.valid() || !service.query_status()) {
|
if (!service.valid() || !service.query_status()) {
|
||||||
throw std::runtime_error(strings::wsc_unavailable_error().data());
|
throw std::runtime_error(std::format("{}\nOpen error: {}", strings::wsc_unavailable_error().data(), GetLastError()));
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto state = service.state();
|
if (service.state() == scm::ServiceState::RUNNING) {
|
||||||
if (state != scm::ServiceState::RUNNING) {
|
/// Wsc service has been already started, no need to start it ourselves
|
||||||
throw std::runtime_error(std::format("{}\nService state: {}, but should be RUNNING", strings::wsc_unavailable_error(),
|
return;
|
||||||
scm::kServiceStateNames[static_cast<std::underlying_type_t<scm::ServiceState>>(state)]));
|
}
|
||||||
|
|
||||||
|
/// Let's start the service ourselves
|
||||||
|
std::println("** wscsvc is not running, starting it..");
|
||||||
|
if (!service.start()) {
|
||||||
|
throw std::runtime_error(std::format("{}\nTried to start the service, but go an error: {}", strings::wsc_unavailable_error(), GetLastError()));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::println("** successfully started the service, waiting for it to get up..");
|
||||||
|
while (true) {
|
||||||
|
if (!service.query_status(/*force=*/true)) {
|
||||||
|
throw std::runtime_error(
|
||||||
|
std::format("{}\nStarted the service, got an error while querying: {}", strings::wsc_unavailable_error(), GetLastError()));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (const auto state = service.state(); state == scm::ServiceState::RUNNING) {
|
||||||
|
std::println("** we are good to go");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(500));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // namespace loader
|
} // namespace loader
|
||||||
|
|||||||
@@ -127,6 +127,12 @@ int main(int argc, char* argv[]) try {
|
|||||||
.enable_autorun = !program.get<bool>("--disable-autorun"),
|
.enable_autorun = !program.get<bool>("--disable-autorun"),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// When running from autorun, we'll be missing all the cli arguments, so lets load some relevant ones
|
||||||
|
if (config.from_autorun) {
|
||||||
|
shared::ctx.deserialize();
|
||||||
|
config.verbose = shared::ctx.verbose;
|
||||||
|
}
|
||||||
|
|
||||||
if (!config.alloc_console && config.verbose) {
|
if (!config.alloc_console && config.verbose) {
|
||||||
fatal_print("--silent flag can not be used in combination with --verbose");
|
fatal_print("--silent flag can not be used in combination with --verbose");
|
||||||
}
|
}
|
||||||
@@ -147,7 +153,12 @@ int main(int argc, char* argv[]) try {
|
|||||||
};
|
};
|
||||||
|
|
||||||
wait_for_finish(ipc);
|
wait_for_finish(ipc);
|
||||||
|
|
||||||
|
/// Only create autorun task when not running from autorun, no need to recreate it because we're missing some config vars
|
||||||
|
if (!config.from_autorun) {
|
||||||
process_autorun(config);
|
process_autorun(config);
|
||||||
|
}
|
||||||
|
|
||||||
banner(config);
|
banner(config);
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
|
|||||||
@@ -33,8 +33,8 @@ namespace scm {
|
|||||||
~Service() = default;
|
~Service() = default;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
bool query_status() noexcept {
|
bool query_status(bool force = false) noexcept {
|
||||||
if (status_process_.has_value()) {
|
if (!force && status_process_.has_value()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,6 +73,12 @@ namespace scm {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool start() noexcept {
|
||||||
|
return StartServiceW(handle_.get(), 0, nullptr) || //
|
||||||
|
GetLastError() == ERROR_SERVICE_ALREADY_RUNNING;
|
||||||
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
[[nodiscard]] bool valid() const noexcept {
|
[[nodiscard]] bool valid() const noexcept {
|
||||||
return handle_.get() != nullptr;
|
return handle_.get() != nullptr;
|
||||||
}
|
}
|
||||||
@@ -87,15 +93,16 @@ namespace scm {
|
|||||||
};
|
};
|
||||||
|
|
||||||
class Manager {
|
class Manager {
|
||||||
constexpr static auto kDesiredPermissions = GENERIC_READ;
|
constexpr static auto kDesiredAccess = GENERIC_READ;
|
||||||
|
constexpr static auto kServiceDesiredAccess = SERVICE_QUERY_STATUS | SERVICE_START;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Manager(): handle_(make_sc_handle(OpenSCManagerW(nullptr, nullptr, kDesiredPermissions))) { };
|
Manager(): handle_(make_sc_handle(OpenSCManagerW(nullptr, nullptr, kDesiredAccess))) { };
|
||||||
~Manager() = default;
|
~Manager() = default;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
[[nodiscard]] Service get_service(const std::wstring_view service_name) noexcept {
|
[[nodiscard]] Service get_service(const std::wstring_view service_name) noexcept {
|
||||||
return Service(OpenServiceW(handle_.get(), service_name.data(), kDesiredPermissions));
|
return Service(OpenServiceW(handle_.get(), service_name.data(), kServiceDesiredAccess));
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|||||||
Reference in New Issue
Block a user