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

4917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
z8674558
f251609ace Merge remote-tracking branch 'upstream/dev/v5.0' into dev/v4.3.0 2021-02-19 12:47:07 +09:00
Benjamin Große
28f9b4d519 feat(peer_cert_as_clientid): peer_cert_as_clientid = cn | dn | crt | pem | md5 
pem is base64 encoded instead of binary crt

peer_cert_as_username=crt breaks exhook proto utf8 parsing of username

crt cannot be used in a topic name due to being invalid utf8
pem cannot be used in a topic name due to having slashes

peer_cert_as_clientid = md5 allows to e.g. subscribe to "t/%c" with ACL

existing peer_cert_as_username combinations are unaffected.
 2021-02-19 10:53:11 +08:00
Zaiming Shi
dfcc2dd566
Merge pull request #4195 from z8674558/env-override 
feat(bin): let cuttlefish read env var
 2021-02-18 22:54:00 +01:00
z8674558
2b9a702b70 test(ci): give parameters thru env variable, not sed 2021-02-19 01:09:20 +09:00
z8674558
74b7ea34d9 feat(bin): let cuttlefish read env var 2021-02-19 01:09:06 +09:00
Zaiming Shi
d2bd9b4078
Merge pull request #4197 from zmstone/improve-shared-sup-random-start-point-for-roundrobin 
improve(shared-sub): Randomise the startpoint for round-robin
 2021-02-18 13:26:01 +01:00
JianBo He
54d82584bc
Merge pull request #4196 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-16
 2021-02-18 11:03:08 +08:00
Zaiming Shi
db461179c5 improve(shared-sub): Randomise the startpoint for round-robin 2021-02-17 19:10:37 +01:00
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
Zaiming Shi
877f1750a4
Merge pull request #4191 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-14
 2021-02-14 21:34:52 +01: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
d4a43aa85c
Merge pull request #4189 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-13
 2021-02-13 21:36:01 +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
4463ccf76c
Merge pull request #4178 from zmstone/resolve-conflict-v4.3.0-to-v5.0 
Resolve conflict v4.3.0 to v5.0
 2021-02-13 09:23:01 +01:00
Zaiming Shi
f5f79af418 fix(boot): allow quoted node name and cookie 2021-02-12 14:55:27 +01: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
3863b7f116 fix(config): Quote config string values 2021-02-12 11:16:45 +01:00
Zaiming Shi
d11487268e Merge remote-tracking branch 'origin/dev/v4.3.0' into resolve-conflict-v4.3.0-to-v5.0 2021-02-12 10:36:16 +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
2fa1d9d10b
Merge pull request #4168 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-09
 2021-02-09 21:28:09 +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
a2d3b413a6
Merge pull request #4151 from emqx/v4.3.0-to-v5.0-resolve-tls-config-conflicts 
Auto-pull-request-on-2021-02-05
 2021-02-09 14:02:46 +01:00
Zaiming Shi
4756eb7e5f
Merge branch 'dev/v5.0' into v4.3.0-to-v5.0-resolve-tls-config-conflicts 2021-02-09 09:37:19 +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