Merge pull request #546 from elfmz/custom-sftp-subsystem

elfmz · web-flow · commit 3d64ea981633 · 2019-06-09T13:39:13.000+03:00
Custom sftp subsystem
diff --git a/NetRocks/configs/plug/eng.lng b/NetRocks/configs/plug/eng.lng
@@ -167,6 +167,7 @@
 
 "SFTP protocol options"
 "Private &key file path:"
+"Custom &subsystem request/exec:"
 "Max &read block size, bytes:"
 "Max &write block size, bytes:"
 "Enable &TCP_NODELAY option"
diff --git a/NetRocks/configs/plug/rus.lng b/NetRocks/configs/plug/rus.lng
@@ -167,6 +167,7 @@
 
 "Настройки протокола SFTP"
 "Путь к файлу приватного &ключа:"
+"Запрос особой подсистемы:"
 "Размер блока чтения, байт:"
 "Размер блока записи, байт:"
 "Включить опцию &TCP_NODELAY"
diff --git a/NetRocks/src/NetRocks.cpp b/NetRocks/src/NetRocks.cpp
@@ -134,7 +134,7 @@ SHAREDSYMBOL int WINAPI _export PutFilesW(HANDLE hPlugin,struct PluginPanelItem
 
 SHAREDSYMBOL int WINAPI _export MakeDirectoryW(HANDLE hPlugin, const wchar_t **Name, int OpMode)
 {
-	return ((PluginImpl *)hPlugin)->MakeDirectory(Name ? *Name : nullptr, OpMode);
+	return ((PluginImpl *)hPlugin)->MakeDirectory(Name, OpMode);
 }
 
 SHAREDSYMBOL int WINAPI ProcessEventW(HANDLE hPlugin, int Event, void * Param)
diff --git a/NetRocks/src/Op/OpMakeDirectory.h b/NetRocks/src/Op/OpMakeDirectory.h
@@ -10,4 +10,5 @@ class OpMakeDirectory : protected OpBase
 public:
 	OpMakeDirectory(int op_mode, std::shared_ptr<IHost> &base_host, const std::string &base_dir, const std::string &dir_name);
 	bool Do();
+	const std::string &DirName() const { return _dir_name; }
 };
diff --git a/NetRocks/src/PluginImpl.cpp b/NetRocks/src/PluginImpl.cpp
@@ -456,22 +456,34 @@ int PluginImpl::DeleteFiles(struct PluginPanelItem *PanelItem, int ItemsNumber,
 	return OpRemove(OpMode, _remote, CurrentSiteDir(true), PanelItem, ItemsNumber).Do() ? TRUE : FALSE;
 }
 
-int PluginImpl::MakeDirectory(const wchar_t *Name, int OpMode)
+int PluginImpl::MakeDirectory(const wchar_t **Name, int OpMode)
 {
-	fprintf(stderr, "NetRocks::MakeDirectory('%ls', 0x%x)\n", Name, OpMode);
+	fprintf(stderr, "NetRocks::MakeDirectory('%ls', 0x%x)\n", Name ? *Name : L"NULL", OpMode);
 	if (!_remote) {
 		return FALSE;
 	}
-	if (_cur_dir[0]) {
-		std::string tmp;
-		if (Name) {
-			Wide2MB(Name, tmp);
-		}
-		return OpMakeDirectory(OpMode, _remote, CurrentSiteDir(true), Name ? tmp.c_str() : nullptr).Do();
-	} else {
-		;//todo
+	if (!_cur_dir[0]) {
+		// todo: create virtual dir in sites list
+		return FALSE;
 	}
-	return FALSE;
+
+	std::string tmp;
+	if (Name && *Name) {
+		Wide2MB(*Name, tmp);
+	}
+	OpMakeDirectory op(OpMode, _remote, CurrentSiteDir(true), Name ? tmp.c_str() : nullptr);
+	if (!op.Do()) {
+		return FALSE;
+	}
+	if (Name && !IS_SILENT(OpMode)) {
+		tmp = op.DirName();
+		const std::wstring name_w = StrMB2Wide(tmp);
+		wcsncpy(_mk_dir, name_w.c_str(), ARRAYSIZE(_mk_dir) - 1);
+		_mk_dir[ARRAYSIZE(_mk_dir) - 1] = 0;
+		*Name = _mk_dir;
+	}
+
+	return TRUE;;
 }
 
 int PluginImpl::ProcessKey(int Key, unsigned int ControlState)
diff --git a/NetRocks/src/PluginImpl.h b/NetRocks/src/PluginImpl.h
@@ -10,7 +10,7 @@ class PluginImpl
 {
 	friend class AllNetRocks;
 
-	wchar_t _panel_title[64], _cur_dir[MAX_PATH];
+	wchar_t _panel_title[64], _cur_dir[MAX_PATH], _mk_dir[MAX_PATH];
 	bool _cur_dir_absolute = false;
 	std::vector<std::wstring> _dir_stack;
 
@@ -40,7 +40,7 @@ class PluginImpl
 	int DeleteFiles(struct PluginPanelItem *PanelItem,int ItemsNumber,int OpMode);
 	int GetFiles(struct PluginPanelItem *PanelItem, int ItemsNumber, int Move, const wchar_t *DestPath, int OpMode);
 	int PutFiles(struct PluginPanelItem *PanelItem, int ItemsNumber, int Move, const wchar_t *SrcPath, int OpMode);
-	int MakeDirectory(const wchar_t *Name, int OpMode);
+	int MakeDirectory(const wchar_t **Name, int OpMode);
 	int ProcessKey(int Key, unsigned int ControlState);
 	int ProcessEventCommand(const wchar_t *cmd);
 };
diff --git a/NetRocks/src/Protocol/ProtocolSFTP.cpp b/NetRocks/src/Protocol/ProtocolSFTP.cpp
@@ -274,7 +274,44 @@ ProtocolSFTP::ProtocolSFTP(const std::string &host, unsigned int port,
 			throw ProtocolAuthFailedError();//"Authentification failed", ssh_get_error(_conn->ssh), rc);
 	}
 
-	_conn->sftp = sftp_new(_conn->ssh);
+	const std::string &subsystem = protocol_options.GetString("CustomSubsystem");
+	if (!subsystem.empty() && protocol_options.GetInt("UseCustomSubsystem", 0) != 0) {
+		ssh_channel channel = ssh_channel_new(_conn->ssh);
+		if (channel == nullptr)
+			throw ProtocolError("SSH channel new", ssh_get_error(_conn->ssh));
+
+		int rc = ssh_channel_open_session(channel);
+		if (rc != SSH_OK) {
+			ssh_channel_free(channel);
+			throw ProtocolError("SFTP channel open", ssh_get_error(_conn->ssh));
+		}
+		if (subsystem.find('/') == std::string::npos) {
+			rc = ssh_channel_request_subsystem(channel, subsystem.c_str());
+		} else {
+			rc = ssh_channel_request_exec(channel, subsystem.c_str());
+		}
+
+		if (rc != SSH_OK) {
+			ssh_channel_free(channel);
+			throw ProtocolError("SFTP custom subsystem", ssh_get_error(_conn->ssh));
+		}
+
+		_conn->sftp = sftp_new_channel(_conn->ssh, channel);
+		if (!_conn->sftp) {
+			ssh_channel_free(channel);
+			throw ProtocolError("SFTP channel", ssh_get_error(_conn->ssh));
+		}
+
+#if (LIBSSH_VERSION_INT >= SSH_VERSION_INT(0, 8, 3))
+		if (!_conn->sftp->read_packet) {
+			_conn->sftp->read_packet = (struct sftp_packet_struct *)calloc(1, sizeof(struct sftp_packet_struct));
+			_conn->sftp->read_packet->payload = ssh_buffer_new();
+		}
+#endif
+	} else {
+		_conn->sftp = sftp_new(_conn->ssh);
+	}
+
 	if (_conn->sftp == nullptr)
 		throw ProtocolError("SFTP session", ssh_get_error(_conn->ssh));
 
diff --git a/NetRocks/src/UI/Settings/ConfigureProtocolSFTP.cpp b/NetRocks/src/UI/Settings/ConfigureProtocolSFTP.cpp
@@ -11,6 +11,8 @@
  ================ SFTP Protocol options =====================
 | [ ] Private key file path:                                 |
 | [EDIT....................................................] |
+| [ ] Custom subsystem request:                              |
+| [EDIT....................................................] |
 | Max read block size, bytes:                 [9999999]      |
 | Max write block size, bytes:                [9999999]      |
 | [ ] Enable TCP_NODELAY option                              |
@@ -26,15 +28,16 @@ class ProtocolOptionsSFTP : protected BaseDialog
 {
 	int _i_ok = -1, _i_cancel = -1;
 	int _i_privkey_enable = -1, _i_privkey_path = -1;
+	int _i_use_custom_subsystem = -1, _i_custom_subsystem = -1;
 	int _i_max_read_block_size = -1, _i_max_write_block_size = -1;
 	int _i_tcp_nodelay = -1, _i_tcp_quickack = -1;
 	//int _i_enable_sandbox = -1;
 
-	bool _keypath_enabled = true, _ok_enabled = true;
+	bool _keypath_enabled = true, _subsystem_enabled = true, _ok_enabled = true;
 
 	void UpdateEnableds(bool due_privkey_enable_clicked)
 	{
-		bool ok_enabled = true, keypath_enabled = false;
+		bool ok_enabled = true, keypath_enabled = false, subsystem_enabled = false;
 		if (IsCheckedDialogControl(_i_privkey_enable)) {
 			ok_enabled = false;
 			keypath_enabled = true;
@@ -54,6 +57,16 @@ class ProtocolOptionsSFTP : protected BaseDialog
 			}
 		}
 
+		subsystem_enabled = IsCheckedDialogControl(_i_use_custom_subsystem);
+
+		if (ok_enabled && subsystem_enabled) {
+			std::string str;
+			TextFromDialogControl(_i_privkey_path, str);
+			if (str.empty()) {
+				ok_enabled = false;
+			}
+		}
+
 		if (ok_enabled != _ok_enabled) {
 			_ok_enabled = ok_enabled;
 			SetEnabledDialogControl(_i_ok, ok_enabled);
@@ -63,6 +76,12 @@ class ProtocolOptionsSFTP : protected BaseDialog
 			_keypath_enabled = keypath_enabled;
 			SetEnabledDialogControl(_i_privkey_path, keypath_enabled);
 		}
+
+		if (subsystem_enabled != _subsystem_enabled) {
+			_subsystem_enabled= subsystem_enabled;
+			SetEnabledDialogControl(_i_custom_subsystem, subsystem_enabled);
+		}
+
 	}
 
 	LONG_PTR DlgProc(int msg, int param1, LONG_PTR param2)
@@ -74,8 +93,8 @@ class ProtocolOptionsSFTP : protected BaseDialog
 #endif
 
 		if ( msg == DN_INITDIALOG
-		|| (msg == DN_BTNCLICK && param1 == _i_privkey_enable)
-		|| (msg == DN_EDITCHANGE && param1 == _i_privkey_path) ) {
+		|| (msg == DN_BTNCLICK && (param1 == _i_privkey_enable || param1 == _i_use_custom_subsystem))
+		|| (msg == DN_EDITCHANGE && (param1 == _i_privkey_path || param1 == _i_custom_subsystem)) ) {
 			UpdateEnableds(msg == DN_BTNCLICK && param1 == _i_privkey_enable);
 		}
 
@@ -85,12 +104,19 @@ class ProtocolOptionsSFTP : protected BaseDialog
 public:
 	ProtocolOptionsSFTP()
 	{
-		_di.Add(DI_DOUBLEBOX, 3,1,64,10, 0, MSFTPOptionsTitle);
+		_di.Add(DI_DOUBLEBOX, 3,1,64,12, 0, MSFTPOptionsTitle);
+
 		_di.SetLine(2);
 		_i_privkey_enable = _di.AddAtLine(DI_CHECKBOX, 5,62, 0, MSFTPPrivateKeyPath);
 		_di.NextLine();
 		_i_privkey_path = _di.AddAtLine(DI_EDIT, 5,62, 0, "");
 
+		_di.NextLine();
+		_i_use_custom_subsystem = _di.AddAtLine(DI_CHECKBOX, 5,62, 0, MSFTPCustomSubsystem);
+		_di.NextLine();
+		_i_custom_subsystem = _di.AddAtLine(DI_EDIT, 5,62, 0, "");
+
+
 		_di.NextLine();
 		_di.AddAtLine(DI_TEXT, 5,50, 0, MSFTPMaxReadBlockSize);
 		_i_max_read_block_size = _di.AddAtLine(DI_FIXEDIT, 51,60, DIF_MASKEDIT, "32768", "9999999999");
@@ -129,7 +155,8 @@ class ProtocolOptionsSFTP : protected BaseDialog
 		LongLongToDialogControl(_i_max_write_block_size, std::max((int)512, sc.GetInt("MaxWriteBlock", 32768)));
 		SetCheckedDialogControl(_i_tcp_nodelay, sc.GetInt("TcpNoDelay", 0) != 0);
 		SetCheckedDialogControl(_i_tcp_quickack, sc.GetInt("TcpQuickAck", 0) != 0);
-
+		SetCheckedDialogControl(_i_use_custom_subsystem, sc.GetInt("UseCustomSubsystem", 0) != 0);
+		TextToDialogControl(_i_custom_subsystem, sc.GetString("CustomSubsystem"));
 	//	SetCheckedDialogControl(_i_enable_sandbox, sc.GetInt("Sandbox", 0) != 0);
 		if (Show(L"ProtocolOptionsSFTP", 6, 2) == _i_ok) {
 			sc.SetInt("PrivKeyEnable", IsCheckedDialogControl(_i_privkey_enable) ? 1 : 0);
@@ -140,6 +167,10 @@ class ProtocolOptionsSFTP : protected BaseDialog
 			sc.SetInt("MaxWriteBlock", std::max((int)512, (int)LongLongFromDialogControl(_i_max_write_block_size)));
 			sc.SetInt("TcpNoDelay", IsCheckedDialogControl(_i_tcp_nodelay) ? 1 : 0);
 			sc.SetInt("TcpQuickAck", IsCheckedDialogControl(_i_tcp_quickack) ? 1 : 0);
+			sc.SetInt("UseCustomSubsystem", IsCheckedDialogControl(_i_use_custom_subsystem) ? 1 : 0);
+			TextFromDialogControl(_i_custom_subsystem, str);
+			sc.SetString("CustomSubsystem", str);
+
 	//		sc.SetInt("Sandbox", IsCheckedDialogControl(_i_enable_sandbox) ? 1 : 0);
 			options = sc.Serialize();
 		}
diff --git a/NetRocks/src/lng.h b/NetRocks/src/lng.h
@@ -170,6 +170,7 @@ enum LanguageID
 
   MSFTPOptionsTitle,
   MSFTPPrivateKeyPath,
+  MSFTPCustomSubsystem,
   MSFTPMaxReadBlockSize,
   MSFTPMaxWriteBlockSize,
   MSFTPTCPNodelay,

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ SHAREDSYMBOL int WINAPI _export PutFilesW(HANDLE hPlugin,struct PluginPanelItem`
`134`	`134`
`135`	`135`	`SHAREDSYMBOL int WINAPI _export MakeDirectoryW(HANDLE hPlugin, const wchar_t **Name, int OpMode)`
`136`	`136`	`{`
`137`		`- return ((PluginImpl )hPlugin)->MakeDirectory(Name ? Name : nullptr, OpMode);`
	`137`	`+ return ((PluginImpl *)hPlugin)->MakeDirectory(Name, OpMode);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`SHAREDSYMBOL int WINAPI ProcessEventW(HANDLE hPlugin, int Event, void * Param)`