yuanbiao/emqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,862 Commits 393 Branches 684 Tags 74 MiB
2b4906b47d
Commit Graph

4862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jóvan Dippenaar
94e8a69a48 docs(typos): vefify -> verify 2021-01-31 17:27:08 +13:00
wwhai
a3206f5e0b fix(rule-engine): reformat code style 2021-01-29 19:32:05 +08:00
JianBo He
38eb849ef0 fix(mysql): upgrade mysql to 1.7.1 for TLS supporting 2021-01-29 19:31:02 +08:00
zhanghongtong
d78b2b23c1 chore(build): update pkg version 2021-01-29 19:29:41 +08:00
JianBo He
1aefee01c2 chore(mgmt): remove needless lines 2021-01-29 18:50:29 +08:00
wwhai
3973c93534 fix(rule-engine): remove unused code 2021-01-29 17:16:00 +08:00
Zaiming Shi
5b4c886b16
Merge pull request #4107 from emqx/resove-master-to-4.3-conflict 
Auto-pull-request-on-2021-01-29
 2021-01-29 08:34:35 +01:00
Zaiming Shi
02fb66f4ce
Merge branch 'dev/v4.3.0' into resove-master-to-4.3-conflict 2021-01-29 08:33:20 +01:00
Zaiming Shi
9140eafd94 chore(docker): Start emqx in foreground mode in docker container 2021-01-29 15:30:32 +08:00
Zaiming Shi
64e7056f3f chore(script): Add a help script to test clustering with docker 2021-01-29 15:30:32 +08:00
wwhai
7072355bc1 fix(rule-engine): fix test failure 2021-01-29 15:24:07 +08:00
wwhai
73655369af fix(rule-engine): reformat some code 2021-01-29 11:52:32 +08:00
Zaiming Shi
d13a33463f chore(bin/emqx): set program name 2021-01-29 09:42:35 +08:00
Zaiming Shi
cf23d9efe9 chore(bin/emqx): Do not rely on beam.smp program name 2021-01-29 09:42:35 +08:00
tigercl
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
zhanghongtong
472b8bf42e chore(CI): cancel the tls test for mysql 2021-01-28 21:23:41 +08:00
zhanghongtong
3a0f6a68be chore(docker): fix some error 2021-01-28 21:23:41 +08:00
tigercl
5878950dc3
feat(websocket): support for checking subprotocols (#4099) 2021-01-28 20:42:57 +08:00
Zaiming Shi
469afbd8bb chore(docker): update to use alpine 3.12 
3.12 is our builder image base
 2021-01-28 20:32:03 +08:00