e478977071
Fixes the following security issues: CVE-2018-12551: If Mosquitto is configured to use a password file for authentication, any malformed data in the password file will be treated as valid. This typically means that the malformed data becomes a username and no password. If this occurs, clients can circumvent authentication and get access to the broker by using the malformed username. In particular, a blank line will be treated as a valid empty username. Other security measures are unaffected. Users who have only used the mosquitto_passwd utility to create and modify their password files are unaffected by this vulnerability. Affects version 1.0 to 1.5.5 inclusive. CVE-2018-12550: If an ACL file is empty, or has only blank lines or comments, then mosquitto treats the ACL file as not being defined, which means that no topic access is denied. Although denying access to all topics is not a useful configuration, this behaviour is unexpected and could lead to access being incorrectly granted in some circumstances. Affects versions 1.0 to 1.5.5 inclusive. CVE-2018-12546: If a client publishes a retained message to a topic that they have access to, and then their access to that topic is revoked, the retained message will still be delivered to future subscribers. This behaviour may be undesirable in some applications, so a configuration option check_retain_source has been introduced to enforce checking of the retained message source on publish. Add two upstream post-1.5.6 patches to fix a build error in the bridge code when ADNS is enabled and when building with older toolchains not defaulting to C99 mode. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
28 lines
985 B
Diff
28 lines
985 B
Diff
From 9378016b19521aa6c281f475267c5cb67ea967d1 Mon Sep 17 00:00:00 2001
|
|
From: "Roger A. Light" <roger@atchoo.org>
|
|
Date: Fri, 8 Feb 2019 21:34:08 +0000
|
|
Subject: [PATCH] Fix build failure when using WITH_ADNS=yes
|
|
|
|
[Peter: drop ChangeLog.txt modification]
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
src/bridge.c | 2 +-
|
|
1 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/bridge.c b/src/bridge.c
|
|
index 6e4b94f..d9611f0 100644
|
|
--- a/src/bridge.c
|
|
+++ b/src/bridge.c
|
|
@@ -228,7 +228,7 @@ int bridge__connect_step3(struct mosquitto_db *db, struct mosquitto *context)
|
|
{
|
|
int rc;
|
|
|
|
- rc = net__socket_connect_step3(context, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port, NULL, false);
|
|
+ rc = net__socket_connect_step3(context, context->bridge->addresses[context->bridge->cur_address].address);
|
|
if(rc > 0){
|
|
if(rc == MOSQ_ERR_TLS){
|
|
net__socket_close(db, context);
|
|
--
|
|
2.11.0
|
|
|