yuanbiao/emqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,302 Commits 393 Branches 684 Tags 74 MiB
0924c7dc13
Commit Graph

4454 Commits

Author SHA1 Message Date
JimMoen
22c25fc7e8 fix(tls_lib): ssl file key list contains atom and bin 2022-04-29 14:05:55 +08:00
DDDHuang
177926b0a8
Merge pull request #7833 from DDDHuang/testm_cluster 
fix: cluster monitor rate, topics calculate error
 2022-04-29 13:45:35 +08:00
JimMoen
ad4b70c27e fix(auth): mongo field filter not required and have default value 2022-04-29 13:37:29 +08:00
zhongwencool
6bdd625b21
Merge pull request #7826 from zhongwencool/dashboard-https 
fix: dashboard https without deafult pem/keyfile
 2022-04-29 13:21:28 +08:00
JimMoen
5f75f6e3be docs: refine auth http i18n description 2022-04-29 12:48:21 +08:00
JimMoen
c1dfd0aa36 test(auth): authn & authz http placeholder in HTTP path 2022-04-29 12:48:17 +08:00
JimMoen
15ef9892c5 fix(auth): authn & authz http support placeholder in HTTP path 2022-04-29 12:48:00 +08:00
JimMoen
dae418ae4a fix(auth): authn & authz http not required body field 2022-04-29 12:47:56 +08:00
JimMoen
e4826400b8 fix(auth): authn & authz HTTP haeders without content-type via GET method 2022-04-29 12:47:52 +08:00
Shawn
fc73f96aeb fix(test): use different http port for testing authz and authn 2022-04-29 12:41:36 +08:00
EMQ-YangM
4a6dabbe57 fix: rename to emqx_metrics_worker 2022-04-29 12:41:36 +08:00
Zaiming (Stone) Shi
1e170da9e8 test: ensure emqx_metrics gen_server stopped after each test 2022-04-29 12:41:36 +08:00
Zaiming (Stone) Shi
4e65322667 refactor: move emqx_plugin_libs_metrics to emqx app 
because it can not depend on other apps
 2022-04-29 12:41:36 +08:00
JianBo He
725c96dc2f
Merge pull request #7814 from HJianBo/fix-gw-bad-ssl 
fix(gw): return BAD_REQUEST if request's ssl files is bad
 2022-04-29 11:52:57 +08:00
JianBo He
fd5b662302 fix(stomp): sync clientid from clientinfo to conninfo 2022-04-29 11:49:57 +08:00
JianBo He
f983ce2562 fix(lwm2m): correct ConnAck properties to map 2022-04-29 11:49:57 +08:00
JianBo He
49b51db231 fix(gw): fix deep_merge can't update the configuration correctly 2022-04-29 11:49:57 +08:00
Zhongwen Deng
591b7c4fdb fix: make ssl options's required keys is [] 2022-04-29 11:45:22 +08:00
Zhongwen Deng
4f36a5152a chore: rename log_file_handlers's label 2022-04-29 11:45:22 +08:00
Zhongwen Deng
bfdd86b3fd fix: reset config not work in cluster 2022-04-29 11:45:22 +08:00
Zhongwen Deng
e91d6f9806 fix: ensure tls option keys 2022-04-29 11:45:22 +08:00
Zhongwen Deng
352984efe7 fix: dashboard https without deafult pem/keyfile 2022-04-29 11:45:22 +08:00
Yang Miao
7061d94cf9
Merge pull request #7823 from EMQ-YangM/authz_add_metrics 
feat: new authz metrics
 2022-04-29 11:27:59 +08:00
DDDHuang
9d1afa06c4 fix: cluster monitor rate, topics calculate error 2022-04-29 11:26:43 +08:00
zhongwencool
1fd0ce8708
Merge pull request #7832 from zhongwencool/fix-hocon-env-crash-json 
fix: delete FROM_ENV from raw_config✨
 2022-04-29 10:57:50 +08:00
JianBo He
99452868ca
Merge pull request #7799 from HJianBo/exproto-save-ssl-files 
exproto save ssl files
 2022-04-29 10:34:41 +08:00
EMQ-YangM
3fa8447c85 fix: fix static check warning, add some fields schema 2022-04-29 10:32:52 +08:00
zhouzb
afe526ba67
Merge pull request #7789 from tigercl/chore/authn-fields 
chore: rename certificate in jwt and selector in mongodb, remove pool_size in jwks
 2022-04-29 10:14:06 +08:00
DDDHuang
778973b2de
Merge pull request #7791 from DDDHuang/auto_failed_connector 
fix: disconnected status in auto_reconnect = false
 2022-04-29 09:30:16 +08:00
zhongwencool
c7241f2abc
Merge pull request #7813 from DDDHuang/bridge_api_bad_format 
fix: bridge api response bad node name format
 2022-04-29 09:12:22 +08:00
EMQ-YangM
712cdb3152 fix: fix static check error 2022-04-29 09:11:06 +08:00
Zhongwen Deng
03d2a1ebb6 chore: reformat emqx_bridge_api 2022-04-29 09:08:45 +08:00
EMQ-YangM
6879df9c5c fix: respect atom name convention 2022-04-29 08:59:51 +08:00
Zhongwen Deng
e24bdab2a5 fix: crash when swagger hocon translation failed 2022-04-29 08:52:03 +08:00
Zhongwen Deng
6f1610257f feat: bump hocon to 0.27.5 to remove FROM_ENV 2022-04-29 08:48:12 +08:00
Zhongwen Deng
1ffb7f5f94 fix: remove '\$FROM_ENV_VAR' from raw conf 2022-04-29 08:41:31 +08:00
Zaiming (Stone) Shi
7997655f02
Merge pull request #7829 from zmstone/0428-test-fix-flaky-test-emqx_ctl_SUITE 
test: fix flaky test emqx_ctl_SUITE.erl
 2022-04-28 23:23:11 +01:00
Zaiming (Stone) Shi
a0a1a2b972 style: make elvis happy 2022-04-28 22:09:05 +02:00
Zaiming (Stone) Shi
dae0da4f37
Merge pull request #7830 from zhongwencool/uninstall-plugin 
fix: delete plugin from configure when uninstall
 2022-04-28 20:52:57 +01:00
Zaiming (Stone) Shi
a4d0a9266a test: fix flaky test emqx_ctl_SUITE.erl 2022-04-28 21:46:36 +02:00
lafirest
828f1b0730
Merge pull request #7819 from lafirest/fix/limiter_schema 
fix(limiter): fix schema parse error
 2022-04-29 01:32:52 +08:00
Zhongwen Deng
35d066e3d5 fix: delete plugin from configure when uninstall 2022-04-29 00:55:21 +08:00
EMQ-YangM
3e314f6785 fix: rewrite status_metrics_example 2022-04-29 00:44:22 +08:00
EMQ-YangM
f91a6b9f00 fix: authz add metrics_and_status schema 2022-04-29 00:37:21 +08:00
Xinyu Liu
8528d76371
Merge pull request #7815 from terry-xiaoyu/fix_bridge_ssl_dry_run_fail 
fix: convert ssl certfiles for dry-run creating bridges
 2022-04-28 22:41:50 +08:00
Shawn
6c9e0d62e2 fix(test): ensure emqx_metrics stopped before testing 2022-04-28 22:40:05 +08:00
Shawn
4b7d9b7239 chore(erlfmt): make the erlfmt happy 2022-04-28 22:39:30 +08:00
EMQ-YangM
a6920ac11b feat: new authz metrics 2022-04-28 22:01:40 +08:00
Zaiming (Stone) Shi
638b7195d4
Merge pull request #7804 from HJianBo/not-allow-empty-claims 
fix(authn-jwt): avoid to save empty claim name
 2022-04-28 14:10:45 +01:00
Zaiming (Stone) Shi
33e9823317 style: reformat emqx_connector_mqtt_mod.erl 2022-04-28 15:07:07 +02:00
Xinyu Liu
8380efef16
Merge pull request #7809 from EMQ-YangM/authn_add_metrics 
feat: authn new metrics
 2022-04-28 19:24:09 +08:00
DDDHuang
73ac588255
Merge pull request #7812 from DDDHuang/mqtt_bridge_sharesub 
fix: remove match topic in mqtt bridge
 2022-04-28 18:31:02 +08:00
firest
60c2427874 fix(limiter): fix schema parse error 2022-04-28 18:30:32 +08:00
Shawn
6edb453ce9 fix: the field 'enable' is missing for GET /bridges/:id 2022-04-28 18:13:19 +08:00
zhouzb
95e63fcadf fix: fix bad code 2022-04-28 16:51:36 +08:00
EMQ-YangM
56761ecb74 fix: remove duplicated create_metrics 2022-04-28 16:20:38 +08:00
Shawn
e18c2a6de2 fix: convert ssl certfiles for dry-run creating bridges 2022-04-28 16:17:55 +08:00
zhongwencool
bd2abd9ce0
Merge pull request #7810 from zhongwencool/bad-plugin-file-500-crash 
fix: bad plugin file upload crash
 2022-04-28 16:14:32 +08:00
JianBo He
23c6047163 fix(gw): return BAD_REQUEST if request's ssl files is bad 2022-04-28 16:12:32 +08:00
EMQ-YangM
51e025f075 fix: remove duplicated code 2022-04-28 16:10:47 +08:00
zhouzb
bd0d0d9797
Merge branch 'master' into chore/authn-fields 2022-04-28 16:09:26 +08:00
zhongwencool
061d9198ce
Merge pull request #7797 from zmstone/0427-5.0-dashboard-add-listener-enable-disable-config 
feat(dashboard): add listener enable/disable config toggle
 2022-04-28 16:07:00 +08:00
DDDHuang
a26b0f79f2 fix: bridge api response bad node name format 2022-04-28 16:06:57 +08:00
EMQ-YangM
4365de9ad5 fix: format code 2022-04-28 15:39:08 +08:00
JianBo He
ff31a5a6a4 feat(gw-exproto): save ssl files for server&handler option 2022-04-28 15:34:57 +08:00
DDDHuang
05cf8af14b fix: connector, remove bad include 2022-04-28 15:32:54 +08:00
DDDHuang
132b37813c refactor: code format emqx_connector emqx_resource 2022-04-28 15:32:47 +08:00
DDDHuang
667da90e52 refactor: resource instance do_create_dry_run 2022-04-28 15:32:41 +08:00
DDDHuang
2a2308bbf8 refactor: resource check & connector status 2022-04-28 15:32:35 +08:00
DDDHuang
e3e7acbcde fix: remove match topic in mqtt bridge 2022-04-28 15:23:30 +08:00
EMQ-YangM
5b0ee30d72 fix: ignore unwanted results 2022-04-28 15:02:07 +08:00
EMQ-YangM
6530604f40 fix: add authn authz metrics supervisor 2022-04-28 14:38:45 +08:00
JianBo He
66c08bdc8b chore(gw): add default value for lwm2m gateway 2022-04-28 14:38:32 +08:00
Zhongwen Deng
e8cead48b2 fix: bad plugin file crash 2022-04-28 14:26:25 +08:00
Zhongwen Deng
c5b42ea0d9 chore: reformat emqx_prometheus_SUITE 2022-04-28 14:06:57 +08:00
Zhongwen Deng
3e8bedda76 fix: dashboard ct add enable options 2022-04-28 14:05:39 +08:00
Zhongwen Deng
2eab3f1cdb fix: dashboard https's password can't update 2022-04-28 14:05:39 +08:00
Zhongwen Deng
5c08c4ff4e chore: more detailed about dashboard inet6 option 2022-04-28 14:05:39 +08:00
Zhongwen Deng
204f04be65 fix: handshake_timeout is ranch option not socket options 2022-04-28 14:05:39 +08:00
Zaiming (Stone) Shi
974380a3d4 feat(dashboard): add listener enable/disable config toggle 2022-04-28 14:05:39 +08:00
EMQ-YangM
098598a0be fix: add resource_metrics, node_resource_metrics 2022-04-28 12:43:55 +08:00
EMQ-YangM
2a7bd74ef1 feat: authn add new metrics 2022-04-28 11:16:45 +08:00
Zhongwen Deng
2c95fba4df fix: api_listener min TLS ct fail 2022-04-28 10:11:38 +08:00
DDDHuang
a50980c496 fix: disconnected status in auto_reconnect = false 2022-04-28 09:47:36 +08:00
JimMoen
4f9b42a250 style: make erlfmt happy 2022-04-28 09:46:14 +08:00
JimMoen
e5d4e272b2 fix(ssl): sni option should be atom 2022-04-28 09:46:14 +08:00
JimMoen
0c7bbf9e64 revert: ssl option should not provide default cert file 
revert commit 3b9b12fe36 in PR#7527
 2022-04-28 09:46:14 +08:00
JianBo He
2dded74584
Merge pull request #7716 from lafirest/fix/delayed_disable_action 
fix(delayed): unify and optimize the enable/disable codes
 2022-04-28 09:39:41 +08:00
JianBo He
e216e0f17f test(authn): add test for verifing claim name 2022-04-28 09:14:28 +08:00
JianBo He
6535eb879c fix(authn-jwt): avoid to save empty claim name 
An empty claim_name has not a real meaning and will result in a
syntax error cluster_override.conf. i.e:
```
authentication {
  mechanism = "jwt"
  verify_claims { = "22"}
  ...
}
```
 2022-04-28 08:34:04 +08:00
JianBo He
ca846d0c53
Merge pull request #7798 from lafirest/fix/gateway_user_search 
fix(gateway): Add support for query by is_superuser
 2022-04-28 08:29:55 +08:00
JianBo He
cd9e7c9a49
Merge pull request #7805 from tigercl/chore/zone-i18n 
docs: improve i18n for zone
 2022-04-28 08:28:55 +08:00
Zaiming (Stone) Shi
02c3f87b31 style: reformat all remaining apps 2022-04-27 15:51:18 +02:00
Xinyu Liu
46e993fa81
Merge pull request #7786 from terry-xiaoyu/save_tls_files_for_bridges 
Save tls files for bridges
 2022-04-27 21:48:18 +08:00
Thales Macedo Garitezi
1be9d4f48f
Merge pull request #7731 from thalesmg/fix-copy-conf-override-startup 
fix(emqx_conf): avoid crash/deadlock depending on node startup order
 2022-04-27 10:01:06 -03:00
zhongwencool
6825aa66fc
Merge pull request #7780 from zhongwencool/log-bug-fix 
fix: make logger config more friendly 🤖
 2022-04-27 19:42:20 +08:00
zhouzb
a83268a0f1 docs: improve descs that mention configuration items 2022-04-27 18:35:34 +08:00
zhongwencool
737abc5700
Merge pull request #7796 from zhongwencool/fix-ws-max-connection-not-work 
fix: websocket's max_connection not work
 2022-04-27 18:30:16 +08:00
zhouzb
bad3adbee6 docs: improve i18n for zone 2022-04-27 18:26:40 +08:00
JianBo He
eb39a8476f
Merge pull request #7769 from HJianBo/zh-for-jwt 
chore(i18n): translate jwt fields to zh
 2022-04-27 17:49:51 +08:00
DDDHuang
c4416fb2ff
Merge pull request #7773 from DDDHuang/app-exp 
feat: app api support show expired
 2022-04-27 17:01:22 +08:00
lafirest
291b6a2530
Merge pull request #7794 from lafirest/fix/sub_api_return 
fix(mgmt): add subscribe options support for some APIS
 2022-04-27 16:51:21 +08:00
firest
fd0f32418e fix(gateway): Add support for query by is_superuser 2022-04-27 15:41:14 +08:00
Zhongwen Deng
ab9e93e8a7 fix: websocket's max_connection not work 2022-04-27 14:18:26 +08:00
Shawn
0635918d16 fix: define ssl SNI field as a non-empty-string 2022-04-27 14:17:22 +08:00
Shawn
46550d5a6f fix: don't remote the cert files when updating authz 2022-04-27 14:07:33 +08:00
Zhongwen Deng
55be66a5eb feat: add self node to /cluster 2022-04-27 13:55:42 +08:00
Zhongwen Deng
08cad804bf fix: bump hocon to 0.27.4 to obfuscate sensitive as binary 2022-04-27 13:55:42 +08:00
Zhongwen Deng
a99c49e75f fix: limit file ^[/\_a-zA-Z0-9\.\-]*$ 2022-04-27 13:55:42 +08:00
Zhongwen Deng
8cfcb10c7e fix: make logger config options more specific 2022-04-27 13:55:42 +08:00
firest
3429eaabcd test(delayed): add enable/disable test for delayed 2022-04-27 13:52:42 +08:00
Xinyu Liu
09b6648567
Merge pull request #7790 from EMQ-YangM/fix_remove_error_field 
fix: remove error field
 2022-04-27 13:41:17 +08:00
firest
d9c3cf5c97 fix(mgmt): add subscribe options in client subscribe API 2022-04-27 12:52:52 +08:00
firest
8d01e8a697 fix(mgmt): add subscribe options into the result of the client subscriptions API 2022-04-27 12:52:52 +08:00
firest
6b84016259 fix(mgmt): add subscribe options into the result of the /subscriptions API 2022-04-27 12:52:52 +08:00
Shawn
318d0df419 fix: return value of post_config_update 2022-04-27 11:59:16 +08:00
Shawn
94e24c2621 refactor: move ssl file handling from resources to bridges 2022-04-27 11:59:15 +08:00
Shawn
ba800d853d fix(rule): republish all available fields if payload template empty 2022-04-27 11:59:15 +08:00
zhouzb
7ddd020dd2 docs: improve desc for filter field 2022-04-27 11:29:18 +08:00
zhouzb
fa9bd74595 chore: rename selector to filter and fix spellcheck 2022-04-27 11:29:18 +08:00
zhouzb
c384ae2534 chore: rename certificate in jwt to public_key, delete pool_size in jwks authn 2022-04-27 11:29:16 +08:00
DDDHuang
0d335456a9 feat: app api support show expired 2022-04-27 11:15:14 +08:00
JimMoen
a75f42d629 docs: add missing i18n trans and make spellcheck happy 2022-04-27 11:00:22 +08:00
Xinyu Liu
a9c6f93b48
Merge pull request #7772 from DDDHuang/dash_format 
chore: dashboard code format
 2022-04-27 10:33:44 +08:00
EMQ-YangM
1fac70d2bb fix: remove error field 2022-04-27 09:48:57 +08:00
ieQu1
73733221d5 chore: Bump versions of mria, ekka, snabbkaffe 2022-04-26 17:35:30 +02:00
Thales Macedo Garitezi
67ed7ba7b8
refactor: do not differentiate node roles 2022-04-26 12:14:38 -03:00
Thales Macedo Garitezi
8519948742
refactor: use macro to denote initial transaction id 2022-04-26 12:03:53 -03:00
Thales Macedo Garitezi
6b969c5c84
fix(emqx_conf): avoid crash/deadlock depending on node startup order 
Depending on the order that a cluster of core nodes might be stopped
and then restarted, there might be a deadlock or crash during the
configuration loading.  The nodes try to check with each other which
has the latest cluster overrides and copy that info.  However, in some
cases, Mnesia on node A might still think that it needs to consult
another node C that is still down, so that this node proceeds with its
boot sequence but `mnesia:wait_for_tables` in `emqx_cluster_rpc` is
stuck.  Meanwhile, a node B can come up, try to copy from the sole
online node A, and fail because it's not ready yet.
 2022-04-26 12:03:53 -03:00
Zaiming (Stone) Shi
f42a5b90df Revert "feat: isolate resource manager processes" 
This reverts commit 40cca58d4f.
 2022-04-26 16:13:38 +02:00
JianBo He
3858c2353a chore(i18n): translate jwt fields to zh 2022-04-26 21:48:55 +08:00
JianBo He
44689f0f63
Merge pull request #7768 from HJianBo/fix-bad-alarm-msg 
fix(alarm): use gen_event:noifty/2 to generate alarm event
 2022-04-26 21:18:57 +08:00
Chris Hicks
9063dbb1ee
Merge pull request #7705 from emqx/EMQX-4199-introduce-a-new-emqx-resource-manager-module 
feat: isolate resource manager processes
 2022-04-26 14:33:15 +02:00
Thales Macedo Garitezi
f8f97d39d3
Merge pull request #7766 from thalesmg/bugfix-telemetry-bridge 
fix: avoid crashing telemetry if bridge app is not ready
 2022-04-26 09:03:29 -03:00
Chris
40cca58d4f feat: isolate resource manager processes 2022-04-26 13:28:29 +02:00
Zaiming (Stone) Shi
bf3acaaaee
Merge pull request #7760 from zmstone/0425-5.0-improve-app-secret-randmisation 
fix(emqx_mgmt_auth): better randomisation of app secrets
 2022-04-26 11:37:35 +01:00
JianBo He
a7354401df
Merge pull request #7758 from lafirest/fix/authn_user_search 
fix(authn): Add support for query by is_superuser to the mensia backend
 2022-04-26 18:27:53 +08:00
zhongwencool
398ebe7f0c
Merge pull request #7770 from tigercl/docs/better-format 
docs(authn): optimize i18n in authn
 2022-04-26 17:23:24 +08:00
DDDHuang
1185f010ec
Merge pull request #7771 from DDDHuang/monitor_topics 
fix: monitor samplers data calculate topics error
 2022-04-26 17:23:14 +08:00
DDDHuang
07444e3da5 chore: dashboard format code 2022-04-26 17:18:30 +08:00
DDDHuang
2ea66ebcee
Merge pull request #7749 from DDDHuang/fix_some_api 
fix: create banned & dashboard default user name
 2022-04-26 16:43:44 +08:00
firest
fc391c7b9e fix(delayed): unify and optimize the enable/disable codes 2022-04-26 15:26:40 +08:00
zhouzb
e2c291c23e fix: fix wrong default username 2022-04-26 15:21:10 +08:00
DDDHuang
00d4e4b9d9 fix: monitor samplers data calculate topics error 2022-04-26 15:17:54 +08:00
zhouzb
a863dcb61d docs(authn): optimize i18n in authn 2022-04-26 15:15:47 +08:00
firest
43c096ecbc test(authn): add is_superuser query test case 2022-04-26 14:29:48 +08:00
firest
2e3033c539 fix(authn): Add support for query by is_superuser to the mensia backend 2022-04-26 14:29:48 +08:00
JianBo He
9f35dd7f80
Merge pull request #7730 from savonarola/jwt-authz 
feat(emqx_auth_jwt): use JWT for ACL checks
 2022-04-26 14:18:50 +08:00
JianBo He
bbcbe01501 fix(alarm): use gen_event:noifty/2 to generate alarm event 
Uniformly report high_system_memory_usage event by gen_event:notify/2 to
ensure generate a same alarm structure
 2022-04-26 13:46:52 +08:00
DDDHuang
6db01bdd85 fix: add dashboard test suite & bug fix 2022-04-26 13:44:55 +08:00