Skip to content

Use same cert pinning on redirects #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use same cert pinning on redirects #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/crypto/Connect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ using namespace std;



Connect::Connect(const string &_url, string _method, int _timeout, const vector<X509Cert> &certs, const string &userAgentData, const string &version)
: method(std::move(_method))
Connect::Connect(const string &_url, string_view _method, int _timeout, vector<X509Cert> _certs, string _userAgentData, string_view _version)
: method(_method)
, userAgentData(std::move(_userAgentData))
, version(_version)
, certs(std::move(_certs))
, timeout(_timeout)
{
DEBUG("Connecting to URL: %s", _url.c_str());
Expand Down Expand Up @@ -128,6 +131,9 @@ Connect::Connect(const string &_url, string _method, int _timeout, const vector<
SSL_CTX_set_options(ssl.get(), options);
#endif
SSL_CTX_set_quiet_shutdown(ssl.get(), 1);
// TLS peer verification is performed only when pinned certificates are provided.
// Without pinning, content-level crypto covers integrity: OCSP responses are signed
// by the responder cert, TSA responses are CMS-signed, and TSL uses known public keys.
if(!certs.empty())
{
SSL_CTX_set_verify(ssl.get(), SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
Expand Down Expand Up @@ -159,7 +165,7 @@ Connect::Connect(const string &_url, string _method, int _timeout, const vector<
}
}

BIO_printf(d, "%s %s HTTP/%s\r\n", method.c_str(), path.c_str(), version.c_str());
BIO_printf(d, "%.*s %s HTTP/%.*s\r\n", STR_VIEW_FMT(method), path.c_str(), STR_VIEW_FMT(version));
addHeader("Connection", "close");
if(port == "80" || port == "443")
addHeader("Host", host);
Expand Down Expand Up @@ -305,7 +311,7 @@ Connect::Result Connect::exec(initializer_list<pair<string_view,string_view>> he
return r;
string &location = r.headers["location"];
string url = location.find("://") != string::npos ? std::move(location) : baseurl + location;
Connect c(url, method, timeout);
Connect c(url, method, timeout, std::move(certs), std::move(userAgentData), version);
c.recursive = recursive + 1;
return c.exec(headers);
}
Expand Down
10 changes: 6 additions & 4 deletions src/crypto/Connect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ class Connect
}
};

Connect(const std::string &url, std::string method = "POST",
int timeout = 0, const std::vector<X509Cert> &certs = {}, const std::string &userAgentData = {},
const std::string &version = "1.1");
Connect(const std::string &url, std::string_view method = "POST",
int timeout = 0, std::vector<X509Cert> certs = {}, std::string userAgentData = {},
std::string_view version = "1.1");
~Connect();
inline Result exec(std::initializer_list<std::pair<std::string_view,std::string_view>> headers,
const std::vector<unsigned char> &data)
Expand All @@ -79,7 +79,9 @@ class Connect
void sendProxyAuth();
static std::string decompress(const std::string &encoding, const std::string &data) ;

std::string baseurl, method;
std::string baseurl, userAgentData;
std::string_view method, version;
std::vector<X509Cert> certs;
BIO *d = nullptr;
std::shared_ptr<SSL_CTX> ssl;
int timeout;
Expand Down
Loading