Fix ssh!

src/server_env_manager.cpp

@@ -60,14 +60,14 @@ std::string server_env_manager::get_variable(const std::string& name) const {
 }
 
 // Helper method implementations
-std::string server_env_manager::construct_ssh_cmd() const {
+std::string server_env_manager::construct_ssh_cmd(bool allocateTTY) const {
     std::stringstream ssh_cmd;
-    ssh_cmd << "ssh -p " << get_SSH_PORT() << " "
+    ssh_cmd << "ssh -p " << get_SSH_PORT() << " " << (allocateTTY ? "-tt " : "")
             << get_SSH_USER() << "@" << get_SSH_HOST();
     return ssh_cmd.str();
 }
 
-std::string server_env_manager::construct_standard_command_run_cmd(const std::string &service_name, const std::string &command, std::vector<std::string> args, bool silent) const
+sCommand server_env_manager::construct_standard_command_run_cmd(const std::string &service_name, const std::string &command, std::vector<std::string> args, bool silent) const
 {
     std::string remote_service_template_path = remotepath::service_template(mServerName,service_name);
     std::string remote_service_config_path = remotepath::service_config(mServerName,service_name);
@@ -83,8 +83,7 @@ std::string server_env_manager::construct_standard_command_run_cmd(const std::st
     }
 
     sCommand scommand(remote_service_template_path, "bash " + quote(script_path) + argstr + (silent ? " > /dev/null 2>&1" : ""), env_vars);
-    std::string run_cmd = scommand.construct_safecmd();
-    return run_cmd;
+    return scommand;
 }
 
 
@@ -119,27 +118,29 @@ bool server_env_manager::check_remote_items_exist(const std::vector<std::string>
     return true;
 }
 
-bool server_env_manager::execute_ssh_command(const sCommand& command) const {
-    std::string full_cmd = construct_ssh_cmd() + " " + quote(command.construct_safecmd());
-    return execute_local_command(full_cmd);
+bool server_env_manager::execute_ssh_command(const sCommand& command, bool allocateTTY) const {
+    std::string full_cmd = construct_ssh_cmd(allocateTTY) + " " + (allocateTTY ? halfquote(command.construct_rawcmd()) : quote(command.construct_safecmd()));
+    return (system(full_cmd.c_str()) == 0);
 }
 
-bool server_env_manager::execute_ssh_command_and_capture_output(const sCommand& command, std::string &output) const
+bool server_env_manager::execute_ssh_command_and_capture_output(const sCommand& command, std::string &output, bool allocateTTY) const
 {
-    std::string full_cmd = construct_ssh_cmd() + " " + quote(command.construct_safecmd());
+    std::string full_cmd = construct_ssh_cmd(allocateTTY) + " " + quote(command.construct_safecmd());
     return execute_local_command_and_capture_output(full_cmd, output);
 }
 
 bool server_env_manager::run_remote_template_command(const std::string &service_name, const std::string &command, std::vector<std::string> args, bool silent) const
 {
-    std::string full_cmd = construct_standard_command_run_cmd(service_name, command, args, silent);
-    return execute_ssh_command(full_cmd);
+    sCommand scommand = construct_standard_command_run_cmd(service_name, command, args, silent);
+    bool allocateTTY = (command=="ssh");
+    return execute_ssh_command(scommand, allocateTTY);
 }
 
 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
 {
-    std::string full_cmd = construct_standard_command_run_cmd(service_name, command, args, silent);
-    return execute_ssh_command_and_capture_output(full_cmd, output);
+    sCommand scommand = construct_standard_command_run_cmd(service_name, command, args, silent);
+    bool allocateTTY = (command=="ssh");
+    return execute_ssh_command_and_capture_output(scommand, output, allocateTTY);
 }
 
 bool server_env_manager::execute_local_command(const sCommand& command) {
@@ -180,6 +181,17 @@ std::string sCommand::construct_safecmd() const
     return commandstr;
 }
 
+std::string sCommand::construct_rawcmd() const
+{
+    std::string rawcmd = "cd " + quote(mDir) + " && ";
+
+    for (const auto& env_var : mVars) {
+        rawcmd += env_var.first + "=" + quote(dequote(trim(env_var.second))) + " ";
+    }
+    rawcmd += mCmd;
+    return rawcmd;
+}
+
 // base64 <<< "FOO=BAR WHEE=YAY bash ./test.sh"
 // echo YmFzaCAtYyAnRk9PPUJBUiBXSEVFPVlBWSBiYXNoIC4vdGVzdC5zaCcK | base64 -d | bash
 

src/server_env_manager.hpp

@@ -27,6 +27,7 @@ class sCommand {
         void add_env_var(const std::string& key, const std::string& value) { mVars[key] = value; }
 
         std::string construct_safecmd() const;
+        std::string construct_rawcmd() const;
 
     private:
         std::string mDir;
@@ -66,15 +67,15 @@ class server_env_manager {
         bool 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=false) const;
 
     public:
-        bool execute_ssh_command(const sCommand& command) const;
-        bool execute_ssh_command_and_capture_output(const sCommand& command, std::string & output) const;
+        bool execute_ssh_command(const sCommand& command, bool allocateTTY=false) const;
+        bool execute_ssh_command_and_capture_output(const sCommand& command, std::string & output, bool allocateTTY=false) const;
 
         static bool execute_local_command(const sCommand& command);
         static bool execute_local_command_and_capture_output(const sCommand& command, std::string & output);
 
     private:
-        std::string construct_ssh_cmd() const;
-        std::string construct_standard_command_run_cmd(const std::string& service_name, const std::string& command, std::vector<std::string> args, bool silent) const;
+        std::string construct_ssh_cmd(bool allocateTTY=false) const;
+        sCommand construct_standard_command_run_cmd(const std::string& service_name, const std::string& command, std::vector<std::string> args, bool silent) const;
 
     private:
         std::string mServerName;

src/utils/utils.cpp

@@ -72,6 +72,11 @@ std::string quote(std::string str)
     return "\""+str+"\"";
 }
 
+std::string halfquote(std::string str)
+{
+    return "'" + str + "'";
+}
+
 std::string multi2string(std::vector<std::string> values)
 {
     std::string result;

src/utils/utils.hpp

@@ -19,6 +19,7 @@ bool replace_line_in_file(const std::string& file_path, const std::string& searc
 std::string trim(std::string str);
 std::string dequote(std::string str);
 std::string quote(std::string str);
+std::string halfquote(std::string str);
 std::string multi2string(std::vector<std::string> values);
 std::vector<std::string> string2multi(std::string values);
 std::vector<std::string> split(const std::string& str, const std::string& delimiter);