Commit Graph

1838 Commits

Author SHA1 Message Date
Zaiming (Stone) Shi 3c84f4b254 chore: re-generate appup 2022-11-26 18:14:15 +01:00
Zaiming (Stone) Shi fdfb735327 Merge remote-tracking branch 'origin/release-v43' into main-v4.3 2022-11-26 15:59:29 +01:00
firest 0d2f1eb49e chore: update appup 2022-11-22 17:31:59 +08:00
firest cc03bc7881 fix: hide sensitive data in some logs 2022-11-22 16:55:47 +08:00
Shawn 17b6b71ea5 Merge remote-tracking branch 'origin/release-v43' into sync_v43_to_v44 2022-11-17 13:47:10 +08:00
Shawn 252b03abd8 fix: generating alarm name for utf8 resource id failed 2022-11-17 10:23:33 +08:00
Shawn f843938364 fix: don't check resource alive for the temporary resources 2022-11-16 09:43:04 +08:00
Shawn e4a3dd9ee8 fix: enlarge the timeout when check alive of resources 2022-11-15 21:07:01 +08:00
firest ebfaecfa91 fix(jwt): fix the jwt ACL will return a wrong result when the token is expired 2022-11-15 09:50:49 +08:00
Zaiming (Stone) Shi 1783fa1e80 Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-11-14 23:15:39 +01:00
JimMoen 7b5340ce09
fix(api): uppercase api request method 2022-11-14 17:55:17 +08:00
Zaiming (Stone) Shi c1d61a6f30 Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-11-10 16:01:29 +01:00
Shawn 6725a36dbf fix: make init_resource_with_retrier/4 only 'throw' when failed 2022-11-10 10:44:11 +08:00
Shawn 407a197c8a fix: typos in the RAISE macro of rule_engine 2022-11-09 12:06:58 +08:00
JianBo He 01ada64e46
Merge pull request #9325 from HJianBo/fix-flaky-test
test(stomp): fix flaky tests
2022-11-08 16:58:39 +08:00
JianBo He 491b402be3 test(stomp): fix flaky tests 2022-11-08 09:46:01 +08:00
Zaiming (Stone) Shi 45eed402d4 Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-11-07 22:16:05 +01:00
Zaiming (Stone) Shi a7768b6e98
Merge pull request #9313 from zmstone/1105-fix-resource-creation-retry-loop-should-delay-first
fix(emqx_rule_monitor): sleep before retry but not after
2022-11-07 22:09:28 +01:00
Zaiming (Stone) Shi 0eebabd34c Merge remote-tracking branch 'origin/release-v43' into release-v44 2022-11-07 10:48:38 +01:00
Zaiming (Stone) Shi 51a959c3b4 Merge remote-tracking branch 'origin/release-v44' into ocsp-rv44 2022-11-07 10:18:15 +01:00
Zaiming (Stone) Shi 2998b014ce
Merge pull request #9314 from zmstone/1105-ci-improve-actions
1105 ci improve actions
2022-11-07 09:20:16 +01:00
Zaiming (Stone) Shi 568bd520a8 ci: ensure docker-ct for emqx_auth_http and emqx_web_hook 2022-11-07 08:51:32 +01:00
Zaiming (Stone) Shi 8ff8a8b55d ci: split fast (regular) and docker-compose (docker) ct 2022-11-06 19:39:06 +01:00
JimMoen 639006e302
fix(prometheus): disable auth for prometheus endpoint on mgmt listener 2022-11-07 00:44:37 +08:00
Zaiming (Stone) Shi 9b194baf69 fix(emqx_rule_monitor): sleep before retry but not after 2022-11-05 17:42:29 +01:00
Zaiming (Stone) Shi 2c8874cfe0
Merge branch 'release-v43' into EMQX-7665-cannot-clear-alarms 2022-11-04 16:12:56 +01:00
Zaiming (Stone) Shi 3346f2a26c Merge remote-tracking branch 'origin/release-v44' into 1104-ci-split-ct-runs 2022-11-04 14:34:24 +01:00
Zaiming (Stone) Shi be10498919 chore: re-generate appup 2022-11-04 13:50:24 +01:00
Thales Macedo Garitezi d3c6ade640 docs: rewrite fn doc 2022-11-04 09:38:40 -03:00
Thales Macedo Garitezi f5c655ec1b refactor: add api to ensure jwt token is created 2022-11-04 09:38:40 -03:00
Thales Macedo Garitezi d714f78590 refactor: use `include` for headers 2022-11-04 09:38:40 -03:00
Thales Macedo Garitezi a33977e635 feat: add ets table creation to jwt supervisor 2022-11-04 09:38:40 -03:00
Thales Macedo Garitezi b4837302aa refactor: move api to emqx_rule_engine_jwt module 2022-11-04 09:38:40 -03:00
Thales Macedo Garitezi 270f47aafc refactor: start jose as an app dependency 2022-11-04 09:38:40 -03:00
Thales Macedo Garitezi f926bcfbc0 fix(appup): stop workers and supervisors before deleting code when downgrading 2022-11-04 09:38:40 -03:00
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