Commit Graph

388 Commits

Author SHA1 Message Date
Zaiming Shi dee375d4db chore(config): delete unused template in emqx.conf
the bbmustache template additional_configs is no longer used
2021-03-23 21:30:49 +01:00
ayodele.akingbule 1086c09242 docs(config): CSWSH(Cross-Site Web-Socket Hijack) Documentation 2021-03-23 19:49:07 +08:00
zhanghongtong 2232bca150 chore(config): update enum for config item
The tcp listener's peer_cert_as_clientid and peer_cert_as_username can only be set to cn
2021-03-17 16:30:34 +08:00
zhanghongtong 237603cee6 revert: fix(config): delete peer_cert_as_username and peer_cert_as_clientid in tcp listener
This reverts commit: 4bf0ad1baf
2021-03-17 16:30:34 +08:00
Turtle 08366c2735 fix(conf): fix split modules conf error 2021-03-17 14:47:18 +08:00
zhanghongtong 4bf0ad1baf fix(config): delete peer_cert_as_username and peer_cert_as_clientid in tcp listener 2021-03-16 19:32:17 +08:00
zhouzb ef1be26bc8 fix(subprotocol): fix bad configuration item name for subprotocol 2021-03-16 13:51:27 +08:00
Zaiming Shi 0eda65d06f chore(config): emqx.conf segmentation
This is to facilitate enterprise edition release script
to slice up the files into smaller config files
2021-03-10 17:39:45 +01:00
zhouzb b8d2e3357d chore(configuration): fix the configuration example in the comment 2021-03-10 08:47:40 +01:00
Zaiming Shi 6b2949e2c1 chore(config): Change default log_to config
By default log to file.
When start from console or forgreground, only log to console.
Only log to file for package builds.
2021-03-02 14:05:04 +01:00
Shawn cc373df49a fix(etc): remove .d suffix from dir names 2021-03-02 16:47:22 +08:00
Benjamin Große 28f9b4d519 feat(peer_cert_as_clientid): peer_cert_as_clientid = cn | dn | crt | pem | md5
pem is base64 encoded instead of binary crt

peer_cert_as_username=crt breaks exhook proto utf8 parsing of username

crt cannot be used in a topic name due to being invalid utf8
pem cannot be used in a topic name due to having slashes

peer_cert_as_clientid = md5 allows to e.g. subscribe to "t/%c" with ACL

existing peer_cert_as_username combinations are unaffected.
2021-02-19 10:53:11 +08:00
Zaiming Shi 507759b9f1 Revert "refactor(emqx_modules): Move modules config to app dir"
This reverts commit 9cae8784c0.
Because the reverted change broke compatibility with 4.2.x
configuration.
2021-02-11 16:44:12 +01:00
Zaiming Shi 514c2c0af5
Merge pull request #4169 from zmstone/refactor-move-modules-config-to-emqx-modules-app
refactor(emqx_modules): Move modules config to app dir
2021-02-10 09:03:04 +01:00
Zaiming Shi 9cae8784c0 refactor(emqx_modules): Move modules config to app dir 2021-02-10 00:02:52 +01:00
Zaiming Shi f000b6583c fix(tls): Ensure tls config integrity
For default tsl version and ciphers, we try to use otp release number
to determin if we want to use tlsv1.3

For default configs, we try to porivde both tlsv1.3 and
ciphers in config (even for commented out configs)
2021-02-09 22:56:28 +01:00
Zaiming Shi f879e8e09b
Merge pull request #4159 from jovdipp/all-versions-ciphers-update-wss
fix(wss-ciphers): cross version ciphers for 1.3,1.2,1.1
2021-02-08 20:41:58 +01:00
Jóvan S. Dippenaar 6decc188e0 fix(wss-ciphers): cross version ciphers for 1.3,1.2,1.1 2021-02-08 20:29:17 +13:00
Zaiming Shi 2dce719bc7 chore(etc): Delete etc/emqx.d
The files are duplicated in etc/
2021-02-06 21:25:16 +01:00
Zaiming Shi 7c94a02bdd
Merge pull request #4134 from jovdipp/tlsv1.3-as-default
Tlsv1.3 as default
2021-02-05 21:33:03 +01:00
Jóvan S. Dippenaar 5e15e3add8 fix(default-config-tls-ciphers): TLS1.3 exclusive ciphers prepended to TLS1.1+TLS1.2 ciphers 2021-02-05 16:21:28 +13:00
Jóvan Dippenaar c3c28f4b72 feat(tls.13): tls1.3 ciphers set in .conf's 2021-01-31 18:38:34 +13:00
Jóvan Dippenaar 94e8a69a48 docs(typos): vefify -> verify 2021-01-31 17:27:08 +13:00
tigercl 5878950dc3
feat(websocket): support for checking subprotocols (#4099) 2021-01-28 20:42:57 +08:00
Zaiming Shi 0087303b25 feat(shared_sub): Support hashing from source topic. 2021-01-21 21:05:56 +01:00
ayodele.akingbule 5794a708ed feat(emqx_ws_connection): Prevent EMQX from CSWSH Cross-Site Web-Socket Hijack 2021-01-15 14:28:22 +01:00
Zaiming Shi 0336cca600 Merge remote-tracking branch 'origin/master' into dev/v4.3.0 2020-12-16 11:22:58 +01:00
Zaiming Shi 4fbc64d84e chore(release): Add OTP_VERSION file to release dir 2020-12-14 10:58:44 +01:00
JianBo He 17e0409c09 feat(ssl): supports configuration of keyfile password 2020-12-14 11:24:07 +08:00
Zaiming Shi f6f6fe47da chore(build): Remove plugin config collection
Plugin configs are to be added manually
2020-12-12 11:59:26 +01:00
JianBo He 19e8a187e4 feat(ssl): supports configuration of keyfile password 2020-12-11 17:33:53 +08:00
zhanghongtong ca86e795e8 feat(listener): add depth for ssl listener 2020-12-11 17:33:53 +08:00
JianBo He 7f556d36d1
Merge branch 'dev/v4.3.0' into e422_to_v430 2020-12-09 11:28:36 +08:00
Shawn d00ea48752 feature(tcp): alarm when tcp connection congested 2020-12-07 14:35:38 +08:00
zhanghongtong ef19e8a08b feat(listener): add depth for ssl listener 2020-12-05 17:01:24 +08:00
Zaiming Shi 73d02beace refactor(apps): Merge emqx_libs back to emqx
And move emqx app back to root level

After realising the challenges of developing plugins in standalone
rebar projects. it is perhaps more smooth to keep using emqx as
a rebar dependency
2020-12-04 19:58:58 +01:00
Zaiming Shi 9382bed9f5 refactor(proj): Move etc and data dir to apps/emqx/ 2020-12-03 12:53:02 +01:00
terry-xiaoyu 20b66e03a1 feature(project): add etc/emqx.d 2020-10-31 12:18:38 +08:00
terry-xiaoyu 151d820058 feature(project): change to rebar3 umbrella project 2020-10-31 11:07:25 +08:00
JianBo He 485bffadd6 refactor(exhook): improve the exhook implementation 2020-10-31 10:24:28 +08:00
JianBo He d1a87d38ba refactor(exproto): improve the exproto implementation 2020-10-31 10:21:53 +08:00
terry-xiaoyu 7b98f62f7a fix(config): enable force_shutdown_policy by default 2020-09-30 11:36:30 +08:00
turtled 048e510dde fix(force-shutdown-policy): default to enable force_shutdown_policy 2020-09-30 08:35:24 +08:00
JianBo He 76ec65830c fix: fix session_locking_strategy enum typos 2020-09-29 15:35:16 +08:00
JianBo He f6b35d63f2 improve: rename quota option name 2020-09-05 17:23:22 +08:00
terry-xiaoyu 2b603bfd11 feature(gen_rpc): support a stateless port discovery 2020-08-28 17:10:26 +08:00
zhouzb b2c0728cd7 fix(conf): add additional_configs line 2020-08-28 17:10:26 +08:00
zhouzb ec12acc4ef feature(mqtt piggyback): transporting mutli MQTT packets at once or single 2020-08-22 15:27:11 +08:00
Rory Z f47e10e08a feature(emqx_mod_rewrite): separate rewrite rules for pub and sub (#3676) 2020-08-22 15:27:11 +08:00
zhouzb dbeabf3de0 refactor(telemetry): remove telemetry code from emqx core 2020-08-22 15:27:11 +08:00
tigercl e37a70509b feature(telemetry): support for collecting telemetry data and disable it by default (#3653) 2020-08-14 16:58:08 +08:00
JianBo He 98faa698f3 feature(quota): add quota confs to limit the number of message forwards 2020-08-14 16:58:08 +08:00
zhouzb 1ba4743213 refactor(alarm): new data structure and support regular cleaning of deactivated alarms 2020-07-31 18:07:20 +08:00
JianBo He 83a2af812f feat(ratelimit): refactor ratelimit 2020-07-31 18:07:20 +08:00
tigercl 1b6a586948
feature(mqtt): support response information (#3533) 2020-06-20 15:07:37 +08:00
JianBo He a05c411566 fix(confs): delete `X-Forwarded-*` options for wss listener 2020-06-06 13:54:27 +08:00
terry-xiaoyu ac82ad12e3 Add log overload protection parameters 2020-05-28 21:18:32 +08:00
tigercl 7a0ad0f8af
Update certs (#3447)
* Update certs

* Update certs

* Fix test cases fail

Co-authored-by: turtleDeng <deng@emqx.io>
2020-05-12 10:37:26 +08:00
turtleDeng d49f4118fe
Mgmt emqx modules (#3376) 2020-04-10 19:55:21 +08:00
JianBo He 1790cde942 Get client's addr/port from proxy header if enable proxy_protocol 2020-04-10 19:40:10 +08:00
tigercl 55a8b1b173
Support topic metrics (#3341)
Support topic metrics
2020-03-27 13:33:10 +08:00
tigercl 5eadca1782
Merge pull request #3335 from emqx/reload_plugin
Read new configuration items when plugins is loaded
2020-03-26 18:35:49 +08:00
JianBo He 9e6966110d
Move emqx_delay_publish here (#3323)
Move emqx_delay_publish here
2020-03-26 18:32:24 +08:00
张奇怪 2ab6ec418e
Add subscription option for proxy subscribing 2020-03-24 11:31:25 +08:00
zhouzb 3b537760d5 Read new configuration items when plugins is loaded 2020-03-23 15:23:38 +08:00
JianBo He cc25ec5835 Revert some lines 2020-03-05 15:54:57 +08:00
JianBo He 6b3446e2b0 Fix emqx.conf typo error 2020-03-05 15:54:57 +08:00
JianBo He 3f6f0eca40
Add an option to allow client bypass auth plugins 2020-02-21 09:42:26 +08:00
JianBo He 24e9765916 Fix typo 2020-02-17 13:45:37 +08:00
Feng Lee d532b5f2e3 Remove the unused 'hibernate_after' config 2020-02-04 15:14:52 +08:00
JianBo He cbaddc4120 Increase shutdown_time of vm.args 2020-01-17 18:01:08 +08:00
Shawn 4655ef94d2
Merge branch 'develop' into tune-node-config 2020-01-17 17:03:32 +08:00
terry-xiaoyu 36b3a443b7 Reduce default tcp client nums to schedulers/2 2020-01-17 17:00:55 +08:00
Feng Lee 050a3feab2 Tune the 'force_gc_policy' and 'force_shutdown_policy' parameters (#3201) 2020-01-17 16:59:36 +08:00
Feng Lee 46479ed608 Tune the default config for node 2020-01-17 16:18:11 +08:00
Feng Lee 4b8b5bfa2c
Tuning the Erlang VM for the broker and edge (#3197)
* Tuning the Erlang VM for the broker and edge

* Remove +stbt and use +sbt instead
2020-01-17 15:47:13 +08:00
Feng Lee 3ae3d8a40d Tune and optimize the Erlang VM (#3195) 2020-01-17 09:58:34 +08:00
Feng Lee a318532bb0 Tuning the 'force_gc_policy' of MQTT connections (#3192)
Tuning the 'force_gc_policy' of MQTT connections
2020-01-17 09:42:16 +08:00
Feng Lee a71486cac7 Tuning the number of threads in async thread pool (#3193) 2020-01-17 09:32:01 +08:00
Feng Lee 2b3003b323 Move the global GC server from 'emqx-recon' to 'emqx' project (#3190) 2020-01-16 23:45:17 +08:00
zhouzb 9a76164e65 Update emqx.conf 2020-01-15 20:16:58 +08:00
zhouzb 40ed0ce7ad Defaults to disable force_shutdown_policy 2020-01-15 20:16:58 +08:00
JianBo He 612abc23ab
Fix the memory of shutdown policy too_large (#3168) 2020-01-10 15:53:37 +08:00
JianBo He 0c3e863ac1
Enlarge performance args for internal zone (#3154) 2020-01-06 09:51:55 +08:00
tigercl 116c593178 Fix returned value of plugin reloading (#3126) 2019-12-20 16:34:07 +08:00
zhanghongtong 03681b6a3b Update config file version 2019-12-13 10:54:29 +00:00
turtled c7f1df0d0c Fix typo 2019-12-07 19:43:18 +08:00
Feng Lee bbcd2bffc5 Improve the session module (#3082)
Improve the session module
2019-12-07 15:54:02 +08:00
Feng Lee 9c3273a2c6 Improve the process of handling MQTT control packets (#3079) 2019-12-06 19:51:06 +08:00
turtleDeng a540958846 Add mqtt.strict_mode configuration (#3069)
Add mqtt.strict_mode configuration
2019-12-04 10:54:52 +08:00
zhouzb 62484ba84e Fix test cases and update certs 2019-11-18 16:08:51 +08:00
terry-xiaoyu dc7c39d479 Update pem certs 2019-11-15 12:05:00 +08:00
turtled e863263156 Fix typo 2019-11-08 15:11:26 +08:00
Feng Lee 4c9dda105f Add 'active_n' option for WebSocket listener 2019-11-01 08:00:11 +08:00
Feng Lee a0e72fd040 Breaking change of listener's rate_limit config 2019-10-18 18:52:57 +08:00
Feng Lee 8c1e452b6e Add 'hibernate_after' option for zone 2019-10-12 16:56:18 +08:00
Feng Lee 0a1679b122
Implement a new flapping module (#2884) 2019-09-10 15:21:08 +08:00
Feng Lee 919aa13221 Update the default acl conf 2019-08-28 15:58:23 +08:00
turtled 91a8dbda56 Fix conflicts 2019-08-09 16:41:11 +08:00
GilbertWong ddc25be915 Rename node.proto_dist to cluster.proto_dist 2019-08-09 15:56:33 +08:00