d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,938 Commits 1 Branch 0 Tags 11 MiB
2f2307f684
Commit Graph

770 Commits

Author SHA1 Message Date
Roger A. Light
1b060bb064 Guard against use-after-free. 
Coverity Scan 1431131, 1431135, 1431141.
 2020-08-06 13:36:24 +01:00
Roger A. Light
84e4ba2c1e Send DISCONNECT with malformed-packet reason code on bad PUBLISHes. 2020-08-02 23:12:47 +01:00
Abilio Marques
d5aae3eca7 lazy init SSL 
Signed-off-by: Abilio Marques <abiliojr@gmail.com>
 2020-07-23 17:48:56 +02:00
Roger A. Light
d371b3c58b Fix mosquitto_publish*() no longer returning MOSQ_ERR_NO_CONN. 
This was always returning success when the client was not connected.

Closes #1725. Thanks to BOTorioN.
 2020-07-15 20:25:36 +01:00
Roger A. Light
d9003bb858 Don't use mutex until it is initialised. 
Coverity Scan 1430456.
 2020-07-15 12:12:51 +01:00
Roger A. Light
e3e8dc4ea4 Allow send__pub{ack,rec,rel,comp} to send properties. 2020-07-10 12:29:53 +01:00
Roger A. Light
c8964228e3 Improved documentation around connect callback return codes. 
Close #1730. Thanks to John Laird.
 2020-06-22 21:45:50 +01:00
Jasper Lievisse Adriaanse
4ef7ea6244 extend ifdef guard to fix compilation on OpenBSD 
otherwise in6_addr, AF_INET and AF_INET6 end up being undefined

Signed-off-by: Jasper Lievisse Adriaanse <jasper@humppa.nl>
 2020-06-17 15:54:24 +01:00
Roger A. Light
a9c97efaa4 Document that keepalive must be >= 5 seconds. 2020-06-10 15:21:01 +01:00
Roger A. Light
cea0423e69 Update changelog and version. 2020-05-25 23:40:15 +01:00
Martin Kelly
8d54aaef89 add a refcount to library init/cleanup 
Add a refcount around mosquitto_lib_init and mosquitto_lib_cleanup so
that multiple calls to init/cleanup don't trigger memory leaks or
double-frees.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
 2020-05-20 11:20:39 +01:00
Martin Kelly
d103174b5c correct mosquitto.h return code documentation 
We currently erroneously claim that mosquitto_lib_init cannot fail,
while it can fail on Windows, if WSAStartup fails in net__init. Correct
this.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
 2020-05-20 10:59:00 +01:00
Martin Kelly
61a50c60d2 add a refcount to library init/cleanup 
Add a refcount around mosquitto_lib_init and mosquitto_lib_cleanup so
that multiple calls to init/cleanup don't trigger memory leaks or
double-frees.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
 2020-05-20 10:57:40 +01:00
Roger A. Light
762ad432e8 Fix support for openssl 3.0 2020-05-12 13:39:49 +01:00
Roger A. Light
21f203b91a Don't treact unexpected PUBACK/COMP as fatal. 2020-03-28 23:33:01 +00:00
Roger A. Light
f0deb9a5a1 CMake: Make building clients, broker and C++ library optional. 
Issue #1641.
 2020-03-27 21:57:06 +00:00
Karl Palsson
efb21fb09c doc: lib clarify _topic_check functions 
Removed some whitespace and copy paste errors.

Signed-off-by: Karl Palsson <karlp@etactica.com>
 2020-03-19 16:40:48 +00:00
Karl Palsson
8c16d7cd50 doc: add mqtt5 property options. 
This just gets them all listed, explaining the available apis where they
could be used is left as further work.

Signed-off-by: Karl Palsson <karlp@etactica.com>
 2020-03-19 16:40:48 +00:00
Karl Palsson
1b4b6f4a2c doc: lib: properly flag code samples for formatting 
Uses the NaturalDocs 1.5 compatible style. (Forward compatible with v2)
Uses > for short snippets and the tagged style for longer snippets.

Signed-off-by: Karl Palsson <karlp@etactica.com>
 2020-03-19 16:40:48 +00:00
Karl Palsson
fd83d2274f doc: lib: avoid unintended code formatting 
Signed-off-by: Karl Palsson <karlp@etactica.com>
 2020-03-19 16:40:48 +00:00
Karl Palsson
1331399228 doc: lib: specifically document mqtt5_sub_options 
This makes the documentation of the options available in
https://mosquitto.org/api/files/mosquitto-h.html#mosquitto_subscribe_v5
a lot cleaner. (and also _subscribe_multiple())

Signed-off-by: Karl Palsson <karlp@etactica.com>
 2020-03-19 16:40:48 +00:00
Karl Palsson
d46707fe02 doc: lib_vesion: correctly format return values 
Signed-off-by: Karl Palsson <karlp@etactica.com>
 2020-03-19 16:40:48 +00:00
Karl Palsson
765f7343c2 doc: lib: _xxx_option() and opts_set() cleanup list syntax 
This change improves the option list rendering by correctly triggering
naturaldocs detection of the lists.  No change other than line breaks
and whitespace.

Signed-off-by: Karl Palsson <karlp@etactica.com>
 2020-03-19 16:40:48 +00:00
Karl Palsson
6c7ef15112 doc: lib: group all _option functions together. 
_string_option was grouped with the callbacks instead of _int_option and
_void_option.  Grouped them all together neatly.

Signed-off-by: Karl Palsson <karlp@etactica.com>
 2020-03-19 16:40:48 +00:00
Roger A. Light
a16d7e0661 iDon't treat an unexpected PUBREL as fatal. 
Issue #1629. Thanks to radcrabs.
 2020-03-19 15:38:29 +00:00
Roger A. Light
346f695937 Separate out delay code from previous commit. 
Plus add missing header.
 2020-03-12 13:53:44 +00:00
Roger A. Light
5cf94d2e57 Merge branch 'fixes' of git://github.com/ChristianS99/mosquitto into fixes 2020-03-12 13:52:00 +00:00
Roger A. Light
7f41e37f0f Fix use of sed on BSD. 
Closes #1614. Thanks to Christoph Krey.
 2020-03-12 11:52:58 +00:00
Roger A. Light
c84d175b3d Fixes for the poor souls stuck on <c99. 
Closes #1622.
 2020-03-12 10:29:11 +00:00
Roger A. Light
d96543c0b8 Merge branch 'fixes' into develop 2020-03-03 12:54:57 +00:00
Roger A. Light
b544b46156 Update version. 2020-02-27 23:27:29 +00:00
Roger A. Light
b0a065f790 Update changelog. Release page. Bump copyright. 2020-02-27 23:26:58 +00:00
Roger A. Light
b6a54a21d8 Remove duplicate code. 2020-02-12 16:47:46 +00:00
Roger A. Light
8d5fd7d1e2 Fix mosquitto_topic_matches_sub() behaviour with wildcards in topic. 
It was not returning MOSQ_ERR_INVAL if the topic contains a wildcard.

Closes #1589. Thanks to mdelete.
 2020-02-07 22:55:50 +00:00
Roger A. Light
2a8c1d03f5 Merge branch 'coverity-fixes' into fixes 2020-02-06 16:20:52 +00:00
Gianfranco Costamagna
7a5c2d4da5 Bugfix: include "deps" directory only if BUNDLED_DEPS has been provided and set to true 
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
 2020-02-06 15:20:29 +00:00
Roger A. Light
3a89059271 Don't call SSL_shutdown() if SSL init hasn't completed. 2020-02-04 17:11:11 +00:00
Roger A. Light
07c54627e9 Print OpenSSL errors in more situations 
Covers when loading certificates fails, or there are ENGINE problems.

Closes #1552. Thanks to Michael Richardson.
 2020-02-04 16:59:29 +00:00
Roger A. Light
27b4518d7e Improve password file parsing in the broker and mosqitto_passwd. 
Closes #1584. Thanks to panava.
 2020-02-04 16:38:51 +00:00
Roger A. Light
e188a6b500 More whitespace trimming fixes/consolidation. 2020-01-30 22:26:13 +00:00
Roger A. Light
70fd600c3a Fix trailing whitespace not being trimmed on acl users. 
Closes #1539. Thanks to CliveJL and LeonPoon.
 2020-01-30 19:52:46 +00:00
Roger A. Light
81641df043 Expose net__print_ssl_error() prototype. 2020-01-30 15:14:52 +00:00
Roger A. Light
11ece604c4 Merge branch 'bugfix-MemLeak_in_handle_unsubscribe' of git://github.com/panava/mosquitto into panava-bugfix-MemLeak_in_handle_unsubscribe 2020-01-30 14:22:12 +00:00
Roger A. Light
89b55094c0 Merge branch 'bugfix-NullDeref_in_util_mosc.c' of git://github.com/panava/mosquitto into panava-bugfix-NullDeref_in_util_mosc.c 2020-01-30 12:43:09 +00:00
Roger A. Light
50735afb5b Fix for internal logging not printing. 2020-01-29 16:25:56 +00:00
Panagiotis Vasilikos
dd6d8237cb Potential Null pointer dereference in util_mosq.c 
Reason: There is no check that the mosquitto__malloc at line 162 was sucessfull.
This could result to a Null pointer dereference in the memcpy call at line 166.

Fix: I added the check.
Signed-off-by: Panagiotis Vasilikos <panagiotis.vasilikos@alexandra.dk>
 2020-01-29 10:17:58 +01:00
Roger A. Light
8f1c8cba59 Set minimum keepalive argument to mosquitto_connect*() to be 5 seconds. 
Closes #1550. Thanks to Markus Gothe.
 2020-01-28 16:59:20 +00:00
Panagiotis Vasilikos
caeb211cc5 Memory leak in socks_mosq.c 
Reason: The memory allocated for the packet pointer at line 155 is not freed
before returning at line 188.

Fix: I inserted the mosquitto__free(packet) statement just before returning
at line 188.

Signed-off-by: Panagiotis Vasilikos <panagiotis.vasilikos@alexandra.dk>
 2020-01-28 11:34:11 +01:00
Roger A. Light
4408339dbc Make consts unsigned where they are compared against unsigned. 2020-01-23 12:51:47 +00:00
Roger A. Light
05ec02b3f3 Remove dead values. 2020-01-23 10:55:49 +00:00
Roger A. Light
d60e86d2a3 Add TCP_NODELAY support to lib and clients. 
Closes #1526. Thanks to Felix Moessbauer.
 2019-12-18 17:04:43 +00:00
Christian Schneider
a3ebeff9d7 fix: replace sleep with (p)select in loop_forever 
sleep was blocking loop_stop(force=false) since it
was uniteruptible

Signed-off-by: Christian Schneider <cschneider@radiodata.biz>
 2019-12-18 18:01:50 +01:00
Roger A. Light
c0443637e8 Merge branch 'master' 
Conflicts:
	ChangeLog.txt
	config.mk
	src/context.c
	src/loop.c
	src/subs.c
	test/broker/01-connect-bad-packet.py
	test/broker/02-subpub-qos1-bad-pubcomp.py
	test/broker/02-subpub-qos1-bad-pubrec.py
	test/broker/02-subpub-qos2-bad-puback-1.py
	test/broker/02-subpub-qos2-bad-puback-2.py
	test/broker/02-subpub-qos2-bad-pubcomp.py
	test/broker/02-subpub-qos2.py
	test/broker/07-will-null-topic.py
 2019-12-03 13:59:05 +00:00
Roger A. Light
b410568299 Bump version, add release post. 2019-11-28 17:08:11 +00:00
Roger A. Light
c37251c53d Document mosquitto_connect_srv(). 
Closes #1499. Thanks to Basavesh Shivakumar.
 2019-11-22 11:16:53 +00:00
Roger A. Light
91961d93c4 Merge branch 'master' of git://github.com/basavesh/mosquitto into basavesh-master 2019-11-21 14:22:19 +00:00
Basavesh Shivakumar
7c34ed2eeb Delete duplicate 'Returns' messages in the comments. 
Signed-off-by: Basavesh Shivakumar <basavesh.shivakumar@gmail.com>
 2019-11-16 21:44:18 -05:00
Roger A. Light
d003fed383 MQTT v5 bridges can handle "retain-available" being false. 2019-11-07 13:31:42 +00:00
Roger A. Light
2af260ba58 Add bridge_outgoing_retain option 
This allows outgoing messages from a bridge to have the retain bit
completely disabled, which is useful when bridging to e.g. Amazon or
Google.
 2019-11-07 11:59:29 +00:00
Roger A. Light
88c83fe6b5 mosquitto_pub now handles the MQTT v5 retain-available property 
It will not set the retain bit if retain-available is false.
 2019-11-06 23:07:00 +00:00
Roger A. Light
e6e7fc961d Fix function in wrong doc section. 2019-10-31 12:04:29 +00:00
Roger A. Light
463fe8fc6c Fix document issues in mosquitto.h. 
Closes #1478. Thanks to Liam Fry.
 2019-10-31 11:58:54 +00:00
Roger A. Light
47dadb902d Only call ERR_clear_error() after an error has occurred. 2019-10-24 22:57:05 +01:00
Roger Light
2f8573b456 Add property helper functions. 
mosquitto_property_identifier()
mosquitto_property_identifier_to_string()
mosquitto_property_next()
 2019-10-15 13:47:46 +01:00
Roger Light
a65aef9232 Null terminate binary data reading. 2019-10-15 13:44:02 +01:00
Roger A. Light
b660283e64 Basic MQTT v5 support for bridges. 
This gives equivalent behaviour as for v3.1.1/v3.1 bridges, there is no extra functionality yet.
 2019-10-09 10:54:44 +01:00
Roger A. Light
499e2f2e98 Add support for unix sockets to broker, lib, and clients. 2019-10-08 20:55:31 +01:00
Roger A. Light
8463c33720 Refactor property remaining length calculation. 2019-10-03 10:36:24 +01:00
Roger A. Light
093c8f90f5 Fix publish props not being passed to v5 msg callback for QoS 2 msgs. 
Closes #1432. Thanks to Magnus Galåen.
 2019-09-26 16:47:34 +01:00
Roger A. Light
54ed3c0fc9 Merge branch 'master' into develop 2019-09-25 19:09:10 +01:00
Roger A. Light
6a01453ce0 Build fixes. 2019-09-25 12:17:17 +01:00
Roger A. Light
b7d8eb1122 Bump version number. Update www. 2019-09-25 11:30:01 +01:00
Roger A. Light
1a8c44b84f Fix regression on use of mosquitto_connect_async() not working. 
Closes #1415 and #1422. Thanks to Karl Palsson, Till Zimmermann and Liam Fry.
 2019-09-24 20:15:04 +01:00
Roger A. Light
4b6cc208e2 Fix inflight max behaviour and option setting. 2019-09-24 11:26:25 +01:00
Roger A. Light
da5ff1746c Don't use / in auto client ids. 
Also update client documentation about automatic client ids.
 2019-09-24 10:05:42 +01:00
Roger A. Light
9883652dde Bump version, update www and changelog. 2019-09-17 16:32:00 +01:00
Roger A. Light
1066750931 Restrict topic hierarchy to 200 levels to prevent possible stack overflow. 
Closes #1412. Thanks to Ryan Shaw.
 2019-09-15 22:57:36 +01:00
Roger A. Light
344bbd087c Install mqtt_protocol.h 2019-09-12 17:19:52 +01:00
Roger A. Light
6e2be25881 Bump version numbers, add release info. 2019-09-12 14:56:15 +01:00
Roger A. Light
808bbedb6a Possible fix for #1385. 2019-09-11 17:35:50 +01:00
Roger A. Light
ee3591d228 Fix missing locks on mosq->state. 
Closes #1374. Thanks to Jeff Trull.
 2019-09-08 21:11:20 +01:00
Roger A. Light
ba918ac73e Fix reconnect backoff where connections are dropped 
Closes #737. Thanks to chelliwell.
 2019-09-04 22:20:13 +01:00
Roger A. Light
412379b03b Fix bridges potentially not connecting on Windows. 
Closes #478.
 2019-09-04 17:51:16 +01:00
Roger A. Light
76865707b2 Guard ssize_t definition on Windows. 
Closes #522. Thanks to trinytron.
 2019-09-04 17:41:50 +01:00
Roger A. Light
ff676811d3 Client no longer generates random client ids for v3.1.1 clients 
These are now expected to be generated on the broker. This matches the
behaviour for v5 clients.

Closes #291.
 2019-09-04 15:56:13 +01:00
Roger A. Light
c1e488cb88 Add timeout return code (27) for sub/rr using -W. 
Closes #275.
 2019-09-04 14:29:26 +01:00
Roger A. Light
a0e7165a9c Fix WITH_STATIC_LIBRARIES using CMake on Windows 
Closes #1369. Thanks to TimmvonderMehden
 2019-08-06 12:01:29 +01:00
Roger A. Light
494d3d29a0 Fix missing function warnings on NetBSD. 
Thanks to Greg Troxel.
 2019-08-04 23:00:26 +01:00
Roger A. Light
ce3e33e890 Bump version number, add release post. 2019-08-01 20:46:50 +01:00
Roger A. Light
d8f6215569 Windows fix 2019-08-01 20:46:23 +01:00
Roger A. Light
64c6d4d962 Fix properties not being sent on QoS>0 PUBLISH messages. 2019-08-01 15:47:48 +01:00
Roger A. Light
4253eca81c Fix memory leak when setting v5 properties in mosquitto_connect_v5() 2019-08-01 14:49:19 +01:00
Roger A. Light
a22ccbd884 Clients: improve error msgs when connecting v3.x broker with v5 client 
Closes #1344. Thanks to HowJMay.
 2019-08-01 11:40:55 +01:00
Roger A. Light
efc8ed39af Fix incoming msgs not being removed when there are no subs 
Fix incoming messages not being removed for a client if the topic being
published to does not have any subscribers.

Closes #1322. Thanks to Yannic Schröder.
 2019-07-31 18:52:51 +01:00
Roger A. Light
f21ccc362b Fix mosquitto_string_option(, MOSQ_OPT_TLS_KEYFORM, ) return value 
`mosquitto_string_option(mosq, MOSQ_OPT_TLS_KEYFORM, ...)` was incorrectly
returning `MOSQ_ERR_INVAL` with valid input. This has been fixed.

Closes #1360. Thanks to Michael Dombrowski.
 2019-07-30 18:46:52 +01:00
Roger A. Light
42237c0239 Make behaviour of mosquitto_connect[_async]() consistent. 
`mosquitto_connect_async()` is now consistent with `mosquitto_connect()`
when connecting to a non-existent server.

Closes #1345. Thanks to Mohammad Reza.
 2019-07-30 18:42:31 +01:00
Roger A. Light
c32715d383 Set *name to NULL on failure. 2019-07-30 15:09:53 +01:00
Roger A. Light
46d12086c9 Set sock to invalid after closing. 2019-07-30 15:06:55 +01:00
Roger A. Light
3ad780839d Fix MQTT v5 sub opts being set for v3 subs. 
Closes #1353. Thanks to Ben Barbour.
 2019-07-24 11:25:46 +01:00
Roger Light
2b2afc93bc Allow other apps access to log file on Windows. 
This change means that users with the appropriate security permissions
can open the log file for reading at the same time that it is being
written.

Closes #515.
 2019-07-03 11:56:46 +01:00
Roger Light
be09731e4a
Merge pull request #1308 from dandrader/no-pthread_cancel-on-android 
No pthread_cancel() on Android
 2019-06-18 12:39:14 +01:00
Roger A. Light
1d6aa9f69c Bump version and web pages. 2019-06-13 16:28:09 +01:00
Daniel d'Andrada
0970451762 pthread_cancel() is not available on Android 
Thus mosquitto_loop_start() and mosquitto_loop_stop()
won't be available there (and mosquitto_connect_async()
as a consequence).

Signed-off-by: Daniel d'Andrada <daniel.dandrada@esrlabs.com>
 2019-06-06 15:04:14 +02:00
Roger A. Light
908d1be6e0 Suppress confusing "unknown PUBREL" message. 2019-05-29 17:36:09 +01:00
Roger Light
44d170053d
Merge pull request #1255 from etactica/ssl-fixes 
Ssl fixes for ENGINE and UI includes
 2019-05-29 10:34:11 +01:00
Roger A. Light
b4dfeb3767 Fix MQTT v5 clients not being able to specify a password without a username. 
Thanks to Erik Moqvist.

Closes #1274.
 2019-05-21 23:56:22 +01:00
Roger A. Light
3f8f4fc2c8 Fix typo causing build error on Windows when building without TLS support. 
Thanks to TimmvonderMehden.

Closes #1264.
 2019-05-21 18:42:22 +01:00
Roger A. Light
999c478c88 Fixes for bug #1273 
* Fix Will message for a persistent client incorrectly being sent when the client reconnects after a clean disconnect.
* Fix Will message for a persistent client not being sent on disconnect.
* Fix mosquitto_pub not using the `-c` option.

Thanks to Yannic Schröder.

Closes #1273.
 2019-05-21 17:08:52 +01:00
Roger A. Light
d05bd95881 Fix compilation problem related to getrandom() on non-glibc systems. 2019-05-16 22:12:18 +01:00
Roger A. Light
b1298dff54 Fix use of getrandom() for Linux and WITH_TLS=no. 2019-05-16 15:03:40 +01:00
Karl Palsson
22303848e2 ssl: support openssl with ENGINE support disabled. 
Alternatively, just drop support for this config.

Signed-off-by: Karl Palsson <karlp@etactica.com>
 2019-05-02 16:44:14 +00:00
Karl Palsson
0928797e57 lib: fix missing openssl/ui.h include. 
Signed-off-by: Karl Palsson <karlp@etactica.com>
 2019-05-02 16:44:01 +00:00
Roger A. Light
0e58a5e94e Bump version numbers, update webpage. 2019-04-30 14:33:32 +01:00
Roger A. Light
b6dc98215a Windows build fixes. 2019-04-30 14:33:18 +01:00
Roger A. Light
dc4b823f92 Fix crash after client has been unable to connect to a broker 
This is part of the cleanup routine when the client is already exiting.

Closes #1246. Thanks to Christoph Krey.
 2019-04-30 13:23:25 +01:00
Roger A. Light
35793ca1c4 Bump version number, update webpage. 2019-04-26 17:07:09 +01:00
Roger A. Light
439575475c Use CMAKE_INSTALL_* variables when installing in CMake. 
Closes #1049. Thanks to Greg Troxel.
 2019-04-26 17:07:05 +01:00
Roger A. Light
efa649f451 Don't call ldconfig in CMake scripts. 
Closes #1048. Thanks to Greg Troxel.
 2019-04-26 17:07:02 +01:00
Roger A. Light
3b4a5419c3 Build fixes around CFLAGS et al. 
- Split CFLAGS and CPPFLAGS, and LDFLAGS and LDADD/LIBADD.
- test/unit now respects CPPFLAGS and LDFLAGS.

Closes #1232. Thanks to Greg Troxel.
 2019-04-26 17:06:54 +01:00
Roger A. Light
0ebf9e4469 Remove incorrect and unused memory limiting code. 2019-04-26 11:31:59 +01:00
Roger Light
a53a727b2b
Merge pull request #1234 from krestivo-kdinfotech/fixes 
Fix comment for option values
 2019-04-25 13:36:39 +01:00
Ken Restivo
c52d4994cd Fix comment 2019-04-19 13:06:39 -07:00
Roger A. Light
4dcd977932 Windows build fixes. 2019-04-17 20:09:59 +01:00
Roger A. Light
947218c975 Fix build when external utlist not available. 2019-04-17 18:15:27 +01:00
Roger A. Light
449103e960 Merge remote-tracking branch 'refs/remotes/origin/fixes' 
Conflicts:
	ChangeLog.txt
 2019-04-17 17:51:34 +01:00
Roger A. Light
56757df512 Bump version and changelog details. 2019-04-17 17:44:02 +01:00
Roger A. Light
3e6cb42a40 Fix minor Coverity issues 
1400727 - unused value
1400726 - dereference after null check
1400728 - derefence before null check
 2019-04-17 16:20:46 +01:00
Roger A. Light
689989cc56 Fix inflight quota inc/dec for both broker and library. 2019-04-17 16:15:41 +01:00
Roger A. Light
9372f425b9 Remove debug statements. 2019-04-17 13:05:58 +01:00
Roger A. Light
f42a72b46b Deprecation warnings for C++ wrapper. 2019-04-17 11:31:15 +01:00
Roger A. Light
6438ce861e Minor build variant fixes. 2019-04-17 11:00:54 +01:00
Roger A. Light
8531cb1d79 Separate broker message queues into in/out. 
This allows and includes better flow control handling for QoS>0.
 2019-04-17 09:29:34 +01:00
Roger A. Light
baf1909ffb Improve some messages when client disconnects. 2019-04-16 11:40:07 +01:00
Roger A. Light
dec769ce33 Client and doc ALPN additions 
Add ALPN support for all clients, update documentation, and add to ChangeLog.
 2019-04-11 11:52:34 +01:00
Roger A. Light
f041cb484a No need to support versions that aren't supported by upstream. 2019-04-11 11:13:58 +01:00
Roger Light
77aaec686e
Merge pull request #1224 from omenlabs/ALPN 
Bridge TLS Application-Layer Protocol Negotiation
 2019-04-11 11:08:15 +01:00
John Hickey
c011be62a4 Bridge TLS Application-Layer Protocol Negotiation 
In order to connect to brokers that support both websockets and
mqtt on the same port (such as Amazon IoT), we need to set an
application for the SSL context.  This change allows the specification
of an application by using the `bridge_alpn` configuration token.

Signed-off-by: John Hickey <jjh-github@daedalian.us>
 2019-04-04 17:27:52 -07:00
Roger A. Light
4fad9aaf24 Consistent message formats. 2019-04-04 22:09:12 +01:00
Roger A. Light
2e7dcee342 Multistep auth, plus reauth, plus tests. 2019-04-04 22:08:55 +01:00
Roger A. Light
a29a7dadc6 Basic plugin support for single step extended auth. 2019-04-04 11:37:04 +01:00
Roger A. Light
da84b9a983 Restrict what packets are allowed in what client state. 2019-04-03 20:46:21 +01:00
Roger A. Light
fb8a2baaad Refactor client msgs to use utlist to reduce code complexity. 2019-04-03 14:13:12 +01:00
Roger A. Light
fe854d3a64 Refactor handle__connect() ahead of extended auth changes. 2019-04-03 10:50:19 +01:00
Roger A. Light
1220ba4bfe Rejig OCSP code. 2019-03-26 22:13:42 +00:00
Roger A. Light
ea046c2405 Merge branch 'master' of git://github.com/LarsVoelker/mosquitto into LarsVoelker-master 2019-03-26 18:36:13 +00:00
Roger A. Light
67707b819d Fix some -Wextra compiler warnings. 2019-03-26 12:15:34 +00:00
Roger A. Light
830f814264 Fix Coverity Scan defect 1400439. Access without lock. 2019-03-26 11:37:31 +00:00
Roger A. Light
5691456ac7 Remove errant header from merge. 2019-03-21 09:48:27 +00:00
Roger A. Light
214a5f3aab v5 persistence file format 
This includes changes to improve read/write performance.
It is not complete, and will have further changes to add properties and anything else required for MQTT v5.
 2019-03-21 00:35:56 +00:00
Roger A. Light
ad2ce6c4e6 Add internal logging type, for development debugging. 2019-03-17 20:54:43 +00:00
Roger A. Light
320ddc1303 Merge branch 'master' 
Conflicts:
	CMakeLists.txt
	ChangeLog.txt
	client/Makefile
	config.mk
	installer/mosquitto.nsi
	installer/mosquitto64.nsi
	lib/mosquitto.h
	lib/mqtt3_protocol.h
	lib/util_mosq.c
	set-version.sh
	snap/snapcraft.yaml
	src/bridge.c
	src/database.c
	src/handle_connack.c
	src/loop.c
	src/persist.c
	test/broker/Makefile
 2019-03-16 10:05:38 +00:00
Roger A. Light
110f4aada6 Don't overwrite disused client state. 2019-03-15 21:38:24 +00:00
Roger A. Light
cc153cfc90 Cleanup TLS UI method on exit. 2019-03-14 09:53:23 +00:00
Roger Light
8a8d13cf96 Shared subscription support. 2019-03-14 06:48:33 +00:00
Roger A. Light
5be83ec1d7 Topic matching optimisations. 2019-03-13 16:03:28 +00:00
Roger A. Light
2dd24449ad Fix "unused parameter" warnings. 2019-03-13 14:46:05 +00:00
Roger A. Light
0941638143 Fix signed/unsigned comparion warnings. 
Closes #1196.
 2019-03-13 13:51:08 +00:00
Roger A. Light
08249313a4 Don't leak sockets. 2019-03-13 12:58:42 +00:00
Roger A. Light
8d513afffb Add missing mosquitto_userdata function. Closes #1191. 2019-03-07 10:18:38 +00:00
Roger A. Light
ac91144495 Session expiry interval support - not working for file persistence. 2019-03-06 14:47:16 +00:00
Roger A. Light
cd07c2b802 Windows build fixes. 2019-03-05 14:01:29 +00:00
Roger A. Light
105ad17dc6 Tests and support for QoS 1 reporting of no subscribers on publish. 2019-03-04 07:36:35 +00:00
Roger A. Light
6a1ac70ee6 Disallow writing to $ topics where appropriate. 2019-03-03 22:00:30 +00:00
Roger A. Light
ce31269e05 Update changelog, bump version, bump copyright year. 2019-02-28 16:56:15 +00:00
Roger A. Light
988554e7f0 Fix openssl deprecated warnings. 2019-02-28 16:47:16 +00:00
Roger A. Light
a6f845bc67 Fix openssl deprecated function use. 2019-02-28 12:21:11 +00:00
Roger A. Light
4490d06a63 Coverity fixes. 
1398654, 1398656 - lib missing unlock on fatal protocol error
1398655 - broker potential double free on startup after fatal persist
          error.
 2019-02-28 11:45:13 +00:00
Roger A. Light
d3d6f3a980 Fix compiling with openssl < 1.1.1. 2019-02-28 11:23:26 +00:00
krismattheus
479d8e5f1a fix incorrect return code when connecting in non-blocking mode 
Signed-off-by: krismattheus <kris.mattheus@visionbms.com>
 2019-02-28 00:16:04 +00:00
Roger A. Light
1924afe49e Add explicit support for TLS v1.3 and drop TLS v1.0. 2019-02-27 22:50:01 +00:00
Roger A. Light
1a3eaeabce Only use getrandom on recent glibc, when TLS not in use. 2019-02-27 20:58:29 +00:00
Roger A. Light
38711fc3f3 Fix merge error for C90 compile fail. 2019-02-27 17:34:32 +00:00
Roger A. Light
deb2fdfc98 Use lib provided random id. Change lib generated id to alphanumeric only. 2019-02-27 14:53:07 +00:00
Roger A. Light
48d731ecb5 Use better random numbers for everything, where possible. 2019-02-27 14:15:31 +00:00
Roger A. Light
72941db546 Coverity fixes 
1399064
1399065
1398655
1398656
1398654
1399067
1399066
1399063
1399060
1399059
1399068
1399062
1398657
1398653
1302848
1302847
1399070
 2019-02-27 12:38:20 +00:00
Roger A. Light
b2c0c3d573 Handle DISCONNECT with will. 2019-02-27 09:27:34 +00:00
Roger A. Light
c506c8335b Will delay tests and implementation. 2019-02-27 09:27:34 +00:00
Roger A. Light
5aabc171b0 Merge branch 'mqtt5' into develop 2019-02-26 18:51:31 +00:00
Roger A. Light
e862a047a8 Rework TLS engine support. 2019-02-26 17:11:29 +00:00
Nicolás Pernas Maradei
20894fcbce Add engine private key password support 
Some OpenSSL engines (selectable via tls_engine option) may require a
password to make use of private keys created with them in the first place.

The TPM engine for example, will require a password to access the underlying
TPM's Storage Root Key (SRK), which is the root key of a hierarchy of keys
associated with a TPM; it is generated within a TPM and is a non-migratable
key. Each owned TPM contains a SRK, generated by the TPM at the request
of the Owner. [1]

By default, the engine will prompt the user to introduce the SRK password
before any private keys created with the engine can be used. This could
be inconvenient when running on an unattended system.

Here's where the new tls_engine_kpass_sha option comes in handy. The user
can specify a SHA1 hash of its engine private key password via command
line or config file and it will be passed on to the engine directly.

This commit adds support for both clients (libmosquitto) and broker.

[1] https://goo.gl/qQoXBY

Signed-off-by: Nicolás Pernas Maradei <nicopernas@gmail.com>
 2019-02-26 15:50:37 +00:00
Nicolás Pernas Maradei
f88cc06435 Add TLS engine and keyform support to libmosquitto 
- Clients can now offload crypto tasks to an external crypto device through
  the OpenSSL ENGINE API.
- The keyfiles can now be treated as PEM or ENGINE keys.
- Two new functions were added to libmosquitto to set up the previously
  mentioned features.
- Both mosquitto_sub and mosquitto_pub include support to turn on the mentioned
  features through command line options.

Signed-off-by: Nicolás Pernas Maradei <nicopernas@gmail.com>
 2019-02-26 15:48:00 +00:00
Roger A. Light
f4e24f9524 Use higher resolution timer for random client id generation. 2019-02-26 14:26:05 +00:00
Roger A. Light
1d17ced449 Broker configurable max_packet_size 
Plus tests.
 2019-02-19 15:57:20 +00:00
Roger A. Light
8fb4ad48b5 Strings for new error codes. 2019-02-19 15:53:15 +00:00
Roger A. Light
b9b8e0ff2a Add client support for outgoing maximum packet size. 2019-02-19 15:14:34 +00:00
Roger A. Light
1877f8a326 Tests and implementation for maximum packet size. 
This is for broker outgoing connack and publish packets only.
 2019-02-18 19:50:51 +00:00
Roger A. Light
66c1e2ccf0 Add mosquitto_unsubscribe_multiple(), plus tests. 2019-02-17 20:59:16 +00:00
Roger A. Light
458a9840ad Bump version for test release. 2019-02-14 10:52:49 +00:00
Roger A. Light
bb72cf9088 Bump version number, update webpage. 2019-02-13 23:49:17 +00:00
Roger A. Light
f9f3fdbfe3 Fix pattern matching test. 2019-02-13 12:05:43 +00:00
Roger A. Light
084062c85e Merge branch 'fixes' into mqtt5 2019-02-12 17:05:42 +00:00
Roger A. Light
b6dc4e5780 Fix datatype_read test. 2019-02-12 11:34:45 +00:00
Roger A. Light
bb914b985c Fix mosquitto_topic_matches_sub() rc with sub=="topic/#abc". 
This now returns MOSQ_ERR_INVAL as expected.
 2019-02-12 11:34:45 +00:00
Roger A. Light
e72d1d6ff5 Fix mosquitto_topic_matches_sub() rc with sub=="topic/#abc". 
This now returns MOSQ_ERR_INVAL as expected.
 2019-02-12 11:26:23 +00:00
Roger A. Light
1b5c900e77 Update CVE details and bump version number. 2019-02-08 13:01:07 +00:00
Roger A. Light
7ff9c3763b Fix socks build when using cmake. 2019-02-08 13:01:07 +00:00
Roger A. Light
f952ae3a67 Fixed durable clients being unable to receive messages when offline. 
This occurred when per_listener_settings was set to true.

Closes #1081. Thanks to dwin-wangjt.
 2019-02-08 13:01:07 +00:00
Roger A. Light
d6a690aa8d Fix Will not being sent for Websockets clients. 
Closes #1143. Thanks to salcedo.
 2019-02-08 13:01:07 +00:00
Roger A. Light
ab8b57ff54 Allow broker to always restart on Windows when using log_dest file. 
Closes #1080. Thanks to lcouz.
 2019-02-08 13:01:07 +00:00
Roger Light
5236295159 Handle mismatched handshakes properly. 
For example, a QoS1 PUBLISH with QoS2 reply.
 2019-02-08 13:01:07 +00:00