remote-ssh/scp/sftp: add convenience -i option to pass ssh identity file

my-devices · Sep 30, 2023 · b87f47e · b87f47e
1 parent 9762cc4
commit b87f47e
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/WebTunnel/WebTunnelSCP/src/WebTunnelSCP.cpp b/WebTunnel/WebTunnelSCP/src/WebTunnelSCP.cpp
@@ -161,6 +161,13 @@ class WebTunnelSCP: public Poco::Util::Application
 				.argument("password"s)
 				.callback(OptionCallback<WebTunnelSCP>(this, &WebTunnelSCP::handlePassword)));
 
+		options.addOption(
+			Option("identity-file"s, "i"s, "Specify SSH identity file. This is passed on to the SCP client (-i)."s)
+				.required(false)
+				.repeatable(false)
+				.argument("path"s)
+				.callback(OptionCallback<WebTunnelSCP>(this, &WebTunnelSCP::handleIdentity)));
+
 		options.addOption(
 			Option("define"s, "D"s, "Define or override a configuration property."s)
 				.required(false)
@@ -204,6 +211,11 @@ class WebTunnelSCP: public Poco::Util::Application
 		_password = value;
 	}
 
+	void handleIdentity(const std::string& name, const std::string& value)
+	{
+		_identity = value;
+	}
+
 	void handleDefine(const std::string& name, const std::string& value)
 	{
 		defineProperty(value);
@@ -369,6 +381,11 @@ class WebTunnelSCP: public Poco::Util::Application
 
 			std::string remoteHost;
 			Poco::Process::Args scpArgs;
+			if (!_identity.empty())
+			{
+				scpArgs.push_back("-i");
+				scpArgs.push_back(_identity);
+			}
 			for (const auto& arg: args)
 			{
 				auto minPos = arg.find('-');
@@ -437,6 +454,7 @@ class WebTunnelSCP: public Poco::Util::Application
 	std::string _password;
 	std::string _scpClient;
 	std::string _protocol;
+	std::string _identity;
 	SSLInitializer _sslInitializer;
 };
 

diff --git a/WebTunnel/WebTunnelSFTP/src/WebTunnelSFTP.cpp b/WebTunnel/WebTunnelSFTP/src/WebTunnelSFTP.cpp
@@ -168,6 +168,13 @@ class WebTunnelSFTP: public Poco::Util::Application
 				.argument("username"s)
 				.callback(OptionCallback<WebTunnelSFTP>(this, &WebTunnelSFTP::handleLogin)));
 
+		options.addOption(
+			Option("identity-file"s, "i"s, "Specify SSH identity file. This is passed on to the SFTP client (-i)."s)
+				.required(false)
+				.repeatable(false)
+				.argument("path"s)
+				.callback(OptionCallback<WebTunnelSFTP>(this, &WebTunnelSFTP::handleIdentity)));
+
 		options.addOption(
 			Option("define"s, "D"s, "Define or override a configuration property."s)
 				.required(false)
@@ -216,6 +223,11 @@ class WebTunnelSFTP: public Poco::Util::Application
 		_login = value;
 	}
 
+	void handleIdentity(const std::string& name, const std::string& value)
+	{
+		_identity = value;
+	}
+
 	void handleDefine(const std::string& name, const std::string& value)
 	{
 		defineProperty(value);
@@ -424,6 +436,11 @@ class WebTunnelSFTP: public Poco::Util::Application
 			sftpURI += Poco::format("localhost:%hu"s, localPort);
 
 			Poco::Process::Args sftpArgs;
+			if (!_identity.empty())
+			{
+				sftpArgs.push_back("-i");
+				sftpArgs.push_back(_identity);
+			}
 			std::vector<std::string>::const_iterator itArgs = ++args.begin();
 			sftpArgs.insert(sftpArgs.end(), itArgs, args.end());
 			sftpArgs.push_back(sftpURI);
@@ -443,6 +460,7 @@ class WebTunnelSFTP: public Poco::Util::Application
 	std::string _username;
 	std::string _password;
 	std::string _login;
+	std::string _identity;
 	std::string _sftpClient;
 	SSLInitializer _sslInitializer;
 };

diff --git a/WebTunnel/WebTunnelSSH/src/WebTunnelSSH.cpp b/WebTunnel/WebTunnelSSH/src/WebTunnelSSH.cpp
@@ -178,6 +178,13 @@ class WebTunnelSSH: public Poco::Util::Application
 				.argument("username"s)
 				.callback(OptionCallback<WebTunnelSSH>(this, &WebTunnelSSH::handleLogin)));
 
+		options.addOption(
+			Option("identity-file"s, "i"s, "Specify SSH identity file. This is passed on to the SSH client (-i)."s)
+				.required(false)
+				.repeatable(false)
+				.argument("path"s)
+				.callback(OptionCallback<WebTunnelSSH>(this, &WebTunnelSSH::handleIdentity)));
+
 		options.addOption(
 			Option("command"s, "m"s, "Specify remote (SSH) command. This is passed as second argument to the SSH client."s)
 				.required(false)
@@ -238,6 +245,11 @@ class WebTunnelSSH: public Poco::Util::Application
 		_login = value;
 	}
 
+	void handleIdentity(const std::string& name, const std::string& value)
+	{
+		_identity = value;
+	}
+
 	void handleCommand(const std::string& name, const std::string& value)
 	{
 		_command = value;
@@ -450,6 +462,11 @@ class WebTunnelSSH: public Poco::Util::Application
 				sshArgs.push_back("-l"s);
 				sshArgs.push_back(_login);
 			}
+			if (!_identity.empty())
+			{
+				sshArgs.push_back("-i");
+				sshArgs.push_back(_identity);
+			}
 			sshArgs.insert(sshArgs.end(), itArgs, args.end());
 			if (Poco::icompare(_sshClient, 0, 3, "scp") != 0)
 			{
@@ -476,6 +493,7 @@ class WebTunnelSSH: public Poco::Util::Application
 	std::string _username;
 	std::string _password;
 	std::string _login;
+	std::string _identity;
 	std::string _sshClient;
 	std::string _command;
 	SSLInitializer _sslInitializer;