yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10439 from thalesmg/unhide-ocsp-config-v50 

chore: un-hide ocsp stapling config
This commit is contained in:
Thales Macedo Garitezi 2023-04-19 09:21:10 -03:00 committed by GitHub
parent c54ae6e72d 199cbc60d9
commit cb3ef65775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/src/emqx.app.src
View File

@ -3,7 +3,7 @@
{id, "emqx"}, {id, "emqx"},
{description, "EMQX Core"}, {description, "EMQX Core"},
% strict semver, bump manually! % strict semver, bump manually!
{vsn, "5.0.23"}, {vsn, "5.0.24"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [ {applications, [

3
apps/emqx/src/emqx_schema.erl
View File

@ -2322,8 +2322,6 @@ server_ssl_opts_schema(Defaults, IsRanchListener) ->
ref("ocsp"), ref("ocsp"),
#{ #{
required => false, required => false,
%% TODO: remove after e5.0.2
importance => ?IMPORTANCE_HIDDEN,
validator => fun ocsp_inner_validator/1 validator => fun ocsp_inner_validator/1
} }
)}, )},
@ -2332,6 +2330,7 @@ server_ssl_opts_schema(Defaults, IsRanchListener) ->
boolean(), boolean(),
#{ #{
default => false, default => false,
importance => ?IMPORTANCE_MEDIUM,
desc => ?DESC("server_ssl_opts_schema_enable_crl_check") desc => ?DESC("server_ssl_opts_schema_enable_crl_check")
} }
)} )}

8
apps/emqx/test/emqx_ocsp_cache_SUITE.erl
View File

@ -677,8 +677,12 @@ do_t_update_listener(Config) ->
%% no ocsp at first %% no ocsp at first
ListenerId = "ssl:default", ListenerId = "ssl:default",
{ok, {{_, 200, _}, _, ListenerData0}} = get_listener_via_api(ListenerId), {ok, {{_, 200, _}, _, ListenerData0}} = get_listener_via_api(ListenerId),
?assertEqual( ?assertMatch(
undefined, #{
<<"enable_ocsp_stapling">> := false,
<<"refresh_http_timeout">> := _,
<<"refresh_interval">> := _
},
emqx_utils_maps:deep_get([<<"ssl_options">>, <<"ocsp">>], ListenerData0, undefined) emqx_utils_maps:deep_get([<<"ssl_options">>, <<"ocsp">>], ListenerData0, undefined)
), ),
assert_no_http_get(), assert_no_http_get(),