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

Merge pull request #12986 from thalesmg/fix-mv-name-length-r57-20240507 

fix(message validation): limit the length of validation name
This commit is contained in:
Thales Macedo Garitezi 2024-05-07 11:39:17 -03:00 committed by GitHub
parent 2989793f4c 96bb6e7d88
commit 02c58b67f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/emqx_message_validation/src/emqx_message_validation_schema.erl
View File

@ -18,8 +18,6 @@
api_schema/1
]).
-export([validate_name/1]).
%%------------------------------------------------------------------------------
%% Type declarations
%%------------------------------------------------------------------------------
@ -55,7 +53,7 @@ fields(validation) ->
binary(),
#{
required => true,
validator => fun validate_name/1,
validator => fun emqx_resource:validate_name/1,
desc => ?DESC("name")
}
)},
@ -200,16 +198,6 @@ ensure_array(undefined, _) -> undefined;
ensure_array(L, _) when is_list(L) -> L;
ensure_array(B, _) -> [B].
validate_name(Name) ->
%% see `MAP_KEY_RE' in hocon_tconf
RE = <<"^[A-Za-z0-9]+[A-Za-z0-9-_]*$">>,
case re:run(Name, RE, [{capture, none}]) of
match ->
ok;
nomatch ->
{error, <<"must conform to regex: ", RE/binary>>}
end.
validate_sql(SQL) ->
case emqx_message_validation:parse_sql_check(SQL) of
{ok, _Parsed} ->

5
apps/emqx_message_validation/test/emqx_message_validation_tests.erl
View File

@ -195,7 +195,6 @@ invalid_names_test_() ->
?_assertThrow(
{_Schema, [
#{
reason := <<"must conform to regex:", _/binary>>,
kind := validation_error,
path := "message_validation.validations.1.name"
}
@ -209,7 +208,9 @@ invalid_names_test_() ->
<<"name!">>,
<<"some name">>,
<<"nãme"/utf8>>,
<<"test_哈哈"/utf8>>
<<"test_哈哈"/utf8>>,
%% long name
binary:copy(<<"a">>, 256)
]
].