rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed to stringstream as Mac had problems with regex

This commit is contained in:
Jamie Newbon 2019-11-14 11:29:17 +00:00
parent 27e5d3b084
commit e64e4c598d
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/net/SecureSocket.cpp
View File

@ -27,6 +27,7 @@
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <cstring> #include <cstring>
#include <sstream>
#include <cstdlib> #include <cstdlib>
#include <memory> #include <memory>
#include <fstream> #include <fstream>
@ -855,13 +856,23 @@ SecureSocket::showSecureConnectInfo()
//For some reason SSL_get_version is return mismatching information to SSL_CIPHER_description //For some reason SSL_get_version is return mismatching information to SSL_CIPHER_description
// so grab the version out the description instead, This seems like a hacky way of doing it. // so grab the version out the description instead, This seems like a hacky way of doing it.
// But when the cipher says "TLSv1.2" but the get_version returns "TLSv1/SSLv3" we it doesn't look right // But when the cipher says "TLSv1.2" but the get_version returns "TLSv1/SSLv3" we it doesn't look right
const std::regex match(R"(^([\w-]*)\s+([\w-.]*).*$)"); // For some reason macOS hates regex's so stringstream is used
const std::string message(msg);
std::smatch stringMatch;
if (std::regex_search(message, stringMatch, match)) { std::istringstream iss(msg);
const std::string protocol = stringMatch[2];
LOG((CLOG_INFO "network encryption protocol: %s", protocol.c_str())); //Take the stream input and splits it into a vetor directly
const std::vector<std::string> parts{std::istream_iterator<std::string>{iss},
std::istream_iterator<std::string>{}};
if (parts.size() > 2)
{
//log the section containing the protocol version
LOG((CLOG_INFO "network encryption protocol: %s", parts[1].c_str()));
}
else
{
//log the error in spliting then display the whole description rather then nothing
LOG((CLOG_ERR "could not split cipher for protocol"));
LOG((CLOG_INFO "network encryption protocol: %s", msg));
} }
} }
else { else {