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

9186 Commits

Author SHA1 Message Date
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
Ivan Dyachkov
f1bc3b68b6
Merge pull request #11674 from id/0925-e5.3.0-alpha.2 
e5.3.0 alpha.2
 2023-09-25 14:21:46 +02:00
JianBo He
6f29bbf997
Merge pull request #11673 from HJianBo/redact_audit_log_from_cli 
Redact audit log from CLI
 2023-09-25 20:03:45 +08:00
William Yang
36d3a3a524 fix: bump to quicer 0.0.201 
do not load cacertfile if verify_none
 2023-09-25 13:02:01 +02:00
William Yang
22193d273a fix(quic): ignore undefined cacertfile 2023-09-25 12:57:55 +02:00
Ivan Dyachkov
8c93c79b44 chore: e5.3.0-alpha.2 2023-09-25 12:52:45 +02:00
JimMoen
7d58f6c61e
Merge pull request #11668 from JimMoen/saml-login-redirect 
fix: saml login acs redirect to dashboard overview
 2023-09-25 18:11:03 +08:00
JianBo He
b970a34ee0 chore: redact some audit logs from CLI 2023-09-25 18:06:39 +08:00
JianBo He
89e15e9134
Merge pull request #11665 from HJianBo/typo-fixes 
Typo fixes
 2023-09-25 17:23:40 +08:00
lafirest
1cd9df6461
Merge pull request #11669 from lafirest/fix/dashboard_cli 
fix(sso): refactor the `admins` CLI
 2023-09-25 16:57:18 +08:00
firest
e63d484632 fix(sso): move the config path of the SSO feature to dashboard.sso 2023-09-25 15:23:52 +08:00
firest
e94192d1fa fix(sso): refactor the admins CLI 
1. revert the opensource version
2. allow delete the SSO user via CLI
 2023-09-25 13:53:01 +08:00
firest
4f4868a46c fix(sso): Disable access to logout endpoint by the API key 2023-09-25 10:31:38 +08:00
JianBo He
30862a94c6 chore: typo fixes 2023-09-24 20:19:05 +08:00
JimMoen
ad4fadc2fa
fix: saml login acs redirect to dashboard overview 2023-09-23 17:29:02 +08:00
JianBo He
f8d06614c0 chore: fix dialyzer warnings 2023-09-23 07:34:04 +08:00
JimMoen
1dddccb448
fix(saml): cert files cleanup when destroy 2023-09-22 22:49:08 +08:00
JimMoen
80a6c1150d
fix(saml): saml login reply role viewer as default 2023-09-22 22:39:02 +08:00
JimMoen
cc3e4e4dc5
fix(saml): drop cert and key content and return path 2023-09-22 22:37:04 +08:00
JimMoen
6349cd3910
fix(saml): sp sign request 2023-09-22 21:57:50 +08:00
JimMoen
2a8f3f9eaa
fix: saml xml metedata format 2023-09-22 21:50:43 +08:00
JimMoen
a318ad486a
refactor: behavior login/2 use all http request 2023-09-22 21:50:43 +08:00
JianBo He
9181ec844f
chore: split out sso_saml_api module 2023-09-22 21:50:43 +08:00