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

Merge pull request #13540 from zmstone/0729-rule-funciton-getenv-should-be-limited-to-vars-with-prefix-EMQXVAR_ 

refactor: force getenv to access only OS env with prefix EMQXVAR_
This commit is contained in:
JianBo He 2024-07-30 08:23:24 +08:00 committed by GitHub
parent 7f7d0741d2 a49cd78aae
commit c347c2c285
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_utils/src/emqx_variform_bif.erl
View File

@ -583,7 +583,7 @@ getenv(Bin) when is_binary(Bin) ->
EnvKey = ?ENV_CACHE(Bin), EnvKey = ?ENV_CACHE(Bin),
case persistent_term:get(EnvKey, undefined) of case persistent_term:get(EnvKey, undefined) of
undefined -> undefined ->
Name = erlang:binary_to_list(Bin), Name = "EMQXVAR_" ++ erlang:binary_to_list(Bin),
Result = Result =
case os:getenv(Name) of case os:getenv(Name) of
false -> false ->

2
apps/emqx_utils/test/emqx_variform_bif_tests.erl
View File

@ -77,5 +77,5 @@ system_test() ->
EnvName = erlang:atom_to_list(?MODULE), EnvName = erlang:atom_to_list(?MODULE),
EnvVal = erlang:atom_to_list(?FUNCTION_NAME), EnvVal = erlang:atom_to_list(?FUNCTION_NAME),
EnvNameBin = erlang:list_to_binary(EnvName), EnvNameBin = erlang:list_to_binary(EnvName),
os:putenv(EnvName, EnvVal), os:putenv("EMQXVAR_" ++ EnvName, EnvVal),
?assertEqual(erlang:list_to_binary(EnvVal), emqx_variform_bif:getenv(EnvNameBin)). ?assertEqual(erlang:list_to_binary(EnvVal), emqx_variform_bif:getenv(EnvNameBin)).

6
changes/ce/feat-13507.en.md
View File

@ -1,2 +1,4 @@
Added a new builtin function `getenv` in the rule engine and variform expression to access the environment variables. Added a new builtin function `getenv` in the rule engine and variform expression to access the environment variables with below limitations.
Note this value is immutable once loaded from the environment.
- Prefix `EMQXVAR_` is added before reading from OS environment variables. i.e. `getenv('FOO_BAR')` is to read `EMQXVAR_FOO_BAR`.
- The values are immutable once loaded from the OS environment.