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

9208 Commits

Author SHA1 Message Date
JianBo He
bdf24d0ec8 chore: remove the unauthorized type for from field 2023-09-28 10:25:37 +08:00
JianBo He
71acf121ba chore(audit): distinguish requests from rest_api or dashboard 2023-09-28 10:25:37 +08:00
JianBo He
dd9938114c chore(audit): add from field 2023-09-28 10:25:37 +08:00
JianBo He
ece7d5b52a
Merge pull request #11690 from lafirest/fix/ldap_parse_cfg 
fix(ldap): improve the LDAP `parse_config` function
 2023-09-28 10:24:52 +08:00
lafirest
b0d86eecd6
Merge pull request #11691 from lafirest/fix/sso_ssl 
fix(sso): support for SSL update && ensure update is atomic
 2023-09-28 10:22:34 +08:00
firest
57781d0544 fix(ldap): remove the parse_config, it never work 2023-09-28 09:38:16 +08:00
firest
9dee2dc31e fix(sso): clear last error first before update && fix the running 2023-09-28 08:56:16 +08:00
Zaiming (Stone) Shi
afdda107af fix(logger): json format log encode binary list as string array 2023-09-27 23:40:01 +02:00
Zaiming (Stone) Shi
6f7a4344dc fix: do not gc sso saml SP singing keys 2023-09-27 23:19:39 +02:00
Zaiming (Stone) Shi
34367fc4ec fix(audit_log): pretty print shell args 2023-09-27 23:19:39 +02:00
Zaiming (Stone) Shi
bb49914fd6 fix(sso): add convet_certs callback for sso backends 
must convert certs in pre_config_update so the cert path refernces
are stored in raw config, otherwise the files might get gc:ed
 2023-09-27 22:41:39 +02:00
Zaiming (Stone) Shi
45caa3bf01 fix(sso): make sp_private_key sensitive 
so it will not be logged
 2023-09-27 21:27:59 +02:00
Zaiming (Stone) Shi
c8cbbff044 fix(logger): no need for special handling of empty string 
when formating json logs, there is no need to handle empty strings
special, already covered by unicode handling
 2023-09-27 21:26:47 +02:00
firest
66d2107007 fix(sso): refactor update logic 2023-09-28 00:09:09 +08:00
Zaiming (Stone) Shi
bd3277c51b
Merge pull request #11683 from zmstone/0925-test-refactor-emqx-rpc-test 
test: refactor emqx_rpc unit tests
 2023-09-27 15:46:27 +02:00
firest
08ad09a68f fix(sso): refactor backen update logic 
1. valid config always can update successfully
2. the `running` endpoint only return successfully created backend
3. enhancement of the `/sso` endpoint, and will check is the resource online
 2023-09-27 20:53:10 +08:00
Zaiming (Stone) Shi
ea8d54fd8b test: ensure atom exists in test module 2023-09-27 12:58:06 +02:00
Zaiming (Stone) Shi
6e8c73258f test: refactor emqx_rpc unit tests 2023-09-27 12:58:06 +02:00
JimMoen
c9194cd6b2
fix(saml_sso): donot load IDP metadata when disabling saml 2023-09-27 18:46:24 +08:00
JimMoen
af9e87c025
fix: saml callback should check saml state 2023-09-27 18:34:48 +08:00
firest
b2699c687b fix(sso): support for SSL update && ensure update is atomic 
1. support update SSL key and cert files
2. increase connection timeout
3. ensure the update is atomicity, everything will be consistent
 2023-09-27 15:48:11 +08:00
firest
0c33df3912 fix(ldap): improve the LDAP parse_config function 2023-09-26 23:28:37 +08:00
JimMoen
3fa18d6935
fix: lower sso saml redirect http header 2023-09-26 23:25:59 +08:00
JianBo He
6a9bb7c3ae
Merge pull request #11681 from zhongwencool/audit-log-fix-2 
fix: don't need to change audit log's level
 2023-09-26 23:12:28 +08:00
lafirest
ac5eb5bc29
Merge pull request #11687 from lafirest/fix/sso_timeout 
fix(sso): Handle backend update timeout and fix create errors
 2023-09-26 22:43:38 +08:00
JianBo He
1a96a5990b
chore: Update apps/emqx_enterprise/src/emqx_enterprise_schema.erl 
Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
 2023-09-26 21:44:40 +08:00
firest
403714d44e fix(sso): Handle backend update timeout and fix create errors 
1. correctly handle the timeout when call update on a backend
2. fix that config update always returns success
3. do not ignore start failures and ensure start is atomic
 2023-09-26 21:43:30 +08:00
Thales Macedo Garitezi
aae59f1efd
Merge pull request #11682 from thalesmg/fix-file-logger-type-r53-20230925 
fix(file_logger): change file logger type depending on rotation size
 2023-09-26 10:22:36 -03:00
Zaiming (Stone) Shi
4e15edb5e4
Merge pull request #11661 from zmstone/0922-fix-json-log-formatter 
0922 fix json log formatter
 2023-09-26 14:13:41 +02:00
Thales Macedo Garitezi
fdcd73e20c fix(file_logger): change file logger type depending on rotation size 
Fixes https://emqx.atlassian.net/browse/EMQX-11036

From `logger_disk_log_h:open_disk_log`:

```erlang
open_disk_log(Name,File,Type,MaxNoBytes,MaxNoFiles) ->
    case filelib:ensure_dir(File) of
        ok ->
            Size =
                if Type==halt -> MaxNoBytes;
                   Type==wrap -> {MaxNoBytes,MaxNoFiles} %% <-------
                end,
            Opts = [{name,   Name},
                    {file,   File},
                    {size,   Size},
                    {type,   Type},
                    {linkto, self()},
                    {repair, false},
                    {format, external},
                    {notify, true},
                    {quiet,  true},
                    {mode,   read_write}],
            case disk_log:open(Opts) of
```

Affects all file loggers (audit included):

```
% emqx_config_logger:update_log_handler/1 -> ok
iex(emqx@127.0.0.1)14> Config override: log.file.emqx_audit is updated, but failed to add handler: {handler_not_added,
                                                                             {badarg,
                                                                              [{size,
                                                                                {infinity,
                                                                                 10}},
                                                                               {type,
                                                                                wrap},
                                                                               {linkto,
                                                                                <0.1952.0>},
                                                                               {repair,
                                                                                false},
                                                                               {format,
                                                                                external},
                                                                               {notify,
                                                                                true},
                                                                               {quiet,
                                                                                true},
                                                                               {mode,
                                                                                read_write}]}}
```
 2023-09-26 09:04:44 -03:00
JianBo He
5e6397b843 chore: remove result field for CLI audit logs 2023-09-26 19:24:35 +08:00
JianBo He
a73c3b8e1e Merge remote-tracking branch 'ce/release-53' into audit-log-fix-2 2023-09-26 19:05:47 +08:00
JianBo He
e9785a6863
Merge pull request #11680 from thalesmg/audit-not-on-ce-r53-20230925 
fix(audit): only support audit log on enterprise edition
 2023-09-26 18:57:22 +08:00
Zaiming (Stone) Shi
7d810c2107 test: fix test case match pattern 2023-09-26 11:40:30 +02:00
Zaiming (Stone) Shi
d31bfc70fb
Merge pull request #11659 from zhongwencool/fix-listener-ssl-create-500 
fix: create ssl listener return 500 crash
 2023-09-26 11:38:07 +02:00
lafirest
8cc626d33f
Merge pull request #11686 from lafirest/fix/sso_user_backend 
fix: fix update SSO user && improve SSO user deletion commnad
 2023-09-26 16:04:51 +08:00
firest
56917fee5f fix(sso): Improved SSO user deletion command 2023-09-26 14:15:41 +08:00
firest
d1af81c86e fix(sso): fix the failure to update SSO users 2023-09-26 12:14:45 +08:00
firest
8135e27586 fix: redact sensitive data in SSO and LDAP 2023-09-26 11:06:47 +08:00
Thales Macedo Garitezi
5d212e1086 fix(audit): only support audit log on enterprise edition 
Fixes https://emqx.atlassian.net/browse/EMQX-11039
 2023-09-25 15:59:35 -03:00
zhongwencool
95060302fd fix: don't need to change audit log's level 2023-09-26 00:28:47 +08:00
Thales Macedo Garitezi
ff7f37ccf5 test(cth): allow defining schema to load for app 2023-09-25 13:22:41 -03:00
lafirest
1df8326fb8
Merge pull request #11677 from lafirest/fix/sso_cfg 
adjust the config path for the SSO feature and improve the update logic
 2023-09-25 23:00:46 +08:00
Zaiming (Stone) Shi
5e6996dc05 refactor: log formatter format mfa+line as m:f/a(line) 
also improve json formatter when a field is iolist
 2023-09-25 16:55:22 +02:00
Zaiming (Stone) Shi
6a557980e4 refactor(logger): ensure JSON log field order 
Ensure that the log fileds in JSON format are ordered as
time, level, msg, mfal, ...
 2023-09-25 16:55:22 +02:00
Zaiming (Stone) Shi
5f45ba50ff refactor: delete log formatter config for audit log handler 
It is using 'json' formatter, the template is useless
 2023-09-25 16:55:22 +02:00
Zaiming (Stone) Shi
1fed38c248 fix(logger): write 'json' format logs as JSON 2023-09-25 16:55:22 +02:00
Zaiming (Stone) Shi
aea1e80290 feat: add 'format' as alias for log 'formatter' 2023-09-25 16:55:22 +02:00
William Yang
9106eb92d2
Merge pull request #11675 from qzhuyan/fix/william/quic-respect-param-verify 2023-09-25 15:48:01 +02:00
firest
cfdb25b213 fix(sso): updates the SSO backend when the [dashboard] has updated 2023-09-25 20:30:47 +08:00