yuanbiao/emqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,360 Commits 393 Branches 684 Tags 74 MiB
8d2f9d4e1c
Commit Graph

1434 Commits

Author SHA1 Message Date
JianBo He
6a99e1535f chore(gw): fix dialyzer warnings 2021-07-21 16:09:48 +08:00
JianBo He
623fc67fc9 chore(gw): uncomment mqttsn confs 2021-07-21 16:09:48 +08:00
JianBo He
9355adae4b fix(gw): fix xrefs 2021-07-21 16:09:48 +08:00
JianBo He
f22384669e chore(gw): temporarily comment out asleep/awake tests 2021-07-21 16:09:48 +08:00
JianBo He
61473b8a5b test(gw): fix the mqtt-sn frame tests 2021-07-21 16:09:48 +08:00
JianBo He
18eaadae08 refactor(gw): remove needless modules 2021-07-21 16:09:48 +08:00
JianBo He
21796314f3 test(gw): fix bad test cases 2021-07-21 16:09:48 +08:00
JianBo He
0f9b5ff3a1 refactor(gw): use typical conn&channel to implement mqtt-sn gateway 2021-07-21 16:09:48 +08:00
JianBo He
45912d8a81 fix(gw): fix typos 2021-07-21 16:09:48 +08:00
JianBo He
40d714049e chore(gw): delete needless files 2021-07-21 16:09:48 +08:00
zhanghongtong
32eabf041e chore(authz): update url type for authz schema 2021-07-21 13:47:35 +08:00
JianBo He
26ba1b630c test(session): fix test cases 2021-07-21 09:47:49 +08:00
JianBo He
b782d4c53a refactor(emqx): strip the side effects of emqx_session module 2021-07-21 09:47:49 +08:00
DDDHuang
2d4d7b2923 fix: routes api function cause 2021-07-20 13:56:20 +08:00
Shawn
98c7f9edb2 refactor(configs): make mqtt related configs only in zone 2021-07-20 11:41:16 +08:00
Shawn
af5470cb30 refactor(configs): make acl related configs only in zone 2021-07-20 11:41:16 +08:00
Shawn
e0e9b7ec5b fix(emqx_congestion): read congestion config only from zone 2021-07-20 11:41:16 +08:00
Shawn
2898e9c6dc refactor(config): make rate_limit only in listeners for now 2021-07-20 11:41:16 +08:00
Shawn
e6424d63d8 refactor(config): don't allow inheritable config entries 2021-07-20 11:41:16 +08:00
Shawn
32b571091b fix(statsd): remove the extra debug log msg 2021-07-20 11:41:16 +08:00
DDDHuang
746a91efd8
Merge pull request #5263 from DDDHuang/apps_api 
refactor: apps api; rename: error response util function
 2021-07-20 11:40:59 +08:00
DDDHuang
9a64c9a464
Merge pull request #5261 from DDDHuang/routes_api 
refactor: routes api
 2021-07-20 09:40:04 +08:00
DDDHuang
51dc9093ed refactor: apps api 2021-07-20 09:35:30 +08:00
DDDHuang
14d9b876e7 refactor: routes api 2021-07-19 17:33:48 +08:00
zhanghongtong
358db0320b fix(authz): fix a re:replace error when username is undefined 2021-07-19 15:31:07 +08:00
DDDHuang
120c2b8cdf chore: add mgmt start listener log 2021-07-19 15:27:12 +08:00
Shawn
31f016fa22 refactor(config): remove emqx_zone 2021-07-19 14:47:43 +08:00
firest
4427ec8155 fix(emqx_retainer): fix remaining quota check error 2021-07-19 08:55:24 +08:00
zhanghongtong
2476664385 chore(release): update emqx release version 2021-07-17 18:12:40 +08:00
Shawn
a0f8ca2c3f fix(config): delete the emqx.conf.old 2021-07-17 17:36:01 +08:00
Turtle
eadaa9e557 Merge branch 'emqx_config' of https://github.com/terry-xiaoyu/emqx into emqx_config 2021-07-17 17:10:07 +08:00
Turtle
7b38ae7f47 fix(test): fix check paho test cases fail 2021-07-17 17:09:16 +08:00
Shawn
6915d9abeb fix(authz): update testcases for emqx_authz 2021-07-17 16:59:31 +08:00
Shawn
1d2cb6cb81
Merge branch 'master' into emqx_config 2021-07-17 15:53:12 +08:00
zhanghongtong
bb417e4498 feat(authz): support http 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-07-17 15:48:29 +08:00
Turtle
89f10d3902 fix(test): fix check emqx management test cases fail 2021-07-17 15:40:18 +08:00
Shawn
c9cf8b66e7 fix(docker): cannot set log_level using os env 2021-07-17 15:25:18 +08:00
Turtle
b9e3095ac3 fix(test): fix check emqx management test cases fail 2021-07-17 14:59:52 +08:00
Shawn
d047f820e5 fix(test): update testcases for emqx_gateway 2021-07-17 13:19:45 +08:00
lafirest
4c931470d8 feat(eqmx_retainer): let emqx_retainer can support other types of databases 2021-07-17 13:18:03 +08:00
Shawn
f68b8c4097 fix(test): update testcases for emqx_gateway 2021-07-17 11:07:46 +08:00
Shawn
f7f2523030 fix(dialyzer): handle undefined conf in post_update_config/2 2021-07-17 10:38:30 +08:00
Shawn
7a77f4f54e fix(emqx_schema): start emqx as standalone app failed 2021-07-17 10:19:06 +08:00
Turtle
dfa9026ea3 fix(tests): fix check authn test fail 2021-07-17 09:06:05 +08:00
Shawn
4d279e47d8 chore(merge): merge code from master 2021-07-17 01:20:57 +08:00
Shawn
b82693cc0b fix(authz): support config hot upgrading 2021-07-17 01:18:14 +08:00
turtleDeng
fc13c59d7b
chore: use hocon to replace cuttlefish 2021-07-16 23:52:43 +08:00
DDDHuang
92ae5663a6 feat: update to openapi 3.0.0 2021-07-16 23:26:56 +08:00
Turtle
ed1cf33b9d chore: merge coap/lwm2m/exhook/exproto to emqx_gateway dir 2021-07-16 23:24:36 +08:00
turtleDeng
8c9be070b4
chore: update hocon tag 2021-07-16 19:59:06 +08:00
Shawn
6d871cc52f fix(authz): resources not created when authz started 2021-07-16 18:06:10 +08:00
Shawn
bb6d7c4e0b
Merge branch 'master' into emqx_config 2021-07-16 16:49:50 +08:00
Shawn
c3d24db642 fix(authz): update emqx_authz for new config 2021-07-16 14:07:27 +08:00
k32
9d9d9f2ce3
Merge pull request #5227 from k32/dev/bump_ekka 
chore(ekka): Bump version to 0.10.3
 2021-07-15 17:09:59 +02:00
Shawn
c834494113 fix(cli): CLI of emqx_gateway_cli broken 2021-07-15 20:39:06 +08:00
Shawn
543f2c78c5 fix(ekka): cluster cannot get started with the new config 2021-07-15 20:28:12 +08:00
DDDHuang
1bfa6ead42 refactor: publish api; add: batch schema util function 2021-07-15 19:25:26 +08:00
DDDHuang
187d200cb7 refactor: stats api & metrics api; fix: clients api parameter type lose 2021-07-15 19:19:26 +08:00
Shawn
a1488b3946 fix(test): merge conflicts 2021-07-15 18:54:31 +08:00
Shawn
ba166967c9
Merge branch 'master' into emqx_config 2021-07-15 18:44:56 +08:00
Shawn
a16a15e3a9 fix(test): remove tlsv1.3 provisionally to make test pass 2021-07-15 18:34:27 +08:00
tigercl
4ed14dfdfd
Merge pull request #5228 from tigercl/feat/one-authn 
feat(one authn): merge simple authn and enhanced authn
 2021-07-15 17:37:50 +08:00
Shawn
d5756ecd52 fix(test): update the testcases 2021-07-15 17:19:46 +08:00
zhouzb
ddda18bcb8 chore(authn): add jose dep 2021-07-15 17:14:35 +08:00
DDDHuang
e838df99a9 fix: api auth header support 2021-07-15 16:20:46 +08:00
Shawn
6fbf20b930 fix(test): update the testcases 2021-07-15 16:19:26 +08:00
zhouzb
07ce636803 feat(authn): support enable authn in config 2021-07-15 16:16:41 +08:00
Shawn
3c47ab92d7 fix(listeners): update the default tls ciphers 2021-07-15 15:11:54 +08:00
Shawn
bcae0cbb50 fix(gateways): hardcode the listener and zone names 2021-07-15 14:26:12 +08:00
zhouzb
5ecc992944 chore(authn): fix coap authn and update tag for esasl 2021-07-15 14:25:23 +08:00
Shawn
f6702b020e fix(hocon): update hocon version to 0.10.1 2021-07-15 13:57:24 +08:00
Shawn
533f4cf63e fix(dialyzer): some dialyzer complains 2021-07-15 13:52:06 +08:00
Shawn
0cc01c2bee Merge branch 'master' into emqx_config 2021-07-15 13:18:57 +08:00
Shawn
4da59a5785 fix(dialyzer): some dialyzer problems 2021-07-15 11:56:13 +08:00
Shawn
7d66760c1e fix(hocon): start emqx failed using os env configs 2021-07-15 11:55:31 +08:00
zhouzb
beecc4c5a2 test(authn): fix test case for authn 2021-07-15 11:36:49 +08:00
JianBo He
980c7d91db chore(gw): fix mqtt-sn test cases 2021-07-15 10:35:28 +08:00
JianBo He
fc5baf8fd4 refactor(gw-sn): support mutil-registry process 2021-07-15 10:35:28 +08:00
JianBo He
d2430e70a8 refactor(gw): move mqtt-sn to gateway 2021-07-15 10:35:28 +08:00
k32
3bb41ae367 chore(ekka): Bump version to 0.10.3 2021-07-14 17:49:31 +02:00
zhouzb
42c5432514 fix(http authn): fix bugs for http authn and http connector 2021-07-14 18:20:46 +08:00
zhouzb
6a8e35ce3a feat(one authn): merge simple authn and enhanced authn 2021-07-14 16:54:13 +08:00
Shawn
157b97eb8a fix(config): workaround for emqx_sn to use configs of mqtt_tcp listener 2021-07-14 10:09:12 +08:00
Shawn
8e32d5314d
Merge branch 'master' into emqx_config 2021-07-14 09:33:58 +08:00
Shawn
25d7616881 fix(test): update the testcases for emqx_ws_connection_SUITE 2021-07-13 19:58:54 +08:00
Shawn
7d9321a141 fix(test): apply default configs for emqx_session_SUITE 2021-07-13 18:39:57 +08:00
Shawn
e4e7eb81e4 fix(test): update the testcases for emqx_mqtt_caps_SUITE 2021-07-13 17:42:44 +08:00
Shawn
3aaf7041a6 fix(test): update the testcases for emqx_os_mon_SUITE 2021-07-13 17:41:15 +08:00
Shawn
01c4c655fb fix(config): make emqx_caps work with the new config struct 2021-07-13 16:42:32 +08:00
Shawn
a0bddfc834 fix(config): start quic connection with zone and listener names 2021-07-13 16:41:20 +08:00
Shawn
b123299c70 fix(config): make flapping work with the new config 2021-07-13 16:39:59 +08:00
Shawn
871353704a fix(test): update the testcases for emqx_channel_SUITE 2021-07-13 16:38:06 +08:00
Shawn
868b31d123 fix(test): update the testcases for emqx_mqtt_protocol_v5_SUITE 2021-07-13 16:37:18 +08:00
DDDHuang
500047fa30 refactor: nodes api ; add: api test util module 2021-07-13 15:08:28 +08:00
Shawn
6d9918d3e5 fix(test): update the testcases for emqx_vm_mon_SUITE 2021-07-13 13:52:29 +08:00
DDDHuang
a8e4ea18ea
Merge pull request #5215 from DDDHuang/clients_api_test 
test: add clients api SUITE & add api [delete sub]
 2021-07-13 10:38:20 +08:00
Shawn
400e08e229 fix(flapping): make the flapping work with the new config structure 2021-07-12 20:43:11 +08:00
zhanghongtong
9081a22b8c chore(deps): deps in rebar must not be use branch 
Can use tags or commit ids in rebar deps

Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-07-12 18:28:47 +08:00
Shawn
499ab5d9c4 fix(config): configure a plain map for mqueue_priorities 2021-07-12 18:10:47 +08:00
DDDHuang
734a5b9420 test: add clients api SUITE & add delete sub api 2021-07-12 18:10:40 +08:00
zhouzb
5bb55332a5 chore(auhtn): keep one ssl opts checking func 2021-07-12 16:33:52 +08:00
Shawn
88638da287 fix(test): always init session with zone and listener names 2021-07-12 16:00:04 +08:00
Shawn
ea68beeef6 fix(test): update test cases for emqx_client_SUITE 2021-07-12 15:41:43 +08:00
tigercl
df92a60085
feat(http connector): support http connector (#5192) 
- support http connector
- support http authn
 2021-07-12 15:35:06 +08:00
DDDHuang
d04e1c6f54
refactor: clients api; status api; adapter minirest v1 
The serious influence:
authn:
api
authz:
api; api test suit
dashboard:
all closed
lwm2m:
api;
modules:
api(api_topic_metrics, modules_api); test suit(emqx_modules_SUITE)
prometheus:
api
retainer:
api; api test suit
rule_engine:
api: api test suit
telemetry:
api
 2021-07-12 10:05:51 +08:00
Shawn
042ff2e0d7 fix(test): update test cases for emqx_connection_SUITE 2021-07-10 18:01:45 +08:00
Shawn
4c122d0722 fix(test): update test cases for emqx_channel_SUITE 2021-07-10 14:29:45 +08:00
Zaiming (Stone) Shi
6b3cfd7c5d
fix(boot): boot exit on config error (#5200) 
* fix(hocon): fail on hocon command errors

call_hocon bash function respects exit code

* fix(bin/emax): get dist_port config from hocon

after config file refactoring (to hocon format) the grep pattern
no longer works

* fix(bin/emqx): set -o pipefail

* feat(bin/emqx): add a DEBUG option
 2021-07-10 08:51:35 +08:00
Shawn
9cda6ab3c8 feat(alarm): update the validity_period timer 2021-07-09 19:09:44 +08:00
zhanghongtong
3195561a79 feat(authz connector): match directly using the results returned by sql 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-07-09 18:21:36 +08:00
DDDHuang
c11a8c6db6 refactor: clients api; status api; adapter minirest v1 
The serious influence:

authn:
    api
authz:
    api; api test suit
dashboard:
    all closed
lwm2m:
    api;
modules:
    api(api_topic_metrics, modules_api); test suit(emqx_modules_SUITE)
prometheus:
    api
retainer:
    api; api test suit
rule_engine:
    api: api test suit
telemetry:
    api
 2021-07-09 18:09:07 +08:00
Zaiming (Stone) Shi
088e615818
Merge pull request #5193 from zmstone/fix-emqx-conf-default-wss-max-conn-102400 
fix(emqx.conf): default wss max_connection from 16 to 102400
 2021-07-09 11:39:34 +02:00
Shawn
14af90d0c3 fix(test): update test cases for emqx_acl_cache_SUITE 2021-07-09 15:38:51 +08:00
Shawn
fb78e510ca fix(test): update test cases for emqx_access_control_SUITE 2021-07-09 15:04:54 +08:00
zhanghongtong
178bafbabf chore: rename required function to not_empty 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-07-09 14:18:41 +08:00
zhanghongtong
c10d154dab chore(connector): update schema file 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2021-07-09 14:18:41 +08:00
Zaiming Shi
e990220e83 fix(emqx.conf): default wss max_connection from 16 to 102400 2021-07-09 07:34:04 +02:00
William Yang
793aa951e3
Merge pull request #5170 from qzhuyan/dev/william/ci-fix-build-package 
ci(quic): conditionally quicer build
 2021-07-08 17:34:47 +02:00
Shawn
0ac2492b36 fix(config): read app env 'config_files' to get the path to emqx.conf 2021-07-08 19:27:36 +08:00
Shawn
27d5c5b2d9 feat(config): make quic listener start with the new config 2021-07-08 15:05:07 +08:00
Rory Z
6d7424b445 fix(connector): fix mongo connector auth failed 2021-07-08 11:25:18 +08:00
William Yang
79d169b3ff chore(quic): bump emqtt vsn to 1.4.2 2021-07-07 13:41:47 +02:00
William Yang
660d16e84b feat(config): set the endpoint to "" to disable listener 2021-07-07 13:41:47 +02:00
William Yang
1f20bae392 feat(quic): conditionally build/start quicer app 2021-07-07 13:41:47 +02:00
William Yang
6adb76cf27 ci: try 32bit fix from quicer 2021-07-07 13:41:43 +02:00
Shawn
477097c062 chore(project): merge code from master 2021-07-07 19:32:52 +08:00
DDDHuang
dc98cff27b
fix: mgmt conf & schema; prepare minirest (#5178) 2021-07-07 17:04:05 +08:00
Shawn
4dd72e59fa feat(listeners): make the APIs and CLIs work with the new listener 2021-07-07 16:22:38 +08:00
Shawn
630b54f6ee feat(acl): make mqtt over websocket work with the new config 2021-07-07 14:43:54 +08:00
Rory Z
612d25fdb3 chore(connector): rename mongo config key 2021-07-07 10:06:10 +08:00
k32
a95b91c005 chore(coap): Fix debug logs 2021-07-06 18:42:39 +02:00
Shawn
707851c36f refactor(force_shutdown): force shutdown the connection if it don't kill itself 2021-07-06 20:11:49 +08:00
Shawn
7c0fd642bb feat(acl): make acl cache work with the new config 2021-07-06 19:24:54 +08:00
Shawn
5efd5c8d3b refactor(emqx_connection): make the mqtt tcp connection work with new config 2021-07-06 18:26:54 +08:00
lafirest
72f9e60d63 feat(emqx_retainer): add simple restapi for emqx_retainer 2021-07-06 18:16:05 +08:00
Rory Z
53df218e6a feat(connector): mongo support replica set 2021-07-06 18:07:06 +08:00
Shawn
969e72c82b refactor(connection): remove active_n from state 2021-07-05 19:13:55 +08:00
Shawn
10b01a34ef refactor(listeners): reformat the code for starting stopping listeners 2021-07-05 19:12:26 +08:00
Shawn
6d92d87ae7 feat(map_lib): support emqx_map_lib:deep_merge/2 2021-07-05 19:11:05 +08:00
Rory Z
fd0a211629 chore(authz): mongo connector support ssl 2021-07-05 17:57:03 +08:00
Rory Z
45ee504dc5 chore(authz): rename ACL to AuthZ 2021-07-05 17:57:03 +08:00
Rory Z
f733293a8b chore(authz): update apps vsn 2021-07-05 17:57:03 +08:00
Rory Z
f92b8bb7fb chore(authz): add test case 2021-07-05 17:57:03 +08:00
Rory Z
694f3bd67f feat(authz): support mongo single 2021-07-05 17:57:03 +08:00
Shawn
807bbb391c feat(map_lib): support emqx_config:get_listener_conf/3,4 2021-07-05 16:40:00 +08:00
Shawn
0aec496886 feat(map_lib): support emqx_map_lib:deep_find/2 2021-07-05 16:02:03 +08:00
Shawn
30c2a76dae refactor(emqx_config): move helper funcs to emqx_map_lib 2021-07-05 15:16:01 +08:00
DDDHuang
ce1e6ce89d fix: start jiffy by emqx 2021-07-05 14:41:33 +08:00
Shawn
a884d215e1 fix(connection): start connection failed 2021-07-05 13:50:37 +08:00
Shawn
fb809a5c08 fix(active_n): revert the changes to active_n 2021-07-05 11:28:21 +08:00