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

Remove some debugging INFO_MSGs

Browse Source
This commit is contained in:
Konstantinos Kallas 2017-08-19 17:47:05 +03:00
parent 15dd88385f
commit 9b3e160e18
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/acme_challenge.erl
View File

@ -21,8 +21,6 @@
%% TODO: Maybe validate request here?? %% TODO: Maybe validate request here??
process(LocalPath, Request) -> process(LocalPath, Request) ->
Result = ets_get_key_authorization(LocalPath), Result = ets_get_key_authorization(LocalPath),
?INFO_MSG("Trying to serve: ~p at: ~p", [Request, LocalPath]),
?INFO_MSG("Http Response: ~p", [Result]),
{200, {200,
[{<<"Content-Type">>, <<"text/plain">>}], [{<<"Content-Type">>, <<"text/plain">>}],
Result}. Result}.
@ -31,7 +29,6 @@ process(LocalPath, Request) ->
-spec key_authorization(bitstring(), jose_jwk:key()) -> bitstring(). -spec key_authorization(bitstring(), jose_jwk:key()) -> bitstring().
key_authorization(Token, Key) -> key_authorization(Token, Key) ->
Thumbprint = jose_jwk:thumbprint(Key), Thumbprint = jose_jwk:thumbprint(Key),
%% ?INFO_MSG("Thumbprint: ~p~n", [Thumbprint]),
KeyAuthorization = erlang:iolist_to_binary([Token, <<".">>, Thumbprint]), KeyAuthorization = erlang:iolist_to_binary([Token, <<".">>, Thumbprint]),
KeyAuthorization. KeyAuthorization.
@ -84,7 +81,8 @@ solve_challenge1(Chal = #challenge{type = <<"http-01">>, token=Tkn}, Key) ->
ets_put_key_authorization(Tkn, KeyAuthz), ets_put_key_authorization(Tkn, KeyAuthz),
{ok, Chal#challenge.uri, KeyAuthz}; {ok, Chal#challenge.uri, KeyAuthz};
solve_challenge1(Challenge, _Key) -> solve_challenge1(Challenge, _Key) ->
?INFO_MSG("Challenge: ~p~n", [Challenge]). ?ERROR_MSG("Unkown Challenge Type: ~p", [Challenge]),
{error, unknown_challenge}.
%% Old way of solving challenges %% Old way of solving challenges

3
src/ejabberd_acme.erl
View File

@ -155,7 +155,6 @@ format_get_certificate({error, Domain, Reason}) ->
{'ok', bitstring(), pem()} | {'ok', bitstring(), pem()} |
{'error', bitstring(), _}. {'error', bitstring(), _}.
get_certificate(CAUrl, DomainName, PrivateKey) -> get_certificate(CAUrl, DomainName, PrivateKey) ->
?INFO_MSG("Getting a Certificate for domain: ~p~n", [DomainName]),
try try
{ok, _Authz} = create_new_authorization(CAUrl, DomainName, PrivateKey), {ok, _Authz} = create_new_authorization(CAUrl, DomainName, PrivateKey),
create_new_certificate(CAUrl, DomainName, PrivateKey) create_new_certificate(CAUrl, DomainName, PrivateKey)
@ -1056,14 +1055,12 @@ get_config_cert_dir() ->
-ifdef(GENERATE_RSA_KEY). -ifdef(GENERATE_RSA_KEY).
generate_key() -> generate_key() ->
?INFO_MSG("Generate RSA key pair~n", []),
Key = public_key:generate_key({rsa, 2048, 65537}), Key = public_key:generate_key({rsa, 2048, 65537}),
Key1 = Key#'RSAPrivateKey'{version = 'two-prime'}, Key1 = Key#'RSAPrivateKey'{version = 'two-prime'},
jose_jwk:from_key(Key1). jose_jwk:from_key(Key1).
%% jose_jwk:generate_key({rsa, 2048}). %% jose_jwk:generate_key({rsa, 2048}).
-else. -else.
generate_key() -> generate_key() ->
?INFO_MSG("Generate EC key pair~n", []),
jose_jwk:generate_key({ec, secp256r1}). jose_jwk:generate_key({ec, secp256r1}).
-endif. -endif.