Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

ext_mod: Don't crash when github page response is 403

Browse Source
This commit is contained in:
Badlop 2023-10-04 19:39:27 +02:00
parent d85c125bef
commit f9d11265d0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ext_mod.erl
View File

@ -357,6 +357,8 @@ geturl(Url) ->
case httpc:request(get, {Url, [UA]}, User, [{body_format, binary}], ext_mod) of case httpc:request(get, {Url, [UA]}, User, [{body_format, binary}], ext_mod) of
{ok, {{_, 200, _}, Headers, Response}} -> {ok, {{_, 200, _}, Headers, Response}} ->
{ok, Headers, Response}; {ok, Headers, Response};
{ok, {{_, 403, Reason}, _Headers, _Response}} ->
{error, Reason};
{ok, {{_, Code, _}, _Headers, Response}} -> {ok, {{_, Code, _}, _Headers, Response}} ->
{error, {Code, Response}}; {error, {Code, Response}};
{error, Reason} -> {error, Reason} ->
@ -799,10 +801,14 @@ maybe_write_commit_json(Url, RepDir) ->
write_commit_json(Url, RepDir) -> write_commit_json(Url, RepDir) ->
Url2 = string_replace(Url, "https://github.com", "https://api.github.com/repos"), Url2 = string_replace(Url, "https://github.com", "https://api.github.com/repos"),
BranchUrl = lists:flatten(Url2 ++ "/branches/master"), BranchUrl = lists:flatten(Url2 ++ "/branches/master"),
{ok, _Headers, Body} = geturl(BranchUrl), case geturl(BranchUrl) of
{ok, F} = file:open(filename:join(RepDir, "COMMIT.json"), [raw, write]), {ok, _Headers, Body} ->
file:write(F, Body), {ok, F} = file:open(filename:join(RepDir, "COMMIT.json"), [raw, write]),
file:close(F). file:write(F, Body),
file:close(F);
{error, Reason} ->
Reason
end.
find_commit_json(Attrs) -> find_commit_json(Attrs) ->
{_, FromPath} = lists:keyfind(path, 1, Attrs), {_, FromPath} = lists:keyfind(path, 1, Attrs),