SeanOMik
/
znc-push
mirror of https://github.com/SeanOMik/znc-push.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add explicit proxy support when using libcurl. 

The appropriate *_proxy environment variables aren't always detected properly
by libcurl. This allows manually setting the proxy when this happens, and
disabling SSL certificate verification if the proxy requires it.
This commit is contained in:
Joel Goguen 2014-08-19 17:40:59 -07:00 committed by John Reese
parent e0aacab2b6
commit b9995692e8
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -112,7 +112,7 @@ and looking in your profile or settings:
/msg *push set username foo /msg *push set username foo
/msg *push set secret ... /msg *push set secret ...
If you're using Boxcar, you need to use the following command to send a subscription request If you're using Boxcar or Airgram, you need to use the following command to send a subscription request
to your account, before ZNC Push can start working: to your account, before ZNC Push can start working:
/msg *push subscribe /msg *push subscribe

21
push.cpp
View File

@ -147,6 +147,10 @@ class CPushMod : public CModule
defaults["nick_blacklist"] = ""; defaults["nick_blacklist"] = "";
defaults["replied"] = "yes"; defaults["replied"] = "yes";
// Proxy, for libcurl
defaults["proxy"] = "";
defaults["proxy_ssl_verify"] = "yes";
// Advanced // Advanced
defaults["channel_conditions"] = "all"; defaults["channel_conditions"] = "all";
defaults["query_conditions"] = "all"; defaults["query_conditions"] = "all";
@ -570,13 +574,15 @@ class CPushMod : public CModule
#ifdef USE_CURL #ifdef USE_CURL
PutDebug("using libcurl"); PutDebug("using libcurl");
params["proxy"] = options["proxy"];
params["proxy_ssl_verify"] = options["proxy_ssl_verify"];
make_curl_request(service_host, service_url, service_auth, params, use_port, use_ssl, use_post, options["debug"] == "on"); make_curl_request(service_host, service_url, service_auth, params, use_port, use_ssl, use_post, options["debug"] == "on");
#else #else
PutDebug("NOT using libcurl"); PutDebug("NOT using libcurl");
// Create the socket connection, write to it, and add it to the queue // Create the socket connection, write to it, and add it to the queue
CPushSocket *sock = new CPushSocket(this); CPushSocket *sock = new CPushSocket(this);
sock->Connect(service_host, use_port, use_ssl); sock->Connect(service_host, use_port, use_ssl);
sock->Request(use_post, service_host, service_url, params, service_auth); sock->Request(use_post, service_host, service_url, params, service_auth, options["proxy"].c_str());
AddSocket(sock); AddSocket(sock);
#endif #endif
} }
@ -1531,13 +1537,16 @@ class CPushMod : public CModule
return; return;
} }
params["proxy"] = options["proxy"];
params["proxy_ssl_verify"] = options["proxy_ssl_verify"];
#ifdef USE_CURL #ifdef USE_CURL
make_curl_request(service_host, service_url, service_auth, params, use_port, use_ssl, use_post, options["debug"] == "on"); make_curl_request(service_host, service_url, service_auth, params, use_port, use_ssl, use_post, options["debug"] == "on");
#else #else
// Create the socket connection, write to it, and add it to the queue // Create the socket connection, write to it, and add it to the queue
CPushSocket *sock = new CPushSocket(this); CPushSocket *sock = new CPushSocket(this);
sock->Connect(service_host, use_port, use_ssl); sock->Connect(service_host, use_port, use_ssl);
sock->Request(use_post, service_host, service_url, params, service_auth); sock->Request(use_post, service_host, service_url, params, service_auth, options["proxy"].c_str());
AddSocket(sock); AddSocket(sock);
#endif #endif
@ -1657,6 +1666,14 @@ CURLcode make_curl_request(const CString& service_host, const CString& service_u
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, query.length()); curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, query.length());
} }
if (params["proxy"] != "") {
curl_easy_setopt(curl, CURLOPT_PROXY, params["proxy"].c_str());
if (params["proxy_ssl_verify"] == "no") {
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
}
}
result = curl_easy_perform(curl); result = curl_easy_perform(curl);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);