Fix tunnel parsing exception handling.

Rather than using STFATAL and exiting, bubble up tunnel parsing
exception to main and display the responsible option arg and print help
menu so the user need not dig into /tmp/etclient-* to determine why et
aborted.

Fixes #491

Author: jshort

src/terminal/TerminalClient.cpp

@@ -8,6 +8,10 @@ vector<PortForwardSourceRequest> parseRangesToRequests(const string& input) {
   auto j = split(input, ',');
   for (auto& pair : j) {
     vector<string> sourceDestination = split(pair, ':');
+    if (sourceDestination.size() < 2) {
+      throw TunnelParseException(
+          "Tunnel argument must have source and destination between a ':'");
+    }
     try {
       if (sourceDestination[0].find_first_not_of("0123456789-") !=
               string::npos &&
@@ -29,8 +33,7 @@ vector<PortForwardSourceRequest> parseRangesToRequests(const string& input) {
 
         if (sourcePortEnd - sourcePortStart !=
             destinationPortEnd - destinationPortStart) {
-          STFATAL << "source/destination port range mismatch";
-          exit(1);
+          throw TunnelParseException("source/destination port range must have same length");
         } else {
           int portRangeLength = sourcePortEnd - sourcePortStart + 1;
           for (int i = 0; i < portRangeLength; ++i) {
@@ -42,17 +45,19 @@ vector<PortForwardSourceRequest> parseRangesToRequests(const string& input) {
         }
       } else if (sourceDestination[0].find('-') != string::npos ||
                  sourceDestination[1].find('-') != string::npos) {
-        STFATAL << "Invalid port range syntax: if source is range, "
-                   "destination must be range";
+        throw TunnelParseException("Invalid port range syntax: if source is range, "
+                                   "destination must be range");
       } else {
         PortForwardSourceRequest pfsr;
         pfsr.mutable_source()->set_port(stoi(sourceDestination[0]));
         pfsr.mutable_destination()->set_port(stoi(sourceDestination[1]));
         pfsrs.push_back(pfsr);
       }
-    } catch (const std::logic_error& lr) {
-      STFATAL << "Logic error: " << lr.what();
-      exit(1);
+    } catch (const TunnelParseException& e) {
+      throw e;
+    } catch (const std::exception& e) {
+      string msg = "Invalid tunnel argument: " + input;
+      throw TunnelParseException(msg.c_str());
     }
   }
   return pfsrs;

src/terminal/TerminalClient.hpp

@@ -41,5 +41,16 @@ class TerminalClient {
   int keepaliveDuration;
 };
 
+class TunnelParseException : public std::exception {
+ public:
+  TunnelParseException(const char* msg) : message(msg) {}
+  const char* what() const noexcept override
+  {
+      return message.c_str();
+  }
+ private:
+  std::string message = " ";
+};
+
 }  // namespace et
 #endif  // __ET_TERMINAL_CLIENT__

src/terminal/TerminalClientMain.cpp

@@ -22,6 +22,12 @@ bool ping(SocketEndpoint socketEndpoint,
   return true;
 }
 
+void handleParseException(std::exception& e, cxxopts::Options& options) {
+  CLOG(INFO, "stdout") << "Exception: " << e.what() << "\n" << endl;
+  CLOG(INFO, "stdout") << options.help({}) << endl;
+  exit(1);
+}
+
 int main(int argc, char** argv) {
   WinsockContext context;
   string tmpDir = GetTempDirectory();
@@ -43,7 +49,7 @@ int main(int argc, char** argv) {
     options.custom_help("[OPTION...] [user@]host[:port]\n\n"
         "  Note that 'host' can be a hostname or ipv4 address with or without a port\n"
         "  or an ipv6 address. If the ipv6 address is abbreviated with :: then it must\n"
-        "  be specfied without a port (use -p,--port)."
+        "  be specified without a port (use -p,--port)."
     );
 
     options.add_options()
@@ -334,17 +340,20 @@ int main(int argc, char** argv) {
     }
     TelemetryService::get()->logToDatadog("Session Started", el::Level::Info,
                                           __FILE__, __LINE__);
+    string tunnel_arg =
+        result.count("tunnel") ? result["tunnel"].as<string>() : "";
+    string r_tunnel_arg =
+        result.count("reversetunnel") ? result["reversetunnel"].as<string>() : "";
     TerminalClient terminalClient(
         clientSocket, clientPipeSocket, socketEndpoint, id, passkey, console,
-        is_jumphost, result.count("t") ? result["t"].as<string>() : "",
-        result.count("r") ? result["r"].as<string>() : "", forwardAgent,
-        sshSocket, keepaliveDuration);
-    terminalClient.run(result.count("command") ? result["command"].as<string>()
-                                               : "");
+        is_jumphost, tunnel_arg, r_tunnel_arg,
+        forwardAgent, sshSocket, keepaliveDuration);
+    terminalClient.run(
+        result.count("command") ? result["command"].as<string>() : "");
+  } catch (TunnelParseException& tpe) {
+    handleParseException(tpe, options);
   } catch (cxxopts::OptionException& oe) {
-    CLOG(INFO, "stdout") << "Exception: " << oe.what() << "\n" << endl;
-    CLOG(INFO, "stdout") << options.help({}) << endl;
-    exit(1);
+    handleParseException(oe, options);
   }
 
 #ifdef WIN32

test/TerminalTest.cpp

@@ -255,6 +255,21 @@ class EndToEndTestFixture {
   bool wasShutdown = false;
 };
 
+TEST_CASE_METHOD(EndToEndTestFixture, "InvalidTunnelArg", "[InvalidTunnelArg]") {
+  REQUIRE_THROWS(new TerminalClient(
+      clientSocketHandler, clientPipeSocketHandler, serverEndpoint, "1234567890123456",
+      CRYPTO_KEY, fakeConsole, false, "6010", "", false, "",
+      MAX_CLIENT_KEEP_ALIVE_DURATION));
+  REQUIRE_THROWS(new TerminalClient(
+      clientSocketHandler, clientPipeSocketHandler, serverEndpoint, "1234567890123456",
+      CRYPTO_KEY, fakeConsole, false, "6010-6012:7000", "", false, "",
+      MAX_CLIENT_KEEP_ALIVE_DURATION));
+  REQUIRE_THROWS(new TerminalClient(
+      clientSocketHandler, clientPipeSocketHandler, serverEndpoint, "1234567890123456",
+      CRYPTO_KEY, fakeConsole, false, "6010-6012:7000-8000", "", false, "",
+      MAX_CLIENT_KEEP_ALIVE_DURATION));
+}
+
 TEST_CASE_METHOD(EndToEndTestFixture, "EndToEndTest", "[EndToEndTest]") {
   readWriteTest("1234567890123456", routerSocketHandler, fakeUserTerminal,
                 serverEndpoint, clientSocketHandler, clientPipeSocketHandler,