yuanbiao/emqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,376 Commits 393 Branches 669 Tags 74 MiB
0bd5cd9336
Commit Graph

2279 Commits

Author SHA1 Message Date
Shawn
2e52ab9712 fix(rules): improve some code for emqx_rule_engine 2021-10-14 15:09:37 +08:00
Shawn
dce57a3f92 fix(rules): add description to the config 'ignore_sys_message' 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2021-10-14 15:09:37 +08:00
Shawn
0e7a3f89a9 feat(rules): support output functions in <<"Mod:Func">> format 2021-10-14 15:09:37 +08:00
Shawn
9c7eef5295 feat(rules): update rule_engine configs from APIs 2021-10-14 15:09:37 +08:00
Shawn
c3effca553 fix(rules): load rules from config file failed 2021-10-14 15:09:37 +08:00
Shawn
467805855d fix(rules): load rules from config file failed 2021-10-14 15:09:37 +08:00
Shawn
c6c314de1a fix(hocon): update hocon to 0.19.6 2021-10-14 15:09:37 +08:00
Shawn
1ffae5d1b0 refactor(rule_engine): merge code for emqx_rule_registry and emqx_rule_engine 2021-10-14 15:09:37 +08:00
Shawn
b063b6f253 feat(rules): support configure rules in config file 2021-10-14 15:09:37 +08:00
zhongwencool
2de5e0157b
chore(doc): replace : by - in namespace (#5920) 2021-10-14 14:48:39 +08:00
lafirest
8a2c5e2422 feat(rate_limiter): implement hierarchical token buckets 2021-10-14 10:20:05 +08:00
William Yang
23fc8afc50 feat(olp): rename olp mgmt API 
on -> enable
off -> disable
 2021-10-13 10:18:57 +02:00
zhongwencool
d80f20aca3
feat(swagger): define mgmt config_api by hocon schema (#5814) 
* feat(swagger): define mgmt config_api by hocon schema

* fix: enum can't defined by integer, use union.

* fix: hocon schema union to enum
 2021-10-13 14:04:43 +08:00
tigercl
3df33da9ac
Merge pull request #5919 from tigercl/fix/scram-users 
fix(authn): fix bad user_id for scram
 2021-10-13 13:56:29 +08:00
zhouzb
ab060198a6 fix(authn): fix bad user_id for scram 2021-10-13 11:35:51 +08:00
DDDHuang
2d4d372952 chore(test): add auto sub suite 2021-10-13 10:59:42 +08:00
William Yang
58033c083d chore(olp): update alarm text 2021-10-12 16:08:20 +02:00
zhanghongtong
674106ffa7 fix(authz api): fix error for update file type 2021-10-12 18:19:18 +08:00
zhanghongtong
084668bdd9 fix(authz): fix error in type determination when updating sources 2021-10-12 17:37:37 +08:00
lafirest
3524942766 fix: change all ~s in io format to ~ts 
we should use unicode to replace latin1
 2021-10-12 15:09:24 +08:00
Zaiming (Stone) Shi
04f2487108
Merge pull request #5908 from zmstone/refactor-emqx-more-slog 
refactor(emqx): fix remaining legacy logging
 2021-10-12 06:45:25 +02:00
JimMoen
19456d84a5 style: code format fix 2021-10-12 10:37:45 +08:00
zhanghongtong
585c4892ce fix(authz api): fix error for read cert file 2021-10-12 09:44:52 +08:00
DDDHuang
c90342da4a fix: topic metrics deny wildcard 2021-10-12 09:39:14 +08:00
William Yang
b0c27c74fd feat(olp): bump lc to 0.1.1 2021-10-12 00:00:20 +02:00
Zaiming Shi
eb43423552 refactor(emqx): fix remaining legacy logging 2021-10-11 21:51:39 +02:00
Zaiming (Stone) Shi
40963221f8
Merge pull request #5898 from zmstone/refactor-slog 
Refactor slog
 2021-10-11 16:15:44 +02:00
Zaiming Shi
7e9d7c4858 test(proper): move emqx_ct_proper_types to local repo 
previously provided by emqx-ct-helpers
 2021-10-11 15:28:12 +02:00
JimMoen
321d941eaf fix(mgmt_api): rows too big fixing. 2021-10-11 21:11:34 +08:00
JimMoen
3960204ce3 refactor(mgmt_api): select_table_with_count. 2021-10-11 21:11:34 +08:00
JimMoen
ea7aa5bc41 refactor(mgmt_api): use select_table congruously. 2021-10-11 21:11:34 +08:00
JimMoen
b65c9908a1 refactor(mgmt_api): Clearer variable name. 2021-10-11 21:11:34 +08:00
JimMoen
77516d3854 refactor(mgmt_api): node_query. 2021-10-11 21:11:34 +08:00
JimMoen
e26804b9ac refactor(mgmt_api): cluster_query. 2021-10-11 21:11:34 +08:00
JimMoen
705ed0ce7b refactor(mgmt_api): Fuzzy filter using select_table. 2021-10-11 21:11:34 +08:00
JimMoen
5daef544a0 refactor(mgmt_api): select_table. 2021-10-11 21:11:34 +08:00
JimMoen
b4433f77c8 refactor(mgmt_api): Add page_start. 2021-10-11 21:11:34 +08:00
JimMoen
9657d7e628 refactor(mgmt_api): Use Continuation with ets selecting. 2021-10-11 21:11:34 +08:00
Spycsh
d4657754eb chore(dialyzer): fix spec for record field message.extra 2021-10-11 14:10:22 +02:00
zhanghongtong
5d1772a6b4 fix(authz api): fix error for move source when disable source 2021-10-11 14:07:10 +08:00
zhanghongtong
24b0fccba9 fix(authz): Fix no match error after deleting a source 2021-10-11 14:04:10 +08:00
zhanghongtong
7c28a3f6c1 fix(authz api): fix 404 error when no have "all" rules 2021-10-11 14:03:48 +08:00
Zaiming Shi
71731c01f1 refactor(emqx): refine SLOG messages 
unified logging for unexpected handle_cast handle_call and handle_info
 2021-10-11 07:41:52 +02:00
Zaiming Shi
785793b345 refactor: add logging allow or not check for SLOG 2021-10-11 07:41:52 +02:00
Zaiming Shi
5274e0a726 refactor(emqx): add 'extra' field to message record 2021-10-11 02:07:33 +02:00
Spycsh
fe5a169be1 chore: change to structured logging under apps/emqx/src 2021-10-09 14:02:22 +08:00
Shawn
63bf161522 fix(test): testcase t_validity_period failed occasionally 2021-10-09 09:17:09 +08:00
Zaiming (Stone) Shi
aa0c58daa0
Merge pull request #5881 from zmstone/fix-flaky-tests-cm-session-race-condition 
chore: fix flaky test cm_SUITE open session racecondition
 2021-10-07 17:28:10 +02:00
William Yang
8d8969672b feat(olp): add desc in schema 2021-10-07 16:03:54 +02:00
Zaiming Shi
a882a8c496 chore: fix flaky test cm_SUITE open session racecondition 2021-10-07 11:51:40 +02:00
Zaiming Shi
7ae4505636 test(emqx_broker): fix flaky tests 2021-10-07 11:31:22 +02:00
William Yang
77f8159ca1 docs(olp): emqx_olp module 2021-10-06 21:07:14 +02:00
William Yang
9ecb7821f9 feat(olp): use tagged deps libs 2021-10-06 10:38:39 +02:00
Zaiming Shi
ce486e5540 fix(ssl): verify ciphers list against all available ciphers 
Prior to this change the ciphers are only checked against
the list returned from from
`ssl:cipher_suites(all, 'tlsv1.2', openssl)`
which may cause some (weak) ciphers missing in certain
otp + openssl installation
 2021-10-05 15:25:56 +02:00
Zaiming Shi
b42a2f2bc2 fix(ssl): delete some weak cipher suites from the default list 2021-10-05 15:15:00 +02:00
William Yang
afb4b5dbd7 test(olp): add CT suite emqx_olp_SUITE 2021-10-05 14:37:39 +02:00
William Yang
bfe4346469 feat(olp): alarm without nodeid 2021-10-05 14:36:36 +02:00
William Yang
547484a2d1 chore(olp): add spec. 2021-10-05 09:47:21 +02:00
William Yang
6baf2dbd95 feat(olp): backoff new conn 2021-10-05 09:23:23 +02:00
William Yang
370edac031 feat(olp): add default config 2021-10-04 16:30:48 +02:00
William Yang
4dc63b26a8 feat(olp): metrics 2021-10-04 16:30:44 +02:00
William Yang
67267acb70 feat(olp): management API 2021-10-04 14:36:30 +02:00
William Yang
eb895a9f80 feat(olp): quic 2021-10-04 12:31:14 +02:00
William Yang
9304e3c122 feat(olp): add config and backoff gc 2021-10-04 12:21:30 +02:00
William Yang
166f02edc4 feat(olp): don't hibernate conn proc when overloaded 2021-10-04 10:44:53 +02:00
William Yang
e9710ade14 feat(olp): first commit for overload protection 
- add lc app
- add alarm handler for lc runq alarm
- backoff when handling CONNECT message
- close new connswhen overload
 2021-10-01 16:14:38 +02:00
zhongwencool
af36e1a791 fix: emqx_cluster_rpc.hrl to emqx_machine.hrl 2021-09-30 16:04:30 +08:00
zhongwencool
93c210887b chore: don't use emqx_machine.hrl in emqx 2021-09-30 16:04:30 +08:00
zhongwencool
44a6f04a45 chore: reorganize shards position 2021-09-30 16:04:30 +08:00
JianBo He
45ca168216 test(gw): fix bad test cases 2021-09-30 15:51:02 +08:00
JianBo He
ac3af8260d fix(gw): fix print client record error 2021-09-30 15:51:02 +08:00
JianBo He
adaf3db719 refactor(gw): put conf operations into emqx_gateway_conf mod 2021-09-30 15:51:02 +08:00
JianBo He
642b588ad0 fix(gw): fix removing listener error 2021-09-30 15:51:02 +08:00
JianBo He
8e4256c06f chore(conf): refine config format 2021-09-30 15:51:02 +08:00
Zaiming Shi
e9991dca02 chore(dashboard): Allow test mode of the dashboard 2021-09-30 09:28:47 +02:00
zhongwencool
be123f613d
Fix: apps should boots after emqx_machine_sup's children spawn. (#5851) 
* fix(cluster_call): apps should start after cluster_call init

* fix: undef function

* chore: reformat code

* fix: ekka must start before emqx
 2021-09-30 13:56:18 +08:00
DDDHuang
e62af95d0d fix: close dashboard before beta 1 2021-09-30 09:45:48 +08:00
zhouzb
50765fa345 fix(http): fix function clause when create http connector instance 2021-09-29 19:35:06 +08:00
zhanghongtong
b94dcb7bc7 chore(release): update emqx release version 2021-09-29 18:29:44 +08:00
zhanghongtong
4044fd8122 chore(authz mnesia api): update schema 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-09-29 18:28:55 +08:00
DDDHuang
f9adecedef fix: exhook code spelling 2021-09-29 17:23:51 +08:00
zhanghongtong
dd3b91e13f fix(authz api): fix update config error 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-09-29 13:46:49 +08:00
tigercl
55ec5bab9e
Merge pull request #5773 from tigercl/feat/psk-file 
feat(psk): support psk
 2021-09-29 13:37:49 +08:00
Zaiming (Stone) Shi
83e7ab681b
Merge pull request #5820 from JimMoen/refactor-frame-parse-logging 
Refactor frame parse logging with bug fix.
 2021-09-28 19:31:39 +02:00
Zaiming Shi
225ebdaa87 fix(frame): simlify error excption context 
We should not raise error with the exact context after logging it
because it will end up duplicated in the log
 2021-09-28 18:15:32 +02:00
JimMoen
c1ff30896a fix(frame): safely serializing and structured log. 2021-09-28 18:55:25 +08:00
tigercl
6670bc49fe
Merge pull request #5791 from tigercl/fix/authn2 
fix(authn): add timeout option for mysql connector
 2021-09-28 14:28:55 +08:00
JimMoen
9832eea250 fix(frame): safely parsings. 2021-09-28 14:11:18 +08:00
JimMoen
7d6180f10a fix(frame): variable byte integer could be larger than 4 bytes. 2021-09-28 14:11:18 +08:00
Zaiming Shi
a158b0235d chore(tests): use assertError 
the ?catch_error macro passes when there is no exception
 2021-09-28 14:11:18 +08:00
Zaiming Shi
fec3c6574e perf(emqx_frame): skip empty tail 2021-09-28 14:11:18 +08:00
Zaiming Shi
9d0ef5de6b refactor(emqx_frame): log frame parse error with more context 2021-09-28 14:11:18 +08:00
JimMoen
1509907744 fix(mgmt): delayed messages payload encoded in basd64 twice. 2021-09-28 12:26:13 +08:00
tigercl
79685a77ba
Merge branch 'master' into fix/authn2 2021-09-28 09:27:08 +08:00
zhouzb
352c87a586 chore(authn): delete useless func 2021-09-28 09:22:59 +08:00
zhanghongtong
8915f61382 fix(authz api): fix badarg error 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-09-28 09:13:17 +08:00
zhanghongtong
c4e0eff772 fix(authz api): fix schema error 2021-09-28 09:13:17 +08:00
zhouzb
2cc2cd2831 chore(psk): return line number rather than the content of line 2021-09-28 09:09:26 +08:00
Zaiming (Stone) Shi
3df21a9e14
Merge pull request #5822 from Spycsh/fix-windows-compile 
chore: fix Windows compilation process
 2021-09-27 23:30:59 +02:00
Shawn
a9185f964e
fix(rules): improve specs and logs (#5821) 
Co-authored-by: Zaiming Shi <zmstone@gmail.com>
 2021-09-27 21:10:48 +02:00
Zaiming Shi
697a11ded0 fix(tls): drop unsupported ciphers 
we use a hard-coded list of pre-selected ciphers as config
default value. some of them may not be supported by the
underlying openssl lib.

now moved the pre-selected ciphers to emqx_tls_lib:selected_ciphers
which performs a filtering before return.
 2021-09-27 20:51:48 +02:00
Shawn
e2721c144c feat(bridge): support http bridge 2021-09-27 22:01:18 +08:00
zhouzb
74c9a38e9f fix(psk): fix bugs and add test case 2021-09-27 21:42:32 +08:00
Spycsh
c3b980fde9 chore: fix Windows compilation process 2021-09-27 21:24:10 +08:00
Zaiming Shi
5417eb328a fix(schema): no ciphers validator for quic listener 2021-09-27 13:53:54 +02:00
Zaiming Shi
58ffc4651f fix(config): use default value for tls versions 
default value for ssl.versions is dynamically resolved based
on otp version and underlying openssl installation
 2021-09-27 13:53:54 +02:00
Zaiming Shi
d376c0f9fc refactor(schema): call emqx_tls_lib for default tls versions 2021-09-27 13:53:54 +02:00
Zaiming Shi
e7e8b8c77b fix(schema): check tlsv1.3 availability 2021-09-27 13:53:54 +02:00
zhouzb
f9aa345787 chore(psk): improve logs for psk 2021-09-27 15:32:56 +08:00
zhouzb
2262bf508e chore(authn): improve code 2021-09-27 14:50:22 +08:00
zhongwencool
5280f83651
Merge pull request #5784 from zhongwencool/delayed-api-schema 
feat(delayed_api): support hocon schema
 2021-09-27 13:45:17 +08:00
zhouzb
84bb486c62 feat(psk): chunk size can be configured and improve code 2021-09-27 10:53:25 +08:00
zhongwencool
c41b4b0c2f fix(delayed_api): delete msg crash return 500 2021-09-27 09:54:41 +08:00
Shawn
69f3cce75d feat(rules): hook on bridges events and query bridges from rules 2021-09-26 23:00:08 +08:00
Shawn
e630e23846 fix(rules): dialyer failed to analysis the emqx_rule_sqlparser:parse/1 2021-09-26 23:00:08 +08:00
Shawn
0d26e50e87 fix(rules): parse outputs failed 2021-09-26 23:00:08 +08:00
Shawn
420ccf0f51 refactor(rules): change republish as an output 2021-09-26 23:00:08 +08:00
Shawn
f33e28af6d fix(rules): update test cases for emqx_rule_engine_SUITE 2021-09-26 23:00:08 +08:00
Shawn
7bc69b129a fix(rules): update test cases for rule metrics 2021-09-26 23:00:08 +08:00
Shawn
d4f20c82e0 feat(rules): support function outputs 2021-09-26 23:00:08 +08:00
Shawn
bd081913b5 refactor(rules): remove emqx_rule_actions 2021-09-26 23:00:08 +08:00
Shawn
af295a9b71 refactor(rules): remove resources and actions 2021-09-26 23:00:08 +08:00
Shawn
b055464f6b refactor(rule): remove CLIs for rules 
We will have new CLIs based on HTTP API in the future.
 2021-09-26 23:00:08 +08:00
zhongwencool
776604a90b chore(dashboard): make dirty operation into ekka_mnesia transation 2021-09-26 21:42:26 +08:00
zhouzb
f325d7c783 chore(psk): catch timeout exception to avoid crash 2021-09-26 20:37:00 +08:00
zhanghongtong
c5494d5c90 chore(authz mnesia api): ensure built-in-database type source is disabled before purge. 2021-09-26 16:38:08 +08:00
Zaiming Shi
8b6eeef7fc refactor(authz): use macro for cmd names 2021-09-26 16:19:47 +08:00
Zaiming Shi
65d0b70ff6 refactor(authz): simplify config update impl 2021-09-26 16:19:47 +08:00
Zaiming Shi
f18d0c7167 fix(authz): delete unused config field 
path is not used for built-in-database type
 2021-09-26 16:19:47 +08:00
zhanghongtong
7d18250a1d chore(authz mnesia): fix dialyzer error 2021-09-26 16:19:47 +08:00
zhanghongtong
673b12a46d chore(authz mnesia): in the mnesia table, replace atom with int 2021-09-26 16:19:47 +08:00
zhanghongtong
9b3917e0d3 chore(authz mnesia api): get method supports paging 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-09-26 16:19:47 +08:00
zhanghongtong
1a02e0cfd1 feat(authz mnesia api): post accept array data 2021-09-26 16:19:47 +08:00
zhanghongtong
2dc3b51675 chore(authz): use ekka_mnesia instead of mnesia 2021-09-26 16:19:47 +08:00
zhanghongtong
b583509976 feat(authz): add authorize for mnesia 2021-09-26 16:19:47 +08:00
zhanghongtong
ed6f4895e2 feat(authz mnesia): add api 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-09-26 16:19:47 +08:00
lafirest
acb5c693ba
Merge pull request #5767 from lafirest/fix/time_unit 
fix(schema): fix some time unit in schema
 2021-09-26 15:35:27 +08:00
JianBo He
8e78d29325 chore(gw): improve emqx_gateway_schema 2021-09-26 15:19:55 +08:00
JianBo He
b78c914651 test(authn): cleanup the dirty configs 2021-09-26 15:19:55 +08:00
JianBo He
791408cd99 refactor(gw): simplify code structure 
1. Add the management API for listener's authn
2. Clarify responsed error messages
 2021-09-26 15:19:55 +08:00
JianBo He
5ad1a8c232 chore(gw): fix test case errors 2021-09-26 15:19:55 +08:00
JianBo He
f0ac62c513 refactor(gw): use emqx_gateway_conf to update conf 2021-09-26 15:19:55 +08:00
JianBo He
b55a1f62c3 test(gw): more cases for emqx_gateway_conf 2021-09-26 15:19:55 +08:00
JianBo He
d163e99d58 chore(gw): add cases for emqx_gateway_conf 2021-09-26 15:19:55 +08:00
JianBo He
f68dfff0d6 refactor(gw): refactor config hot-upgrade mechnism 2021-09-26 15:19:55 +08:00
JianBo He
a9e32ac106 chore(gw): fix gatway enable/1 not working 2021-09-26 15:19:55 +08:00
JianBo He
d8176f4378 chore(gw): pass listener id into listener params 2021-09-26 15:19:55 +08:00
JianBo He
3e033b419c refactor(gw): integrate with authn 2021-09-26 15:19:55 +08:00
JianBo He
f3c675b139 chore(deps): upgrade esockd to 5.8.3 2021-09-26 15:19:55 +08:00
JianBo He
eda94f5754 chore(gw): more comment for coap options 2021-09-26 15:19:55 +08:00