Fix potential socket issue

We noticed that there was a possibility that the client socket could get overwritten so the socket processor thread would lose access to the client socket and cause a crash.

Author: Chris Board

MySQLManager-TunnelPlugin_C++/LinuxSocket.cpp

@@ -142,14 +142,16 @@ bool LinuxSocket::bindAndStartListening()
 	@param clientAddr A memset initialised sockaddr_in structure where the client information will be stored when a new client connects
 	@return SOCKET A socket descriptor of the client connection
 */
-int LinuxSocket::acceptClientAndReturnSocket(sockaddr_in *clientAddr)
+int *LinuxSocket::acceptClientAndReturnSocket(sockaddr_in *clientAddr)
 {
     socklen_t clilen = sizeof(clientAddr);
-    int clientSocket = accept(this->serverSocket, (struct sockaddr *)&clientAddr, &clilen);
-    if (clientSocket < 0)
+    //int clientSocket = accept(this->serverSocket, (struct sockaddr *)&clientAddr, &clilen);
+	int *clientSocket = new int;
+	*clientSocket = accept(this->serverSocket, (struct sockaddr *)&clientAddr, &clilen);
+    if (*clientSocket < 0)
     {
         stringstream logstream;
-        logstream << "Unable to accept client socket. Error: " << strerror(clientSocket);
+        logstream << "Unable to accept client socket. Error: " << strerror(*clientSocket);
         throw SocketException(logstream.str().c_str());
     }
     return clientSocket;
@@ -246,6 +248,7 @@ void LinuxSocket::closeSocket(int *socket)
     if (*socket != -1)
     {
         int result = close(*socket);
+		delete socket;
         if (result < 0)
         {
             stringstream logstream;

MySQLManager-TunnelPlugin_C++/LinuxSocket.h

@@ -20,7 +20,7 @@ class LinuxSocket : public BaseSocket
         bool createSocket(int family, int socketType, int protocol, int port, int bufferLength, std::string ipAddress); 
         bool bindAndStartListening();
         int returnSocket();
-        int acceptClientAndReturnSocket(sockaddr_in *clientAddr);
+        int *acceptClientAndReturnSocket(sockaddr_in *clientAddr);
         int sendToSocket(int *socket, std::string dataToSend);
         std::string receiveDataOnSocket(int * socket);
         void closeSocket();

MySQLManager-TunnelPlugin_C++/SocketListener.cpp

@@ -79,9 +79,9 @@ void SocketListener::socketListenerThread()
 		sockaddr_in clientAddr;
                 memset(&clientAddr, 0, sizeof(sockaddr_in));
 #ifdef _WIN32
-		SOCKET clientSocket = socketManager.acceptClientAndReturnSocket(&clientAddr);
+		SOCKET *clientSocket = socketManager.acceptClientAndReturnSocket(&clientAddr);
 #else
-		int clientSocket = socketManager.acceptClientAndReturnSocket(&clientAddr);
+		int *clientSocket = socketManager.acceptClientAndReturnSocket(&clientAddr);
 #endif //!_WIN32
 
 
@@ -90,15 +90,15 @@ void SocketListener::socketListenerThread()
 		//1 extra client has connected.
 		if (statusManager.getApplicationStatus() == StatusManager::ApplicationStatus::Stopping)
 		{
-			this->socketManager.closeSocket(&clientSocket);
+			this->socketManager.closeSocket(clientSocket);
 			this->socketManager.closeSocket();
 			return;
 		}
 
                 SocketListener::socketListenerMutex.lock();
 		SocketProcessor socketProcessor(this->logger, &socketManager);
                 //socketProcessor.processSocketData(&clientSocket);
-		std::thread *socketProcessorThread = new thread(&SocketProcessor::processSocketData, &socketProcessor, &clientSocket);
+		std::thread *socketProcessorThread = new thread(&SocketProcessor::processSocketData, &socketProcessor, clientSocket);
 		processingThreadList.push_back(socketProcessorThread);
                 this_thread::sleep_for(chrono::seconds(1));
                 SocketListener::socketListenerMutex.unlock();

MySQLManager-TunnelPlugin_C++/WindowsSocket.cpp

@@ -114,12 +114,13 @@ bool WindowsSocket::bindAndStartListening(int backlog)
 	@param clientAddr A memset initialised sockaddr_in structure where the client information will be stored when a new client connects
 	@return SOCKET A socket descriptor of the client connection
 */
-SOCKET WindowsSocket::acceptClientAndReturnSocket(sockaddr_in *clientAddr)
+SOCKET *WindowsSocket::acceptClientAndReturnSocket(sockaddr_in *clientAddr)
 {
-	SOCKET clientSocket = INVALID_SOCKET;
+	SOCKET *clientSocket = new SOCKET();
+	*clientSocket = INVALID_SOCKET;
 	//sockaddr_in clientAddr;
 	socklen_t sin_size = sizeof(struct sockaddr_in);
-	clientSocket = accept(this->serverSocket, (struct sockaddr*)clientAddr, &sin_size);
+	*clientSocket = accept(this->serverSocket, (struct sockaddr*)clientAddr, &sin_size);
 	return clientSocket;
 }
 
@@ -292,13 +293,10 @@ void WindowsSocket::closeSocket(SOCKET *socket)
 	if (*socket != -1)
 	{
 		int result = closesocket(*socket);
+		delete socket;
 		if (result < 0)
 		{
 			throw SocketException(this->getErrorStringFromErrorCode(result).c_str());
 		}
-		else
-		{
-			*socket = -1;
-		}
 	}
 }

MySQLManager-TunnelPlugin_C++/WindowsSocket.h

@@ -24,7 +24,7 @@ class WindowsSocket : public BaseSocket
 	bool bindAndStartListening();
 	bool bindAndStartListening(int backlog);
 	SOCKET *returnSocket();
-	SOCKET acceptClientAndReturnSocket(sockaddr_in *clientAddr);
+	SOCKET *acceptClientAndReturnSocket(sockaddr_in *clientAddr);
 	int sendToSocket(SOCKET *clientSocket, std::string dataToSend);
 	std::string receiveDataOnSocket(SOCKET *socket);
 	std::string getErrorStringFromErrorCode(int errorCode);

MySQLManager-TunnelPlugin_C++/readme.txt

@@ -0,0 +1,59 @@
+First of all, thank you for your interest in Boardies MySQL Manager for Android and the PHP and SSH Tunnelling APIs. This is the source code for the SSH Tunnelling Plugin
+
+This readme file will outline how to use the project but more information can be found on the GitHub page. If you need
+any help with anything, such as making changes to the code, installing the APIs on your own server, then please ask the question
+via GitHub or via the support portal support ticketing system at https://support.boardiesitsolutions.com. 
+
+We would love to hear your feedback and see what changes and enhancements the open source community wish to make, but please be gentle with me,
+this is my first C++ application coming from a C#/Java/PHP background :). 
+
+***Using the Source Code***
+The project consists of a Visual Studio Solution file and project file, so can be opened straight into Visual Studio - 2017 minimum. 
+You can use a different IDE if you prefer when making changes, but when uploading the changes to GitHub, please ensure that your own IDE
+project files are not uploaded to GitHub and that the Visual Studio project files remain and are still intact. 
+
+Note that you might need to change the project properties to point to the correct location of the dependency libraries to 
+match the location of where they are stored on your own development environment. 
+
+Note that there is also a makefile located in the route of the project source. This makefile is not used by Visual Studio but is instead the file 
+that is used by the Linux compiler - more on that in a sec.
+
+***Prerequsits***
+There are several dependencies that are required in order to compile the source code. 
+Whether its on Linux or Windows, the following dependency libraries are required:
+- OpenSSL
+- Boost Library including:
+	- Boost Filesystem
+	- Boost System
+- Libssh2
+- RapidJson
+- C++11 Compiler
+How to compile and link to the libraries are outside the scope of this readme - follow the libraries documentation on how to compile
+
+***Compiling for Windows***
+As mentioned Visual Studio can be used - minimum version of Visual Studio 2017 is required. You might need to change the project properties to match the location
+of where your dependency libraries are stored. You can use your own IDE but ensure your IDE files are not added to the project on GitHub. 
+
+The project has only been compiled on x64 bit Windows 10, there should be no reason that I can think of as to why it wouldn't work on 32 bit but as Boardies IT Solutions 
+is just me, I don't have another x86 copy of Windows to be able to try it on. If you have/need this to run on a 32 bit operating system, and find that it does not work, then
+please feel free to make any necessary changes - but please ensure it doesn't break the x64 and Linux platform compatibility. 
+
+***Compiling for Linux***
+You need the following tools installed on Linux in order to build the source code
+- GCC
+- G++
+- Make
+- GDB (Not necessarily required, but might be useful if you need to debug)
+Ensure that any dependencies are installed for the above tools. 
+The make file is used in order to compile the source code. Go into the root directory of where the .cpp and .h files are and run make clean to remove any already compiled object files
+followed by make. This will ensure everything is compiled from scratch, while just make changes to the code, you can just run make to compile what's changed instead of make clean followed 
+by make. 
+
+***Notes About Making Changes***
+In order to push changes to GitHub, you must follow the points below otherwise the change might be rejected
+- Ensure that any changes do not break compatibility between the Windows and Linux platforms, if a change is made, that is only supported on 1 particular platform,
+unless it provides a big improvement or requirement for the platform it works on it will likely get rejected. All efforts must be made to ensure that compatibility
+between Linux and Windows is maintained.
+- Test the code for memory leaks, don't worry, if you miss one too much, its easily done, but please try to ensure memory leaks do not occur due to your code changes
+- If you're using your own IDE - if you're developing for Linux you have to, but please ensure that any specific IDE files or directories that are created are not pushed
+to GitHub.