GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

TLS

Browse source 
- If a CA is provided, it is used.
This commit is contained in:
Paul Beckingham 2013-11-03 12:49:56 -05:00
parent 8c9bc99af6
commit f1f93aa5d5
6 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/commands/CmdSync.cpp
View file

@ -96,11 +96,14 @@ int CmdSync::execute (std::string& output)
throw std::string (STRING_CMD_SYNC_BAD_CRED);
bool trust = context.config.getBoolean ("taskd.trust");
/*
// CA must exist, if provided.
File ca (context.config.get ("taskd.ca"));
if (ca._data != "" && ! ca.exists ())
throw std::string (STRING_CMD_SYNC_BAD_CA);
*/
if (trust && ca._data != "")
throw std::string (STRING_CMD_SYNC_TRUST_CA);
File certificate (context.config.get ("taskd.certificate"));
if (! certificate.exists ())
@ -164,7 +167,7 @@ int CmdSync::execute (std::string& output)
signal (SIGUSR2, SIG_IGN);
Msg response;
if (send (connection, certificate._data, key._data, trust, request, response))
if (send (connection, ca._data, certificate._data, key._data, trust, request, response))
{
std::string code = response.get ("code");
if (code == "200")
@ -321,6 +324,7 @@ int CmdSync::execute (std::string& output)
////////////////////////////////////////////////////////////////////////////////
bool CmdSync::send (
const std::string& to,
const std::string& ca,
const std::string& certificate,
const std::string& key,
bool trust,
@ -339,10 +343,13 @@ bool CmdSync::send (
{
TLSClient client;
client.debug (context.config.getInteger ("debug.tls"));
client.trust (trust);
// TODO Either use 'ca' or 'trust', but not both.
if (trust && ca == "")
client.trust (trust);
client.init (certificate, key);
client.connect (server, port);
client.send (request.serialize () + "\n");
std::string incoming;

2
src/commands/CmdSync.h
View file

@ -39,7 +39,7 @@ public:
int execute (std::string&);
private:
bool send (const std::string&, const std::string&, const std::string&, bool, const Msg&, Msg&);
bool send (const std::string&, const std::string&, const std::string&, const std::string&, bool, const Msg&, Msg&);
};
#endif