Merge pull request #3523 from sysown/v2.x-3518

Address update checker security issue(s) reported in #3518

.gitignore

@@ -135,6 +135,7 @@ deps/pcre/pcre/
 # curl
 deps/curl/curl/
 deps/curl/curl-7.57.0/
+deps/curl/curl-7.77.0/
 
 deps/libev/libev-4.24/
 

deps/Makefile

@@ -102,7 +102,8 @@ ev: libev/libev/.libs/libev.a
 
 curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a
 	cd curl && rm -rf curl-7.57.0 || true
-	cd curl && tar -zxf curl-7.57.0.tar.gz
+	cd curl && rm -rf curl-7.77.0 || true
+	cd curl && tar -zxf curl-7.77.0.tar.gz
 	#cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE}
 	cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE}
 curl: curl/curl/lib/.libs/libcurl.a
@@ -275,6 +276,7 @@ cleanall:
 	cd libmicrohttpd && rm -rf libmicrohttpd-0.9.55 || true
 	cd libmicrohttpd && rm -rf libmicrohttpd-0.9.68 || true
 	cd curl && rm -rf curl-7.57.0 || true
+	cd curl && rm -rf curl-7.77.0 || true
 	cd libev && rm -rf libev-4.24 || true
 	cd libssl && rm -rf openssl-1.1.0h || true
 	cd libssl && rm -rf openssl-1.1.1b || true

deps/curl/curl

@@ -1 +1 @@
-curl-7.57.0
+curl-7.77.0

lib/ProxySQL_HTTP_Server.cpp

@@ -86,7 +86,6 @@ static char * check_latest_version() {
 	curl_easy_setopt(curl_handle, CURLOPT_URL, "https://www.proxysql.com/latest");
 	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
 	curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&chunk);
-	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
 
 	string s = "proxysql-agent/";
 	s += PROXYSQL_VERSION;

src/main.cpp

@@ -201,7 +201,6 @@ static char * main_check_latest_version() {
 	curl_easy_setopt(curl_handle, CURLOPT_URL, "https://www.proxysql.com/latest");
 	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
 	curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&chunk);
-	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
 
 	string s = "proxysql-agent/";
 	s += PROXYSQL_VERSION;