Commit Graph

102 Commits

Author SHA1 Message Date
zhouzb 9bedd1bb4f chore(ehttpc): update tag of ehttpc 2021-04-15 21:47:20 +08:00
z8674558 971e6ca90e Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-07 20:29:08 +09:00
JianBo He f08ddec296
Add server_name_indication and verify option (#4349)
Add server_name_indication and verify option
2021-03-23 19:48:04 +08:00
Zaiming Shi 6c106207ff
Merge pull request #4293 from emqx/master
Auto-pull-request-on-2021-03-05
2021-03-10 20:57:45 +01:00
Zaiming Shi 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
Zaiming Shi 5edef84332
Merge branch 'dev/v5.0' into fix-merge-conflict-master-to-5.0 2021-03-01 19:58:16 +01:00
z8674558 fb8133b998 chore(emqx_auth_http): match emqx:hook with ok 2021-02-24 21:32:48 +09:00
Zaiming Shi c2cd2fd231 Merge remote-tracking branch 'origin/dev/v4.3.0' into dev/v5.0 2021-02-19 21:13:33 +01:00
z8674558 706e272410 chore(emqx_auth_http): fix dialyzer warnings (match returned values) 2021-02-19 16:23:18 +09: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 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
z8674558 e8729fb00e Merge branch 'dev/v5.0' of private:emqx/emqx into merge430 2021-01-29 17:11:12 +09: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
JianBo He 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
Zaiming Shi c422b200be
Merge pull request #4088 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-27
2021-01-27 22:02:52 +01:00
zhouzb e6235d3bc9 fix(scheme): fix default scheme 2021-01-27 19:11:41 +01:00
zhouzb 92d307b1b3 fix(scheme): update test case 2021-01-27 19:11:41 +01:00
zhouzb 45aafc75dd fix(scheme): using uri_string:normalize/1 2021-01-27 19:11:41 +01:00
zhouzb 311df2f8a6 fix(scheme): fix scheme parsing 2021-01-27 19:11:41 +01:00
zhouzb a631a2d64f fix(ssl): fix ssl option 2021-01-27 19:11:41 +01:00
zhanghongtong 689b530b4f chore(auth-http): remove needless test case 2021-01-27 19:55:21 +08:00
JianBo He b77ac247eb chore(auth-http): remove needless lines 2021-01-27 19:55:21 +08:00
Zaiming Shi 937390fe0f
Merge pull request #4072 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-25
2021-01-25 22:05:03 +01:00
zhouzb b25dedccc9 refactor(inet parse): refactor inet parse 2021-01-25 15:59:23 +08:00
Zaiming Shi 5d45325cb8 fix(conf): quote config values 2021-01-22 14:20:47 +01:00
Zaiming Shi b9071394c4 Merge remote-tracking branch 'origin/dev/v4.3.0' into chore-merge-v430-to-v50 2021-01-21 23:53:12 +01:00
Yudai Kiyofuji 455f210b4c
feat(cuttlefish): use hocon as a parsing function (#4008)
* chore(conf): add quotation for hocon

* chore(conf): fix paths incompatible with hocon

* chore(conf): use hocon as parsing function

* chore(docker): add quotation to some env variables for hocon
2021-01-19 19:52:17 +09:00
tigercl 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
JianBo He 32b23b9181 Revert "feat(auth_http): support for getting websocket cookies"
This reverts commit 5427057c2c.
2021-01-14 15:10:48 +01:00
tigercl 372687d79d
improve(http): replace httpc with gun, improve performance and fix httpc unresponsiveness (#3940) 2021-01-13 13:47:23 +08:00
JianBo He 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
ayodele.akingbule 80cca940c2 fix(emqx_http_client): fix Dialyzer warnings 2020-12-25 07:42:01 +08:00
Shawn 54ff20ec0e fix(build): remove the extra cowlib deps from emqx_auth_http 2020-12-22 17:50:10 +08:00
Zaiming Shi d60212787b chore(build): remove emqx from app's applications list 2020-12-12 23:02:26 +01:00
Zaiming Shi 7bdd093ef5 Merge remote-tracking branch 'origin/dev/v4.3.0' into umbrella-fix-build 2020-12-11 08:55:57 +01:00
Zaiming Shi 3a91ff8a7b chore(proj): resync apps 2020-12-11 08:19:26 +01:00
Shawn ed510936fe fix(test): revert the code committed by mistake 2020-12-10 21:37:29 +08:00
ayodele.akingbule d8c9547a5e fix(emqx_auth_http): Dialyzer warnings 2020-12-10 11:22:38 +01:00
ayodele.akingbule db25660497 fix(emqx_auth_http_app): Dialyzer warnings 2020-12-10 11:22:38 +01:00
Shawn 02afda2f3b chore(test): testing the github action 2020-12-10 16:49:32 +08:00
JianBo He 49d15d974a build(make): add xref, dialyzer command 2020-12-09 14:21:54 +08:00
Zaiming Shi 80e1d6cc9d chore(apps): delete LICENSE files for apps 2020-12-08 22:28:46 +01:00
Zaiming Shi 7fdbfba06a Merge branch 'umbrella-for-430-auto-sync' into umbrella-for-430 2020-12-08 22:09:59 +01:00
Zaiming Shi 2fda0a1565 chore(apps): Sync again all apps 2020-12-07 21:30:21 +01:00
Zaiming Shi db792ec577 chore(apps): Sync again with 4.3.0 2020-12-05 03:02:35 +01:00
Zaiming Shi 8a12018863 Add more cleanups 2020-12-05 02:45:01 +01:00
Zaiming Shi 0fb5fb31a5 refactor(proj) sync 4.3.0 plugins with tracked files 2020-12-05 02:43:04 +01:00
Zaiming Shi 686c006d6e refactor(proj): Add apps 2020-12-04 22:11:53 +01:00
Zaiming Shi 73d02beace refactor(apps): Merge emqx_libs back to emqx
And move emqx app back to root level

After realising the challenges of developing plugins in standalone
rebar projects. it is perhaps more smooth to keep using emqx as
a rebar dependency
2020-12-04 19:58:58 +01:00
Zaiming Shi 2cbd2bc800 chore(app.src): use semver 4.3.0 for apps version base 2020-12-03 19:59:41 +01:00
Zaiming Shi 5bb0cccb53 refactor(build): Clean up app version management
Starting from 5.0.0, all apps in apps dir should follow semver
strictly. Do not use the umbrella project's release tags.

The universal tags made sense when we have applications scattered
in different repos. Now since this is an umbrella project, it is
enough to have a single package level version number corelated with
git tag.
2020-12-01 23:22:33 +01:00
terry-xiaoyu 0cd1c57a54 Migrate plugins from tag 4.2.2 2020-10-31 12:10:19 +08:00