5dab6985c1
Merge branch 'dev/v5.0' into resolve-master-dev/v5.0-conflict-release-version
2021-06-05 11:51:02 +02:00
443b83624c
fix(webhook): fix bad ssl options
2021-06-02 09:31:28 +08:00
3984f8cd2f
chore(log): update log content
2021-05-14 19:27:04 +08:00
c6771a57b6
chore(update dep): update dep of ehttpc
2021-05-14 19:27:04 +08:00
0d9a9fc966
Merge branch 'dev/v5.0' into resolve-conflict-master-to-v5.0
2021-05-07 08:43:26 +02:00
b8e271a588
chore: add more info in test log
2021-05-06 11:03:02 +02:00
d904a1048b
Merge remote-tracking branch 'origin/master' into merge-master-to-dev/v5.0
2021-04-30 15:09:31 +02:00
a37f47887a
fix(ipv6): add ipv6_probe socket option only when supported
...
ipv6_probe is a socket option supported in EMQ's otp.git fork.
If the target hostname has a ipv6 DNS resolution, gen_tcp
tries to establish a connection on ipv6.
If it fails, then a fallback to default gen_tcp:connection
2021-04-28 10:43:36 +02:00
d9c7c72612
feat(ipv6 probe): automatically probe whether it is IPv6
2021-04-28 10:43:36 +02:00
6354e75626
chore: update copyrights
2021-04-23 20:43:00 +02:00
186dfd04a7
test(webhook): ignore messages from other clients
2021-04-20 18:29:50 +02:00
e59eacb891
test(webhook): test ipv6 for real
2021-04-20 08:13:23 +02:00
8ef4df4592
chore(web hook): fix tests error
2021-04-16 23:27:20 +08:00
53992ba138
chore(tests): fix tests error for web hook
2021-04-15 23:07:00 +08:00
50f6ff4151
test(proper): avoid to generate any term
2021-04-15 21:49:25 +08:00
9bedd1bb4f
chore(ehttpc): update tag of ehttpc
2021-04-15 21:47:20 +08:00
c413af5c35
test(proper): track to the lastest code
...
- use limited atom type
- keep webhook confs testing to lastest schema
2021-04-14 19:38:56 +08:00
1d241bc39c
fix(webhook): convert atom to binary to avoid jiffy encoding failure
2021-04-14 19:38:56 +08:00
9ead5c8cfd
chore(test): fix shutting down of applications in web hooks suite
2021-04-14 19:18:35 +08:00
b0c3c713b5
Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5
2021-04-13 00:09:17 +09:00
16c999ed9b
Start emqx-modules application by default ( #4518 )
...
* fix(modules): start emqx_modules by default
* chore(test): eliminate some compile warnings
2021-04-12 09:45:31 +08:00
765d84ef48
test(mgmt): add data import tests ( #4481 )
2021-04-12 09:06:22 +08:00
971e6ca90e
Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5
2021-04-07 20:29:08 +09:00
f08ddec296
Add server_name_indication and verify option ( #4349 )
...
Add server_name_indication and verify option
2021-03-23 19:48:04 +08:00
71559dd001
refactor(ssl): Move data dir for ssl certs upload down to lib module
2021-03-22 16:41:01 +01:00
8a41a4ee00
fix(ssl): Fix dir name for uploaded certificates
...
The dir is "rules" not "rule" in the original code
ref: f1eba1c648/src/emqx_rule_actions_utils.erl
2021-03-22 16:41:01 +01:00
98c62df2e4
fix(log): fix web hook print error
2021-03-16 10:22:07 +01:00
6c106207ff
Merge pull request #4293 from emqx/master
...
Auto-pull-request-on-2021-03-05
2021-03-10 20:57:45 +01:00
c752f3bec5
Refactor http lib add uri parse ( #4292 )
...
* feat(http_lib): Add uri parse to emqx_http_lib
* fix(webhook): call emqx_http_lib to parse uri
* fix(auth-http): Call emqx_http_lib to parse uri
* fix(rule-engine): call emqx_http_lib to parse uri
2021-03-06 13:35:02 +08:00
efd4ef8091
Merge branch 'dev/v5.0' of private:emqx/emqx into fix-merge-conflict-master-to-5.0
2021-03-04 22:12:09 +09:00
1504164933
chore(src): fix dialyzer warnings (match values)
2021-03-03 20:06:31 +09:00
5edef84332
Merge branch 'dev/v5.0' into fix-merge-conflict-master-to-5.0
2021-03-01 19:58:16 +01:00
16c27663cd
refactor(webhook): transport options refine
2021-03-01 21:00:17 +08:00
801b3d6daf
style: remove spaces at the end of lines
2021-03-01 21:00:17 +08:00
db13f18cbe
fix(webhook): transport options
2021-03-01 21:00:17 +08:00
026e1494fb
fix(webhook): fix config entry web.hook.api.url -> web.hook.url
2021-03-01 21:00:17 +08:00
319d44d1bf
chore(webhook): remove needless files
2021-03-01 21:00:17 +08:00
4aca2c294f
fix(webhook): transport options
2021-03-01 21:00:17 +08:00
0a51bd4c2f
fix(webhook): Call common lib for ssl options
2021-03-01 21:00:17 +08:00
219eeed6d7
fix(webhook): Explicit default tls version and cipher
2021-03-01 21:00:17 +08:00
fcfcbf139d
chore(webhook): merge enterprise to opensource
2021-03-01 21:00:17 +08:00
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
507759b9f1
Revert "refactor(emqx_modules): Move modules config to app dir"
...
This reverts commit 9cae8784c0
2021-02-11 16:44:12 +01: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
55253f914c
Merge pull request #4149 from emqx/dev/v4.3.0
...
Auto-pull-request-on-2021-02-04
2021-02-04 23:17:10 +01:00
045bc02ec9
test(ci): add proptests chekcing to the makefile
2021-02-04 14:22:17 +08:00
3e1b6394f2
Merge pull request #4131 from emqx/dev/v4.3.0
...
Auto-pull-request-on-2021-02-01
2021-02-02 20:05:43 +01:00
6eff70a646
fix(rule-engine): reply 500 when update resource failed ( #4120 )
2021-02-01 09:47:08 +08:00
Zaiming (Stone) Shi