Merge pull request #13213 from zmstone/0609-syn-release-57-to-master

0609 syn release 57 to master

apps/emqx_bridge_s3/src/emqx_bridge_s3.erl

@@ -22,6 +22,10 @@
     connector_examples/1
 ]).
 
+-export([
+    pre_config_update/4
+]).
+
 %%-------------------------------------------------------------------------------------------------
 %% `hocon_schema' API
 %%-------------------------------------------------------------------------------------------------
@@ -106,3 +110,15 @@ connector_example(put) ->
             enable_pipelining => 1
         }
     }.
+
+%% Config update
+
+pre_config_update(Path, _Name, Conf = #{<<"transport_options">> := TransportOpts}, _ConfOld) ->
+    case emqx_connector_ssl:convert_certs(filename:join(Path), TransportOpts) of
+        {ok, NTransportOpts} ->
+            {ok, Conf#{<<"transport_options">> := NTransportOpts}};
+        {error, {bad_ssl_config, Error}} ->
+            {error, Error#{reason => <<"bad_ssl_config">>}}
+    end;
+pre_config_update(_Path, _Name, Conf, _ConfOld) ->
+    {ok, Conf}.

apps/emqx_connector/src/emqx_connector.erl

@@ -126,19 +126,28 @@ pre_config_update([?ROOT_KEY, _Type, _Name], Oper, OldConfig) when
 ->
     %% to save the 'enable' to the config files
     {ok, OldConfig#{<<"enable">> => operation_to_enable(Oper)}};
-pre_config_update([?ROOT_KEY, _Type, Name] = Path, Conf = #{}, _OldConfig) ->
+pre_config_update([?ROOT_KEY, _Type, Name] = Path, Conf = #{}, ConfOld) ->
     case validate_connector_name(Name) of
         ok ->
             case emqx_connector_ssl:convert_certs(filename:join(Path), Conf) of
-                {error, Reason} ->
-                    {error, Reason};
                 {ok, ConfNew} ->
-                    {ok, ConfNew}
+                    connector_pre_config_update(Path, ConfNew, ConfOld);
+                {error, Reason} ->
+                    {error, Reason}
             end;
         Error ->
             Error
     end.
 
+connector_pre_config_update([?ROOT_KEY, Type, Name] = Path, ConfNew, ConfOld) ->
+    Mod = emqx_connector_info:config_transform_module(Type),
+    case Mod =/= undefined andalso erlang:function_exported(Mod, pre_config_update, 4) of
+        true ->
+            apply(Mod, pre_config_update, [Path, Name, ConfNew, ConfOld]);
+        false ->
+            {ok, ConfNew}
+    end.
+
 operation_to_enable(disable) -> false;
 operation_to_enable(enable) -> true.
 

apps/emqx_rule_engine/src/emqx_rule_events.erl

@@ -908,7 +908,7 @@ test_columns('client.check_authn_complete') ->
     [
         {<<"clientid">>, [<<"c_emqx">>, <<"the clientid if the client">>]},
         {<<"username">>, [<<"u_emqx">>, <<"the username if the client">>]},
-        {<<"reason_code">>, [<<"sucess">>, <<"the reason code">>]},
+        {<<"reason_code">>, [<<"success">>, <<"the reason code">>]},
         {<<"is_superuser">>, [true, <<"Whether this is a superuser">>]},
         {<<"is_anonymous">>, [false, <<"Whether this is a superuser">>]}
     ];
@@ -1087,7 +1087,7 @@ columns_with_exam('client.check_authn_complete') ->
         {<<"clientid">>, <<"c_emqx">>},
         {<<"username">>, <<"u_emqx">>},
         {<<"peername">>, <<"192.168.0.10:56431">>},
-        {<<"reason_code">>, <<"sucess">>},
+        {<<"reason_code">>, <<"success">>},
         {<<"is_superuser">>, true},
         {<<"is_anonymous">>, false},
         {<<"timestamp">>, erlang:system_time(millisecond)},

apps/emqx_rule_engine/test/emqx_rule_engine_api_2_SUITE.erl

@@ -276,7 +276,7 @@ t_rule_test_smoke(_Config) ->
                         #{
                             <<"clientid">> => <<"c_emqx">>,
                             <<"event_type">> => <<"client_check_authn_complete">>,
-                            <<"reason_code">> => <<"sucess">>,
+                            <<"reason_code">> => <<"success">>,
                             <<"is_superuser">> => true,
                             <<"is_anonymous">> => false,
                             <<"username">> => <<"u_emqx">>

apps/emqx_rule_engine/test/emqx_rule_engine_api_rule_test_SUITE.erl

@@ -206,7 +206,7 @@ t_ctx_check_authn_complete(_) ->
         #{
             clientid => <<"c_emqx">>,
             event_type => client_check_authn_complete,
-            reason_code => <<"sucess">>,
+            reason_code => <<"success">>,
             is_superuser => true,
             is_anonymous => false
         },

apps/emqx_utils/src/emqx_utils_sql.erl

@@ -31,8 +31,44 @@
 -type statement_type() :: select | insert | delete | update.
 -type value() :: null | binary() | number() | boolean() | [value()].
 
+-define(INSERT_RE_MP_KEY, insert_re_mp).
+-define(INSERT_RE_BIN, <<
+    %% case-insensitive
+    "(?i)^\\s*",
+    %% Group-1: insert into, table name and columns (when existed).
+    %% All space characters suffixed to <TABLE_NAME> will be kept
+    %% `INSERT INTO <TABLE_NAME> [(<COLUMN>, ..)]`
+    "(insert\\s+into\\s+[^\\s\\(\\)]+\\s*(?:\\([^\\)]*\\))?)",
+    %% Keyword: `VALUES`
+    "\\s*values\\s*",
+    %% Group-2: literals value(s) or placeholder(s) with round brackets.
+    %% And the sub-pattern in brackets does not do any capturing
+    %% `([<VALUE> | <PLACEHOLDER>], ..])`
+    "(\\((?:[^()]++|(?2))*\\))",
+    "\\s*$"
+>>).
+
 -dialyzer({no_improper_lists, [escape_mysql/4, escape_prepend/4]}).
 
+-on_load(put_insert_mp/0).
+
+put_insert_mp() ->
+    persistent_term:put({?MODULE, ?INSERT_RE_MP_KEY}, re:compile(?INSERT_RE_BIN)),
+    ok.
+
+%% The type Copied from stdlib/src/re.erl to compatibility with OTP 26
+%% Since `re:mp()` exported after OTP 27
+-type mp() :: {re_pattern, _, _, _, _}.
+-spec get_insert_mp() -> {ok, mp()}.
+get_insert_mp() ->
+    case persistent_term:get({?MODULE, ?INSERT_RE_MP_KEY}, undefined) of
+        undefined ->
+            ok = put_insert_mp(),
+            get_insert_mp();
+        {ok, MP} ->
+            {ok, MP}
+    end.
+
 -spec get_statement_type(iodata()) -> statement_type() | {error, unknown}.
 get_statement_type(Query) ->
     KnownTypes = #{
@@ -54,17 +90,11 @@ get_statement_type(Query) ->
 -spec parse_insert(iodata()) ->
     {ok, {_Statement :: binary(), _Rows :: binary()}} | {error, not_insert_sql}.
 parse_insert(SQL) ->
-    case re:split(SQL, "((?i)values)", [{return, binary}]) of
+    {ok, MP} = get_insert_mp(),
-        [Part1, _, Part3] ->
+    case re:run(SQL, MP, [{capture, all_but_first, binary}]) of
-            case string:trim(Part1, leading) of
+        {match, [InsertInto, ValuesTemplate]} ->
-                <<"insert", _/binary>> = InsertSQL ->
+            {ok, {InsertInto, ValuesTemplate}};
-                    {ok, {InsertSQL, Part3}};
+        nomatch ->
-                <<"INSERT", _/binary>> = InsertSQL ->
-                    {ok, {InsertSQL, Part3}};
-                _ ->
-                    {error, not_insert_sql}
-            end;
-        _ ->
             {error, not_insert_sql}
     end.
 

apps/emqx_utils/test/emqx_utils_sql_SUITE.erl

@@ -0,0 +1,132 @@
+%%--------------------------------------------------------------------
+%% Copyright (c) 2022-2024 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%--------------------------------------------------------------------
+
+-module(emqx_utils_sql_SUITE).
+
+-compile(export_all).
+-compile(nowarn_export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+-import(emqx_utils_sql, [get_statement_type/1, parse_insert/1]).
+
+all() ->
+    emqx_common_test_helpers:all(?MODULE).
+
+t_get_statement_type(_) ->
+    ?assertEqual(select, get_statement_type("SELECT * FROM abc")),
+    ?assertEqual(insert, get_statement_type("INSERT INTO abc (c1, c2, c3)VALUES(1, 2, 3)")),
+    ?assertEqual(update, get_statement_type("UPDATE abc SET c1 = 1, c2 = 2, c3 = 3")),
+    ?assertEqual(delete, get_statement_type("DELETE FROM abc WHERE c1 = 1")),
+    ?assertEqual({error, unknown}, get_statement_type("drop table books")).
+
+t_parse_insert(_) ->
+    %% `values` in table name
+    run_pi(
+        <<"insert into tag_VALUES(tag_values,Timestamp) values (${tagvalues},${date})"/utf8>>,
+        {<<"insert into tag_VALUES(tag_values,Timestamp)"/utf8>>, <<"(${tagvalues},${date})"/utf8>>}
+    ),
+    run_pi(
+        <<"INSERT INTO Values_таблица (идентификатор, имя, возраст)   VALUES \t (${id}, 'Иван', 25)  "/utf8>>,
+        {<<"INSERT INTO Values_таблица (идентификатор, имя, возраст)"/utf8>>,
+            <<"(${id}, 'Иван', 25)"/utf8>>}
+    ),
+
+    %% `values` in column name
+    run_pi(
+        <<"insert into PI.dbo.tags(tag_values,Timestamp) values (${tagvalues},${date}  )"/utf8>>,
+        {<<"insert into PI.dbo.tags(tag_values,Timestamp)"/utf8>>,
+            <<"(${tagvalues},${date}  )"/utf8>>}
+    ),
+
+    run_pi(
+        <<"INSERT INTO mqtt_test(payload, arrived) VALUES (${payload}, FROM_UNIXTIME((${timestamp}/1000)))"/utf8>>,
+        {<<"INSERT INTO mqtt_test(payload, arrived)"/utf8>>,
+            <<"(${payload}, FROM_UNIXTIME((${timestamp}/1000)))">>}
+    ),
+
+    run_pi(
+        <<"insert into таблица (идентификатор,имя,возраст) VALUES(${id},'Алексей',30)"/utf8>>,
+        {<<"insert into таблица (идентификатор,имя,возраст)"/utf8>>,
+            <<"(${id},'Алексей',30)"/utf8>>}
+    ),
+    run_pi(
+        <<"INSERT into 表格 (标识, 名字, 年龄) VALUES (${id}, '张三', 22)"/utf8>>,
+        {<<"INSERT into 表格 (标识, 名字, 年龄)"/utf8>>, <<"(${id}, '张三', 22)"/utf8>>}
+    ),
+    run_pi(
+        <<"  inSErt into 表格(标识,名字,年龄)values(${id},'李四', 35)"/utf8>>,
+        {<<"inSErt into 表格(标识,名字,年龄)"/utf8>>, <<"(${id},'李四', 35)"/utf8>>}
+    ),
+    run_pi(
+        <<"insert into PI.dbo.tags( tag_value,Timestamp)  VALUES\t\t(   ${tagvalues},   ${date} )"/utf8>>,
+        {<<"insert into PI.dbo.tags( tag_value,Timestamp)"/utf8>>,
+            <<"(   ${tagvalues},   ${date} )"/utf8>>}
+    ),
+    run_pi(
+        <<"insert into PI.dbo.tags(tag_value , Timestamp )vALues(${tagvalues},${date})"/utf8>>,
+        {<<"insert into PI.dbo.tags(tag_value , Timestamp )"/utf8>>,
+            <<"(${tagvalues},${date})"/utf8>>}
+    ),
+
+    run_pi(
+        <<"inSErt  INTO  table75 (column1, column2, column3) values (${one}, ${two},${three})"/utf8>>,
+        {<<"inSErt  INTO  table75 (column1, column2, column3)"/utf8>>,
+            <<"(${one}, ${two},${three})"/utf8>>}
+    ),
+    run_pi(
+        <<"INSERT Into some_table      values\t(${tag1},   ${tag2}  )">>,
+        {<<"INSERT Into some_table      "/utf8>>, <<"(${tag1},   ${tag2}  )">>}
+    ).
+
+t_parse_insert_nested_brackets(_) ->
+    InsertPart = <<"INSERT INTO test_tab (val1, val2)">>,
+    ValueLs = [
+        <<"(ABS(POWER((2 * POWER(ABS( (-3 + 1) * 4), (2 * (1 + ABS( (-3 + 1) * 4))))), (3 - POWER(4, 2)))), ",
+            "POWER(ABS( (-3 + 1) * 4), (2 * (1 + ABS( (-3 + 1) * 4)))))">>,
+        <<"(GREATEST(LEAST(5, 10), ABS(-7)), LEAST(GREATEST(3, 2), 9))">>,
+        <<"(ABS(POWER((2 * 2), (3 - 1))), POWER(ABS(-3), (2 * (1 + 1))))">>,
+        <<"(SQRT(POWER(4, 2)), MOD((10 + 3), (2 * 5)))">>,
+        <<"(ROUND(CEIL(3.14159 * 2), 2), CEIL(ROUND(7.5, 1)))">>,
+        <<"(FLOOR(SQRT(ABS(-8.99))), SIGN(POWER(-2, 3)))">>,
+        <<"(TRUNCATE(RAND() * 100, 2), ROUND(RAND() * 10, 1))">>,
+        <<"(EXP(LOG(POWER(2, 3))), LOG(EXP(5)))">>,
+        <<"(COS(PI() / (3 - 1)), PI() / COS(PI() / 4))">>,
+        <<"(SIN(TAN(PI() / 4)), TAN(SIN(PI() / 6)))">>
+    ],
+
+    [
+        run_pi(<<InsertPart/binary, " VALUES ", ValueL/binary>>, {InsertPart, ValueL})
+     || ValueL <- ValueLs
+    ].
+
+t_parse_insert_failed(_) ->
+    run_pi("drop table books"),
+    run_pi("SELECT * FROM abc"),
+    run_pi("UPDATE abc SET c1 = 1, c2 = 2, c3 = 3"),
+    run_pi("DELETE FROM abc WHERE c1 = 1"),
+    run_pi("insert intotable(a,b)values(1,2)"),
+    run_pi("insert into (a,val)values(1,'val')").
+
+run_pi(SQL) ->
+    ?assertEqual({error, not_insert_sql}, parse_insert(SQL)),
+    ct:pal("SQL:~n~ts~n", [SQL]).
+
+run_pi(SQL, {InsertPart, Values}) ->
+    {ok, {InsertPart0, Values0}} = parse_insert(SQL),
+    ?assertEqual(InsertPart, InsertPart0),
+    ?assertEqual(Values, Values0),
+    ct:pal("SQL:~n~ts~n", [SQL]).

changes/ce/fix-13164.en.md

@@ -3,4 +3,4 @@ Fix HTTP authorization request body encoding.
 Prior to this fix, the HTTP authorization request body encoding format was taken from the `accept` header.
 The fix is to respect the `content-type` header instead.
 Also added `access` templating variable for v4 compatibility.
-The access code of SUBSCRIBE action is `1` and SUBSCRIBE action is `2`.
+The access code of SUBSCRIBE action is `1` and PUBLISH action is `2`.

changes/ce/fix-13189.en.md

@@ -0,0 +1 @@
+Fixed an issue where the data integration with Microsoft SQL Server or MySQL could not use SQL templates with substring `values` in table name or column name.

changes/ee/fix-13197.en.md

@@ -0,0 +1 @@
+Fixed an issue with S3 Bridge that prevented automatic saving of TLS certificates and key files to the file system, when they are supplied through the Dashboard UI or Connector API.