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

12393 Commits

Author SHA1 Message Date
Thales Macedo Garitezi
24ac241727
Merge pull request #13380 from thalesmg/20240701-r57-fix-http-bridge-hc-return-value 
fix(http action): use correct return value for channel health check
 2024-07-02 09:13:53 -03:00
Thales Macedo Garitezi
db07a1ebea feat(message transformation): add more read-only fields to context 
Fixes https://emqx.atlassian.net/browse/EMQX-12583
 2024-07-02 09:13:19 -03:00
firest
686f79c036 fix: fix two minor issues of bulti-in authn/authz 
1. the `Derived Key Length` for `pbkdf2` should be a positive integer.
2. fix topics in the authorization rules might be parsed incorrectly
 2024-07-02 19:35:48 +08:00
firest
a46440d00a feat(log): allows custom the encoding of payload in the log 2024-07-02 19:33:31 +08:00
JianBo He
7e0bcd4eda chore: tests in otp26 2024-07-02 15:26:07 +08:00
Thales Macedo Garitezi
317b29451f test(gcp consumer): attempt to stabilize flaky test 
```
%%% emqx_bridge_kafka_impl_consumer_SUITE ==> ssl.t_start_and_consume_ok: FAILED
%%% emqx_bridge_kafka_impl_consumer_SUITE ==> {{panic,
     #{msg => "Unexpected result",
       result =>
           {run_stage_failed,error,
               {badmatch,{{1,0},timeout}},
               [{emqx_bridge_kafka_impl_consumer_SUITE,
                    '-t_start_and_consume_ok/1-fun-12-',4,
                    [{file,
                         "/emqx/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl"},
                     {line,1184}]},
                {emqx_bridge_kafka_impl_consumer_SUITE,
                    t_start_and_consume_ok,1,
                    [{file,
                         "/emqx/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl"},
                     {line,1171}]}]}}},
 [{emqx_bridge_kafka_impl_consumer_SUITE,t_start_and_consume_ok,1,
      [{file,
           "/emqx/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_consumer_SUITE.erl"},
       {line,1240}]},
```
 2024-07-01 17:57:17 -03:00
Thales Macedo Garitezi
c04e93838f test(eviction agent): attempt to stabilize flaky test 
```
%%% emqx_eviction_agent_SUITE ==> t_session_serialization: FAILED
%%% emqx_eviction_agent_SUITE ==>
Failure/Error: ?assertEqual(1, emqx_eviction_agent : session_count ( ))
  expected: 1
       got: 2
      line: 348
```
 2024-07-01 16:10:32 -03:00
Thales Macedo Garitezi
59084dbfbe fix(message transformation): correctly read from user properties in context 
Port of https://github.com/emqx/emqx/pull/13316 to release-57

Fixes https://emqx.atlassian.net/browse/EMQX-12582
 2024-07-01 14:53:42 -03:00
Thales Macedo Garitezi
6dbb561944
Merge pull request #13355 from thalesmg/20240627-r57-fix-connector-api-bad-ssl-config 
fix(connector api): handle bad tls config file conversion errors
 2024-07-01 14:26:09 -03:00
Thales Macedo Garitezi
b14856cf1a refactor: improve error messages 2024-07-01 13:21:17 -03:00
Thales Macedo Garitezi
72664780df fix(http action): use correct return value for channel health check 
Fixes https://emqx.atlassian.net/browse/EMQX-12622
 2024-07-01 11:17:57 -03:00
Thales Macedo Garitezi
d1e9b097d1
Merge pull request #13365 from thalesmg/20240628-r57-fix-dashboard-add-default-user-concurrently 
fix(dashboard): handle add default user race condition
 2024-07-01 10:22:32 -03:00
lafirest
bd075caf56
Merge pull request #13358 from lafirest/fix/authn_reason 
fix(events): fixed the reason format of the `authn_complete_event`
 2024-07-01 18:46:18 +08:00
firest
a0644d4612 chore: update app version 2024-07-01 16:32:08 +08:00
Thales Macedo Garitezi
ec6e862539 test(authz cache): attempt to fix flaky test 
Hypothesis: some race condition involving the previous test case, which uses the same
clientid.

```
Testing apps.emqx.emqx_authz_cache_SUITE: *** FAILED test case 3 of 3 ***
%%% emqx_authz_cache_SUITE ==> t_drain_authz_cache: FAILED
%%% emqx_authz_cache_SUITE ==>
Failure/Error: ?assertEqual([], list_cache ( ClientPid ))
  expected: []
       got: [{{#{qos => 0,action_type => publish,retain => false},<<"t1">>},
              {allow,1719599365019}}]
      line: 72
```
 2024-06-28 15:40:55 -03:00
Thales Macedo Garitezi
9215b3710f
Merge pull request #13327 from thalesmg/fix-kprodu-delete-wolff-r57-20240624 
fix(kafka and derivatives): add `alias` config to avoid clashes with same topic
 2024-06-28 15:22:11 -03:00
Thales Macedo Garitezi
b69f298058 fix(dashboard): handle add default user race condition 
This can happen at least in tests, when nodes boot concurrently.
 2024-06-28 15:18:23 -03:00
Thales Macedo Garitezi
795d280861 fix(connector api): handle bad tls config file conversion errors 
Fixes https://emqx.atlassian.net/browse/EMQX-12581
 2024-06-28 14:31:31 -03:00
Thales Macedo Garitezi
2a9c27d206
Merge pull request #13345 from thalesmg/20240626-r572-fix-validate-schema-reg-name 
fix(schema registry api): validate schema name when creating
 2024-06-28 12:08:27 -03:00
Thales Macedo Garitezi
063e7657b5
Merge pull request #13344 from thalesmg/20240626-r572-multi-node-bulk-subscribe 
fix(client mgmt api): make bulk subscribe work again in clusters
 2024-06-28 12:08:16 -03:00
Thales Macedo Garitezi
067beece75 chore: add count to thrown error 2024-06-28 12:06:47 -03:00
JianBo He
7cf0e69fdf chore: fix failed tests 2024-06-28 14:07:59 +08:00
firest
e8176b80a6 fix(events): fixed the reason format of the authn_complete_event 2024-06-28 11:09:28 +08:00
JianBo He
b39557f6fd
Merge pull request #13336 from zhongwencool/authn-boostrap-file 
feat: support bootstrap_file on authentication for build-in-database
 2024-06-28 09:07:53 +08:00
Thales Macedo Garitezi
e76e94b497 perf(mgmt): optimize bulk unsubscribe when registry is enabled 2024-06-27 10:32:55 -03:00
Thales Macedo Garitezi
0b329dbf06 perf(mgmt): optimize bulk subscribe when registry is enabled 2024-06-27 10:32:55 -03:00
Thales Macedo Garitezi
c49900af50 perf(mgmt): optimize clientid lookup when registry is enabled 2024-06-27 10:32:55 -03:00
Thales Macedo Garitezi
7b7f44b9ac fix(client mgmt api): make bulk subscribe work again in clusters 
Fixes https://emqx.atlassian.net/browse/EMQX-12337
 2024-06-27 09:37:55 -03:00
Thales Macedo Garitezi
6f00df6452 fix(schema registry api): validate schema name when creating 
Fixes https://emqx.atlassian.net/browse/EMQX-10958
 2024-06-27 09:26:41 -03:00
Thales Macedo Garitezi
ff8c2bc1d8 feat(authz): add ignore metric for each source type 
Fixes https://emqx.atlassian.net/browse/EMQX-12411
 2024-06-27 09:22:45 -03:00
Thales Macedo Garitezi
4bd0abc93f chore: bump app vsns 2024-06-27 09:22:06 -03:00
Thales Macedo Garitezi
4c3c86e919 chore: bump wolff -> 2.0.0 2024-06-27 09:20:00 -03:00
Thales Macedo Garitezi
164a507899 test(pulsar): add testcase for different producers using the same topic 2024-06-27 09:20:00 -03:00
Thales Macedo Garitezi
ed5e6599d9 fix(buffer worker, kafka): send reply when async call fails immediately 
Fixes https://emqx.atlassian.net/browse/EMQX-12585
 2024-06-27 09:20:00 -03:00
Thales Macedo Garitezi
6023012f8b fix(kafka and derivatives): add alias config to avoid clashes with same topic 
Fixes https://emqx.atlassian.net/browse/EMQX-12592
 2024-06-27 09:20:00 -03:00
JianBo He
3b21c41690 feat: support to extract the client peersni field to clientinfo 2024-06-27 17:13:10 +08:00
zmstone
b6e7d7566d Merge remote-tracking branch 'origin/release-572' into release-57 2024-06-27 11:09:02 +02:00
JimMoen
ef28579c4a
Merge pull request #13334 from JimMoen/fix-mqtt-username-password-flag 
fix(mqtt): check password flag to respect protocol spec
 2024-06-27 16:16:53 +08:00
lafirest
68d747b7b9
Merge pull request #13324 from lafirest/feat/oidc-572 
feat(sso): add OIDC support
 2024-06-27 11:24:05 +08:00
firest
3d398873f1 fix(oidc): return to dashboard when provider calls back 
fixed a bug when updating config
 2024-06-27 10:22:07 +08:00
zhongwencool
9594b6df32 chore: warning overrided when restart authn 2024-06-27 10:16:04 +08:00
zhongwencool
24d2534641 chore: apply review suggestion 2024-06-27 10:16:04 +08:00
zhongwencool
5265c3cc1f feat: support bootstrap_file on build-in-db authn 2024-06-27 10:16:04 +08:00
zmstone
557a843c69 chore: minimize oss/platform diff 2024-06-26 22:48:50 +02:00
zmstone
82e7b75a02 chore: bump app versions 2024-06-26 22:47:18 +02:00
zmstone
98f70ea8d8 Merge remote-tracking branch 'origin/release-572' into release-57 2024-06-26 22:28:08 +02:00
Andrew Mayorov
d8963c836e
Merge pull request #13332 from keynslug/ft/EMQX-12571/error-mapping 
feat(bridge-s3): provide more meaningful error details in status
 2024-06-26 21:13:51 +02:00
Thales Macedo Garitezi
263e654208
Merge pull request #13340 from thalesmg/20240626-r572-fix-docs-conf-load 
fix: don't crash if application is already loaded
 2024-06-26 15:15:49 -03:00
Thales Macedo Garitezi
e81494a132 fix: don't crash if application is already loaded 
```
Runtime terminating during boot ({{badmatch,{error,{already_loaded,wolff}}},[{emqx_conf,load,2,[{file,"emqx_conf.erl"},{line,167}]},{lists,foreach_1,2,[{file,"lists.erl"},{line,1686}]},{emqx_conf,dump_schema,2,[{file,"emqx_conf.erl"},{line,150}]},{erl_eval,do_apply,7,[{file,"erl_eval.erl"},{line,746}]},{erl_eval,expr,6,[{file,"erl_eval.erl"},{line,494}]},{erl_eval,exprs,6,[{file,"erl_eval.erl"},{line,136}]},{init,start_it,1,[]},{init,start_em,1,[]}]})
```
 2024-06-26 13:41:32 -03:00
Thales Macedo Garitezi
954adc71c4 test: attempt to fix flaky test 
https://github.com/emqx/emqx/actions/runs/9662725303/job/26653594859?pr=13328#step:6:186

```
%%% emqx_resource_SUITE ==> t_expiration_retry: FAILED
%%% emqx_resource_SUITE ==> {{panic,
     #{msg => "Unexpected result",
       result =>
           {run_stage_failed,error,
               {badmatch,{ok,timeout}},
               [{emqx_resource_SUITE,'-do_t_expiration_retry/0-fun-12-',0,
                    [{file,
                         "/__w/emqx/emqx/apps/emqx_resource/test/emqx_resource_SUITE.erl"},
                     {line,2569}]},
                {emqx_resource_SUITE,do_t_expiration_retry,0,
                    [{file,
                         "/__w/emqx/emqx/apps/emqx_resource/test/emqx_resource_SUITE.erl"},
                     {line,2518}]}]}}},
 [{emqx_resource_SUITE,do_t_expiration_retry,0,
      [{file,"/__w/emqx/emqx/apps/emqx_resource/test/emqx_resource_SUITE.erl"},
       {line,2594}]},
  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1302}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1234}]}]}
```
 2024-06-26 13:40:49 -03:00
zmstone
ef1b6d2a55 chore: keep enterprise edition version updated as well 2024-06-26 11:40:49 +02:00
zmstone
465ae507d8 chore: update release version to v5.7.1 2024-06-26 10:49:59 +02:00
zmstone
af9bfc21cb
Merge pull request #13312 from zmstone/0621-fix-regex_extract-docs 
doc: fix regex_extract function doc
 2024-06-26 10:48:40 +02:00
zmstone
7f73f27d56
docs: fix typo 2024-06-26 10:18:08 +02:00
zhongwencool
4942f6f75a feat: improve keepalive_multiplier and keepalive_check_interval 2024-06-26 15:43:48 +08:00
Thales Macedo Garitezi
21c01f32ff
Merge pull request #13305 from kjellwinblad/kjell/redis_conn_always_time_out_no_username_password/EMQX-12557 
fix: redis connector should not timeout because no username and password
 2024-06-25 16:06:21 -03:00
Andrew Mayorov
da214be5a1
test(bridge-s3): adapt testcase to different CI environment 2024-06-25 18:35:53 +02:00
JimMoen
ed130fdc57
test: MQTT CONNECT flags check 2024-06-25 23:25:42 +08:00
JimMoen
02a9885aa5
fix(mqtt): check password flag to respect protocol spec 2024-06-25 23:25:36 +08:00
JimMoen
983f02ea1b
refactor: separate CONNECT flags validation funcs 2024-06-25 23:15:39 +08:00
Kjell Winblad
130571b56e fix: code improvements thanks to comments from @thalesmg 2024-06-25 12:00:36 -03:00
Kjell Winblad
6190192cbc fix: redis connector should not timeout because no username and password 
A redis connector of type single or sentinel always got a timeout error
when doing the connector test in the dashboard if no username or
password was provided. This commit makes sure that the user instead get
an informative error message. Additionally, this commit adds more
more error information for all redis connector types.

Fixes:
https://emqx.atlassian.net/browse/EMQX-12557
 2024-06-25 12:00:36 -03:00
Thales Macedo Garitezi
cc89a20ed9
Merge pull request #13318 from thalesmg/test-flaky-gcp-consu-r57-20240621 
test(gcp consumer): stabilize flaky test
 2024-06-25 11:52:20 -03:00
Andrew Mayorov
486a041adf
feat(bridge-s3): also map credentials / aggreg upload errors 2024-06-25 16:51:07 +02:00
Andrew Mayorov
fb9afd8313
feat(bridge-s3): beautify posix write errors 2024-06-25 16:51:07 +02:00
Andrew Mayorov
f3ffbd4710
feat(bridge-s3): provide more meaningful error details in status 2024-06-25 16:51:06 +02:00
Andrew Mayorov
98e4ea6fde
feat(bridge-s3): make validation errors more readable 
And also turn them into schema-level validations, instead of
bridge-level error conditions.
 2024-06-25 16:51:06 +02:00
Thales Macedo Garitezi
1a497bcaf2 fix(greptime): correctly define grpc options for grpcbox_channel 
Will probably fix CI flakiness.
 2024-06-25 09:47:31 -03:00
Thales Macedo Garitezi
c9ec5ac87b test(gcp consumer): stabilize flaky test 
https://github.com/emqx/emqx/actions/runs/9614788348/job/26526973635?pr=13317#step:5:1463

```
%%% emqx_bridge_gcp_pubsub_consumer_SUITE ==> t_connection_down_before_starting: FAILED
%%% emqx_bridge_gcp_pubsub_consumer_SUITE ==> {{panic,
     #{msg => "Unexpected result",
       result =>
           {run_stage_failed,error,
               {assertMatch,
                   [{module,emqx_bridge_gcp_pubsub_consumer_SUITE},
                    {line,1451},
                    {expression,"health_check ( Config )"},
                    {pattern,"{ ok , connecting }"},
                    {value,{ok,disconnected}}]},
               [{emqx_bridge_gcp_pubsub_consumer_SUITE,
                    '-t_connection_down_before_starting/1-fun-11-',4,
                    [{file,
                         "/emqx/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_consumer_SUITE.erl"},
                     {line,1451}]},
                {emqx_bridge_gcp_pubsub_consumer_SUITE,
                    t_connection_down_before_starting,1,
                    [{file,
                         "/emqx/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_consumer_SUITE.erl"},
                     {line,1427}]}]}}},
 [{emqx_bridge_gcp_pubsub_consumer_SUITE,t_connection_down_before_starting,1,
      [{file,
           "/emqx/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_consumer_SUITE.erl"},
       {line,1462}]},
  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1302}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1234}]}]}
```
 2024-06-25 09:36:55 -03:00
zmstone
5d1608f34b chore: minimize oss/platform diff 2024-06-24 15:30:03 +02:00
firest
abc255bb02 fix(oidc): make CI happy 2024-06-24 18:11:02 +08:00
firest
892420e2c6 feat(oidc): be more compatible with okta 2024-06-24 16:51:54 +08:00
firest
ddb197951e feat(oidc): implement JWKS, private_key_jwt, DPoP 2024-06-24 16:51:43 +08:00
firest
9c0df3c0a8 feat(oidc): support the PKCE extension 2024-06-24 16:51:32 +08:00
firest
5e2693c9b4 feat(oidc): implement session management 2024-06-24 16:51:20 +08:00
firest
512b4b9cbb feat(sso): add OIDC support 2024-06-24 16:50:58 +08:00
JianBo He
23acbb664e
Merge pull request #13258 from HJianBo/fix-boot-order-for-gws 
fix: gateway app must depends on all auth apps
 2024-06-24 16:31:27 +08:00
zmstone
f9e17d6c25
Merge pull request #13269 from JimMoen/improve-plugin-behavior 
fix: mark fresh install to cp the default configuration file directly
 2024-06-24 09:17:25 +02:00
Ivan Dyachkov
4a81c3ac18
Merge pull request #13298 from qzhuyan/fix/william/hot-conf-disable-partial-chain 
fix(tls): disable partial_chain in hot config
 2024-06-24 09:02:07 +02:00
zhongwencool
75a524c916 test: add more debug msg to flaky cluster_rpc SUITE 2024-06-21 18:04:24 +08:00
zmstone
8a99995810 docs: fix regex_extract function doc 2024-06-21 09:25:09 +02:00
JianBo He
d8e6c07ca0 chore: fix failed tests 2024-06-21 11:04:23 +08:00
JianBo He
a8af90f912 chore: add changes 2024-06-21 09:39:14 +08:00
JianBo He
08f085d823 fix: gateway app must depends on all auth apps 2024-06-21 09:39:14 +08:00
JimMoen
acc8bf3405
Merge pull request #13222 from JimMoen/fix-will-qos-retain-flag-check 
fix: check willretain and willqos when WillFlag set to `true`
 2024-06-21 01:28:23 +08:00
Ivan Dyachkov
ba4fb0d3f9
Merge pull request #13290 from kjellwinblad/kjell/format_rule_cli/EMQX-12548 
fix: do not crash when showing rule unsing the cmd interface
 2024-06-20 14:55:33 +02:00
zmstone
2a0071aa01
Merge pull request #13295 from thalesmg/test-flaky-greptime-mkII-r57-20240619 
test(greptime): attempt to fix flaky tests (attempt without driver patch)
 2024-06-20 14:49:21 +02:00
Serge Tupchii
ac8762be10 chore: upgrade ekka to 0.19.5 (mria 0.8.8) 
mria 0.8.8 heals a network partition once majority of core nodes are alive.
Previously, the autoheal worked only when all core nodes were reachable.

Fixes: EMQX-10974
 2024-06-20 12:53:58 +03:00
William Yang
464a0a82f0 fix(tls): move default_root_fun to ?CONST_MOD_V1 2024-06-20 11:38:52 +02:00
zmstone
7d32275ebe chore: minimize oss/platform diff 2024-06-20 10:36:01 +02:00
Kjell Winblad
12859b8959 fix: handle yet another action format 2024-06-20 10:03:49 +02:00
JimMoen
675abd7512
test: will retain and willqos in connect flags 2024-06-20 10:32:15 +08:00
JimMoen
cf9d6943d5
fix: check willretain and willqos when WillFlag set to true 2024-06-20 10:32:15 +08:00
JianBo He
c307c1dfc2 chore: cut v5.7.1-alpha.1 2024-06-20 09:40:42 +08:00
JimMoen
ff742d926a
fix: ?SLOG with msg field 2024-06-20 02:18:26 +08:00
Thales Macedo Garitezi
9559ba2f06 test: remove unnecessary lines 2024-06-19 13:22:02 -03:00
William Yang
8d04545f03 test(tls): root_fun is set even when partial_chain is false 2024-06-19 17:34:04 +02:00
William Yang
41239ae766 fix(tls): disable partial_chain in hot config 2024-06-19 17:03:05 +02:00
zmstone
02a6ee1ef4
Merge pull request #13279 from zmstone/0617-json-decode-payload-for-map_to_redis_hset_args 
fix(redis): json decode if arg for map_to_redis_hset_args is string
 2024-06-19 14:55:21 +02:00
JimMoen
a6fa3e82d9
fix: prevent use pd 2024-06-19 20:15:07 +08:00