f9465dda16
Merge branch 'dev/v4.3.0' into merge-e4.2.4-to-dev-4.3.0
2021-02-14 21:41:23 +01:00
9b82112b7c
Merge remote-tracking branch 'origin/dev/e4.3.0' into merge-e4.2.4-to-dev-4.3.0
2021-02-13 11:10:08 +01:00
8f477e8411
refactor(proj): Move opensource apps to lib-opensource
...
One step closer for better code abstraction for opensorce vs enterprise
So far this relocation is to make opensource to enterprise merges
conflict free.
2021-02-11 16:45:05 +01:00
507759b9f1
Revert "refactor(emqx_modules): Move modules config to app dir"
...
This reverts commit 9cae8784c0
2021-02-11 16:44:12 +01:00
2b4906b47d
Merge branch 'dev/v4.3.0' into unify_pgsql_conf
2021-02-11 15:50:43 +08:00
514c2c0af5
Merge pull request #4169 from zmstone/refactor-move-modules-config-to-emqx-modules-app
...
refactor(emqx_modules): Move modules config to app dir
2021-02-10 09:03:04 +01:00
9cae8784c0
refactor(emqx_modules): Move modules config to app dir
2021-02-10 00:02:52 +01:00
f000b6583c
fix(tls): Ensure tls config integrity
...
For default tsl version and ciphers, we try to use otp release number
to determin if we want to use tlsv1.3
For default configs, we try to porivde both tlsv1.3 and
ciphers in config (even for commented out configs)
2021-02-09 22:56:28 +01:00
353ceafbb6
fix(telemtry): report only in official version
2021-02-09 10:46:48 +08:00
e4d3702f15
feat(apps): Ensure emqx_modules started before dependent apps
...
emqx_management and emqx_telemetry calls emqx_modules APIs
2021-02-08 22:07:13 +01:00
7aff861f9b
refactor(emqx_modules): Move emqx_modules to lib-opensource
...
emqx_moduels for enterprise is refactored as a lib/plugin
in order to avoid merge conflicts, we make sure they can
co-exist in the same branch, because lib-opensource is compiled
in opensource project and lib-enterprise (to be added) is
compiled in enterprise project
2021-02-08 21:35:44 +01:00
7c94a02bdd
Merge pull request #4134 from jovdipp/tlsv1.3-as-default
...
Tlsv1.3 as default
2021-02-05 21:33:03 +01:00
70a490114d
fix(rulesql): proc cassandra cql with apostrophes failed
2021-02-05 15:30:16 +08:00
90c02f1116
test(emqx_exporto): refactored ssl ciphers call for ct_helpers update
2021-02-05 16:21:28 +13:00
5e15e3add8
fix(default-config-tls-ciphers): TLS1.3 exclusive ciphers prepended to TLS1.1+TLS1.2 ciphers
2021-02-05 16:21:28 +13:00
a2fa84255f
fix(rulesql): proc_sql_param_str incorrect with apostrophes #4135 ( #4137 )
2021-02-05 10:41:54 +08:00
c30666ee26
fix(rule-engine): remove plugin_template ( #4146 )
...
chore(build): remove template plugin
The template plugin is intended to work as a standalone plugin
development template repo. Should not be in the umbrella
project.
2021-02-04 10:01:37 +01:00
c3642c5c83
refactor(pgsql): set the default ssl version to tlsv1.3,tlsv1.2,tlsv1.1
2021-02-04 15:32:08 +08:00
045bc02ec9
test(ci): add proptests chekcing to the makefile
2021-02-04 14:22:17 +08:00
6eff70a646
fix(rule-engine): reply 500 when update resource failed ( #4120 )
2021-02-01 09:47:08 +08:00
c3c28f4b72
feat(tls.13): tls1.3 ciphers set in .conf's
2021-01-31 18:38:34 +13:00
94e8a69a48
docs(typos): vefify -> verify
2021-01-31 17:27:08 +13:00
a3206f5e0b
fix(rule-engine): reformat code style
2021-01-29 19:32:05 +08:00
38eb849ef0
fix(mysql): upgrade mysql to 1.7.1 for TLS supporting
2021-01-29 19:31:02 +08:00
1aefee01c2
chore(mgmt): remove needless lines
2021-01-29 18:50:29 +08:00
3973c93534
fix(rule-engine): remove unused code
2021-01-29 17:16:00 +08:00
7072355bc1
fix(rule-engine): fix test failure
2021-01-29 15:24:07 +08:00
73655369af
fix(rule-engine): reformat some code
2021-01-29 11:52:32 +08:00
730d09f874
fix(http): upgrade ehttpc to 0.1.2 ( #4093 )
...
For fix the connection closed by keepalive
2021-01-29 09:35:08 +08:00
f0993c6b0f
chore(style): improve the codes style
2021-01-28 20:01:59 +08:00
6a83cf3f35
chore(format): format some code
2021-01-28 19:18:18 +08:00
456e3e5faa
chore(bridge-mqtt): fix styles
2021-01-28 16:24:42 +08:00
d98d26942c
fix(bridge-mqtt): add max_inflight_size option back
...
For compatibility with versions below 4.2, we still
use the `max_inflight_size` option, but generate it
as the `max_inflight`
Previous PR: https://github.com/emqx/emqx/pull/3938
2021-01-28 16:24:42 +08:00
e96d03dc1b
Merge pull request #4087 from zmstone/fix-auth-ldap
...
fix(auth_ldap): do not load plugin when no params configured
2021-01-28 08:51:08 +01:00
d38b626579
fix(emqx_coap_ps_resource): Copy uri decode code from OTP-22
2021-01-27 19:19:38 +01:00
e6235d3bc9
fix(scheme): fix default scheme
2021-01-27 19:11:41 +01:00
92d307b1b3
fix(scheme): update test case
2021-01-27 19:11:41 +01:00
45aafc75dd
fix(scheme): using uri_string:normalize/1
2021-01-27 19:11:41 +01:00
311df2f8a6
fix(scheme): fix scheme parsing
2021-01-27 19:11:41 +01:00
a631a2d64f
fix(ssl): fix ssl option
2021-01-27 19:11:41 +01:00
f42e52e84e
fix(auth_pgsql): Add back econnrefused error clause
2021-01-27 19:10:47 +01:00
b5c435e211
fix(rule-engine): add format space
2021-01-27 19:01:11 +01:00
fc71285c3f
fix(auth_ldap): do not load plugin when no params configured
2021-01-27 12:56:13 +01:00
689b530b4f
chore(auth-http): remove needless test case
2021-01-27 19:55:21 +08:00
b77ac247eb
chore(auth-http): remove needless lines
2021-01-27 19:55:21 +08:00
eaa7394554
chore(ldap): delete uesless dir
2021-01-27 18:58:35 +08:00
02cb8d0211
chore(style): set warnings_as_errors compile option
2021-01-27 18:02:12 +08:00
001a89a396
Merge pull request #4070 from wwhai/fix-update-problem
...
feat(rule-engine): change init resource to test resource
2021-01-27 17:09:37 +08:00
e7153c4266
fix(rule-engine): add cluster init callback
2021-01-27 15:06:12 +08:00
7919f08e03
Merge pull request #4067 from HJianBo/fix/webhook_certs
...
fix(webhook): fix bad https confs
2021-01-27 10:44:28 +08:00
5477457c7e
fix(emqx_recon): fix badarg for remote module load
2021-01-25 19:09:41 +01:00
81da182e1b
feat(rule-engine): change init resource to test resource
2021-01-25 19:44:32 +08:00
8d56371465
Merge branch 'dev/v4.3.0' into fix/webhook_certs
2021-01-25 19:22:14 +08:00
6a6a94f99e
Merge pull request #4057 from zmstone/fix-emqx_vm-allocator-info-otp-23-compatibility
...
fix emqx_vm allocator info otp 23 compatibility
2021-01-25 11:36:47 +01:00
86942ffa14
fix(webhook): fix bad https confs
2021-01-25 18:20:12 +08:00
670c3894fb
chore(redis): upgrade eredis_cluster to 0.6.4
2021-01-25 17:29:56 +08:00
b25dedccc9
refactor(inet parse): refactor inet parse
2021-01-25 15:59:23 +08:00
67e56658a7
fix(bridge-mqtt): fix bad time unit
2021-01-25 15:35:04 +08:00
3de8fea435
fix(bridge-mqtt): fix bad received metrics counting
2021-01-25 15:35:04 +08:00
f3420e8810
fix(rule-engine): fix update resource maybe remove resource
2021-01-25 10:56:58 +08:00
3322bb60c3
fix(exproto): fix the bad return type for auth
2021-01-25 09:24:03 +08:00
8a05380388
refactor(emqx_coap): use url_string module to decode url encoded topic
2021-01-24 10:28:37 +01:00
17d70772a8
refactor(emqx_recon): Use latest version recon
...
Moved recon dependency from emqx_recon to root
2021-01-23 11:42:28 +01:00
c1b1ddbb6f
Merge pull request #4032 from zmstone/chore-sync-apps-resync-4.2.6
...
chore(sync-apps): resync plugin apps from their 4.2.6 tag
2021-01-23 11:15:46 +01:00
2c03bca6ae
chore(auth_jwt): Upgrade to jose 1.11.1 prepare for OTP 23
2021-01-22 20:31:27 +01:00
c6785b1a34
test(coap): add test on acl and connection discarding ( #4039 )
2021-01-21 11:03:06 +09:00
4103a7292a
Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6
2021-01-18 20:37:45 +01:00
be771f6cd9
fix(auth_pgsql): Make ssl_opts.versions backward compatible
2021-01-18 20:37:45 +01:00
14ca914068
Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6
2021-01-18 20:37:26 +01:00
86895ddc24
chore(sync-apps): sync emqx_auth_mnesia e4.2.3
2021-01-18 20:05:08 +01:00
a2b4e50a8d
chore(sync-apps): re-sync apps from dev/v4.3.0 branch
2021-01-18 19:24:08 +01:00
fc0b912cde
refactor(emqx_dashboard): www dir is to be downloaded at build time
2021-01-18 19:20:49 +01:00
fd2e9f147b
fix(auth http): using ehttpc ( #4021 )
...
* fix(auth http): using ehttpc
* chore(ehttpc): update tag of ehttpc
* fix(config): update comment
2021-01-16 23:10:53 +08:00
a6de90c3f9
fix(test): add two way ssl test ( #4025 )
2021-01-16 22:28:15 +08:00
2751fa6a41
fix(scheme): update emqx_web_hook_actions.erl
2021-01-16 22:25:12 +08:00
bf84686b76
chore(ehttpc): update tag of ehttpc
2021-01-16 22:25:12 +08:00
9f0dbeff29
fix(webhook): fix ipv6 in ip and hostname
2021-01-16 22:25:12 +08:00
114bf8e048
fix(webhook): only POST and PUT requests carry Content-Type header and using the original URL as host header
2021-01-16 22:25:12 +08:00
9e03d6fea1
chore(auth): configuration format of unified authentication plug-in
2021-01-15 20:25:09 +08:00
981482d707
fix(test): fix test cases ( #4012 )
...
* fix(test): fix test cases
2021-01-15 09:48:57 +08:00
aed801d6fd
test(exproto): refine test cases
2021-01-15 09:47:56 +08:00
d360e7ead1
feat(exproto): use client streaming APIs for handler
...
- Use the gRPC client streaming APIs to improve the
ConnectionHandler server performance.
- Change the 'conn' field type to term binary
2021-01-15 09:47:56 +08:00
42f95bba09
fix(alarms): add duration field for alarms
2021-01-15 09:27:15 +08:00
67bfb4f10a
fix(rule_engine): resource update problem and add cli ( #3991 )
2021-01-15 09:12:24 +08:00
32b23b9181
Revert "feat(auth_http): support for getting websocket cookies"
...
This reverts commit 5427057c2c
2021-01-14 15:10:48 +01:00
f2190dd5b5
chore(mnesia): explicitly specify the copy type for table
2021-01-14 15:46:16 +08:00
2a029b71c9
perf(mnesia): unify the copy types of all nodes
2021-01-14 15:46:16 +08:00
372687d79d
improve(http): replace httpc with gun, improve performance and fix httpc unresponsiveness ( #3940 )
2021-01-13 13:47:23 +08:00
5427057c2c
feat(auth_http): support for getting websocket cookies
...
see: https://github.com/emqx/emqx-auth-http/pull/225
2021-01-11 09:21:16 +08:00
2b481dabe7
Fix some dialyzer warnings ( #3988 )
2021-01-05 20:49:50 +01:00
ca1e78677e
chore(dashboard): delete static files
...
delete static files of dashboard and download them during build
2021-01-05 17:22:19 +08:00
b9661cddfa
fix(emqx_lwm2m_message): Path is built from binary format ( #3987 )
2021-01-04 17:31:21 +01:00
9b6b762f1c
fix(emqx_retainer): fix dialyzer warnings
2021-01-04 14:14:55 +01:00
30588ac666
fix(emqx_mgmt): fix dialyzer warnings
2021-01-04 14:14:55 +01:00
990be9c198
fix(emqx_rule_engine_api): fix dialyzer warnings
2021-01-04 14:14:55 +01:00
e518828d8f
fix(rule_engine): mechanism of restarting resources ( #3980 )
2021-01-04 11:52:57 +08:00
26021b37b3
Umbrella fix build ( #3969 )
...
* fix(dialyzer): dialyzer warning.
2021-01-04 09:10:22 +08:00
d86b5ef210
fix(rule_engine): compile warnings on the macro RAISE
2020-12-31 17:03:39 +08:00
a747cf16bd
fix(resource_cli): update the CLIs for resources ( #3978 )
2020-12-31 13:41:33 +08:00
37974f7376
fix(rule_engine): add resource reconnect check ( #3974 )
...
* fix(rule_engine): add resource reconnect check
* fix(rule_engine): add reason for RAISE macro
2020-12-31 12:51:01 +08:00
903ce29ce0
fix(rule_engine): fix resource update maybe failure
2020-12-31 11:43:03 +08:00
41afcde964
chore(ssl conf): update the ssl configuration format for mongo, pgsql, and redis plug-ins
2020-12-29 00:03:12 +08:00
6989c7a83d
test(CI): add cts
2020-12-29 00:03:12 +08:00
efb32e9903
test(rule_engine): add update resource unit test case ( #3964 )
...
* test(rule_engine): add update resource unit test case
* feat(rule_engine): add update resource support
Co-authored-by: wwhai <cnwwhai@gmail.com>
2020-12-28 14:59:28 +08:00
56920b6ca6
fix(bridge_mqtt): max_inflight_size -> max_inflight; this enables emqtt.erl to use the value ( #3938 )
...
* fix(bridge_mqtt): max_inflight_size -> max_inflight; this enables emqtt.erl to use the value
* chore(bridge_mqtt): fix elvis
* fix(worker): max_inflight_batches -> max_inflight
2020-12-28 13:43:13 +08:00
739e49218f
fix(cm): fix the problem of registering a channel twice ( #3831 )
2020-12-28 11:03:29 +08:00
9e22f492c7
refactor(rule-engine): add proc_sql_param_str/2 to handle sql params
2020-12-28 10:51:13 +08:00
d628c49f16
fix(management): make client format function durable
2020-12-28 10:51:13 +08:00
b68a0b3730
fix(emqx_lua_hook): fix dialyzer warnings.
2020-12-25 07:42:01 +08:00
2126129aee
fix(emqx_prometheus): fix Dialyzer warnings
2020-12-25 07:42:01 +08:00
80cca940c2
fix(emqx_http_client): fix Dialyzer warnings
2020-12-25 07:42:01 +08:00
02245aeb7a
chore(test): provisionally delete the testcase for SASL
...
The SASL feature in emqtt is not ready, delete the testcases for now.
2020-12-23 16:42:49 +08:00
865c63d82e
fix(emqx_mgmt): data export failed on generating the exported filename
2020-12-23 16:41:18 +08:00
6b5878cdd0
fix(test): solve verification issue when verify the resource numbers
2020-12-23 16:39:40 +08:00
ec8cfecdc0
fix(test): typos in emqx_mgmt_api_SUITE
2020-12-23 13:47:22 +08:00
60f1b64ad9
fix(test): delete extra emqx_lua_hook:stop()
2020-12-22 22:05:24 +08:00
9e3b6da9ca
fix(test): delete extra verfication for 'max_age'
2020-12-22 18:22:17 +08:00
54ff20ec0e
fix(build): remove the extra cowlib deps from emqx_auth_http
2020-12-22 17:50:10 +08:00
a364758e2a
test(emqx_recon): stop emqx correctly in the test case
2020-12-22 13:39:49 +08:00
3ef08f9ce3
test(meck): add meck unload after meck load
2020-12-22 13:39:49 +08:00
26758d48d1
test(auth mnesia): the initial environment is restored at the end of the test case
2020-12-22 13:39:49 +08:00
443ff737ed
fix(rule_engine): use rpc in emqx_rule_engine_api
2020-12-22 11:18:16 +08:00
e15c0c325e
fix(rule_engine): nested_get value from binary was supported in 4.1
2020-12-22 11:18:16 +08:00
86d20b060c
fix(metrics): counters not created before incr 'rule.matched'
2020-12-22 11:18:16 +08:00
c3159420bb
feat(funcs): add bitsize/1 and subbits/2,3,6 functions
2020-12-22 11:18:16 +08:00
8a50c70ca3
Merge pull request #3929 from z8674558/feat/coap-acl
...
feat(coap): use emqx_access_control:check_acl before pub/sub
2020-12-21 16:38:49 +09:00
0ef84d2722
fix(auth mnesia): remove the duplicate cli command
...
style(auth mnesia): fix elvis check failurex
style(auth mnesia): remove the extra symbol
2020-12-19 15:20:46 +08:00
e72cbd22c4
fix(rule_validator): fill default values when validating the params
2020-12-18 11:08:17 +08:00
a564670863
fix(coap): fix the issue the connection with same clientid is not discarded
2020-12-17 15:57:38 +09:00
fd6cc1a848
test(CI): update actions
...
add fvt tests
update test cases
2020-12-17 14:23:33 +08:00
0a44270932
* fix(dialyzer): remove the dialyzer errors
2020-12-17 10:04:49 +08:00
f06ec6baaa
chore(lint): fix elvis
2020-12-17 10:55:57 +09:00
c89dad559e
feat(coap): use emqx_access_control:check_acl before pub/sub
2020-12-17 10:36:51 +09:00
d4e7a87807
fix(emqx_stomp): Fix emqx_stomp_protocol xref
2020-12-16 18:39:18 +08:00
ab57c19e7a
Merge pull request #3917
...
Fix dialyzer warnings
2020-12-15 13:50:31 +01:00
893301db6a
fix(emqx_stomp_protocol): fix Dialyzer warnings
2020-12-15 12:45:47 +01:00
ec79523ea5
fix(emqx_rule_actions): fix Dialyzer warnings
2020-12-15 11:39:52 +01:00
51c62dfe65
fix(emqx_auth_mnesia_api): fix Dialyzer warnings
2020-12-15 11:31:55 +01:00
8ee98e3f20
fix(emqx_rule_utils): fix Dialyzer warnings
2020-12-15 11:31:55 +01:00
66ebcfa301
test(emqx_auth_redis): add test cases for sentinel
2020-12-15 10:35:13 +08:00
bddacf5284
test(management): refine the tests
2020-12-14 11:35:05 +08:00
5d98944c94
feat(management): implement the auth-mnesia import/export
...
All codes picks from emqx-management:dev/e4.2.3
2020-12-14 11:35:05 +08:00
1b016b16f4
Merge branch 'dev/v4.3.0' into refact/avoid_anonymous_funcs
2020-12-14 11:23:13 +08:00
1be1757bbd
fix(mongo): avoid function_caluse while query returned other types
2020-12-14 11:13:36 +08:00
27d6b73c37
refactor(mqttsn): avoid saving anonymous functions
2020-12-14 11:13:04 +08:00
d60212787b
chore(build): remove emqx from app's applications list
2020-12-12 23:02:26 +01:00
10dbb5bc96
Fix testcases warns ( #3906 )
2020-12-11 18:54:48 +08:00
7bdd093ef5
Merge remote-tracking branch 'origin/dev/v4.3.0' into umbrella-fix-build
2020-12-11 08:55:57 +01:00
d75b89eadb
chore(proj): sync .ci directories
2020-12-11 08:37:14 +01:00
0237abd3d2
chore(emqx_lwm2m): Ensure xml dir copied to build dir
2020-12-11 08:29:45 +01:00
Zaiming Shi