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

7163 Commits

Author SHA1 Message Date
zhouzb bb62b44554 feat(auth): support bcrypt 2021-06-09 18:57:08 +08:00
zhouzb ae8be5d66f feat(authentication): add a 16-byte salt in front of the password before hashing 2021-06-09 16:53:40 +08:00
zhanghongtong aa030315b3 chore(CI): replace the emqx_ctl with curl in the test script 2021-06-09 13:38:14 +08:00
zhouzb d838206a56 chore(code): add type spec 2021-06-09 11:10:03 +08:00
zhouzb 2bfb7f74df fix(jwt): fix chain interruption 2021-06-09 10:36:06 +08:00
Shawn 1de2f5cb2f fix(emqx_data_bridge): update bridge failed 2021-06-08 21:46:52 +08:00
Shawn fdd0233103 feat(emqx_resource): update the demo.md 2021-06-08 21:46:52 +08:00
Shawn 65dc2f2be8 feat(emqx_resource): remove the schema sugar from parse transformed code 2021-06-08 21:46:52 +08:00
zhouzb 0c237bf797 feat(jwt): support based encoded secret 2021-06-08 15:56:13 +08:00
zhouzb f297c36929 feat(jwt auth): support JWT auth 2021-06-08 11:40:46 +08:00
Shawn 4ecf469cbf chore(merge): Merge branch 'emqx_connector' 2021-06-08 10:01:22 +08:00
Shawn 2f720f4a17 feat(emqx_data_bridge): add license headers 2021-06-07 22:15:23 +08:00
Shawn bdf6374414 fix(emqx_resource): disable the debug print for parse-transformed code 2021-06-07 22:11:05 +08:00
Shawn 149a54cef4 fix(emqx_resource): dialyzer issues 2021-06-07 22:08:21 +08:00
Shawn 3c1c457697 fix(emqx_resource): call to undefined function hocon:richmap_to_map/1 2021-06-07 21:54:17 +08:00
Shawn 16c0a5b80a fix(emqx_resource): merge conflict 2021-06-07 21:25:19 +08:00
Shawn a37b3957e3
Merge branch 'master' into emqx_connector 2021-06-07 21:12:00 +08:00
Shawn dddab31326 fix(emqx_data_bridge): resource type to bridge type 2021-06-07 20:01:28 +08:00
Shawn e9fe345ac8 fix(emqx_data_bridge): correct the format of HTTP responses 2021-06-07 19:52:08 +08:00
turtleDeng a564e0c4bf
Merge pull request #4947 from emqx/dev/v5.0 
Merge dev/v5.0 to master
 2021-06-07 17:26:38 +08:00
Shawn 4914b003ac feat(emqx_resource): update the unused APIs 2021-06-07 17:20:34 +08:00
Shawn 2ff92d2880 feat(emqx_data_bridge): add HTTP APIs for data bridge 2021-06-07 16:12:06 +08:00
zhanghongtong 5d30e52e73 chore(CI): fix error for sync code to enterprise 2021-06-07 16:02:01 +08:00
zhanghongtong d5366c7f5f chore(CI): change base branch to sync enterprise 2021-06-07 15:47:37 +08:00
Zaiming (Stone) Shi c97ac8e5be
Merge pull request #4925 from zmstone/dev-v5-merge-move-emqx-to-apps 
v5.0: move emqx to apps dir
 2021-06-07 09:43:37 +02:00
Zaiming Shi 4ee6c82714 test(emqx_rule_engine_SUITE): delegate app start to ct-helper (2.0.0) 2021-06-07 09:09:28 +02:00
Zaiming Shi b92a6837d7 build(emqx): fix emqx standalone dialyzer 2021-06-07 09:09:28 +02:00
Zaiming Shi 7da34b80e5 chore(emqx): bump app version to 5.0.0 2021-06-07 09:09:28 +02:00
Zaiming Shi 13b7dcef4b chore(emqx): emqtt as test dependency 2021-06-07 09:09:28 +02:00
Zaiming Shi 045a944192 chore(ci): check emqx app standalone 2021-06-07 09:09:28 +02:00
Zaiming Shi 0431c64708 test(ci): fix path to cert dir 2021-06-07 09:09:28 +02:00
Zaiming Shi 36e3675d54 test(emqx_listeners_SUITE): fix etc dir path 2021-06-07 09:09:28 +02:00
Zaiming Shi 311cb7b659 build: relocate BUILT_ON template 2021-06-07 09:09:28 +02:00
Zaiming Shi 948ff66111 test: fix rebar3 eunit arg 
--dir apps/app_name causes rebar3 to crash because eunit handler
injects a `[]` as one of the extra_src_dirs option
 2021-06-07 09:09:28 +02:00
Zaiming Shi c573474ec6 build: work with new emqx app location 2021-06-07 09:09:28 +02:00
Zaiming Shi 1715b87dce chore: move root level src, test, include, priv and etc to apps/emqx 2021-06-07 09:09:28 +02:00
Zaiming (Stone) Shi 729e9697cd
Merge pull request #4943 from emqx/master 
Auto-pull-request-on-2021-06-05
 2021-06-07 09:05:42 +02:00
Zaiming (Stone) Shi ad43209fc7
Merge pull request #4944 from zmstone/fix-flaky-tests-emqx-sn 
test(emqx_sn): an attempt to fix flaky tests
 2021-06-07 09:04:32 +02:00
Zaiming (Stone) Shi 7dbdd7160a
Merge pull request #4942 from zmstone/fix-build-and-test-case 
Fix build and test case
 2021-06-07 09:04:01 +02:00
Zaiming Shi 536c2ddc0e test(emqx_sn): an attempt to fix flaky tests 
Some flaky tests such as t_asleep_test06_to_awake_qos2_dl_msg
and t_asleep_test07_to_connected are likely due to test cases
interfering each other.
This changes the cases to use a unique client ID
 2021-06-06 09:03:52 +02:00
Zaiming Shi e01222ef21 build: build macos package on correct OTP release 2021-06-05 19:53:56 +02:00
Zaiming Shi cddfa928b1 test: deterministic tests 2021-06-05 19:53:56 +02:00
zhanghongtong 8f936e3839 chore(CI): remove raspbian9 in build packages workflows 2021-06-05 23:28:28 +08:00
Zaiming (Stone) Shi 65a660aaea
Merge pull request #4903 from emqx/resolve-master-dev/v5.0-conflict-release-version 
Auto-pull-request-on-2021-05-31
 2021-06-05 15:31:21 +02:00
Zaiming Shi b6b144fa31 test: expect unsupported_version for now 2021-06-05 15:04:11 +02:00
Zaiming Shi 5ccaff5a86 fix: app versions emqx_auth_jwt and emqx_sn 2021-06-05 13:21:59 +02:00
Zaiming (Stone) Shi b13051d94c
Merge pull request #4928 from z8674558/license-conf 
chore(bin/emqx): support license conf option
 2021-06-05 13:19:15 +02:00
Zaiming (Stone) Shi ee48c961d0
Merge branch 'dev/v5.0' into license-conf 2021-06-05 13:18:58 +02:00
Zaiming (Stone) Shi 5052b26c7f
Merge pull request #4937 from zmstone/chore-use-http-lib-deps 
chore(http_lib): use lib app
 2021-06-05 13:17:33 +02:00
zhanghongtong 7d0324fb1b chore(CI): fix download packages error in build packages 2021-06-05 18:57:00 +08:00