From 1f446388e5f0f41efda8daa2395fc3a5892e2ad8 Mon Sep 17 00:00:00 2001 From: tastytea Date: Mon, 5 Aug 2019 17:00:34 +0200 Subject: [PATCH] Support plain HTTP as well. --- include/uri.hpp | 4 ++-- src/lib/uri.cpp | 47 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/include/uri.hpp b/include/uri.hpp index 2d26c1a..1521915 100644 --- a/include/uri.hpp +++ b/include/uri.hpp @@ -48,8 +48,8 @@ namespace remwharead protected: string _uri; - //! Make a HTTPS request. - const string https_request(const string &uri) const; + //! Make a HTTP(S) request. + const string make_request(const string &uri) const; //! Extract the title from an HTML page. const string extract_title(const string &html); diff --git a/src/lib/uri.cpp b/src/lib/uri.cpp index 0511ac0..77a534b 100644 --- a/src/lib/uri.cpp +++ b/src/lib/uri.cpp @@ -20,6 +20,7 @@ #include #include #include +#include "Poco/Net/HTTPClientSession.h" #include "Poco/Net/HTTPSClientSession.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" @@ -41,6 +42,9 @@ namespace remwharead using std::regex_constants::icase; using std::array; using std::istream; + using std::unique_ptr; + using std::make_unique; + using Poco::Net::HTTPClientSession; using Poco::Net::HTTPSClientSession; using Poco::Net::HTTPRequest; using Poco::Net::HTTPResponse; @@ -65,7 +69,7 @@ namespace remwharead { std::ostringstream oss; - const string answer = https_request(_uri); + const string answer = make_request(_uri); if (answer.empty()) { cerr << "Error: Could not download page.\n"; @@ -89,7 +93,7 @@ namespace remwharead return { "", "", "" }; } - const string URI::https_request(const string &uri) const + const string URI::make_request(const string &uri) const { Poco::URI poco_uri(uri); string path = poco_uri.getPathAndQuery(); @@ -97,25 +101,50 @@ namespace remwharead { path = "/"; } - HTTPSClientSession session(poco_uri.getHost(), poco_uri.getPort()); + + unique_ptr session; + if (poco_uri.getScheme() == "https") + { + session = make_unique(poco_uri.getHost(), + poco_uri.getPort()); + } + else if (poco_uri.getScheme() == "http") + { + session = make_unique(poco_uri.getHost(), + poco_uri.getPort()); + } + HTTPRequest request(HTTPRequest::HTTP_GET, path, HTTPMessage::HTTP_1_1); - HTTPResponse response; request.set("User-Agent", string("remwharead/") + global::version); - session.sendRequest(request); - istream &rs = session.receiveResponse(response); - if (response.getStatus() == HTTPResponse::HTTP_OK) + HTTPResponse response; + + session->sendRequest(request); + istream &rs = session->receiveResponse(response); + + switch (response.getStatus()) + { + case HTTPResponse::HTTP_MOVED_PERMANENTLY: // 301 + case HTTPResponse::HTTP_PERMANENT_REDIRECT: // 308 + case HTTPResponse::HTTP_FOUND: // 302 + case HTTPResponse::HTTP_SEE_OTHER: // 303 + case HTTPResponse::HTTP_TEMPORARY_REDIRECT: // 307 + { + return make_request(response.get("Location")); + } + case HTTPResponse::HTTP_OK: { string answer; StreamCopier::copyToString(rs, answer); return answer; } - else + default: { cerr << response.getStatus() << " " << response.getReason() << endl; return ""; } + } } const string URI::extract_title(const string &html) @@ -511,7 +540,7 @@ namespace remwharead try { - const string answer = https_request("https://web.archive.org/save/" + const string answer = make_request("https://web.archive.org/save/" + _uri); smatch match;