fix(HTTPClientSession): not working with UNIX_LOCAL SocketAddress #2578

Net/include/Poco/Net/HTTPClientSession.h

@@ -384,7 +384,7 @@ class Net_API HTTPClientSession: public HTTPSession
 	HTTPBasicCredentials  _proxyBasicCreds;
 	HTTPDigestCredentials _proxyDigestCreds;
 	HTTPNTLMCredentials   _proxyNTLMCreds;
-	bool                  _ntlmProxyAuthenticated;
+	bool                  _ntlmProxyAuthenticated = false;
 
 	static ProxyConfig _globalProxyConfig;
 

Net/include/Poco/Net/SocketAddress.h

@@ -208,6 +208,9 @@ class Net_API SocketAddress
 			/// Maximum length in bytes of a socket address.
 	};
 
+	static bool isUnixLocal(const std::string& hostAndPort);
+		/// Returns true iff `hostAndPort` is an absolute file path.
+
 protected:
 	void init(const IPAddress& hostAddress, Poco::UInt16 portNumber);
 	void init(const std::string& hostAddress, Poco::UInt16 portNumber);

Net/src/HTTPClientSession.cpp

@@ -459,7 +459,12 @@ void HTTPClientSession::reconnect()
 {
 	SocketAddress addr;
 	if (_proxyConfig.host.empty() || bypassProxy())
-		addr = SocketAddress(_host, _port);
+	{
+		if (SocketAddress::isUnixLocal(_host))
+			addr = SocketAddress(_host);
+		else
+			addr = SocketAddress(_host, _port);
+	}
 	else
 		addr = SocketAddress(_proxyConfig.host, _proxyConfig.port);
 

Net/src/HTTPSession.cpp

@@ -196,7 +196,8 @@ void HTTPSession::connect(const SocketAddress& address)
 	_socket.connect(address, _connectionTimeout);
 	_socket.setReceiveTimeout(_receiveTimeout);
 	_socket.setSendTimeout(_sendTimeout);
-	_socket.setNoDelay(true);
+	if (address.family() != SocketAddress::UNIX_LOCAL)
+		_socket.setNoDelay(true);
 	// There may be leftover data from a previous (failed) request in the buffer,
 	// so we clear it.
 	_pCurrent = _pEnd = _pBuffer;

Net/src/SocketAddress.cpp

@@ -79,7 +79,7 @@ SocketAddress::SocketAddress()
 
 SocketAddress::SocketAddress(Family fam)
 {
-		init(IPAddress(fam), 0);
+	init(IPAddress(fam), 0);
 }
 
 
@@ -362,31 +362,34 @@ void SocketAddress::init(Family fam, const std::string& address)
 }
 
 
+bool SocketAddress::isUnixLocal(const std::string& hostAndPort)
+{
+#if defined(POCO_HAS_UNIX_SOCKET)
+	#if defined(POCO_OS_FAMILY_WINDOWS)
+		RegularExpression re(R"((?:[a-zA-Z]\:|\\\\[\w\s\.]+\\[\w\s\.$]+)\\(?:[\w\s\.]+\\)*[\w\s\.]*?$)");
+		if (re.match(hostAndPort)) return true;
+	#elif defined(POCO_OS_FAMILY_UNIX)
+		if (hostAndPort.size() && (hostAndPort[0] == '/')) return true;
+	#endif
+#endif
+	return false;
+}
+
+
 void SocketAddress::init(const std::string& hostAndPort)
 {
 	poco_assert (!hostAndPort.empty());
 
-#if defined(POCO_OS_FAMILY_WINDOWS) && defined(POCO_HAS_UNIX_SOCKET)
-	RegularExpression re(R"((?:[a-zA-Z]\:|\\\\[\w\s\.]+\\[\w\s\.$]+)\\(?:[\w\s\.]+\\)*[\w\s\.]*?$)");
-	if (re.match(hostAndPort))
+	if (isUnixLocal(hostAndPort))
 	{
 		newLocal(hostAndPort);
 		return;
 	}
-#endif
 
 	std::string host;
 	std::string port;
 	std::string::const_iterator it  = hostAndPort.begin();
 	std::string::const_iterator end = hostAndPort.end();
-
-#if defined(POCO_OS_FAMILY_UNIX)
-	if (*it == '/')
-	{
-		newLocal(hostAndPort);
-		return;
-	}
-#endif
 	if (*it == '[')
 	{
 		++it;

Net/testsuite/src/HTTPClientSessionTest.cpp

@@ -15,6 +15,8 @@
 #include "Poco/Net/HTTPRequest.h"
 #include "Poco/Net/HTTPResponse.h"
 #include "Poco/StreamCopier.h"
+#include "Poco/File.h"
+#include "Poco/Path.h"
 #include "HTTPTestServer.h"
 #include <istream>
 #include <ostream>
@@ -26,6 +28,8 @@ using Poco::Net::HTTPRequest;
 using Poco::Net::HTTPResponse;
 using Poco::Net::HTTPMessage;
 using Poco::StreamCopier;
+using Poco::File;
+using Poco::Path;
 
 
 HTTPClientSessionTest::HTTPClientSessionTest(const std::string& name): CppUnit::TestCase(name)
@@ -54,6 +58,32 @@ void HTTPClientSessionTest::testGetSmall()
 }
 
 
+void HTTPClientSessionTest::testGetSmallUnix()
+{
+#if defined(POCO_HAS_UNIX_SOCKET)
+#if POCO_OS == POCO_OS_ANDROID
+	File socketFile("/data/local/tmp/SocketTest.sock");
+#elif defined(POCO_OS_FAMILY_WINDOWS)
+	File socketFile(Path::tempHome() + "SocketTest.sock");
+#else
+	File socketFile("/tmp/SocketTest.sock");
+#endif // POCO_OS == POCO_OS_ANDROID
+	if (socketFile.exists()) socketFile.remove();
+	HTTPTestServer srv(socketFile.path());
+	HTTPClientSession s(socketFile.path());
+	HTTPRequest request(HTTPRequest::HTTP_GET, "/small");
+	s.sendRequest(request);
+	HTTPResponse response;
+	std::istream& rs = s.receiveResponse(response);
+	assertTrue(response.getContentLength() == HTTPTestServer::SMALL_BODY.length());
+	assertTrue(response.getContentType() == "text/plain");
+	std::ostringstream ostr;
+	StreamCopier::copyStream(rs, ostr);
+	assertTrue(ostr.str() == HTTPTestServer::SMALL_BODY);
+#endif // POCO_HAS_UNIX_SOCKET
+}
+
+
 void HTTPClientSessionTest::testGetLarge()
 {
 	HTTPTestServer srv;
@@ -373,6 +403,7 @@ CppUnit::Test* HTTPClientSessionTest::suite()
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HTTPClientSessionTest");
 
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testGetSmall);
+	CppUnit_addTest(pSuite, HTTPClientSessionTest, testGetSmallUnix);
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testGetLarge);
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testHead);
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testPostSmallIdentity);

Net/testsuite/src/HTTPClientSessionTest.h

@@ -25,6 +25,7 @@ class HTTPClientSessionTest: public CppUnit::TestCase
 	~HTTPClientSessionTest();
 
 	void testGetSmall();
+	void testGetSmallUnix();
 	void testGetLarge();
 	void testHead();
 	void testPostSmallIdentity();

Net/testsuite/src/HTTPTestServer.cpp

@@ -37,6 +37,17 @@ HTTPTestServer::HTTPTestServer():
 }
 
 
+HTTPTestServer::HTTPTestServer(const std::string& addr) :
+	_socket(SocketAddress(addr)),
+	_thread("HTTPTestServer"),
+	_stop(false)
+{
+	_thread.start(*this);
+	_ready.wait();
+	_lastRequest.reserve(4000);
+}
+
+
 HTTPTestServer::~HTTPTestServer()
 {
 	_stop = true;
@@ -74,13 +85,15 @@ void HTTPTestServer::run()
 				{
 					_lastRequest.append(buffer, n);
 					if (!requestComplete())
+					{
 						n = ss.receiveBytes(buffer, sizeof(buffer));
+					}
 					else
 						n = 0;
 				}
 				std::string response = handleRequest();
-				ss.sendBytes(response.data(), (int) response.size());
-				Poco::Thread::sleep(1000);
+				n = ss.sendBytes(response.data(), (int) response.size());
+				if (n) Poco::Thread::sleep(1000);
 				try
 				{
 					ss.shutdown();

Net/testsuite/src/HTTPTestServer.h

@@ -27,6 +27,9 @@ class HTTPTestServer: public Poco::Runnable
 	HTTPTestServer();
 		/// Creates the HTTPTestServer.
 
+	HTTPTestServer(const std::string& addr);
+	/// Creates the HTTPTestServer on the specified address.
+
 	~HTTPTestServer();
 		/// Destroys the HTTPTestServer.