github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-05-15 03:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: CAPATH or CAFILE set TLS

Browse Source 
addresses #232
This commit is contained in:
Jan-Piet Mens
2018-04-23 18:56:37 +02:00
parent fbd2c26c9d
commit da3bafe863
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
recorder.c
View File

@@ -1193,6 +1193,7 @@ int main(int argc, char **argv)
UT_string *clientid;
int rc, i;
struct utsname uts;
bool do_tls = false;
#endif /* WITH_MQTT */
char err[1024], *p;
char *logfacility = "local0";
@@ -1636,7 +1637,7 @@ int main(int argc, char **argv)
mosquitto_username_pw_set(mosq, ud->username, ud->password);
}
if (ud->psk && ud->cafile) {
if (ud->psk && (ud->cafile || ud->capath)) {
olog(LOG_ERR, "Configuring TLS together with PSK is an error");
exit(2);
}
@@ -1648,11 +1649,15 @@ int main(int argc, char **argv)
NULL); /* Ciphers */
}
if (ud->cafile && *ud->cafile) {
do_tls = (ud->cafile || ud->capath);
if (access(ud->cafile, R_OK) != 0) {
olog(LOG_ERR, "cafile configured as `%s' can't be opened: errno=%d", ud->cafile, errno);
exit(2);
if (do_tls) {
if (ud->cafile) {
if (access(ud->cafile, R_OK) != 0) {
olog(LOG_ERR, "cafile configured as `%s' can't be opened: errno=%d", ud->cafile, errno);
exit(2);
}
}
rc = mosquitto_tls_set(mosq,
@@ -1679,7 +1684,7 @@ int main(int argc, char **argv)
olog(LOG_INFO, "connecting to MQTT on %s:%d as clientID %s %s %s",
ud->hostname, ud->port,
ud->clientid,
((ud->cafile && *ud->cafile) || (ud->psk && *ud->psk)) ? "with" : "without",
do_tls ? "with" : "without",
(ud->psk && *ud->identity) ? "PSK" : "TLS");
rc = mosquitto_connect(mosq, ud->hostname, ud->port, 60);