yuanbiao/emqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,411 Commits 393 Branches 684 Tags 74 MiB
b29fd486af
Commit Graph

10381 Commits

Author SHA1 Message Date
Zaiming (Stone) Shi
2b61f5290d
Merge pull request #12236 from zmstone/1227-ensure-short-mqtt-bridge-clientid 
fix(bridge/mqtt): ensure short clientid
 2023-12-28 16:06:09 +01:00
zhongwencool
a6acebb4aa
Merge pull request #12240 from zhongwencool/ft-api-e-541 
fix: return raw config when update ft's config
 2023-12-28 22:25:22 +08:00
Andrew Mayorov
18dc9b2516
fix(s3): remove emqx_bridge_http from runtime dependencies 
Otherwise it's impossible to test `emqx_s3` in isolation.
 2023-12-28 14:13:22 +01:00
Andrew Mayorov
1d9374125c
chore: bump emqx_s3 to 5.0.13 2023-12-28 14:12:33 +01:00
Andrew Mayorov
33ef964582
fix(s3): handle extra configured headers correctly 
* Header names in config become atoms.
  (Probably because of blanket `unsafe_atom_key_map/1` in `emqx_config`)
* Header names should be normalized to lowercase.
  (Otherwise signature will be incorrect)
 2023-12-28 13:55:05 +01:00
Zaiming (Stone) Shi
4669c4d552 fix(bridge/mqtt): ensure short clientid 
Some mqtt brokers do not allow long client IDs.
To make it compatible with this limitation, this commit
tries to limit the number of bytes under 23 with a best-effort
attempt to derive it from the bridge name.
 2023-12-28 11:53:27 +01:00
zhongwencool
1fd67564ce fix: return raw config when update ft's config 2023-12-28 14:49:36 +08:00
JianBo He
b6391cf18c fix(bridge-http): compatible conf with the error format introduced in 5.3.2 2023-12-28 11:36:48 +08:00
zhongwencool
e645fa4874 fix: ft config update api return raw config 2023-12-27 21:13:47 +08:00
Serge Tupchii
423b8b4274 fix(emqx_opentelemetry): use converter to convert legacy metrics config 
HOCON converter is cleaner and safer option,
that will also work for configurations defined in emqx.conf.
Previously used `upgrade_raw_conf/1` is currently not supported in hocon_cli (used in bin/emqx).

Fixes: EMQX-11643
 2023-12-27 14:15:12 +02:00
zhongwencool
711a9a06c8
Merge pull request #12221 from thalesmg/test-flaky-retry-m-20231222 
test: reduce flakiness
 2023-12-27 14:30:25 +08:00
zhongwencool
11feab983f fix: clean rpc_commit when force_leave cluster 2023-12-26 15:25:58 +08:00
Zaiming (Stone) Shi
e421e9ce56 Merge remote-tracking branch 'origin/release-54' into 1222-sync-e5.4.0-build.2-to-master 2023-12-23 11:22:05 +01:00
Zaiming (Stone) Shi
f36b842d94 chore: prepare for e5.4.0 retag 2023-12-23 11:18:19 +01:00
Zaiming (Stone) Shi
86a018d921 chore: bump app versions 2023-12-22 21:28:26 +01:00
Zaiming (Stone) Shi
9fdac4af0c Merge remote-tracking branch 'origin/master' into 1222-sync-e5.4.0-build.2-to-master 2023-12-22 21:27:27 +01:00
Thales Macedo Garitezi
890970345b test: reduce flakiness 2023-12-22 15:31:56 -03:00
Zaiming (Stone) Shi
ac6e4cf2cc fix: config update for ft 2023-12-22 19:01:14 +01:00
Zaiming (Stone) Shi
733196aa83 chore: prepare for e5.4.0-build.2 2023-12-22 18:59:46 +01:00
Thales Macedo Garitezi
85963d3b45 test: restore connect timeout for test case 2023-12-22 14:10:24 -03:00
Zaiming (Stone) Shi
23ded313ec chore: update app versions 2023-12-22 15:29:22 +01:00
Zaiming (Stone) Shi
891fd972bd Merge remote-tracking branch 'origin/release-54' into 1221-prepare-bpapi-on-otp-26 2023-12-22 15:19:25 +01:00
Zaiming (Stone) Shi
5b5d4a6f68 chore: bump release version to e5.4.0-build.1 2023-12-22 14:00:12 +01:00
zhongwencool
a16bce8c24 fix: deobfuscate ft's secret keys in api 2023-12-22 13:13:44 +01:00
Zaiming (Stone) Shi
20543d55ef chore: bump app vsn 2023-12-22 13:13:30 +01:00
Zaiming (Stone) Shi
322b7bb7d2 chore: bump app vsn 2023-12-22 13:00:37 +01:00
Zaiming (Stone) Shi
ecc31217fd Merge remote-tracking branch 'origin/master' into 1221-prepare-bpapi-on-otp-26 2023-12-22 12:48:06 +01:00
Zaiming (Stone) Shi
17d3037a13 chore: add 5.4.bpapi 2023-12-22 12:47:41 +01:00
ieQu1
ec0693861a fix(static_checks): Prepare for OTP26 2023-12-22 12:02:30 +01:00
zhongwencool
2d5f7e0a6d
Merge pull request #12215 from thalesmg/sync-r54-m-20231221 
sync r54 to master
 2023-12-22 10:24:29 +08:00
Thales Macedo Garitezi
035f5f977e Merge remote-tracking branch 'origin/release-54' into sync-r54-m-20231221 2023-12-21 17:53:05 -03:00
Zaiming (Stone) Shi
f4286f3208 test(gcp_pubsub): increase wait timeout and fix falt injection 2023-12-21 20:59:51 +01:00
Zaiming (Stone) Shi
36d2929534 chore: prepare for release version 5.4.0 2023-12-21 19:51:12 +01:00
Zaiming (Stone) Shi
a9b1b82546
Merge pull request #12210 from keynslug/feat/EMQX-11579/schema-type-doc 
feat(schema): provide type-level documentation snippets
 2023-12-21 18:46:22 +01:00
Zaiming (Stone) Shi
d9b3280f30
Merge pull request #12214 from zhongwencool/update-actions-connectors 
fix: emqx conf ctl load failed with connectors/actions
 2023-12-21 17:39:44 +01:00
Andrew Mayorov
aa3f8d6735
fix(typedoc): meld it into the field doc in the meantime 2023-12-21 17:15:54 +01:00
Andrew Mayorov
85d7518a7d
feat(schema): provide type-level documentation snippets 
For stuff like `duration()`, `bytesize()` and `secret()` for now.
 2023-12-21 17:15:54 +01:00
zhongwencool
37930f1d3c fix: emqx conf ctl load failed with connectors/actions 2023-12-21 22:09:53 +08:00
zhongwencool
74f1ce0955
Merge pull request #12211 from zhongwencool/redis-resource-opts 
fix: redis resource_opts not working
 2023-12-21 22:08:41 +08:00
Thales Macedo Garitezi
18b69809da Merge branch 'release-54' into sync-r54-m-20231221 2023-12-21 10:05:13 -03:00
Thales Macedo Garitezi
d898573acf
Merge pull request #12208 from thalesmg/test-yet-another-attempt-r54-20231220 
test(gcp_pubsub_consumer): yet another attempt to stabilize tests
 2023-12-21 09:55:33 -03:00
zhongwencool
5d1a412d0c fix: redis resource_opts not working 2023-12-21 18:29:49 +08:00
lafirest
de02dd21ca
Merge pull request #12157 from lafirest/feat/dsgen 
feat(ds): add an API for making new generations
 2023-12-21 09:30:17 +08:00
Thales Macedo Garitezi
471877598e
Merge pull request #12209 from thalesmg/fix-schema-file-typo-r54-20231220 
ci: fix typo in file name
 2023-12-20 17:49:07 -03:00
Thales Macedo Garitezi
aeabff41c9 ci: fix typo in file name 2023-12-20 15:39:57 -03:00
Thales Macedo Garitezi
b2c82ab052 test(gcp_pubsub_consumer): yet another attempt to stabilize tests 
Hopefully, should work better after https://github.com/emqx/emqx/pull/12197
 2023-12-20 13:21:13 -03:00
Thales Macedo Garitezi
a43f49f8fa chore: prepare to tag 5.4.0-rc.1 2023-12-20 12:43:08 -03:00
Thales Macedo Garitezi
2b03ae8daf
Merge pull request #12205 from thalesmg/fix-list-v2-actions-in-v1-bridges-r54-20231220 
fix(bridges_v1): don't list v2-only bridges in API
 2023-12-20 12:37:16 -03:00
Andrew Mayorov
f39af14524
Merge pull request #12180 from keynslug/fix/gw-dtls-opts 
fix(gw): use more conservative set of DTLS options
 2023-12-20 15:24:56 +01:00
firest
612be8e280 fix(ds): make dialyzer happy 2023-12-20 22:09:03 +08:00
Thales Macedo Garitezi
b61ccf3373 fix(bridges_v1): don't list v2-only bridges in API 
Fixes https://emqx.atlassian.net/browse/EMQX-11614
 2023-12-20 10:46:35 -03:00
Andrew Mayorov
ccb9a977d6
test(gw-authn): switch to emqx_cth_suite + simplify testsuite 2023-12-20 14:38:18 +01:00
Andrew Mayorov
76c89ad372
test(gw-authz): switch to emqx_cth_suite + simplify testsuite 
Also separate DTLS related MQTT-SN test config, so that it doesn't
leak into this test suite.
 2023-12-20 14:37:49 +01:00
Serge Tupchii
333709164c refactor: change mria default shard transport from 'gen_rpc' to 'distr' 
Erlang distribution seems to outperform gen_rpc (unless gen_rpc clients
are scaled up, but this is not easy to achive for shard transport as it
may reorder events).
 2023-12-20 15:37:00 +02:00
Andrew Mayorov
32a64cf201
fix(gw): update DTLS listener setup according to esockd 5.11.x 
Also drop unnecessary UDP default options.
 2023-12-20 13:59:30 +01:00
Andrew Mayorov
62bb9938e7
test(exproto): switch to emqx_cth_suite + fix listener options 2023-12-20 13:59:30 +01:00
firest
ed38ca67d5 fix(ds): Unified the names of the add_generation API 2023-12-20 18:58:03 +08:00
Andrew Mayorov
5c5ecbe3cf
fix(gw): unbreak schema + transform DTLS options properly 
Thus ensuring full backward compatibility. Unsupported options
(`gc_after_handshake`, `ocsp`) are silently ignored now. Also make
sure that UDP configuration are part of DTLS option set, as expected
by `esockd`.
 2023-12-20 11:46:08 +01:00
Andrew Mayorov
3ea2bbefaa
test(mqttsn): generate TLS certificates for tests on the fly 2023-12-20 11:46:07 +01:00
Andrew Mayorov
3d679f7e26
test(cth-tls): add test helpers for TLS related activities 
Currently, only certificate issuing and related utilities are there.
 2023-12-20 11:46:07 +01:00
Andrew Mayorov
78d3f49fe4
fix(gw): use more conservative set of DTLS options 2023-12-20 11:46:04 +01:00
Andrew Mayorov
d3b32b64e1
Merge pull request #12201 from keynslug/feat/EMQX-11527/tls-hot-update 
feat(listen): support hot config update of MQTT listeners
 2023-12-20 09:45:12 +01:00
zhongwencool
a4fe4ceb9e chore: add example for clients api 2023-12-20 14:53:05 +08:00
JianBo He
cc15e3a03b
Merge pull request #12199 from zhongwencool/configs-put-bridge-v1-api 
fix: support bridge v1 conf hocon-format in the put configs API.
 2023-12-20 09:32:32 +08:00
JianBo He
1e288de1d9
Merge pull request #12203 from JimMoen/EMQX-11610-gw-OCPP-subscription-cnt 
EMQX 11610 gw ocpp subscription cnt
 2023-12-20 09:31:08 +08:00
Andrew Mayorov
a6c26ce992
test(listen): stabilize flaky testcase 2023-12-19 23:36:52 +01:00
Andrew Mayorov
baf46c9aa2
test(listen): also change CA on update and verify clients notice 2023-12-19 22:48:38 +01:00
JimMoen
465f71180a
fix(gw): return HTTP 400 for unimplemented handle call 2023-12-20 03:22:54 +08:00
Zaiming (Stone) Shi
9e24d08be3
Merge pull request #12202 from zmstone/1219-upgrade-gen_rpc-3.3.1 
fix: upgrade to gen_rpc 3.3.1 which does not log cast args only arity
 2023-12-19 19:41:46 +01:00
JimMoen
578a231a8d
fix(gw_ocpp): subscriptions cnt 2023-12-20 02:14:30 +08:00
JimMoen
d37c5cc798
fix(gw_ocpp): frame outgoing badmatch 2023-12-20 01:27:12 +08:00
JimMoen
af7b14ed3f
refactor(gw_ocpp): default conf macro readable 2023-12-20 01:27:12 +08:00
Thales Macedo Garitezi
55f0c1bbda
Merge pull request #12197 from thalesmg/test-more-flaky-fix-r54-20231218 
test(gcp_pubsub_consumer): another attempt to stabilize flaky tests
 2023-12-19 13:47:23 -03:00
Thales Macedo Garitezi
5b19e6b6f4
Merge pull request #12198 from thalesmg/sync-r54-m-20231218 
sync r54 to master
 2023-12-19 13:22:45 -03:00
Andrew Mayorov
7e4049620d
fix(listen): ensure limiter server state consistent with updates 2023-12-19 16:06:27 +01:00
Andrew Mayorov
4796f85dff
test(listen): verify SSL options of WSS listener are hot updateable 2023-12-19 16:06:27 +01:00
Andrew Mayorov
036048b9ab
feat(listen): support hot update of WS/WSS options as well 
However, currently any transport option changes will cause listener to
restart, which slightly impacts the availability of the broker.
 2023-12-19 16:06:27 +01:00
Andrew Mayorov
68bbbec556
chore: bump to esockd 5.11.1 
With a typespec fix.
 2023-12-19 16:06:27 +01:00
Andrew Mayorov
a20ef0376b
test(exproto): fix too small buffer size for listener 
These options have not been picked up by the listener before esockd
5.11.0, so it was not apparent that they are not working.
 2023-12-19 16:06:27 +01:00
Andrew Mayorov
fb2d4544b6
test(listen): verify that SSL options are hot-updateable 2023-12-19 16:06:26 +01:00
Andrew Mayorov
da0f0f947e
feat(listen): support hot config update of esockd-based listeners 2023-12-19 16:06:26 +01:00
Zaiming (Stone) Shi
2b6176aa60 fix: upgrade to gen_rpc 3.3.1 which does not log cast args only arity 2023-12-19 12:46:42 +01:00
Andrew Mayorov
cafd384466
chore: upgrade to esockd 5.11.0 2023-12-19 11:15:09 +01:00
zhongwencool
1c17121d44 chore: move redis_type into paramaters in actions 2023-12-19 17:09:08 +08:00
zhongwencool
a46b415c77 fix: support bridge v1 conf hocon-format in the put configs API. 2023-12-19 16:40:45 +08:00
Zaiming (Stone) Shi
2be898ca4d refactor(auth/jwt): support raw rules from jwt acl claim 2023-12-19 08:10:38 +01:00
Thales Macedo Garitezi
5128c11542 test(gcp_pubsub_consumer): another attempt to stabilize flaky tests 2023-12-18 17:37:58 -03:00
Thales Macedo Garitezi
cf9331a95f Merge branch 'release-54' into sync-r54-m-20231218 2023-12-18 17:21:08 -03:00
Andrew Mayorov
78f7d01b1c
test(listen): simplify test suite setup / teardown 2023-12-18 20:52:57 +01:00
Thales Macedo Garitezi
f61f267ac4
Merge pull request #12195 from thalesmg/test-redis-v2-r54-20231218 
test(redis_action): add minimal smoke tests
 2023-12-18 16:34:03 -03:00
Thales Macedo Garitezi
bd54a0f532
Merge pull request #12193 from thalesmg/fix-mysql-batch-update-r54-20231218 
fix(mysql_bridge): forbid update statements with batch operations
 2023-12-18 16:33:51 -03:00
Thales Macedo Garitezi
2c61b2bfbb fix(mysql_bridge): forbid update statements with batch operations 
Fixes https://emqx.atlassian.net/browse/EMQX-11605
 2023-12-18 15:05:14 -03:00
Zaiming (Stone) Shi
7338e394c8 perf: upgrade to wolff 1.9.1 for better performance 
Upgrade from 1.8.0:
- wollf-1.9.0 has the global stats disabled by default
- wolff-1.9.1 improved client pid lookup performance
 2023-12-18 18:54:21 +01:00
Thales Macedo Garitezi
f6bb948e6f test(redis_action): add minimal smoke tests 2023-12-18 14:39:13 -03:00
Thales Macedo Garitezi
2d11aca39f
Merge pull request #12186 from thalesmg/gcp-pubsub-local-topic-action-r54-20231215 
fix(gcp_pubsub_producer): mark `local_topic` as hidden in action schema
 2023-12-18 11:34:19 -03:00
Thales Macedo Garitezi
3f06ebcaf7
Merge pull request #12181 from thalesmg/fix-fill-default-v1-api-return-r54-20231215 
fix(bridge_v1_api): fill defaults for v2 raw configs and fix redis connector schema
 2023-12-18 11:34:07 -03:00
Zaiming (Stone) Shi
ef2cf71bea chore: bump version to 5.4.0-alpha.2 2023-12-18 13:51:21 +01:00
Zaiming (Stone) Shi
a9963e043b refactor(authz): improve logging 
Move authz result logging to common place.

Prior to this change, the final result is not logged when
fallback to the default authorization.no_match config value.

Aso, if the result is provided by a hook callback,
it's also not logged.

After this change, only the final result is logged.
The authz chain resutls can be traced (or logged at debug level).
 2023-12-17 22:32:26 +01:00
Zaiming (Stone) Shi
35504bd323 refactor: move ntoa (ip address formatting) code to emqx_utils 2023-12-17 21:03:16 +01:00
JimMoen
725e7a17bb
docs(gw_jt808): fix and reformat data exchange guide 2023-12-18 03:21:49 +08:00