Commit Graph

2401 Commits

Author SHA1 Message Date
x1001100011 23d72b334e feat: fix runtime issues after merge master 2021-10-28 20:04:41 -07:00
x1001100011 0f57fb9599 feat: fix runtime issues after merge master 2021-10-27 22:38:49 -07:00
x1001100011 5d31c7eb6b Merge branch 'master' into EMQX-782 2021-10-27 21:49:24 -07:00
Zaiming (Stone) Shi 44446bb762 refactor(dashboard): rename 'password' field to 'pwdhash' (#5990)
* refactor(dashboard): rename 'password' field to 'pwdhash'

rename as it is not plaintext password stored in db

* refactor(emqx_dashboard): rename records

* test(emqx_dashboard_token): add test case to cover match specs
2021-10-27 21:48:00 -07:00
JimMoen c5241670e0 refactor(paginate): use exported fun call `{M,F}` 2021-10-27 21:47:59 -07:00
JimMoen f936aba6b7 fix(authn): users pagination on spec listener_id and authn_id 2021-10-27 21:47:59 -07:00
JimMoen 295b1312be feat(authn_scram): authn_scram users page query 2021-10-27 21:47:59 -07:00
JimMoen c6ea575d35 feat(authn): authn users page query 2021-10-27 21:47:59 -07:00
JimMoen 36fd7369e0 fix(authn): api description using binary string 2021-10-27 21:47:59 -07:00
JimMoen 2b46e16d74 fix(authz): add license headers 2021-10-27 21:47:59 -07:00
JimMoen 7a4edc0104 chore(authz): fix test suite page params 2021-10-27 21:47:59 -07:00
JimMoen c1b737a9b2 fix(authz): authz rules page query 2021-10-27 21:47:59 -07:00
JianBo He 2ded7fbe8c fix(api): escape the searching string 2021-10-27 21:47:59 -07:00
Zaiming (Stone) Shi 4eb966549e fix: typo in apps/emqx_authz/src/emqx_authz.erl
Co-authored-by: Rory Z <Rory-Z@outlook.com>
2021-10-27 21:47:59 -07:00
Zaiming Shi 70491aee07 fix(authn): save certificates to certs dir 2021-10-27 21:47:59 -07:00
Zaiming Shi bc99d5c1a6 refactor(authz): call emqx_tls_lib to save & read SSL files 2021-10-27 21:47:59 -07:00
Zaiming Shi fdf439bc7b refactor(tls): move ssl files handling to emqx_tls_lib
This is an attempt ot make it more generic for other APPs to use.
Aslo added test cases to cover most of the code paths.
2021-10-27 21:47:59 -07:00
zhanghongtong d796f815d7 chore(authz): add more test case 2021-10-27 21:47:59 -07:00
zhanghongtong b8de05891e chore(authz): implement create_dry_run in other function clause
Signed-off-by: zhanghongtong <rory-z@outlook.com>
2021-10-27 21:47:59 -07:00
zhanghongtong 74b63f7d68 fix(emqx_resource): fix InstId type error 2021-10-27 21:47:59 -07:00
zhanghongtong 2def7e4ac2 fix(authz): fix configuration could be updated with incorrect values
when updating the configuration, first check with emqx_resouce:create_dry_run/2

Signed-off-by: zhanghongtong <rory-z@outlook.com>
2021-10-27 21:47:59 -07:00
zhouzb ddcf73f465 fix(authn): fix handling of pgsql response 2021-10-27 21:47:59 -07:00
zhouzb cc5b995cf2 fix(authn): no longer use single quotes to wrap placeholders 2021-10-27 21:47:59 -07:00
zhouzb ab201625c3 fix(authn): fix sql parse for mysql 2021-10-27 21:47:59 -07:00
firest 1c144d7d67 fix(emqx_telemetry): add default value to get_value 2021-10-27 21:47:59 -07:00
Zaiming Shi 92d5f4b3b2 test: fix emqx_config_SUITE 2021-10-27 21:47:59 -07:00
Zaiming Shi 54223e4fe6 fix(schema): add roots for emqx_zone_schema
emqx_zone_schema is never used at root level, but for config doc
generation, it needs the roots.
2021-10-27 21:47:59 -07:00
Zaiming Shi 0531a1925c docs: authenticator_config ref link to the struct 2021-10-27 21:47:59 -07:00
Zaiming Shi 1b56fba471 chore: pin hocon 0.20.5
for two changes:
default string values are filled with binary() instead of [integer()]
better reference links in config document
2021-10-27 21:47:59 -07:00
zhongwencool 1d24e46ece Rewrite http api with hocon schema (#5980)
* feat: rewrite http api with hocon

* fix: crash when default_username is empty

* chore: udpate rewrite api with emqx_conf's cluster_rpc

* fix: spec wrong
2021-10-27 21:47:59 -07:00
Ilya Averyanov c9a0c37dbb style(behaviour attrs): unify behaviour declarations 2021-10-27 21:47:59 -07:00
zhongwencool d2fc66f436 emqx_conf (#5939)
* feat(emqx_conf): move conf manager for emqx_machine to emqx_conf

* chore(emqx_conf): change emqx:get_config/2 to emqx_conf:get/2

* fix: common test failed

* fix: badmatch by typo wrong key

* fix(emqx_conf): get the wrong core nodes

* fix(emqx_conf): get core node's tnx_id not latest tnx_id

* fix: add ro_transation when copy conf file

* fix: delete debug info

* fix: change ekka_rlog to mria_rlog

* fix: remove cluster_rpc from emqx_machine.

* fix: don't call ekka:start/0 explicitly

* fix: ekka should be start in emqx_machine
2021-10-27 21:47:59 -07:00
k32 6697b9fa42 fix(emqx_machine): Fix start/stop callbacks (#5969)
* fix(emqx_machine): Fix start/stop callbacks

* chore(ekka): Bump version to 0.11.1

* fix(router): Wait for the tables

* fix(emqx_cluster_rpc): Stop cluster RPC when joining a cluster

* fix(emqx_app): Fix a deadlock when joining the cluster

* fix(emqx_telemetry): Wait for mnesia tables

* test(ct_helper): Start ekka before emqx
2021-10-27 21:47:59 -07:00
Zaiming Shi 2f2a093150 refactor(authn): make schema doc generation work 2021-10-27 21:47:59 -07:00
Zaiming Shi efca545d3d fix(authn): allow single authenticator instance from config 2021-10-27 21:47:59 -07:00
Zaiming Shi 1c22c0d596 fix(authn): rename config key http-server to http 2021-10-27 21:47:59 -07:00
Zaiming Shi c0364ad5a2 refactor(emqx_config_handler): async remove 2021-10-27 21:47:59 -07:00
Zaiming Shi 6d9b3ed341 feat: support check_config callback for authenticator provider 2021-10-27 21:47:59 -07:00
Zaiming Shi 494bac419d fix: fill string fields' default value with binary 2021-10-27 21:47:59 -07:00
Zaiming Shi 835539364e refactor(authn): check authenticator config with provider module
mainly two changes:

1. the schema is simplified at root level, per-authenticator checks
   are done after the type can be identified
2. the config handling part is split out from emqx_authentication
   module to emqx_authentication_config module
2021-10-27 21:47:59 -07:00
zhouzb 4b8bd8e562 chore(deps): unify version of hocon 2021-10-27 21:47:59 -07:00
zhouzb 257bc353a4 fix(authn): fix placeholders are not replaced correctly 2021-10-27 21:47:59 -07:00
William Yang 0d38b75bb2 feat(olp): bump to 0.1.2
remove noop logging
2021-10-27 21:47:59 -07:00
k32 6ef68f8e2c fix(mria): Replace mnesia calls with mria 2021-10-27 21:47:59 -07:00
k32 fca7fd755d fix(emqx_alarm): Wait for tables 2021-10-27 21:47:59 -07:00
k32 760d896d9d fix(dialyzer): Fix problems found by dialyzer 2021-10-27 21:47:59 -07:00
k32 69126fede6 fix(mria): Fix startup sequence 2021-10-27 21:47:59 -07:00
k32 887544c3c1 chore(ct): ekka_mnesia -> mria_mnesia 2021-10-27 21:47:59 -07:00
k32 d224687de2 fix(mria): Hook up mria to emqx_machine 2021-10-27 21:47:58 -07:00
k32 e182a5f38c chore(mria): Remove the obsolete annotiation 2021-10-27 21:47:58 -07:00