3fc8d4049f
Merge pull request #6571 from emqx/fix-sticky-shared-sub-conf
...
fix(config): add missing enum constructors for `shared_subscription_strategy`
Currently, there's [code](048afa6d2d/apps/emqx/src/emqx_shared_sub.erl (L270-L279)
2021-12-29 15:08:49 -03:00
43141dffee
Merge branch 'release-5.0-beta.3' into trace-formatter
2021-12-29 22:37:59 +08:00
b8bb5ff738
fix(trace): delete duplicate topic from msg
2021-12-29 22:33:34 +08:00
048afa6d2d
fix(config): add missing enum constructors for `shared_subscription_strategy`
...
Currently, there's code and tests that expect the possibility of a
value `sticky`, `hash_topic` and `hash_clientid` in the
`node.shared_subscritpion_strategy` configuration, but the schema enum
does not contain those constructors.
2021-12-29 10:34:20 -03:00
2b3d3ebb0a
chore(authn): test JWT authn with HTTPS key server
2021-12-29 16:24:57 +03:00
f230c20521
chore(authn): test HTTPS authn
2021-12-29 16:24:57 +03:00
a7ca6cb39f
chore(authn): test MongoDB authn via ssl connection
2021-12-29 16:24:52 +03:00
f5049b696a
docs: fix a misspell in emqx_mgmt_cli
2021-12-29 13:29:51 +01:00
34dfc327f3
fix(api): auth failed with basic type check
2021-12-29 19:34:13 +08:00
04313dc044
fix(trace): download trace api not working
2021-12-29 19:03:54 +08:00
121d906992
chore(log): add SLOG/3 to add meta info
2021-12-29 14:48:48 +08:00
6280c8c9f0
chore: fix dialyzer warnings
2021-12-29 14:02:45 +08:00
d769401869
Merge pull request #6555 from tigercl/chore/new-epgsql
...
chore: support prepared query in postgresql connector
2021-12-29 13:37:29 +08:00
8b5b3a448a
fix(test): trace_handler ct fail
2021-12-29 11:06:31 +08:00
8f4453fedb
fix(gateway): undo move headers to root `include`
...
Keeping headers in the src directory makes sense for the interfaces we
don't want to expose outside, but the `include_lib` directive fails to
compile under Mix. Changing `include_lib("emqx_gateway/src/...")` to
`-include("src/...")` pleases both Mix and Rebar.
2021-12-28 17:34:47 -03:00
4b6bba11eb
feat(trace): struct log for trace
2021-12-29 00:26:54 +08:00
b78cfa0a1c
fix(api_key): support expired_at never expired when undefined
2021-12-29 00:22:59 +08:00
0712fc1e75
chore(schema): remove emqx_schema:unicode_binary/0
2021-12-28 23:50:12 +08:00
0020cf592f
Merge remote-tracking branch 'origin/master' into build-with-mix-mkII
2021-12-28 11:28:40 -03:00
f8ffb9c021
Merge pull request #6506 from savonarola/test-authz-mnezia
...
Test HTTP, Mria, File authorization
2021-12-28 15:53:37 +03:00
47be5b9ef2
Merge pull request #6539 from zhongwencool/fix-override-conf-not-load
...
fix(conf): can't include local/overide-conf file
2021-12-28 18:03:56 +08:00
0f14f73a50
Merge pull request #6552 from zmstone/fix-5.0-portable-shebang
...
fix: portable shebang
2021-12-28 10:51:15 +01:00
3a39db4f97
Merge pull request #6550 from terry-xiaoyu/fix_utf8_topic_rewrite
...
Fix utf8 topic rewrite
2021-12-28 17:08:23 +08:00
1d4be368cb
Merge pull request #6556 from terry-xiaoyu/fixes_for_bridges
...
Bug fixes for data bridges
2021-12-28 17:07:54 +08:00
e44f7de596
chore(conf): update hocon to 0.22.1
2021-12-28 16:17:19 +08:00
9363b6110e
chore(authz): make test http server more robust
2021-12-28 11:06:52 +03:00
6a686c3314
Merge pull request #6503 from tigercl/feat/authz-config
...
feat(authz): support sync configuration in the cluster
2021-12-28 14:39:56 +08:00
07997ab865
fix(bridge): Bridges should send a JSON message if payload template not set
2021-12-28 14:18:14 +08:00
4406589980
fix(bridge): time unit error for MQTT keepalive
2021-12-28 14:12:28 +08:00
e48df910d8
Merge pull request #6493 from lafirest/refactor/exhook
...
refactor(emqx_exhook): refactore exhook and add api module
2021-12-28 14:00:19 +08:00
487b84f166
test: fix test case
2021-12-28 11:37:51 +08:00
eb992ad2ad
fix(bridge): add test cases for sending msgs via http bridge
2021-12-28 11:35:47 +08:00
1a22d5ca46
fix: fix undef function call
2021-12-28 11:21:41 +08:00
bf2392f682
chore(typerefl): update typerefl to 0.8.6
2021-12-28 10:52:30 +08:00
c68499e39a
fix(api): fix the payload in the result of the api of emqx_retainer & emqx_dealy
2021-12-28 10:25:53 +08:00
1cd226c18b
fix(bridge): make direction defaults to egress if not provided
2021-12-28 10:12:39 +08:00
d26042703e
chore: provide prepared_query and equery
2021-12-28 09:52:31 +08:00
afe51446b0
Merge pull request #6538 from lafirest/fix/rap
...
fix(emqx_retainer): add support for RAP falg
2021-12-28 09:31:57 +08:00
fc89fb0f8a
chore: using prepared query in postgresql connector
2021-12-28 09:16:00 +08:00
68eb13d478
fix: portable shebang
2021-12-27 15:45:12 +01:00
8203b1f328
refactor(gw): simplify massive repeated codes
2021-12-27 16:50:39 +08:00
e9c2b5d1cf
fix(rewrite): don't check and translate body for topic rewrite APIs
2021-12-27 16:17:59 +08:00
e2e2c98679
chore(authn): test Mysql authn via ssl connection
2021-12-27 11:16:31 +03:00
6de89d1207
chore(authn): test PostgreSQL authn via ssl connection
2021-12-27 11:16:31 +03:00
520629d6e2
chore(authn): test Redis authn via ssl connection
2021-12-27 11:16:31 +03:00
76b35910b7
chore(gw): fix elvis warnings
2021-12-27 16:03:31 +08:00
fca5a3bc21
chore(gw): add cli testcases
2021-12-27 16:03:31 +08:00
668180388c
feat(trace): replace logger_formatter by emqx_trace_formatter
2021-12-27 14:40:40 +08:00
d781dc73a5
Merge pull request #6536 from tigercl/fix/authn-ssl
...
fix(authn): attempt to convert certificate content only when TLS is enabled
2021-12-27 09:50:11 +08:00
523b5761b7
Merge pull request #6527 from HJianBo/fix-receive-maximum-50
...
fix: disconnect the client due to exceed receive-maximum packets
2021-12-27 09:13:24 +08:00
cc652c3343
ci(mix): add elixir deps check
...
Checks whether there are discrepancies between rebar3 and mix deps.
2021-12-24 14:44:49 -03:00
2bada0bab8
chore(authz): test Mria authz
2021-12-24 16:18:46 +03:00
d75e0104cc
chore(authz): test file authz with real files
2021-12-24 16:18:41 +03:00
e0f860d7d9
chore(authz): fix HTTP authz, cover with tests
2021-12-24 16:18:36 +03:00
0b099432c5
fix(conf): can't include local/overide-conf file
2021-12-24 19:20:36 +08:00
b80a01554b
fix(emqx_retainer): add support for RAP falg
2021-12-24 18:03:55 +08:00
6326e436d3
Merge pull request #6532 from zhongwencool/fix-banned-bad-peerhost-crash
...
fix(banned): crash by bad peerhost; add banned http API tests
2021-12-24 17:04:26 +08:00
41694b7b34
Merge pull request #6526 from emqx/release-5.0-beta.3
...
Sync 5.0-beta.3 fixes into master
2021-12-24 13:49:13 +08:00
72a27e9d8f
fix: fix undefined function call
2021-12-24 13:44:28 +08:00
9769ddeb14
fix(authn): attempt to convert certificate content only when TLS is enabled
2021-12-24 13:40:13 +08:00
33a6568654
fix(banned): crash by bad peerhost; add banned http API tests
2021-12-24 10:56:41 +08:00
d2d50443ce
fix(emqx_retainer): use base64 to encode payload in api's result
2021-12-24 10:48:12 +08:00
8c42b623c6
Merge pull request #6529 from lafirest/fix/retain_payload
...
fix(emqx_retainer): use base64 to encode payload in api's result
2021-12-24 10:26:00 +08:00
b6755d5953
fix(emqx_retainer): use base64 to encode payload in api's result
2021-12-24 10:22:10 +08:00
11c169501e
chore(mix): fix app dependencies and reboot apps (emqx_conf)
...
While declaring `emqx_conf` as an application dependency of
`emqx_resource` worked for releases, it messed up the startup
relationship during tests. Since only removing `emqx_conf` from the
`applications` key in `emqx_resource` breaks the list of apps that
need to be rebooted on config changes (since `emqx_conf` is not on any
apps dependencies list, it was not being added to the final
topologically sorted list), we now always add it as a vertex to ensure
its presence there. This (apparently) makes the rebar3 release, the
mix release and test runs behave normally.
2021-12-23 13:48:28 -03:00
bd31b52e35
chore(ekka): Bump version to 0.11.2
2021-12-23 15:29:35 +01:00
41e373dbc4
Merge pull request #6478 from Spycsh/slog
...
chore: refactor ?SLOG
2021-12-23 22:21:33 +08:00
7c9c7b6a60
refactor(emqx_exhook): refactore exhook and add api module
2021-12-23 17:51:13 +08:00
52502e29c3
fix: disconnect the client due to exceed receive-maximum packets
...
As described in the 5.0 specification, we should disconnect clients that
exceed the receive-maximum limit.
> If it receives more than Receive Maximum QoS 1 and QoS 2 PUBLISH packets
where it has not sent a PUBACK or PUBCOMP in response, **the Server uses a
DISCONNECT packet with Reason Code 0x9**
fix : #6447
2021-12-23 14:06:11 +08:00
80c1128b7a
fix(authz): fix deadlock issues
2021-12-23 11:45:58 +08:00
967989075c
Merge pull request #6512 from terry-xiaoyu/fix_rule_api_swagger
...
Fix rule api swagger
2021-12-23 10:37:53 +08:00
238895a301
chore(mix): correctly define release version
...
With this, we no longer need the last hack in `mix_release.sh`.
A version schema with 3 parts (Major.Minor.Patch) is required by
Elixir:
https://hexdocs.pm/elixir/1.13.1/Version.html#module-versions
2021-12-22 15:43:43 -03:00
e137555052
fix(tests): fix include paths that were moved
2021-12-22 15:15:19 -03:00
68cbded7c6
fix(dialyzer): fix dialyzer warnings
...
Adding hocon to emqx solves the issue, since other offending apps
depend on emqx. The warnings were that it was not able to find info
on the `hocon_schema` behaviour.
Example:
```
Callback info about the hocon_schema behaviour is not available
```
2021-12-22 15:15:19 -03:00
b846193556
Merge pull request #6518 from HJianBo/gw-review-r2
2021-12-22 22:10:18 +08:00
34d6dbca61
chore(mix): simplify build by using rebar3 for umbrella apps
...
By treating the apps in the umbrella as dependencies to be managed and
built by rebar3, we can simplify the maintenance of the release, at
the cost of increased build times: using Mix as before, it could track
changed files better than using rebar. But the complexity and
possibility of discrepancies make it using rebar much more compelling.
2021-12-22 09:40:01 -03:00
1bcdbf3a06
chore(gw): make some fields required
2021-12-22 16:49:34 +08:00
6d4aac1600
chore(gw): improve http error messages
2021-12-22 16:49:33 +08:00
3fd9061418
fix(gw): save coap channel info
2021-12-22 16:49:33 +08:00
2e10a5700c
Merge pull request #6515 from zhongwencool/fix-bann-utf8
...
fix(banned): create banned with utf8 failed by 500 response
2021-12-22 16:08:34 +08:00
b11a15fa00
fix(banned): create banned with utf8 failed by 500
2021-12-22 14:29:15 +08:00
cd4227b851
fix(rules): don't show the module name 'emqx_rule_outputs' in outputs
2021-12-22 10:26:22 +08:00
9b4b3d2e8c
fix(rules): make the 'name' field of POST /rules mandatory
2021-12-22 10:26:22 +08:00
5f050b149b
fix(rules): the schema for unsubscribe is messing from rule_test API
2021-12-22 10:26:22 +08:00
917575de5a
chore(mix): minimal elixir mix release build
...
This commit enables a minimal working build of EMQX release using
Mix. However, to properly start the release, several configuration
steps are still missing. A `mix_release.sh` script does a few hacks
to get the release built with Mix to start properly, by first assuming
that `make emqx` has been run prior to the release, ran once to
generate the `app.*.config` files, and then it copies that and some
other files to the expected places.
Also, `emqx_telemetry` hangs the start procedure because it thinks
it's in an official release and tries to make a request. We disable
it temporarily via config just to get a working build for now.
2021-12-21 13:51:22 -03:00
25b7719db5
feat(authz): support sync configuration in the cluster
2021-12-21 17:00:49 +08:00
99a5f14301
fix(telemetry): use required fields, rolling distro use PRETTY_NAME
2021-12-21 10:44:54 +08:00
6f28e103d0
fix(dashobard): statistical diagram timestamp use UTC time
2021-12-20 19:21:19 +08:00
db08cee20f
Merge pull request #6456 from HJianBo/gw-review-r1
2021-12-20 13:48:24 +08:00
efb0365cdd
Merge pull request #6481 from terry-xiaoyu/fix_rule_apis
...
fix(connector): some desc for connector APIs
2021-12-20 13:46:29 +08:00
27de3139a4
fix(http_connect): don't check status on_start
2021-12-20 11:36:52 +08:00
f7a55d3f8d
Merge pull request #6238 from zhongwencool/fix-keepalive-ct-failed
...
fix: keepalive ct failed
2021-12-20 11:00:20 +08:00
5b1ed76a44
chore(gw-frame): export types for dialyzer check
2021-12-20 10:59:16 +08:00
a879ec0f3a
feat(resource): add option 'force_create' to emqx_resource:create/4
2021-12-20 10:26:27 +08:00
96ee51fe57
Merge pull request #6460 from zmstone/feat-add-plugin-mgmt
...
refactor(plugins): refactor plugins configuration interface
2021-12-20 09:24:38 +08:00
05e24b457a
fix(bridge): update emqx_bridge.conf
2021-12-18 20:53:14 +08:00
a9c9d9d805
fix(rule): rename enabled to enable
2021-12-18 20:28:14 +08:00
cfaad15364
fix(connector): update the connector config failed
2021-12-18 20:19:34 +08:00
a44e18e869
fix(bridge): filter out some extra fields from the request body
2021-12-18 19:19:58 +08:00
11e8e0db69
fix(bridge): stop http failed due to econnrefused
2021-12-18 15:33:25 +08:00
f08f37ec9c
fix(bridge): create bridge failed but the config was saved
2021-12-18 11:19:22 +08:00
20091f8d2a
fix(connector): some desc for connector APIs
2021-12-18 09:52:15 +08:00
b2e7a6a249
Merge pull request #6473 from terry-xiaoyu/fix_connector_apis
...
fix(connector): add type and name in repsonse of GET /connectors
2021-12-18 09:35:45 +08:00
ca2660d609
chore: refactor ?SLOG
2021-12-18 00:17:45 +01:00
494c08f849
refactor(rule): add name field to request body of POST /rules
2021-12-18 06:34:44 +08:00
7cceecc11e
Merge pull request #6446 from savonarola/test-authz-more
...
Test authz more
2021-12-17 19:06:52 +03:00
93acf8a3a7
Merge pull request #6451 from k32/dev/fix-dispatch-when-emqx-is-stopped
...
fix(broker): Check broker status before dispatch
2021-12-17 15:19:34 +01:00
673a545aa2
fix(dialyzer): bad type specs
2021-12-17 22:15:56 +08:00
7bcd38c101
fix(bridge): update qos fields for swagger examples
2021-12-17 21:41:25 +08:00
0699682f38
refactor(bridges): rename some config entries for MQTT bridge
2021-12-17 21:22:04 +08:00
e24cdb067c
chore(authz): fix Mysql variable substitution
2021-12-17 14:20:53 +03:00
462ec39cb1
chore(authz): test Postgresql backend with real Postgresql
2021-12-17 14:20:50 +03:00
0a1a68245d
chore(authz): test Mysql backend with real Mysql
2021-12-17 14:18:54 +03:00
a21f67a67e
chore(authz): test Mongo backend with real Mongo
2021-12-17 14:18:54 +03:00
28c319b6c4
chore(authz): test Mongo backend with real Mongo
2021-12-17 14:18:54 +03:00
6ad71a483e
chore(authz): test Redis backend with real Redis
2021-12-17 14:18:54 +03:00
9b34f6f9a3
fix(connector): add type and name in repsonse of GET /connectors
2021-12-17 16:45:42 +08:00
870af6df41
fix: Limit interval between 0~65535
2021-12-17 15:51:54 +08:00
fdff3c5a53
fix: keepalive ct failed
2021-12-17 15:51:51 +08:00
58f32c2572
fix(plugins): catch stop_app exception
2021-12-17 08:35:10 +01:00
92fd9c1eca
chore(gw): fix adding subscription
2021-12-17 15:31:07 +08:00
38d42517f7
fix: misc_SUITE:t_drain_down sometimes fails
2021-12-17 14:58:50 +08:00
52c78974d6
chore(gw): fix elvis warnings
2021-12-17 14:16:00 +08:00
561c95c31a
feat(lwm2m): support subscribe/unsubscribe operations
2021-12-17 14:16:00 +08:00
bfbf377a45
feat(coap): support subscribe/unsubscribe operations
2021-12-17 14:16:00 +08:00
6b8bdfd113
chore(gw): support to get subscriptions from coap
2021-12-17 14:16:00 +08:00
3443aeff18
fix(gw): handle discard/kick event
2021-12-17 14:16:00 +08:00
a2823f2ad6
chore(gw): improve some type specs
2021-12-17 14:16:00 +08:00
8be2aaf72c
Merge pull request #6452 from zhongwencool/log-trace-api
...
feat(trace): trace http api schema
2021-12-17 12:44:15 +08:00
3a3226fc78
fix(dashboard): enable dashboard by default
2021-12-17 11:20:23 +08:00
38438415b8
fix: replace LOG by SLOG
2021-12-17 10:52:14 +08:00
89d904b7ef
feat(trace): trace http api schema
2021-12-17 09:29:37 +08:00
f15efb4930
chore: add a function comment
2021-12-16 22:08:16 +01:00
b1ec8c1aba
fix(plugins): fix relative positioning
2021-12-16 21:57:08 +01:00
48ad0adbaa
refactor: delete plugin management APIs from emqx_mgmt
...
Will move the APIs to emqx_plugins_api.erl
2021-12-16 21:53:42 +01:00
3a7924d0fd
refactor(plugins): new CLI for plugins
2021-12-16 21:21:16 +01:00
47661042b9
fix(cli): make emqx_ctl aware of max width
2021-12-16 20:12:15 +01:00
477b62200d
fix(authz): placeholder regular expression escape
2021-12-16 23:33:26 +08:00
b9a3b558ee
refactor(plugins): refactor plugins configuration interface
2021-12-16 13:59:20 +01:00
618113d507
fix(broker): Check broker status before dispatch
...
Fixes : #6388
2021-12-15 19:49:46 +01:00
a43ac1b778
fix: improve rfc3339 format error
2021-12-15 16:58:07 +08:00
e4a21fd90d
fix: merge from master
2021-12-15 16:24:25 +08:00
f95ef04cf7
Merge branch 'master' into api-key-secret
2021-12-15 16:01:09 +08:00
141921bfc4
Merge pull request #6449 from zhongwencool/slow_sub
...
fix: slow_sub api return field's notice_interval is missing
2021-12-15 14:45:33 +08:00
29ccc98a42
fix: slow_sub api return field's notice_interval is missing
2021-12-15 10:36:13 +08:00
95de2d3467
fix(monitor): fix return value on badrpc
...
If the rpc in `emqx_dashboard_monitor_api:get_collect/1` fails, an
empty map is return. But the current function expects a 4-tuple,
which results in a 500 error returned on such occasions.
```
curl -su admin:public localhost:8888/api/v5/monitor/current | jq .
{
"code": "INTERNAL_ERROR",
"message": "error, function_clause, [{emqx_dashboard_monitor_api,format_current_metrics,[[#{},{0,0,0,0},{0,0,0,0}],{0,0,0,0}],[{file,\"emqx_dashboard_monitor_api.erl\"},{line,179}]},{emqx_dashboard_monitor_api,current_counters,2,[{file,\"emqx_dashboard_monitor_api.erl\"},{line,167}]},{minirest_handler,apply_callback,3,[{file,\"minirest_handler.erl\"},{line,112}]},{minirest_handler,init,2,[{file,\"minirest_handler.erl\"},{line,38}]},{cowboy_handler,execute,2,[{file,\"cowboy_handler.erl\"},{line,41}]},{cowboy_stream_h,execute,3,[{file,\"cowboy_stream_h.erl\"},{line,318}]},{cowboy_stream_h,request_process,3,[{file,\"cowboy_stream_h.erl\"},{line,302}]},{proc_lib,init_p_do_apply,3,[{file,\"proc_lib.erl\"},{line,226}]}]"
}
```
2021-12-14 17:56:32 -03:00
0300403fc0
fix(admin): inconsistent return type on empty inputs
...
If an empty username or password are given during the initialization
of `emqx_dashboard_admin`, it'll return just the atom `ok`, which
breaks the expected `{ok, _}` in `emqx_dashboard_app:start/2`.
```
{'EXIT',
{{failed_to_start_app,emqx_dashboard,
{emqx_dashboard,
{bad_return,
{{emqx_dashboard_app,start,[normal,[]]},
{'EXIT',
{{badmatch,ok},
[{emqx_dashboard_app,start,2,
[{file,
"/home/thales/dev/emqx/emqx/apps/emqx_dashboard/src/emqx_dashboard_app.erl"},
{line,32}]},
{application_master,start_it_old,4,
[{file,"application_master.erl"},{line,293}]}]}}}}}}}}
```
2021-12-14 17:51:50 -03:00
b8a68d7a9f
Merge pull request #6384 from savonarola/refactor-password-hashing
...
refactor(authn): unify password hashing
2021-12-14 16:21:02 +03:00
5538cd3708
Merge pull request #6441 from savonarola/refactor-acl
...
refactor(authz): hide mnesia authz implementation details
2021-12-14 11:32:25 +03:00
56804ef733
Merge pull request #6427 from zmstone/feat-add-emqx-plugins-app
...
feat(plugins): add emqx_plugins skeleton
2021-12-14 16:26:58 +08:00
Thales Macedo Garitezi