Add --tls option to pass to ws server command, to enable/disable tls

This commit is contained in:
Benjamin Sergeant 2019-10-01 13:54:46 -07:00
parent afed387bcf
commit d6542383ed
3 changed files with 10 additions and 1 deletions

View File

@ -270,7 +270,7 @@ namespace ix
// create socket // create socket
std::string errorMsg; std::string errorMsg;
bool tls = false; bool tls = _socketTLSOptions.tls;
auto socket = createSocket(tls, clientFd, errorMsg, _socketTLSOptions); auto socket = createSocket(tls, clientFd, errorMsg, _socketTLSOptions);
if (socket == nullptr) if (socket == nullptr)

View File

@ -18,15 +18,21 @@ namespace ix
// the certificate presented to peers // the certificate presented to peers
std::string certFile; std::string certFile;
// the key used for signing/encryption // the key used for signing/encryption
std::string keyFile; std::string keyFile;
// the ca certificate (or certificate bundle) file containing // the ca certificate (or certificate bundle) file containing
// certificates to be trusted by peers; use 'SYSTEM' to // certificates to be trusted by peers; use 'SYSTEM' to
// leverage the system defaults, use 'NONE' to disable peer verification // leverage the system defaults, use 'NONE' to disable peer verification
std::string caFile = "SYSTEM"; std::string caFile = "SYSTEM";
// list of ciphers (rsa, etc...)
std::string ciphers = "DEFAULT"; std::string ciphers = "DEFAULT";
// whether tls is enabled, used for server code
bool tls = false;
bool hasCertAndKey() const; bool hasCertAndKey() const;
bool isUsingSystemDefaults() const; bool isUsingSystemDefaults() const;

View File

@ -102,6 +102,9 @@ int main(int argc, char** argv)
app->add_option("--ciphers", app->add_option("--ciphers",
tlsOptions.ciphers, tlsOptions.ciphers,
"A (comma/space/colon) separated list of ciphers to use for TLS"); "A (comma/space/colon) separated list of ciphers to use for TLS");
app->add_flag("--tls",
tlsOptions.tls,
"Enable TLS");
}; };
app.add_flag("--version", version, "Connection url"); app.add_flag("--version", version, "Connection url");