diff options
author | Konstantinos Kallas <konstantinos.kallas@hotmail.com> | 2017-08-25 12:08:16 +0300 |
---|---|---|
committer | Konstantinos Kallas <konstantinos.kallas@hotmail.com> | 2017-08-25 12:08:16 +0300 |
commit | 80b44d8c154b2884d90a4ee156c05ebda1cac6c2 (patch) | |
tree | bc9eafe1f262c6b1d689800ffc7406f685ecfee7 | |
parent | More whitespace changes (diff) |
Remove some unused variable warnings, replace lists:join with string join
-rw-r--r-- | src/acme_challenge.erl | 14 | ||||
-rw-r--r-- | src/ejabberd_acme.erl | 13 | ||||
-rw-r--r-- | src/ejabberd_admin.erl | 2 |
3 files changed, 9 insertions, 20 deletions
diff --git a/src/acme_challenge.erl b/src/acme_challenge.erl index 0e9e395e..c8491e9c 100644 --- a/src/acme_challenge.erl +++ b/src/acme_challenge.erl @@ -18,8 +18,9 @@ -include("ejabberd_http.hrl"). -include("ejabberd_acme.hrl"). + %% TODO: Maybe validate request here?? -process(LocalPath, Request) -> +process(LocalPath, _Request) -> Result = ets_get_key_authorization(LocalPath), {200, [{<<"Content-Type">>, <<"text/plain">>}], @@ -85,17 +86,6 @@ solve_challenge1(Challenge, _Key) -> {error, unknown_challenge}. -%% Old way of solving challenges -save_key_authorization(Chal, Tkn, KeyAuthz, HttpDir) -> - FileLocation = HttpDir ++ "/.well-known/acme-challenge/" ++ bitstring_to_list(Tkn), - case file:write_file(FileLocation, KeyAuthz) of - ok -> - {ok, Chal#challenge.uri, KeyAuthz}; - {error, Reason} = Err -> - ?ERROR_MSG("Error writing to file: ~s with reason: ~p~n", [FileLocation, Reason]), - Err - end. - -spec ets_put_key_authorization(bitstring(), bitstring()) -> ok. ets_put_key_authorization(Tkn, KeyAuthz) -> Tab = ets_get_acme_table(), diff --git a/src/ejabberd_acme.erl b/src/ejabberd_acme.erl index b28cb1cd..e40ad9cc 100644 --- a/src/ejabberd_acme.erl +++ b/src/ejabberd_acme.erl @@ -56,7 +56,7 @@ is_valid_domain_opt(DomainString) -> case parse_domain_string(DomainString) of [] -> false; - SeparatedDomains -> + _SeparatedDomains -> true end. @@ -128,8 +128,7 @@ format_get_certificates_result(Certs) -> Cond = lists:all(fun(Cert) -> not is_error(Cert) end, Certs), - FormattedCerts = lists:join($\n, - [format_get_certificate(C) || C <- Certs]), + FormattedCerts = string:join([format_get_certificate(C) || C <- Certs], "\n"), case Cond of true -> Result = io_lib:format("Success:~n~s", [FormattedCerts]), @@ -329,7 +328,7 @@ renew_certificate(CAUrl, {DomainName, _} = Cert, PrivateKey) -> -spec cert_to_expire({bitstring(), data_cert()}) -> boolean(). -cert_to_expire({DomainName, #data_cert{pem = Pem}}) -> +cert_to_expire({_DomainName, #data_cert{pem = Pem}}) -> Certificate = pem_to_certificate(Pem), Validity = get_utc_validity(Certificate), @@ -551,7 +550,7 @@ revoke_certificate2(CAUrl, PemEncodedCert) -> {ok, Dirs, Nonce} = ejabberd_acme_comm:directory(CAUrl), Req = [{<<"certificate">>, Certificate}], - {ok, [], Nonce1} = ejabberd_acme_comm:revoke_cert(Dirs, CertPrivateKey, Req, Nonce), + {ok, [], _Nonce1} = ejabberd_acme_comm:revoke_cert(Dirs, CertPrivateKey, Req, Nonce), ok. -spec parse_revoke_cert_argument(string()) -> {domain, bitstring()} | {file, file:filename()}. @@ -802,7 +801,7 @@ utc_string_to_datetime(UtcString) -> Second = list_to_integer([S1,S2]), {{Year, Month, Day}, {Hour, Minute, Second}} catch - E:R -> + _:_ -> ?ERROR_MSG("Unable to parse UTC string", []), throw({error, utc_string_to_datetime}) end. @@ -910,7 +909,7 @@ data_add_certificate(Data, DataCert = #data_cert{domain=Domain}) -> data_set_certificates(Data, NewCerts). -spec data_remove_certificate(acme_data(), data_cert()) -> acme_data(). -data_remove_certificate(Data, DataCert = #data_cert{domain=Domain}) -> +data_remove_certificate(Data, _DataCert = #data_cert{domain=Domain}) -> Certs = data_get_certificates(Data), NewCerts = lists:keydelete(Domain, 1, Certs), data_set_certificates(Data, NewCerts). diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index 76cdec45..368c7fe5 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -580,7 +580,7 @@ get_certificate(Domains) -> true -> ejabberd_acme:get_certificates(Domains); false -> - String = io_lib:format("Invalid domains: ~p", [Domains]) + io_lib:format("Invalid domains: ~p", [Domains]) end. renew_certificate() -> |