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

Merge pull request #7955 from zmstone/0515-fix-verify-none-for-telemetry-clients 

fix(telemetry): Ensure verify_none for http client
This commit is contained in:
JianBo He 2022-05-16 09:42:30 +08:00 committed by GitHub
parent d6178f8611 ea9af26642
commit 61014e5088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib-ce/emqx_telemetry/src/emqx_telemetry.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_telemetry, {application, emqx_telemetry,
[{description, "EMQ X Telemetry"}, [{description, "EMQ X Telemetry"},
{vsn, "4.3.2"}, % strict semver, bump manually! {vsn, "4.3.3"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_telemetry_sup]}, {registered, [emqx_telemetry_sup]},
{applications, [kernel,stdlib]}, {applications, [kernel,stdlib]},

4
lib-ce/emqx_telemetry/src/emqx_telemetry.appup.src
View File

@ -1,13 +1,13 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{VSN, {VSN,
[ [
{<<"4\\.3\\.[0-1]">>, [ {<<"4\\.3\\.[0-2]">>, [
{load_module, emqx_telemetry, brutal_purge, soft_purge, []} {load_module, emqx_telemetry, brutal_purge, soft_purge, []}
]}, ]},
{<<".*">>, []} {<<".*">>, []}
], ],
[ [
{<<"4\\.3\\.[0-1]">>, [ {<<"4\\.3\\.[0-2]">>, [
{load_module, emqx_telemetry, brutal_purge, soft_purge, []} {load_module, emqx_telemetry, brutal_purge, soft_purge, []}
]}, ]},
{<<".*">>, []} {<<".*">>, []}

4
lib-ce/emqx_telemetry/src/emqx_telemetry.erl
View File

@ -367,7 +367,9 @@ report_telemetry(State = #state{url = URL}) ->
end. end.
httpc_request(Method, URL, Headers, Body) -> httpc_request(Method, URL, Headers, Body) ->
httpc:request(Method, {URL, Headers, "application/json", Body}, [], []). HTTPOptions = [{timeout, timer:seconds(10)}, {ssl, [{verify, verify_none}]}],
Options = [],
httpc:request(Method, {URL, Headers, "application/json", Body}, HTTPOptions, Options).
ignore_lib_apps(Apps) -> ignore_lib_apps(Apps) ->
LibApps = [kernel, stdlib, sasl, appmon, eldap, erts, LibApps = [kernel, stdlib, sasl, appmon, eldap, erts,