Fix deadlock in TlsStream::Close

fixes #10235

icinga-studio/api.cpp

@@ -54,14 +54,12 @@ void ApiClient::TypesHttpCompletionCallback(HttpRequest& request, HttpResponse&
 	while ((count = response.ReadBody(buffer, sizeof(buffer))) > 0)
 		body += String(buffer, buffer + count);
 
+	std::vector<ApiType::Ptr> types;
+
 	if (response.StatusCode < 200 || response.StatusCode > 299) {
 		Log(LogCritical, "ApiClient")
 		    <<  "Failed HTTP request; Code: " << response.StatusCode << "; Body: " << body;
-		return;
+	} else {
-	}
-
-	std::vector<ApiType::Ptr> types;
-
 		try {
 			result = JsonDecode(body);
 
@@ -82,6 +80,7 @@ void ApiClient::TypesHttpCompletionCallback(HttpRequest& request, HttpResponse&
 			Log(LogCritical, "ApiClient")
 			    << "Error while decoding response: " << DiagnosticInformation(ex);
 		}
+	}
 
 	callback(types);
 }
@@ -125,14 +124,13 @@ void ApiClient::ObjectsHttpCompletionCallback(HttpRequest& request,
 	while ((count = response.ReadBody(buffer, sizeof(buffer))) > 0)
 		body += String(buffer, buffer + count);
 
+	std::vector<ApiObject::Ptr> objects;
+
 	if (response.StatusCode < 200 || response.StatusCode > 299) {
 		Log(LogCritical, "ApiClient")
 		    <<  "Failed HTTP request; Code: " << response.StatusCode << "; Body: " << body;
 		return;
-	}
+	} else {
-
-	std::vector<ApiObject::Ptr> objects;
-
 		try {
 			result = JsonDecode(body);
 
@@ -174,6 +172,7 @@ void ApiClient::ObjectsHttpCompletionCallback(HttpRequest& request,
 			Log(LogCritical, "ApiClient")
 				<< "Error while decoding response: " << DiagnosticInformation(ex);
 		}
+	}
 
 	callback(objects);
 }

lib/base/socketevents.cpp

@@ -166,10 +166,12 @@ void SocketEvents::WakeUpThread(bool wait)
 
 			l_SocketIOFDChanged = true;
 
+			while (l_SocketIOFDChanged) {
 				(void) send(l_SocketIOEventFDs[1], "T", 1, 0);
 
-			while (l_SocketIOFDChanged)
+				boost::system_time const timeout = boost::get_system_time() + boost::posix_time::milliseconds(50);
-				l_SocketIOCV.wait(lock);
+				l_SocketIOCV.timed_wait(lock, timeout);
+			}
 		}
 	} else {
 		(void) send(l_SocketIOEventFDs[1], "T", 1, 0);

lib/base/stream.cpp

@@ -22,7 +22,7 @@
 
 using namespace icinga;
 
-void Stream::RegisterDataHandler(const boost::function<void(void)>& handler)
+void Stream::RegisterDataHandler(const boost::function<void(const Stream::Ptr&)>& handler)
 {
 	if (SupportsWaiting())
 		OnDataAvailable.connect(handler);
@@ -52,7 +52,7 @@ size_t Stream::Peek(void *buffer, size_t count, bool allow_partial)
 
 void Stream::SignalDataAvailable(void)
 {
-	OnDataAvailable();
+	OnDataAvailable(this);
 
 	{
 		boost::mutex::scoped_lock lock(m_Mutex);

lib/base/stream.hpp

@@ -131,7 +131,7 @@ public:
 
 	virtual bool IsDataAvailable(void) const;
 
-	void RegisterDataHandler(const boost::function<void(void)>& handler);
+	void RegisterDataHandler(const boost::function<void(const Stream::Ptr&)>& handler);
 
 	StreamReadStatus ReadLine(String *line, StreamReadContext& context, bool may_wait = false);
 
@@ -139,7 +139,7 @@ protected:
 	void SignalDataAvailable(void);
 
 private:
-	boost::signals2::signal<void(void)> OnDataAvailable;
+	boost::signals2::signal<void(const Stream::Ptr&)> OnDataAvailable;
 
 	boost::mutex m_Mutex;
 	boost::condition_variable m_CV;

lib/base/tlsstream.cpp

@@ -184,10 +184,12 @@ void TlsStream::OnEvent(int revents)
 	if (rc > 0) {
 		m_CurrentAction = TlsActionNone;
 
+		if (!m_Eof) {
 			if (m_SendQ->GetAvailableBytes() > 0)
 				ChangeEvents(POLLIN|POLLOUT);
 			else
 				ChangeEvents(POLLIN);
+		}
 
 		lock.unlock();
 

lib/remote/httpclientconnection.cpp

@@ -49,6 +49,9 @@ void HttpClientConnection::Reconnect(void)
 	m_Context.~StreamReadContext();
 	new (&m_Context) StreamReadContext();
 
+	m_Requests.clear();
+	m_CurrentResponse.reset();
+
 	TcpSocket::Ptr socket = new TcpSocket();
 	socket->Connect(m_Host, m_Port);
 
@@ -59,9 +62,9 @@ void HttpClientConnection::Reconnect(void)
 		/* m_Stream = new NetworkStream(socket);
 		   -- does not currently work because the NetworkStream class doesn't support async I/O */
 
-	m_Stream->RegisterDataHandler(boost::bind(&HttpClientConnection::DataAvailableHandler, this));
+	m_Stream->RegisterDataHandler(boost::bind(&HttpClientConnection::DataAvailableHandler, this, _1));
 	if (m_Stream->IsDataAvailable())
-		DataAvailableHandler();
+		DataAvailableHandler(m_Stream);
 }
 
 Stream::Ptr HttpClientConnection::GetStream(void) const
@@ -95,8 +98,10 @@ bool HttpClientConnection::ProcessMessage(void)
 {
 	bool res;
 
-	if (m_Requests.empty())
+	if (m_Requests.empty()) {
+		m_Stream->Close();
 		return false;
+	}
 
 	const std::pair<boost::shared_ptr<HttpRequest>, HttpCompletionCallback>& currentRequest = *m_Requests.begin();
 	HttpRequest& request = *currentRequest.first.get();
@@ -129,19 +134,26 @@ bool HttpClientConnection::ProcessMessage(void)
 	return res;
 }
 
-void HttpClientConnection::DataAvailableHandler(void)
+void HttpClientConnection::DataAvailableHandler(const Stream::Ptr& stream)
 {
 	boost::mutex::scoped_lock lock(m_DataHandlerMutex);
 
+	ASSERT(stream == m_Stream);
+
 	try {
 		while (ProcessMessage())
 			; /* empty loop body */
 	} catch (const std::exception& ex) {
 		Log(LogWarning, "HttpClientConnection")
-		    << "Error while reading Http request: " << DiagnosticInformation(ex);
+		    << "Error while reading Http response: " << DiagnosticInformation(ex);
 
 		Disconnect();
 	}
+
+	if (m_Context.Eof) {
+		Log(LogWarning, "HttpClientConnection", "Encountered unexpected EOF while reading Http response.");
+		m_Stream->Close();
+	}
 }
 
 boost::shared_ptr<HttpRequest> HttpClientConnection::NewRequest(void)

lib/remote/httpclientconnection.hpp

@@ -68,7 +68,7 @@ private:
 
 	void Reconnect(void);
 	bool ProcessMessage(void);
-	void DataAvailableHandler(void);
+	void DataAvailableHandler(const Stream::Ptr& stream);
 
 	void ProcessMessageAsync(HttpRequest& request);
 };

lib/remote/httpresponse.cpp

@@ -34,10 +34,14 @@ HttpResponse::HttpResponse(const Stream::Ptr& stream, const HttpRequest& request
 
 void HttpResponse::SetStatus(int code, const String& message)
 {
-	ASSERT(m_State == HttpResponseStart);
 	ASSERT(code >= 100 && code <= 599);
 	ASSERT(!message.IsEmpty());
 
+	if (m_State != HttpResponseStart) {
+		Log(LogWarning, "HttpResponse", "Tried to set Http response status after headers had already been sent.");
+		return;
+	}
+
 	String status = "HTTP/";
 
 	if (m_Request.ProtocolVersion == HttpVersion10)
@@ -54,7 +58,11 @@ void HttpResponse::SetStatus(int code, const String& message)
 
 void HttpResponse::AddHeader(const String& key, const String& value)
 {
-	ASSERT(m_State = HttpResponseHeaders);
+	if (m_State != HttpResponseHeaders) {
+		Log(LogWarning, "HttpResponse", "Tried to add header after headers had already been sent.");
+		return;
+	}
+
 	String header = key + ": " + value + "\r\n";
 	m_Stream->Write(header.CStr(), header.GetLength());
 }

lib/remote/httpserverconnection.cpp

@@ -157,6 +157,8 @@ void HttpServerConnection::ProcessMessageAsync(HttpRequest& request)
 		try {
 			HttpHandler::ProcessRequest(user, request, response);
 		} catch (const std::exception& ex) {
+			Log(LogCritical, "HttpServerConnection")
+			    << "Unhandled exception while processing Http request: " << DiagnosticInformation(ex);
 			response.SetStatus(503, "Unhandled exception");
 			response.AddHeader("Content-Type", "text/plain");
 			String errorInfo = DiagnosticInformation(ex);