Commit Graph

194 Commits (0e562d09df2aafe2b61dc0b56dc4ac644f6e92c9)

Author SHA1 Message Date
Roger A. Light fd68bf00c7 Merge branch 'master' into develop 3 years ago
Roger A. Light ba13edc6a4 dynsec: Forbid deleting the anon group. 3 years ago
Roger A. Light 9d9469cbec Merge branch 'fixes' 3 years ago
Roger A. Light 4d1b587e29 dynsec: Forbid deleting the anon group. 3 years ago
Roger A. Light df317ff71f Dynamic security: Fix the plugin being able to be loaded twice.
Currently only a single plugin can interact with a unique $CONTROL
topic. Using multiple instances of the plugin would produce duplicate
entries in the config file.

Closes #2601.
Closes #2470.
3 years ago
Roger A. Light 436f0b9348 dynsec: Fix modifyClient and modifyGroup commands
They will now not modify the client/group if a new group/client being
added is not valid, or on other failures.

Closes #2598. Thanks to Sebastian Szczepański.
3 years ago
Roger A. Light b22df5140e Clear errno before check. 3 years ago
Roger A. Light 80c7726d5c Fix confusing error message when dynamic security config file was a directory.
Closes #2520. Thanks to sezanzeb
3 years ago
Roger A. Light a2f91babdf Fix incorrect format specifier 3 years ago
Kai Buschulte 8b67883548 Remove old compatibility header support
Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>
3 years ago
Roger A. Light 7794001ce2 Don't free arrays. 3 years ago
Roger A. Light 832e51cb57 dynsec: reduce memory allocations 3 years ago
Roger A. Light e5d6bbb907 dynsec: don't leave in partial state on error 3 years ago
Roger A. Light dd34b707ac Fix Coverity Scan 1490914. 3 years ago
Roger A. Light c397d080b4 Merge branch 'fix-corrupted-dynsec-config' of https://github.com/NorbertHeusser/mosquitto into NorbertHeusser-fix-corrupted-dynsec-config 3 years ago
Roger A. Light ca61baf5e3 Merge branch 'add-common-options-target-to-enable-compiler-warnings' of https://github.com/buschulte/mosquitto into buschulte-add-common-options-target-to-enable-compiler-warnings 3 years ago
Roger A. Light 11b16756cb Windows fixes. 3 years ago
Norbert Heusser 621d74fd6a Created new helper function mosquitto_write_file in common/misc_mosq.h to consolidate
saving config files in failsafe manner

Signed-off-by: Norbert Heusser <norbert.heusser@cedalo.com>
3 years ago
Kai Buschulte 71456077ad Introduce a common-options cmake target
this makes it possible to explicitly share compile options, without
using the `add_definition` function. This function declares options for
the current directory and below (in our case also for `deps`).

Adding -Wall, -Wconversion and -Wextra to at least make compiler
warnings visible for the cmake build.

Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>
3 years ago
Kai Buschulte 8b5a86fd52 Introduce config-header cmake target
This is an interface cmake target which specifies include directories
required by the config.h places in the root of the project.

This header is a "public" header visible to plugins linking the
mosquitto exports.

Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>
3 years ago
Roger A. Light 34391080d6 Add dynsec init by simple file. 3 years ago
Roger A. Light 546df9db85 Build fixes, particularly pedantic compiler warnings. 3 years ago
Roger A. Light 2c8dc3968e Migrate persist-sqlite to use persistence_location. 3 years ago
Roger A. Light 4ac8c0bcc3 Add deny-protocol-version example plugin, for 2.0 only. 3 years ago
Roger A. Light 51f9a76f03 Merge branch 'macos-cmake-build' of https://github.com/buschulte/mosquitto into buschulte-macos-cmake-build 3 years ago
Kai Buschulte 7e4746aac4 Fix missing symbols MacOS
Core symbols needed by plugins are now properly linked to their objects

 * Remove link_directories() call:

This specification is not necessary for our own libraries as cmake
shares this information over the targets.

If needed they should be specified target specific, like done for
the external DLT library.

Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>
3 years ago
Kai Buschulte 0e9df05d0d Add imported target for cJSON
Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>
3 years ago
Kai Buschulte 15208e55cc Use preinstalled CMake find module for SQLite3
CMake >= 3.14 comes with a preinstalled FindSQLite3 module, which now
replaces the self-written one.

Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>
3 years ago
Roger A. Light ab1803d72f Fix casting. 3 years ago
Abilio Marques 82b6eaa31d Persist-sqlite: add flush_period and page_size options
Signed-off-by: Abilio Marques <abiliojr@gmail.com>
3 years ago
Norbert Heusser d4216c8cb6 Fixed CMakeLists.txt
* Addded missing files plugin_subscribe and plugin_unsubscribe to src/CMakeLists.txt
* Aligned mixed usage of all-keyword and all-plain in target_link_libra…ry definition in in CMakeLists.txt

Signed-off-by: Norbert Heusser <norbert.heusser@cedalo.com>
4 years ago
Roger A. Light 40d8015837 Add MOSQ_EVT_SUBSCRIBE and MOSQ_EVT_UNSUBSCRIBE events.
These are called when subscribe/unsubscribes actually succeed.
4 years ago
Roger A. Light af42640d60 Dynsec: Allow initial password generation from environment variable. 4 years ago
Roger A. Light 5ab7603811 Fix Coverity Scan 1486934 Unchecked return value 4 years ago
Roger A. Light 27b4a6aa33 Fix Coverity Scan 1487012 Resource leak 4 years ago
Roger A. Light b3096982b5 Fix Coverity Scan 1486953 Use after free 4 years ago
Roger A. Light 07b7533b1e Fix Coverity Scan 1486947 Double free 4 years ago
Roger A. Light c661f475b4 Coverity Scan fixes - Invalid type in argument to printf format specifier
1453805
1453806
1486939
1486954
1486955
1486956
1486960
4 years ago
Roger A. Light 7939633114 Optimise persist client msg clearing. 4 years ago
Roger A. Light bf1d39746a dynsec: admin should have sys-observe role 4 years ago
Roger A. Light 0a4a029fbf Persist plugin: Simplify cases where we don't take a copy.
Some members of the persist plugin interface are only used to find a
client struct, for example. There is no need for the plugin to allocate
a new copy and the broker to free it in that case.
4 years ago
Roger A. Light 3122d3e2c5 Simplify some dynsec config functions. 4 years ago
Roger A. Light 5279a424b1 Dynsec: Kick clients in tick event rather than immediately
This means that PUBACK/PUBREC should be sent to clients that modify
their own roles.

Closes #2474. Thanks to Stefano Berlato.
4 years ago
Roger A. Light 0deaae286e NULL after freeing. 4 years ago
Roger A. Light 051fbadb99 Move some CONTROL code to plugin common. 4 years ago
Roger A. Light cbb01193a0 Rename persist retain_add to retain_set 4 years ago
Roger A. Light 8d94fdc688 Minor housekeeping. 4 years ago
Roger A. Light 2d3b152a22 Rename of mosquitto_msg_store struct.
struct mosquitto_msg_store -> struct mosquitto_base_msg

This is the base message which client messages and retained messages
refer to. The base messages are still held in the message store.

This change comes about because the persistence interface exposes these
message types. Prior to this commit the different messages were "msg",
"client_msg", and "retain". After this commit there is "base_msg",
"client_msg", and and "retain_msg" in the persist interface.
4 years ago
Roger A. Light d2f598b6f6 persist-sqlite: commit transactions once every 5 seconds 4 years ago
Roger A. Light 68c002bc55 Plugin event counter example plugin. 4 years ago