public/dropshell
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 44 Wiki Activity

Seems to be working!!

Browse Source
This commit is contained in:
Your Name 2025-05-06 21:57:48 +12:00
parent d60b7364bc
commit bc29705ead
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server_env_manager.cpp
View File

@ -172,10 +172,13 @@ bool server_env_manager::run_remote_template_command(const std::string &service_
bool server_env_manager::run_remote_template_command_and_capture_output(const std::string &service_name, const std::string &command, std::vector<std::string> args, std::string &output, bool silent) const bool server_env_manager::run_remote_template_command_and_capture_output(const std::string &service_name, const std::string &command, std::vector<std::string> args, std::string &output, bool silent) const
{ {
sCommand scommand = construct_standard_template_run_cmd(service_name, command, args, silent); sCommand scommand = construct_standard_template_run_cmd(service_name, command, args, false);
if (scommand.get_command_to_run().empty()) if (scommand.get_command_to_run().empty())
return false; return false;
return execute_ssh_command(get_SSH_INFO(), scommand, cMode::CaptureOutput, &output);
cMode mode = (silent ? cMode::Silent : cMode::None);
mode |= cMode::CaptureOutput;
return execute_ssh_command(get_SSH_INFO(), scommand, mode, &output);
} }

26
src/utils/execute.cpp
View File

@ -68,8 +68,9 @@ bool execute_local_command(const sCommand& command, bool silent, bool safe) {
return ok; return ok;
} }
bool execute_local_command_and_capture_output(const sCommand& command, std::string &output, bool silent, bool safe) bool execute_local_command_and_capture_output(const sCommand& command, std::string * output, bool silent, bool safe)
{ {
ASSERT_MSG(output != nullptr, "Output string must be provided");
if (command.get_command_to_run().empty()) if (command.get_command_to_run().empty())
return false; return false;
cStyle style = safe ? cStyle::Safe : cStyle::Raw; cStyle style = safe ? cStyle::Safe : cStyle::Raw;
@ -80,7 +81,7 @@ bool execute_local_command_and_capture_output(const sCommand& command, std::stri
} }
char buffer[128]; char buffer[128];
while (fgets(buffer, sizeof(buffer), pipe) != nullptr) { while (fgets(buffer, sizeof(buffer), pipe) != nullptr) {
output += buffer; (*output) += buffer;
} }
int ret = pclose(pipe); int ret = pclose(pipe);
return EXITSTATUSCHECK(ret); return EXITSTATUSCHECK(ret);
@ -90,19 +91,19 @@ bool execute_local_command_and_capture_output(const sCommand& command, std::stri
bool execute_local_command(const sCommand & command, cMode mode, std::string * output /* = nullptr */) bool execute_local_command(const sCommand & command, cMode mode, std::string * output /* = nullptr */)
{ {
if (mode & cMode::Interactive) { if (hasFlag(mode, cMode::Interactive)) {
ASSERT_MSG((mode & cMode::CaptureOutput), "Interactive mode and capture output mode cannot be used together"); ASSERT_MSG(! hasFlag(mode, cMode::CaptureOutput), "Interactive mode and capture output mode cannot be used together");
ASSERT_MSG(output == nullptr, "Interactive mode and an output string cannot be used together"); ASSERT_MSG(output == nullptr, "Interactive mode and an output string cannot be used together");
ASSERT_MSG(! (mode & cMode::SafeCommand), "Interactive mode and safe command mode cannot be used together"); ASSERT_MSG(! hasFlag(mode, cMode::SafeCommand), "Interactive mode and safe command mode cannot be used together");
return execute_local_command_interactive(command, mode & cMode::Silent); return execute_local_command_interactive(command, hasFlag(mode, cMode::Silent));
} }
if (mode & cMode::CaptureOutput) { if (hasFlag(mode, cMode::CaptureOutput)) {
ASSERT_MSG(output != nullptr, "Capture output mode requires an output string to be provided"); ASSERT_MSG(output != nullptr, "Capture output mode requires an output string to be provided");
return execute_local_command_and_capture_output(command, *output, mode & cMode::Silent, mode & cMode::SafeCommand); return execute_local_command_and_capture_output(command, output, hasFlag(mode, cMode::Silent), hasFlag(mode, cMode::SafeCommand));
} }
return execute_local_command(command, mode & cMode::Silent, mode & cMode::SafeCommand); return execute_local_command(command, hasFlag(mode, cMode::Silent), hasFlag(mode, cMode::SafeCommand));
} }
bool execute_ssh_command(const sSSHInfo &ssh_info, const sCommand &command, cMode mode, std::string *output) bool execute_ssh_command(const sSSHInfo &ssh_info, const sCommand &command, cMode mode, std::string *output)
@ -110,13 +111,14 @@ bool execute_ssh_command(const sSSHInfo &ssh_info, const sCommand &command, cMod
if (command.get_command_to_run().empty()) if (command.get_command_to_run().empty())
return false; return false;
ASSERT_MSG(!(mode & cMode::Interactive && mode & cMode::SafeCommand), "Safe command mode must not be used with Interactive mode"); ASSERT_MSG(!(hasFlag(mode, cMode::Interactive) && hasFlag(mode, cMode::SafeCommand)), "Safe command mode must not be used with Interactive mode");
ASSERT_MSG(!(hasFlag(mode, cMode::CaptureOutput) && output == nullptr), "Capture output mode must be used with an output string");
std::stringstream ssh_cmd; std::stringstream ssh_cmd;
ssh_cmd << "ssh -p " << ssh_info.port << " " << (mode & cMode::Interactive ? "-tt " : "") ssh_cmd << "ssh -p " << ssh_info.port << " " << (hasFlag(mode, cMode::Interactive) ? "-tt " : "")
<< ssh_info.user << "@" << ssh_info.host; << ssh_info.user << "@" << ssh_info.host;
sCommand ssh_command(ssh_cmd.str() + " bash -c " + quote(escapequotes(command.construct_cmd(mode & cMode::SafeCommand ? cStyle::Safe : cStyle::Raw)))); sCommand ssh_command(ssh_cmd.str() + " bash -c " + quote(escapequotes(command.construct_cmd(hasFlag(mode, cMode::SafeCommand) ? cStyle::Safe : cStyle::Raw))));
bool rval = execute_local_command(ssh_command, mode, output); bool rval = execute_local_command(ssh_command, mode, output);

14
src/utils/execute.hpp
View File

@ -66,12 +66,16 @@ class sCommand {
// Bitwise AND operator for cMode // Bitwise AND operator for cMode
inline bool operator&(cMode lhs, cMode rhs) { inline cMode operator&(cMode lhs, cMode rhs) {
return ( return static_cast<cMode>(
static_cast<int>(lhs) & static_cast<int>(rhs) != 0 static_cast<int>(lhs) & static_cast<int>(rhs)
); );
} }
inline bool hasFlag(cMode mode, cMode flag) {
return (mode & flag) == flag;
}
inline cMode operator-(cMode lhs, cMode rhs) { inline cMode operator-(cMode lhs, cMode rhs) {
return static_cast<cMode>( return static_cast<cMode>(
static_cast<int>(lhs) & ~static_cast<int>(rhs) static_cast<int>(lhs) & ~static_cast<int>(rhs)
@ -82,6 +86,10 @@ inline cMode operator|(cMode lhs, cMode rhs) {
return static_cast<cMode>(static_cast<int>(lhs) | static_cast<int>(rhs)); return static_cast<cMode>(static_cast<int>(lhs) | static_cast<int>(rhs));
} }
inline cMode operator|=(cMode & lhs, cMode rhs) {
return lhs = lhs | rhs;
}
} // namespace dropshell } // namespace dropshell