Commit Graph

4881 Commits

Author SHA1 Message Date
Shawn eec64e440d
fix(tracer): create short handler-id if clientid is too long (#4164)
* fix(tracer): create short handler-id if clientid is too long

No need to support lists and atoms for when tracing clients/topics.
2021-02-16 14:45:33 +08:00
JianBo He 56a75d0d47 fix(mgmt): make the format function clearer
Co-authored-by: Zaiming Shi <zmstone@gmail.com>
2021-02-14 18:58:13 +08:00
JianBo He fcbf2539bc refactor(mgmt): move the fomating codes to emqx_mgmt_api_clients.erl 2021-02-14 18:58:13 +08:00
JianBo He 9b3a6aa635 fix(mgmt): fix client formating crash
see: https://github.com/emqx/emqx/issues/3868
2021-02-14 18:58:13 +08:00
Zaiming Shi db5ec5bbb7
Merge pull request #4180 from zmstone/chore-delete-unused-vars
chore(ci): delete usage of EMQX_DEPS_DEFAULT_VSN
2021-02-14 07:51:10 +01:00
Zaiming Shi 8077cf60d5
Merge pull request #4185 from HJianBo/upgrade_cowboy
chore(deps): upgrade cowboy to 2.8.2
2021-02-13 18:05:47 +01:00
Zaiming Shi 9c5c99c94f
Merge pull request #4186 from zmstone/chore-sytle-fix-elvis
Chore sytle fix elvis
2021-02-13 14:19:53 +01:00
Zaiming Shi dc184574a3 chore(style): fix elvis check for emqx_access_rule 2021-02-13 11:54:09 +01:00
Zaiming Shi 406a7d60c7 chore(style): fix elvis check for emqx_connection 2021-02-13 11:50:17 +01:00
Zaiming Shi b4b318cb86 chore(style): fix elvis check for emqx_connection_SUITE 2021-02-13 11:41:18 +01:00
JianBo He e3d19b03c5 chore(deps): upgrade cowboy to 2.8.2 2021-02-13 18:29:39 +08:00
Zaiming Shi 99c9374a9c chore(ci): delete usage of EMQX_DEPS_DEFAULT_VSN
EMQX_DEPS_DEFAULT_VSN is the old package version number
used in emqx-rel project.
We no longer use it in emqx.git umbrella project
2021-02-12 14:50:01 +01:00
Zaiming Shi 12568c8c74
Merge pull request #4173 from zmstone/refactor-relocate-management-and-dashboard
refactor(proj): Move opensource apps to lib-opensource
2021-02-12 10:20:47 +01:00
Zaiming Shi 23b66c0fd5 chore(rebar.config.erl): wildcard only one level for include dir 2021-02-11 17:22:20 +01:00
Zaiming Shi e7785a63ee fix(scripts): update scripts to work with new lib-opensource dir 2021-02-11 17:22:20 +01:00
Zaiming Shi 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
Zaiming Shi 6f736a79b7 chore(script): Allow compare base to be a commit sha1 hash 2021-02-11 16:44:12 +01:00
Zaiming Shi 507759b9f1 Revert "refactor(emqx_modules): Move modules config to app dir"
This reverts commit 9cae8784c0.
Because the reverted change broke compatibility with 4.2.x
configuration.
2021-02-11 16:44:12 +01:00
JianBo He 7bf0097330
Merge pull request #4140 from HJianBo/unify_pgsql_conf
Refine the auth-pgsql SSL version configuration
2021-02-11 15:51:09 +08:00
JianBo He 2b4906b47d
Merge branch 'dev/v4.3.0' into unify_pgsql_conf 2021-02-11 15:50:43 +08:00
Zaiming Shi 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
Zaiming Shi 8bf763b72b
Merge pull request #4167 from zmstone/fix-tls-ensure-tls-config-integrity
fix(tls): Ensure tls config integrity
2021-02-10 08:26:46 +01:00
Zaiming Shi d74bb81ff1 chore(style): make elvis happy 2021-02-10 00:02:52 +01:00
Zaiming Shi 9cae8784c0 refactor(emqx_modules): Move modules config to app dir 2021-02-10 00:02:52 +01:00
Zaiming Shi 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
Zaiming Shi 2852ac79d4 feat(tls): Add a tls lib module
emqx_tls_lib is added to help ensure integrity of tls version
and cipher options.
2021-02-09 21:20:26 +01:00
Zaiming Shi 1f10160fa2
Merge pull request #4158 from zmstone/refactor-move-emqx-modules-to-extra-src-dir
refactor(emqx_modules): Move emqx_modules to lib-opensource
2021-02-09 14:48:38 +01:00
Zaiming Shi 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
Zaiming Shi 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
Zaiming Shi f879e8e09b
Merge pull request #4159 from jovdipp/all-versions-ciphers-update-wss
fix(wss-ciphers): cross version ciphers for 1.3,1.2,1.1
2021-02-08 20:41:58 +01:00
Jóvan S. Dippenaar 6decc188e0 fix(wss-ciphers): cross version ciphers for 1.3,1.2,1.1 2021-02-08 20:29:17 +13:00
Zaiming Shi c463e12d36
Merge pull request #4154 from zmstone/chore-etc-delete-emqx.d
chore(etc): Delete etc/emqx.d
2021-02-06 21:56:49 +01:00
Zaiming Shi 2dce719bc7 chore(etc): Delete etc/emqx.d
The files are duplicated in etc/
2021-02-06 21:25:16 +01:00
Zaiming Shi 7c94a02bdd
Merge pull request #4134 from jovdipp/tlsv1.3-as-default
Tlsv1.3 as default
2021-02-05 21:33:03 +01:00
Shawn 70a490114d fix(rulesql): proc cassandra cql with apostrophes failed 2021-02-05 15:30:16 +08:00
Jóvan S. Dippenaar 145958a178 test(emqx-ct-helpers): version upgrade 1.3.5 2021-02-05 16:21:28 +13:00
Jóvan S. Dippenaar 90c02f1116 test(emqx_exporto): refactored ssl ciphers call for ct_helpers update 2021-02-05 16:21:28 +13:00
Jóvan S. Dippenaar 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
Jóvan S. Dippenaar 6541c589ab test(tls1.3): Tests for default ssl config, as well as specific tls versions ( 1.1, 1.2, 1.3 ) 2021-02-05 16:21:28 +13:00
Shawn a2fa84255f
fix(rulesql): proc_sql_param_str incorrect with apostrophes #4135 (#4137) 2021-02-05 10:41:54 +08:00
wwhai 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
Yudai Kiyofuji aadd1ba11a
add shellcheck to ci (#4126)
* chore(shell): disable some shellcheck

* refactor(shell): fix shellcheck

* test(ci): add shellcheck
2021-02-04 16:51:48 +09:00
JianBo He daa9648db5 chore(ci): delete the ssl version configuration 2021-02-04 15:33:25 +08:00
JianBo He c3642c5c83 refactor(pgsql): set the default ssl version to tlsv1.3,tlsv1.2,tlsv1.1 2021-02-04 15:32:08 +08:00
JianBo He 045bc02ec9 test(ci): add proptests chekcing to the makefile 2021-02-04 14:22:17 +08:00
JianBo He 52c747ca6b chore(cover): add coverall back 2021-02-04 14:22:17 +08:00
JianBo He 7f349d814e test(ci): unify the pgsql confs 2021-02-03 17:03:16 +08:00
zhanghongtong a310cd3278 chore(CI): update aws cli download url 2021-02-01 14:48:08 +08:00
wwhai 6eff70a646
fix(rule-engine): reply 500 when update resource failed (#4120) 2021-02-01 09:47:08 +08:00
Jóvan Dippenaar c3c28f4b72 feat(tls.13): tls1.3 ciphers set in .conf's 2021-01-31 18:38:34 +13:00