Merge pull request #4088 from ethereum/upnp

Disable builds with UPnP by default
ethereum · May 24, 2017 · b428693 · b428693
2 parents 6df20b8 + 6203e4d
commit b428693
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 30 deletions.
diff --git a/cmake/EthOptions.cmake b/cmake/EthOptions.cmake
@@ -15,9 +15,15 @@ macro(configure_project)
 	eth_default_option(FATDB ON)
 	eth_default_option(ROCKSDB OFF)
 	eth_default_option(PARANOID OFF)
-	eth_default_option(MINIUPNPC ON)
+	eth_default_option(MINIUPNPC OFF)
 	eth_default_option(FASTCTEST OFF)
 
+	if(MINIUPNPC)
+		message(WARNING
+			"Security vulnerabilities have been discovered in miniupnpc library."
+			"This build option is for testing only. Do not use it in public networks")
+	endif()
+
 	# components
 	eth_default_option(TESTS ON)
 	eth_default_option(TOOLS ON)

diff --git a/cmake/scripts/install_deps.cmake b/cmake/scripts/install_deps.cmake
@@ -11,4 +11,3 @@ endfunction(download_and_install)
 download_and_install("curl-7.4.2")
 download_and_install("leveldb-1.2")
 download_and_install("microhttpd-0.9.2")
-download_and_install("miniupnpc-1.9")
diff --git a/libp2p/CMakeLists.txt b/libp2p/CMakeLists.txt
@@ -1,10 +1,7 @@
-aux_source_directory(. SRC_LIST)
-
 file(GLOB HEADERS "*.h")
+file(GLOB SOURCES "*.cpp")
 
-add_library(p2p ${SRC_LIST} ${HEADERS})
-
-find_package(Dev)
+add_library(p2p ${SOURCES} ${HEADERS})
 
 target_link_libraries(p2p devcrypto devcore)
 target_include_directories(p2p PRIVATE ..)

diff --git a/libp2p/UPnP.cpp b/libp2p/UPnP.cpp
@@ -14,24 +14,18 @@
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file UPnP.cpp
- * @authors:
- *   Gav Wood <[email protected]>
- *   Lefteris Karapetsas <[email protected]>
- * @date 2014, 2015
- */
+/// @file
+/// UPnP port forwarding support.
 
 #include "UPnP.h"
 
-#include <stdio.h>
 #include <string.h>
 #if ETH_MINIUPNPC
 #include <miniupnpc/miniwget.h>
 #include <miniupnpc/miniupnpc.h>
 #include <miniupnpc/upnpcommands.h>
 #endif
 #include <libdevcore/Exceptions.h>
-#include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Log.h>
 using namespace std;
@@ -81,8 +75,8 @@ UPnP::UPnP()
 #endif
 		if (descXML)
 		{
-			parserootdesc (descXML, descXMLsize, m_data.get());
-			free (descXML); descXML = 0;
+			parserootdesc(descXML, descXMLsize, m_data.get());
+			free(descXML);
 #if MINIUPNPC_API_VERSION >= 9
 			GetUPNPUrls (m_urls.get(), m_data.get(), dev->descURL, 0);
 #else
@@ -113,9 +107,8 @@ string UPnP::externalIP()
 	char addr[16];
 	if (!UPNP_GetExternalIPAddress(m_urls->controlURL, m_data->first.servicetype, addr))
 		return addr;
-	else
 #endif
-		return "0.0.0.0";
+	return "0.0.0.0";
 }
 
 int UPnP::addRedirect(char const* _addr, int _port)
@@ -137,7 +130,7 @@ int UPnP::addRedirect(char const* _addr, int _port)
 		return _port;
 
 	// Failed - now try (random external, port internal) and cycle up to 10 times.
-	srand(time(NULL));
+	srand(static_cast<unsigned int>(time(nullptr)));
 	for (unsigned i = 0; i < 10; ++i)
 	{
 		_port = rand() % (32768 - 1024) + 1024;
@@ -181,7 +174,6 @@ void UPnP::removeRedirect(int _port)
 	(void)_port;
 #if ETH_MINIUPNPC
 	char port_str[16];
-//		int t;
 	printf("TB : upnp_rem_redir (%d)\n", _port);
 	if (m_urls->controlURL[0] == '\0')
 	{

diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
@@ -99,7 +99,6 @@ Darwin)
     brew install \
         leveldb \
         libmicrohttpd \
-        miniupnpc \
         $TRAVIS_PACKAGES
 
     ;;
@@ -142,8 +141,7 @@ Linux)
             gcc \
             libtool \
             leveldb \
-            libmicrohttpd \
-            miniupnpc
+            libmicrohttpd
 
     elif [ -f "/etc/os-release" ]; then
 
@@ -159,8 +157,7 @@ Linux)
                 libcurl4-openssl-dev \
                 libgmp-dev \
                 libleveldb-dev \
-                libmicrohttpd-dev \
-                libminiupnpc-dev
+                libmicrohttpd-dev
             ;;
 
         Fedora)
@@ -202,7 +199,6 @@ Linux)
                 libgmp-dev \
                 libleveldb-dev \
                 libmicrohttpd-dev \
-                libminiupnpc-dev \
                 $TRAVIS_PACKAGES
             ;;
 

diff --git a/scripts/tests.bat b/scripts/tests.bat
@@ -44,9 +44,10 @@ if "%TESTS%"=="On" (
     IF errorlevel 1 GOTO ON-ERROR-CONDITION
 
     REM Run the tests for the JIT
-    echo Testing EVMJIT
-    testeth.exe -t VMTests,StateTests -- --vm jit --testpath %APPVEYOR_BUILD_FOLDER%\test\jsontests
-    IF errorlevel 1 GOTO ON-ERROR-CONDITION
+    REM echo Testing EVMJIT
+    REM testeth.exe -t VMTests,StateTests -- --vm jit --testpath %APPVEYOR_BUILD_FOLDER%\test\jsontests
+    REM IF errorlevel 1 GOTO ON-ERROR-CONDITION
+
     cd ..\..\..
 
 )