merge FTPSClientSession from develop-experimental

2025-10-27 11:06:50 +01:00 · 2020-01-23 11:57:28 +01:00
parent 958ce15bb5
commit 5d481ff493
13 changed files with 1416 additions and 37 deletions
--- a/NetSSL_OpenSSL/src/FTPSClientSession.cpp
+++ b/NetSSL_OpenSSL/src/FTPSClientSession.cpp
@@ -0,0 +1,130 @@
+//
+// FTPSClientSession.cpp
+//
+// Library: Net
+// Package: FTP
+// Module:  FTPSClientSession
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "Poco/Net/FTPSClientSession.h"
+#include "Poco/Net/SecureStreamSocket.h"
+#include "Poco/Net/SecureStreamSocketImpl.h"
+#include "Poco/Net/SSLManager.h"
+#include "Poco/Net/NetException.h"
+
+namespace Poco {
+namespace Net {
+
+FTPSClientSession::FTPSClientSession() :
+	FTPClientSession()
+{
+}
+
+
+FTPSClientSession::~FTPSClientSession()
+{
+}
+
+FTPSClientSession::FTPSClientSession(const StreamSocket& socket, bool readWelcomeMessage, bool tryUseFTPS) :
+	FTPClientSession(socket, readWelcomeMessage), _tryFTPS(tryUseFTPS)
+{
+}
+
+
+FTPSClientSession::FTPSClientSession(const std::string& host,
+	Poco::UInt16 port,
+	const std::string& username,
+	const std::string& password) :
+	FTPClientSession(host, port, username, password)
+{
+}
+
+void FTPSClientSession::tryFTPSmode(bool bTryFTPS)
+{
+	_tryFTPS = bTryFTPS;
+}
+
+void FTPSClientSession::beforeCreateDataSocket()
+{
+	if (_secureDataConnection)
+		return;
+	_secureDataConnection = false;
+	if (!_pControlSocket->secure())
+		return;
+	std::string sResponse;
+	int status = sendCommand("PBSZ 0", sResponse);
+	if (isPositiveCompletion(status))
+	{
+		status = sendCommand("PROT P", sResponse);
+		if (isPositiveCompletion(status))
+			_secureDataConnection = true;
+	}
+}
+
+void FTPSClientSession::afterCreateControlSocket()
+{
+	if (!_tryFTPS)
+		return;
+	_pControlSocket->setNoDelay(true);
+	if (_pControlSocket->secure())
+		return;
+
+	std::string sResponse;
+	int status = sendCommand("AUTH TLS", sResponse);
+	if (!isPositiveCompletion(status))
+		status = sendCommand("AUTH SSL", sResponse);
+
+	if (isPositiveCompletion(status))
+	{
+		//Server support FTPS
+		try
+		{
+			Poco::Net::SecureStreamSocket sss(Poco::Net::SecureStreamSocket::attach(*_pControlSocket, Poco::Net::SSLManager::instance().defaultClientContext()));
+			*_pControlSocket = sss;
+		}
+		catch (Poco::Exception&)
+		{
+			throw;
+		}
+	}
+	else
+	{
+		_tryFTPS = false;
+	}
+}
+
+StreamSocket FTPSClientSession::establishDataConnection(const std::string& command, const std::string& arg)
+{
+	beforeCreateDataSocket();
+
+	StreamSocket ss = FTPClientSession::establishDataConnection(command, arg);
+	ss.setNoDelay(true);
+
+	//SSL nogotiating of data socket
+	if ((_secureDataConnection) && (_pControlSocket->secure()))
+	{
+		//We need to reuse the control socket SSL session so the server can ensure that client that opened control socket is the same using data socket
+		Poco::Net::SecureStreamSocketImpl* pSecure = dynamic_cast<Poco::Net::SecureStreamSocketImpl*>(_pControlSocket->impl());
+		if (pSecure != nullptr)
+		{
+			Poco::Net::SecureStreamSocket sss(Poco::Net::SecureStreamSocket::attach(ss, pSecure->context(), pSecure->currentSession()));
+			ss = sss;
+		}
+	}
+	return ss;
+}
+
+void FTPSClientSession::receiveServerReadyReply()
+{
+	FTPClientSession::receiveServerReadyReply();
+	afterCreateControlSocket();
+}
+
+}
+} // namespace Poco::Net