Commit Graph

606 Commits (9751cccf0de920cfbca5604b3c8b54c1af254745)

Author SHA1 Message Date
Roger A. Light 5ff8127f44 Fix will sending for duplicate clients.
When a client with an in-use client-id connects, if the old client has a
will, send the will message. Closes #26.

Thanks to Pierre F.
8 years ago
Roger A. Light 943b311344 Don't use deprecated openssl functions. 8 years ago
Roger A. Light a5781c0b46 Missing #endif. 8 years ago
Roger A. Light 24d68b5af8 Remove support for openssl 1.0.0 and 1.0.1.
These are no longer supported by openssl.
8 years ago
Roger A. Light f4d238be18 Bump copyright years. 8 years ago
Roger A. Light d982c265cb Fix signed/unsigned comparison.
Closes #747, closes #753.
8 years ago
Tifaifai Maupiti f2376551bc Fix: use websockets without OpenSSL / TLS.
Signed-off-by: Tifaifai Maupiti <tifaifai.maupiti@gmail.com>
8 years ago
Roger A. Light 40e6a75709 Use c99 as compiling standard.
Closes: #765.
8 years ago
Roger A. Light c3314fd593 Add missing tests (Closes #748). 8 years ago
Roger A. Light 2a05602d84 Obtain canonical name for password file. 8 years ago
Roger A. Light d09d7c47c5 Further Coverity Scan fixes. 8 years ago
Roger A. Light dbdd113c86 Merge branch 'develop' of github.com:eclipse/mosquitto into develop 8 years ago
Roger A. Light e273c2593e Fix uninitialised variable. 8 years ago
Roger A. Light 8a22b918c0 Fix Coverity Scan defects. 8 years ago
Roger A. Light a979ed6535 Per listener plugins. 8 years ago
Roger A. Light a3b859a995 Remove name confusion 8 years ago
Roger A. Light 600217649b Merge branch 'develop' of github.com:eclipse/mosquitto into develop 8 years ago
Roger A. Light 13753f7661 Fix building mosquitto_passwd on Windows. 8 years ago
Roger A. Light 26bc3206cd Per listener allow_zero_length_clientid. 8 years ago
Roger A. Light 7271893966 Per listener auto_id_prefix. 8 years ago
Roger A. Light 4e266ff28f Copy default parameters. 8 years ago
Roger A. Light fd7b08c0eb Per listener psk_file. 8 years ago
Roger A. Light b2e1592376 Per listener allow_anonymous. 8 years ago
Roger A. Light 7046691b7d Reload password files properly. 8 years ago
Roger A. Light aa87f3c170 Per listener allow_anonymous. 8 years ago
Roger A. Light a571104809 Check correct password list. 8 years ago
Roger A. Light 0fef6bdee8 Maximum connections on Windows increased to 2048.
Thanks to ericGTT.
8 years ago
Peter Korsgaard 01ead7e73e websockets.c: unbreak build without TLS
Commit 7943072b1f (Fix use_identity_as_username not working on websockets
clients) added code which unconditionally accesses mosq-ssl, breaking the
build when TLS support is disabled.

Fix it by guarding this logic inside #ifdef WITH_TLS.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
8 years ago
Roger A. Light 57e852db05 Per listener password file. 8 years ago
Roger A. Light bc13eab9d6 Add per_listener_settings, which isn't used yet. 8 years ago
Roger A. Light 4d3f5b2b39 Ensure pollfd_index is initialised. 8 years ago
Thomas Pedley ba8734b749 Add LWT message logging.
Signed-off-by: Thomas Pedley <me@shallax.com>
8 years ago
Roger A. Light 9ea0d38002 [706] Serve http /dir/ as /dir/index.html.
Thanks to Jean-Claude Wippler.
8 years ago
Roger A. Light 4f838e5161 Windows fixes. 8 years ago
Roger A. Light 5b2bf3d1c1 Bump version number, update copyrights. 8 years ago
Roger A. Light e6cbff0e94 Fix unauthorised clients being able to cause OOM on connect. 8 years ago
Roger A. Light b76982db13 Fix reloading of config when fds are exhausted. 8 years ago
Roger A. Light ec63d7bfc7 Add set_tcp_nodelay option to disable Nagle's algorithm.
Bug: https://github.com/eclipse/mosquitto/issues/433
8 years ago
Roger A. Light 81cb7ab547 Merge branch 'fixes' into develop 8 years ago
Roger A. Light c001e778c1 [693] Fix handling of null bytes in received strings.
Thanks to Umberto Boscolo.

Bug: https://github.com/eclipse/mosquitto/issues/693
8 years ago
Roger A. Light 3066f89a24 packet__read_string() returns the string length. 8 years ago
Roger A. Light ff55499725 Fix persistence reloading. 8 years ago
Roger A. Light 027c5d7f6e Don't remove invalid socket from epoll fd. 8 years ago
Roger A. Light 2283585e39 Remove build timestamp information for reproducible builds. 8 years ago
Pierre Fersing 59380cef2d Fix CONNACK not send over WebSocket for bad auth
When client over WebSockets fail to authenticate, the CONNACK packet was
not sent because the connection was closed too early. Closes #18.

Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
8 years ago
Roger A. Light b4c72e8fc0 Fix HUP disconnecting clients incorrectly.
Bug: https://github.com/eclipse/mosquitto/issues/657
8 years ago
Roger A. Light 9c6a5f3cf0 [656] Fix building on Windows.
Thanks to Arun Kirthi Cherian.

Bug: https://github.com/eclipse/mosquitto/issues/656
8 years ago
Tatsuzo Osawa 024fd400d4 Fix Unsubscribe with No Topic
Signed-off-by: Tatsuzo Osawa <tatsuzo.osawa@gmail.com>
8 years ago
Pierre Fersing 7775924bae [534]Fix upgrade_outgoing_qos for retained message 8 years ago
Pierre Fersing 7df5c40004 Fix $SYS counters when message is sent over WS
Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
8 years ago
Roger A. Light 7f82cdc753 [652] Don't limit config file lines to 1024 chars.
Bug: https://github.com/eclipse/mosquitto/issues/652
8 years ago
Michael Heimpold 48dec391f7 Quote ${DESTDIR} usage in various Makefiles
This prevents failures during make install when whitespace
is part of DESTDIR pathname.

Signed-off-by: Michael Heimpold <michael.heimpold@i2se.com>
8 years ago
Roger A. Light d3239920d7 Validate UTF-8 client ids, usernames and topics. 8 years ago
Roger A. Light 0745bcdb91 Improve some struct ordering. 8 years ago
Roger A. Light 8795f063d4 Add ability to deny access to SUBSCRIBE messages.
This is as well as the current read/write accesses. Currently for auth
plugins only.
8 years ago
Roger A. Light 7096d57c3a Documentation fix. 8 years ago
Roger A. Light 36e86355d7 Improve documentation and formatting. 8 years ago
toast-uz df9ad5f0bd Add Epoll. (#495)
Signed-off-by: Tatsuzo Osawa <tatsuzo.osawa@gmail.com>
8 years ago
Roger A. Light 7943072b1f Fix use_identity_as_username not working on websockets clients.
Thanks to achest.
8 years ago
Roger A. Light 53c71b2a77 Fix memory leak related to use_identity_as_username. 8 years ago
Roger A. Light c26b852c53 Don't double free when using remote_clientid/username/password. 8 years ago
Roger A. Light ac6997d7bc Fix merge error. 8 years ago
Roger A. Light 5a267368d7 Merge branch 'master' into develop 8 years ago
Roger A. Light ba0122f9a9 Don't disable IPv6 support for websockets. 8 years ago
Roger A. Light d8cc5bc4fe Merge branch 'fixes' of github.com:eclipse/mosquitto into fixes 8 years ago
Roger A. Light 0ba0bc434e Use constant time memcmp for password checks. 8 years ago
Fredrik Fornwall 366194cde4 Replace getdtablesize() with sysconf(_SC_OPEN_MAX)
From http://man7.org/linux/man-pages/man3/getdtablesize.3.html:

"It is not specified in POSIX.1; portable applications should employ
sysconf(_SC_OPEN_MAX) instead of this call."

Specifically this fixes a build failure on Android which does not
have getdtablesize().

Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
8 years ago
Roger A. Light e74203de2c Merge branch 'master' into develop 8 years ago
Roger A. Light 2a50b2e9bd Fix regression from 1.4.13 where persistence data was not being saved. 8 years ago
Roger A. Light 8de5ed4464 Remove "error in poll" messages. 8 years ago
Roger A. Light cd17ca45cd [462] Relax CVE-2017-7650 checks.
Checks for '/' are no longer made, this character is a much lower risk
and is widely used in usernames.

Bug: https://github.com/eclipse/mosquitto/issues/462
8 years ago
Roger A. Light c3823c0a81 [462] Add auth_plugin_deny_special_chars option.
Auth plugins can be configured to disable the check for +# in
usernames/client ids with the auth_plugin_deny_special_chars option.

Thanks to wiebeytec.

Bug: https://github.com/eclipse/mosquitto/issues/462
8 years ago
Roger A. Light 5246a76f87 [477] Send will messages for connected clients when broker stops.
Thanks to mikeS7.

Bug: https://github.com/eclipse/mosquitto/issues/477
8 years ago
Roger A. Light 96db6d6644 Fix CONNECT check for reserved=0, as per MQTT v3.1.1 check MQTT-3.1.2-3. 8 years ago
Roger A. Light 6e7d02ba16 Fix for CVE-2017-9868 for Windows. 8 years ago
Pierre Fersing 408972ddc1 Fix two issues with Websocket (#472)
* Websocket were always marked as "want_write" (even if they only
  want to read, or worse want nothing).
* Websocket FD was read twice in some case (when socket recv queue was
  larger that size read by libwebsocket)

Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
8 years ago
Roger A. Light 09cb1b61c8 [468] Set persistence file to only be readable by owner.
Not implemented on Windows.

Thanks to Moshe Zioni.

Bug: https://github.com/eclipse/mosquitto/issues/468
8 years ago
Roger A. Light ab45f86d74 Prevent out of bounds array access. 8 years ago
Roger A. Light c78678607d [427] Fix large retained messages over websockets.
Thanks to Brian Block.

Bug: https://github.com/eclipse/mosquitto/issues/427
8 years ago
Roger A. Light bb61cd2dee Fix merge error. 8 years ago
Roger A. Light 8f59d5ad28 Remove unused vars and reset pollfd_index on disconnect. 8 years ago
Roger A. Light c07ba2a3da Experimental fix for poor websockets performance. 8 years ago
Jan Lukavsky 621f18d696 #419 Broker sometimes kills connection to client
Signed-off-by: Jan Lukavsky <je.ik@seznam.cz>
8 years ago
Roger A. Light b61fefcf08 Merge branch 'master' into develop 8 years ago
Roger A. Light 9af3c6958f Fix for CVE-2017-7650. 8 years ago
Roger A. Light ca8a507607 [446] Don't segfault on duplicate bridge names.
Thanks to Tifaifai Maupiti.

Bug: https://github.com/eclipse/mosquitto/issues/446
9 years ago
Riccardo Magliocchetti 059ba5f00b Fix use of unitialized memory in gets_quiet
Spotted by cppcheck

Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
9 years ago
YuLun Shih 97572610c0 Fix bridge->restart_t won't be reset
Signed-off-by: YuLun Shih <shih@yulun.me>
9 years ago
Roger A. Light a93a0c9bb1 [424]
Fix mosquitto.db from becoming corrupted due to client messages being
persisted with no stored message.

Thanks to codami.

Bug: https://github.com/eclipse/mosquitto/issues/424
9 years ago
Roger A. Light 91b308a11d Merge branch 'master' into develop 9 years ago
Jiří Pinkava 1ed39b9aac Add (missing) plugin.c into build
Signed-off-by: Jiří Pinkava <j-pi@seznam.cz>
9 years ago
Roger A. Light 1a0240b5d5 [379] Improve mosquitto_passwd error messages.
Thanks to Jaimyn Mayer. Closes #379.

Bug: https://github.com/eclipse/mosquitto/issues/379
9 years ago
Roger A. Light b55e7035ff [344] Fix non-async case. 9 years ago
Roger A. Light 433ee5c4d6 [344] Don't compile in async dns support by default for makefiles. 9 years ago
Roger A. Light 8406c08124 [344] Detect libanl in cmake. 9 years ago
Roger A. Light 6f45ab9624 [344] Only do async dns on glibc. 9 years ago
Roger A. Light e0e8cc9f3e [344] Fix leaks and incorrect connect call. 9 years ago
Roger A. Light e13af18ed9 Start of fix for [344]. 9 years ago
Fredrik Fornwall 54a467d782 Include <syslog.h> instead of <sys/syslog.h>
Using the standard <syslog.h> header instead of <sys/syslog.h> makes it
consistent with other source files and fixes compilation on Android.

Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
9 years ago
Fredrik Fornwall 35cc1eb21e Check for rt and pthread libraries before linking
This fixes building on Android which does not have separate librt
or libpthread libraries.

Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
9 years ago
Roger A. Light 2c92d3b837 More file closing fixes. 9 years ago
Roger A. Light e7c1507f88 Fix error message when websockets http_dir directory does not exist. 9 years ago
Roger A. Light b01e32bd8b [354] Close http files even on bad clients.
Thanks to jbwdevries.

Bug: https://github.com/eclipse/mosquitto/issues/354
9 years ago
Roger A. Light 7279e48191 [316] Don't error on zero length persistence files.
Closes #316.

Bug: https://github.com/eclipse/mosquitto/issues/316
9 years ago
Roger A. Light ed80a9a526 [295] Usage should say we support 3.1.1 as well as 3.1.
Closes #295.

Bug: https://github.com/eclipse/mosquitto/issues/295
9 years ago
tucic 9f743d5972 Maximum connections for websockets listener (#271)
Check current number of connections before accepting new websockets clients.

Signed-off-by: tucic <tucic.milan@gmail.com>
9 years ago
Roger A. Light 6b68371dbe [259] Fix crash when "lazy" type bridge attempts to reconnect.
Thanks to hakofugu41.

Bug: https://github.com/eclipse/mosquitto/issues/259
9 years ago
Karl Palsson 20197e2496 websockets: fix compatibility with older lws versions (#260)
In 1.3, 1.4 and 1.5, the function was "libwebsockets_get_protocol" not
"libwebsocket_get_protocol"  While the #define name doesn't matter on
newer libwebsockets, where it redirects to lws_get_protocol, the naming
is critical for older versions.

Fixes: 477cd3e399 (Fix missing context->listener for websocket client)

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Roger A. Light f72d9b3a34 [17] Sort include_dir files before loading them.
Bug: https://github.com/eclipse/mosquitto/issues/17
9 years ago
Roger A. Light ebad302119 [379] Improve mosquitto_passwd error messages.
Thanks to Jaimyn Mayer. Closes #379.

Bug: https://github.com/eclipse/mosquitto/issues/379
9 years ago
Roger A. Light 565c9c3432 [344] Fix non-async case. 9 years ago
Roger A. Light f0485d1398 [344] Don't compile in async dns support by default for makefiles. 9 years ago
Roger A. Light fb824e7f1e [344] Detect libanl in cmake. 9 years ago
Roger A. Light 3d40ffe18b [344] Only do async dns on glibc. 9 years ago
Roger A. Light f464970fcf [344] Fix leaks and incorrect connect call. 9 years ago
Roger A. Light ef7a230365 Start of fix for [344]. 9 years ago
Fredrik Fornwall 23b0891048 Include <syslog.h> instead of <sys/syslog.h>
Using the standard <syslog.h> header instead of <sys/syslog.h> makes it
consistent with other source files and fixes compilation on Android.

Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
9 years ago
Fredrik Fornwall 532273250c Check for rt and pthread libraries before linking
This fixes building on Android which does not have separate librt
or libpthread libraries.

Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
9 years ago
Roger A. Light 9b05b12039 More file closing fixes. 9 years ago
Roger A. Light a2a2099fa1 Fix error message when websockets http_dir directory does not exist. 9 years ago
Roger A. Light 8171a975ae [354] Close http files even on bad clients.
Thanks to jbwdevries.

Bug: https://github.com/eclipse/mosquitto/issues/354
9 years ago
Roger A. Light 7f66bf1f65 [316] Don't error on zero length persistence files.
Closes #316.

Bug: https://github.com/eclipse/mosquitto/issues/316
9 years ago
Ben Hardill 740b710a0b Add support for local only bridge notifications (#328)
This update adds an option to only publishes bridge
notification messages to the local side of the bridge.

It adds a config file option called notifications_local_only
that accepts a boolean value, defaults to false to be
consistent with existing behaviour.

Fixes #233

Signed-off-by: Ben Hardill <hardillb@uk.ibm.com>
9 years ago
Roger A. Light 1abd089afb [295] Usage should say we support 3.1.1 as well as 3.1.
Closes #295.

Bug: https://github.com/eclipse/mosquitto/issues/295
9 years ago
tucic f272e2e047 Maximum connections for websockets listener (#271)
Check current number of connections before accepting new websockets clients.

Signed-off-by: tucic <tucic.milan@gmail.com>
9 years ago
Roger A. Light 762126064c [259] Fix crash when "lazy" type bridge attempts to reconnect.
Thanks to hakofugu41.

Bug: https://github.com/eclipse/mosquitto/issues/259
9 years ago
Roger A. Light 7ace6c9e7e Merge branch 'master' into fixes 9 years ago
Roger A. Light a71bee494f HASH_DELETE needs to modify subhier. 9 years ago
Roger A. Light 9ddec11f89 Fix Coverity issue 1362805. 9 years ago
Karl Palsson 374c62586e db_dump: use objects to simplify printing (#215)
Prepratory work for providing more filtering of the output dump.
This makes _no_ difference to the current behaviour, but makes it much
simpler for people who "need", for whatever reason, to hack some private
changes into the db_dump tool.

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Karl Palsson 2dec0ed895 broker: fix queue_qos0_messages behaviour
Prior, offline qos0 clients had an unlimited queue depth when
queue_qos0_messages was true.

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Karl Palsson c6aac741c2 broker: support byte based queueing
Limiting queued message depth purely based on message count is hard to
control for memory constrained devices.  The size of messages can vary
wildly, from a few bytes, to a few kilobytes.  Support a new
max_queued_bytes option, and drop packets when the first limit is
reached.  Option defaults to 0 (disabled) by default.
Support also a max_inflight_bytes variable, with similar behaviour.

Fixes (partof) https://github.com/eclipse/mosquitto/issues/100

This pulls up some helper routines for calculating whether to allow
inflight or queuing, resolving some inconsistences in connection
resumption.

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Karl Palsson 03d4b8c270 websockets: fix compatibility with older lws versions (#260)
In 1.3, 1.4 and 1.5, the function was "libwebsockets_get_protocol" not
"libwebsocket_get_protocol"  While the #define name doesn't matter on
newer libwebsockets, where it redirects to lws_get_protocol, the naming
is critical for older versions.

Fixes: 477cd3e399 (Fix missing context->listener for websocket client)

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Karl Palsson 8268e6da08 database: drop unnecessary local variable
No need to maintain count and context->msg_count separately.

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Karl Palsson 8a48fd13f1 broker: publish initial load averages
This publishes initial 0 figures for all load averages, as is done for
all the existing counter values in the SYS tree.  This makes the
behaviour of certain variables use for diagnostics (stored count for
instance) more predictable, instead of changing due to the creation of
load topics as soon as the load became non-zero.

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Karl Palsson 30c96f4a1c broker: track stored messages in bytes as well as count
Instead of simply tracking the count of stored messages, keep track of
the total byte size of stored messages.  While only informational at
this point, it provides the basis for byte based limits in the future.

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Karl Palsson 641158aed9 config: garbage line number if file not found
If the file is not found, showing 0 rather than a garbage number is
mildly better.

Signed-off-by: Karl Palsson <karlp@etactica.com>
9 years ago
Roger A. Light ee1fd1718b Merge branch 'fixes' 9 years ago
kcallin 7ba3f3d33b [189] Mosquitto database corrupted on power-loss. (#206)
Mosquitto database writes are not atomic and if power is lost during
a write the file will be permanently lost.  This commit makes writes as
atomic as possible.

Signed-off-by: Keegan Callin <kc@kcallin.net>
Bug: https://github.com/eclipse/mosquitto/issues/189
9 years ago
Roger A. Light ba2de88790 Display error if broker unable to open the log file.
Thanks to Matthew Treinish.

Bug: https://github.com/eclipse/mosquitto/issues/234
9 years ago
Pierre Fersing 477cd3e399 Fix missing context->listener for websocket client (#239)
The context associated with websocket client didn't had listener
filled, which caused use_username_as_clientid to be ignored.

Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
9 years ago
Roger A. Light 00aa181749 [244] Add note on compiling auth plugin on OSX.
Closes #244.

Bug: https://github.com/eclipse/mosquitto/issues/244
9 years ago
Roger A. Light b1c4171cdc Merge branch 'develop' of github.com:eclipse/mosquitto into develop 9 years ago
Roger A. Light bcfa29cbd1 [222] Fix will retained flag handling on Windows.
Thanks to codami.

Bug: https://github.com/eclipse/mosquitto/issues/222
9 years ago
Roger A. Light 883af8af53 Better subtree searching. 9 years ago
tucic 50b26347d4 Writing least significant byte of subscription QoS (#210)
Signed-off-by: Milan Tucic <tucic.milan@gmail.com>
9 years ago
Roger A. Light 0b5d524723 Update defer plugin function signatures. 9 years ago
Roger A. Light e4db6a760f Backwards compatibility for auth plugins. 9 years ago
Roger A. Light b40cedaf1d More client accessors. 9 years ago
Roger A. Light 025e56fd4c New mosquitto_auth_psk_key_get() 9 years ago