tastytea
/
gitea2rss
1
0
Fork 0
Code Issues Pull Requests Releases 12 Activity

Merge branch 'develop'
continuous-integration/drone/push Build is passing Details

This commit is contained in:
tastytea 2019-09-06 02:34:30 +02:00
parent c7e36a7297 d9d28dd707
commit 095645ba6e
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/http.cpp
View File

@ -14,10 +14,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <sstream>
#include <iostream> #include <iostream>
#include <exception> #include <exception>
#include <memory> #include <memory>
#include <regex>
#include <Poco/Net/HTTPClientSession.h> #include <Poco/Net/HTTPClientSession.h>
#include <Poco/Net/HTTPSClientSession.h> #include <Poco/Net/HTTPSClientSession.h>
#include <Poco/Net/HTTPRequest.h> #include <Poco/Net/HTTPRequest.h>
@ -35,6 +35,9 @@ using std::endl;
using std::istream; using std::istream;
using std::unique_ptr; using std::unique_ptr;
using std::make_unique; using std::make_unique;
using std::regex;
using std::regex_search;
using std::smatch;
using Poco::Net::HTTPClientSession; using Poco::Net::HTTPClientSession;
using Poco::Net::HTTPSClientSession; using Poco::Net::HTTPSClientSession;
using Poco::Net::HTTPRequest; using Poco::Net::HTTPRequest;
@ -47,31 +50,25 @@ void set_proxy()
{ {
try try
{ {
HTTPClientSession::ProxyConfig proxy; HTTPSClientSession::ProxyConfig proxyconfig;
string proxy_env = Environment::get("http_proxy"); string env_proxy = Environment::get("http_proxy");
size_t pos; regex re_proxy("^(?:https?://)?(?:([^:]+):?([^@]*)@)?" // user:password
"([^:]+):([[:digit:]]+/?)"); // host:port
smatch match;
// Only keep text between // and /. if (regex_search(env_proxy, match, re_proxy))
if ((pos = proxy_env.find("//")) != string::npos)
{ {
proxy_env = proxy_env.substr(pos + 2); string username, password;
} Poco::URI::decode(match[1].str(), username);
if ((pos = proxy_env.find('/')) != string::npos) Poco::URI::decode(match[2].str(), password);
{
proxy_env = proxy_env.substr(0, pos);
}
if ((pos = proxy_env.find(':')) != string::npos) proxyconfig.host = match[3].str();
{ proxyconfig.port = std::stoi(match[4].str());
proxy.host = proxy_env.substr(0, pos); proxyconfig.username = username;
proxy.port = std::stoi(proxy_env.substr(pos + 1)); proxyconfig.password = password;
}
else
{
proxy.host = proxy_env;
}
HTTPClientSession::setGlobalProxyConfig(proxy); HTTPSClientSession::setGlobalProxyConfig(proxyconfig);
}
} }
catch (const std::exception &) catch (const std::exception &)
{ {