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

1803 Commits

Author SHA1 Message Date
Thales Macedo Garitezi 4a06c25178 chore: add some docs and specs; treat some possible errors 2022-11-04 09:38:40 -03:00
Thales Macedo Garitezi 7f4ffee7b5 feat: add jwt worker for rule actions 
Will be used in GCP PubSub resource for EE.
 2022-11-04 09:38:11 -03:00
Zaiming (Stone) Shi 2062911e3b Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-11-04 13:28:12 +01:00
Xinyu Liu 1887ae735b
Merge pull request #9291 from JimMoen/fix/repub-or-mqtt-bridge-topic-validate 
fix: mqtt_bridge and republish validate msg topic
 2022-11-04 19:14:41 +08:00
Zaiming (Stone) Shi 7dfa83f3c6
Merge pull request #9223 from emqx/av/parallelCTruns 
ci(test): test parallel CT runs on self-hosted runners
 2022-11-04 12:11:54 +01:00
JimMoen f9276edaf8
fix: mqtt_bridge and republish validate msg topic 2022-11-04 15:40:46 +08:00
zhongwencool 215548155b chore: update management.bootstrap_apps_file's document 2022-11-04 10:35:59 +08:00
Zaiming (Stone) Shi 279046c51e Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-11-03 21:58:25 +01:00
Zaiming (Stone) Shi 78c0ca18a7
Merge pull request #9296 from terry-xiaoyu/improve_testcase_emqx_rule_utils 
test: improve the test cases for t_if_contains_placeholder
 2022-11-03 14:45:24 +01:00
Thales Macedo Garitezi 915504c694 chore(appup): update appups 2022-11-03 10:35:57 -03:00
Thales Macedo Garitezi af4141bef4 chore(oscp_crl): port OCSP and CRL features to CE repo (re4.4) 2022-11-03 10:10:16 -03:00
Stefan Strigler 835d3a33ef fix(emqx_mgmt): call emqx_alarm:delete_all_deactivated_alarms for remote nodes 
Old call was calling a non-existant function on current module, instead we make
call directly into `emqx_alarm` on remote node.
 2022-11-03 14:02:55 +01:00
Shawn 2c27f8c474 test: improve the test cases for t_if_contains_placeholder 2022-11-03 18:49:06 +08:00
JimMoen cb3bd24528
test: unlink the process would be exited by tcp close 2022-11-03 16:43:34 +08:00
JimMoen 86dd1a3e05
test: different resons for disconnect event 2022-11-03 16:43:34 +08:00
Zaiming (Stone) Shi 7d3c7e1cc3 test: clear mqtt_admin table after bootstrap test suite 2022-11-02 20:15:23 +01:00
Zaiming (Stone) Shi 16a306f6f8 test: ensure rule engine resource providers are loaded 2022-11-02 20:06:26 +01:00
Zaiming (Stone) Shi 6d943181d7 test: ensure emqx_dashboard tables are created for data export import 2022-11-02 19:20:39 +01:00
Zaiming (Stone) Shi ae0225853b chore: regenerate appup 2022-11-01 19:37:35 +01:00
Zaiming (Stone) Shi f0b350ba4f Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-11-01 13:51:06 +01:00
zhongwencool b8dad3f667
Merge branch 'release-v43' into revert-9256-bootstrap-users 2022-11-01 07:44:21 +08:00
Zaiming (Stone) Shi 809f98502a chore(emqx_auth_mnesia): re-generate appup 2022-10-31 17:33:51 +01:00
Zaiming (Stone) Shi 7e322bd392
chore: fix typos in command line examples 2022-10-31 16:35:25 +01:00
zhongwencool e4473d34c0 feat: bootstrap app/secret from management.bootstrap_apps_file 2022-10-31 19:57:04 +08:00
zhongwencool 3aeb21cc37
Revert "feat: bootstrap dashboard users from dashboard.bootstrap_users_file" 2022-10-31 19:54:34 +08:00
Xinyu Liu 91bc2403a5
Merge pull request #9264 from terry-xiaoyu/message_acked_hook_for_coap 
fix: run the 'message.acked' hook when ACK received from CoAP devices
 2022-10-31 15:20:11 +08:00
Shawn 3f17119e36 fix: run the 'message.acked' hook when ACK received from CoAP devices 2022-10-31 11:46:21 +08:00
Zaiming (Stone) Shi 442ab8a246 chore: re-generate appup 2022-10-28 17:09:32 +02:00
zhongwencool 47d88186d1 chore: update emqx_auth_mnesia appup 2022-10-28 21:44:05 +08:00
zhongwencool ec426df0a7 fix: typo error 2022-10-28 21:44:03 +08:00
Zaiming (Stone) Shi 4a020d0e1a Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-10-28 14:35:56 +02:00
Zaiming (Stone) Shi dd95a26270 Merge remote-tracking branch 'origin/main-v4.3' into release-v43 2022-10-28 14:12:44 +02:00
Zaiming (Stone) Shi 86329075cb
Merge pull request #9242 from lafirest/fix/log_sensitive_acl 
Use LOG_SENSITIVE to replace the risky LOG in ACL
 2022-10-28 13:16:08 +02:00
Zaiming (Stone) Shi 332e5e7b56 fix: ensure unicode binary is used everywhere in data backup 2022-10-28 11:29:05 +02:00
JimMoen 139aabd078
Merge pull request #9190 from JimMoen/rule-engine-api-id 
fix(rule_engine): rule id in path urlencoded
 2022-10-28 15:41:40 +08:00
Xinyu Liu 8260c55530
Merge pull request #9254 from terry-xiaoyu/webhook_support_placeholders_in_headers 
feat: support to use placeholders as http headers in webhook actions
 2022-10-28 09:43:11 +08:00
Xinyu Liu eeb87fd253
Merge pull request #9239 from emqx/webhook_support_placeholders_in_headers 
feat: support to use placeholders as http headers in webhook actions
 2022-10-28 09:01:29 +08:00
Zaiming (Stone) Shi 7b9d943c33 chore: update appup 2022-10-27 20:19:05 +02:00
Zaiming (Stone) Shi 5394de92f8 fix(emqx_mgmt_data_backup): ensure unicode filename 2022-10-27 20:02:56 +02:00
Zaiming (Stone) Shi 537f088616 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-10-27 17:31:15 +02:00
JimMoen c21a2cf4c6
test(rule_engine): test some unicode chars as rule id 2022-10-27 17:32:21 +08:00
Shawn 982fc9b4fe feat: support to use placeholders as http headers in webhook actions 2022-10-27 17:24:05 +08:00
firest b70feef432 chore: bump version && update appup 2022-10-27 17:03:12 +08:00
firest 4fc56a6e5b fix(log): Use LOG_SENSITIVE to replace the risky LOG in ACL 
We should ensure that neither client nor backend database passwords should be printed out when users use ACLs
 2022-10-27 17:02:57 +08:00
JianBo He d0ad44d364 chore(auth-http): using warning level instead of error 2022-10-27 16:23:30 +08:00
JianBo He 49a5862a63
Merge pull request #9046 from HJianBo/more-logs-for-auth-http 
More logs for http authn/authz
 2022-10-27 15:42:36 +08:00
JimMoen 892becb5bf
fix(rule_engine): rule_id and resource_id in path urlencoded 2022-10-27 00:39:13 +08:00
firest e66e563648 fix(logger): add new macro `?LOG_SENSITIVE` and use it to replace some `?LOG` for security reason 
some arguments  passed to external API may contain sensitive data, when the API execution fails, sensitive data may be returned as a part of the failure reason, if this reason printed to the log, it will lead to sensitive data leakage, so we should check carefully and scan these failed returns
 2022-10-26 17:14:46 +08:00
Zaiming (Stone) Shi f5c0ef3e56
Merge pull request #9226 from zmstone/1025-fix-drop-tuple-value-message-headers 
fix(emqx_rule_events): do not keep tuple-value message headers
 2022-10-26 09:59:12 +02:00
Xinyu Liu 7f63912bba
Merge pull request #9224 from terry-xiaoyu/utf8_backup_filenames 
fix: list exported json files failed with utf8 filenames
 2022-10-26 15:47:00 +08:00
Zaiming (Stone) Shi 81e6a40454 fix(emqx_rule_events): do not keep tuple-value message headers 
the converted message is for JSON encoding, keeping the tuple-values
will lead to encoding error.
 2022-10-26 08:52:20 +02:00
Zaiming (Stone) Shi c6067447ac chore: sync changes back from ee to ce 2022-10-26 08:49:52 +02:00
Xinyu Liu 90ef9254fd
Merge pull request #9199 from terry-xiaoyu/boot_blocked_by_unreachable_resources 
fix: refresh resources and rules asynchronously
 2022-10-26 13:41:07 +08:00
Shawn fa333157eb fix: list exported json files failed with utf8 filenames 2022-10-26 11:46:45 +08:00
zhongwencool 3dddacb3f0 chore: update emqx_trace_api into appup.src 2022-10-26 10:16:33 +08:00
zhongwencool 81d4bd10a3 fix: alway use os:system_time/1 when managing traces 2022-10-26 10:07:44 +08:00
zhongwencool 0d903eb2e1 chore: update changelog 2022-10-26 10:03:00 +08:00
zhongwencool 59b5923887 chore: update changelog and appup.src 2022-10-26 10:03:00 +08:00
zhongwencool 4e4f72d479 fix: use os:system_time replace erlang:system_time in trace's start_at/end_at 2022-10-26 10:03:00 +08:00
zhongwencool 3dd2084c2e fix: get trace list crash when trace not initialized 2022-10-26 10:03:00 +08:00
Zaiming (Stone) Shi 51c73eed55
Merge pull request #9044 from HJianBo/fix-jwt-acl-rules 
fix(acl): support all rules in JWT ACL
 2022-10-25 20:33:22 +02:00
Thales Macedo Garitezi 8206f39b7c chore: update appups 2022-10-25 09:43:12 -03:00
Thales Macedo Garitezi a987d6fc94 test(rulesql): fix broken test 2022-10-25 09:43:12 -03:00
Shawn 006d2e5f29 fix: rolling upgrade failed on undef funcs 2022-10-25 20:41:31 +08:00
Thales Macedo Garitezi 0a8f3d4e16 Merge remote-tracking branch 'origin/main-v4.3' into sync-v44-a 2022-10-24 16:28:11 -03:00
Thales Macedo Garitezi c0b5b887c3 fix(mgmt_api): return 503 when emqx is not running in `/status` 2022-10-24 14:22:28 -03:00
JianBo He bd59197a58 chore: apply suggestions from code review 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2022-10-24 16:28:25 +08:00
JianBo He 4a9b5662f8 chore: fix diaylzer warnings 2022-10-24 09:51:05 +08:00
Shawn 15248eb069 chore: update the change log 2022-10-21 15:41:00 +08:00
Shawn 2c61f92eec fix: refresh resources and rules asynchronously 2022-10-21 15:06:35 +08:00
JianBo He b9e9540120 chore(auth): support printing unicode string 2022-10-21 11:59:01 +08:00
JianBo He 38e87579c0 chore(jwt-acl): avoid the disruptions caused by rule formatting errors 2022-10-21 11:47:19 +08:00
JianBo He fa4203effa chore: apply suggestions from code review 
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
 2022-10-21 11:47:19 +08:00
JianBo He 7b0acf2c4d chore: update changes and appup.src 2022-10-21 11:47:07 +08:00
JianBo He 1857fe643a fix(acl): support all rules in JWT ACL 2022-10-21 11:44:48 +08:00
Shawn bfe238fa1c fix: set precision of counter 'max_speed' to 2 digits 2022-10-21 09:05:25 +08:00
JianBo He 8e199b3a77 chore: update appup.src 2022-10-20 15:52:17 +08:00
JianBo He 317ef65c7e chore: remove the duplicated clientid print in log 2022-10-20 15:50:04 +08:00
JianBo He 4cf3d181d8 chore(auth-http): more infos for auth/acl checking failure 2022-10-20 15:48:58 +08:00
JimMoen 8a644bac99 chore: bump app.src and appup.src 2022-10-18 11:28:54 +08:00
JimMoen bac7b61cfd Merge branch 'release-v44' into 1018-sync-release-v44-back-to-main 2022-10-18 10:44:27 +08:00
Zaiming (Stone) Shi 5bc822cc78 chore: delete duplicated module from appup 2022-10-17 12:55:22 +02:00
Zaiming (Stone) Shi 11026b7644 chore: re-generate appup for v4.3.22 2022-10-16 08:43:45 +02:00
Zaiming (Stone) Shi 20e0d14026 chore: bump app versions 2022-10-15 15:01:57 +02:00
Zaiming (Stone) Shi 1ba2c01f25 Merge remote-tracking branch 'origin/release-v43' into main-v4.3 2022-10-15 14:58:22 +02:00
Zaiming (Stone) Shi 62878e7851 Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-10-14 12:10:22 +02:00
Xinyu Liu 265fab8ccf
Merge pull request #9150 from terry-xiaoyu/port_rule_metrics_fix_to_release_v43 
fix: reset rule metrics crashed under certain conditions
 2022-10-14 16:05:23 +08:00
Shawn 381c56d52f fix: reset rule metrics crashed under certain conditions 2022-10-14 10:50:39 +08:00
Ilya Averyanov 53bc2d9d58 fix(jwt): restore legacy emqx_auth_jwt hook interface 2022-10-13 11:37:50 +03:00
Ivan Dyachkov 73d72eacce fix: demote rate limit log level to notice 2022-10-11 13:05:21 +02:00
JimMoen 7f92c29ada chore: bump appup.src for `emqx_rule_funcs.erl` 2022-10-11 13:45:11 +08:00
JimMoen 3e8c070b59 Revert "fix: rm unused module" 
This reverts commit 267946c379.

Revert it temporary, we need fix `scripts/update-appup.sh` later.
It only compares the current release with its predecessor.
 2022-10-11 13:44:34 +08:00
JimMoen 5047211950 test: rulesql select fields and select from event message 2022-10-11 13:44:34 +08:00
JimMoen 27e19da066 test(rulesql): num funcs type cases 2022-10-11 13:44:34 +08:00
JimMoen 32376c7cf9 fix(rule_func): refine num funcs error info type unsupported 2022-10-11 11:23:25 +08:00
JimMoen 0a5a0867e4 fix(rule_func): refine `+` error info when type implicit conversion 2022-10-11 11:23:25 +08:00
JimMoen d8a022fb45 fix(test): unstopped test client 2022-10-11 11:23:25 +08:00
JimMoen 267946c379 fix: rm unused module 
`emqx_rule_date` was added before [v4.3.15-rc1]
PR: emqx#7894
commit: 8558a62ee2

The change was released in [v4.3.15-rc1] [v4.3.15-rc2]

And unused at [v4.3.15-rc3]
PR: emqx#8044
commit: 4fc5cb2817

We just keep the module from [v4.3.15-rc1] to [v4.3.20] and remove this module in newer version
 2022-10-11 11:23:25 +08:00
JimMoen fd7230353c refactor(test): move rule_engine sql test cases into a separate file 2022-10-11 11:23:25 +08:00
JianBo He 85aa120b06 Merge branch 'release-v43' into release-v44 2022-10-11 10:24:22 +08:00