From 73f0b6707a0d1245923b372ba0e0424d17145ba3 Mon Sep 17 00:00:00 2001
From: Konstantinos Kallas <konstantinos.kallas@hotmail.com>
Date: Sat, 12 Aug 2017 15:59:54 +0300
Subject: [PATCH] Move the ca_url to the config file

---
 ejabberd.yml.example   |  4 ++--
 src/ejabberd_acme.erl  | 34 ++++++++++++++++++++++++----------
 src/ejabberd_admin.erl |  6 +++---
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/ejabberd.yml.example b/ejabberd.yml.example
index 85754e1bb..ee3dda24c 100644
--- a/ejabberd.yml.example
+++ b/ejabberd.yml.example
@@ -664,11 +664,11 @@ language: "en"
 ###'  ACME
 
 ##
-## Must contain a contact and a directory that the Http Challenges can be solved at
+## Must contain a contact and the ACME CA url
 ##
 acme:
   contact: "mailto:cert-admin-ejabberd@example.com"
-  http_dir: "/home/konstantinos/Desktop/Programming/test-server-for-acme/"
+  ca_url: "http://localhost:4000"
 
 cert_dir: "/usr/local/var/lib/ejabberd/"
 
diff --git a/src/ejabberd_acme.erl b/src/ejabberd_acme.erl
index e84493beb..541aa2879 100644
--- a/src/ejabberd_acme.erl
+++ b/src/ejabberd_acme.erl
@@ -1,10 +1,10 @@
 -module (ejabberd_acme).
 
 -export([%% Ejabberdctl Commands
-	 get_certificates/3,
-	 renew_certificates/1,
+	 get_certificates/2,
+	 renew_certificates/0,
 	 list_certificates/1,
-	 revoke_certificate/2,
+	 revoke_certificate/1,
 	 %% Command Options Validity
 	 is_valid_account_opt/1,
 	 is_valid_verbose_opt/1,
@@ -60,9 +60,10 @@ is_valid_domain_opt(DomainString) ->
 %% Get Certificate
 %%
 
--spec get_certificates(url(), domains_opt(), account_opt()) -> string() | {'error', _}.
-get_certificates(CAUrl, Domains, NewAccountOpt) ->
+-spec get_certificates(domains_opt(), account_opt()) -> string() | {'error', _}.
+get_certificates(Domains, NewAccountOpt) ->
     try
+	CAUrl = binary_to_list(get_config_ca_url()),
 	get_certificates0(CAUrl, Domains, NewAccountOpt)
     catch
 	throw:Throw ->
@@ -266,9 +267,10 @@ ensure_account_exists() ->
 %%
 %% Renew Certificates
 %%
--spec renew_certificates(url()) -> string() | {'error', _}.
-renew_certificates(CAUrl) ->
+-spec renew_certificates() -> string() | {'error', _}.
+renew_certificates() ->
     try
+	CAUrl = binary_to_list(get_config_ca_url()),
         renew_certificates0(CAUrl)
     catch
 	throw:Throw ->
@@ -454,10 +456,10 @@ get_utc_validity(#'Certificate'{tbsCertificate = TbsCertificate}) ->
 %% Revoke Certificate
 %%
 
-%% Add a try-catch to this stub
--spec revoke_certificate(url(), string()) -> {ok, deleted} | {error, _}.
-revoke_certificate(CAUrl, Domain) ->
+-spec revoke_certificate(string()) -> {ok, deleted} | {error, _}.
+revoke_certificate(Domain) ->
     try
+	CAUrl = binary_to_list(get_config_ca_url()),
 	revoke_certificate0(CAUrl, Domain)
     catch
 	throw:Throw ->
@@ -968,6 +970,18 @@ get_config_contact() ->
 	    throw({error, configuration_contact})
     end.
 
+-spec get_config_ca_url() -> bitstring().
+get_config_ca_url() ->
+    Acme = get_config_acme(),
+    case lists:keyfind(ca_url, 1, Acme) of
+	{ca_url, CAUrl} ->
+	    CAUrl;
+	false ->
+	    ?ERROR_MSG("No CA url has been specified", []),
+	    throw({error, configuration_ca_url})
+    end.
+
+
 -spec get_config_hosts() -> [bitstring()].
 get_config_hosts() ->
     case ejabberd_config:get_option(hosts, undefined) of
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 5a313511f..ceafed567 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -582,7 +582,7 @@ get_certificate(Domains, UseNewAccount) ->
 	true ->
 	    case ejabberd_acme:is_valid_account_opt(UseNewAccount) of
 		true ->
-		    ejabberd_acme:get_certificates("http://localhost:4000", Domains, UseNewAccount);
+		    ejabberd_acme:get_certificates(Domains, UseNewAccount);
 		false ->
 		    io_lib:format("Invalid account option: ~p", [UseNewAccount])
 	    end;
@@ -591,7 +591,7 @@ get_certificate(Domains, UseNewAccount) ->
     end.
 
 renew_certificate() ->
-    ejabberd_acme:renew_certificates("http://localhost:4000").
+    ejabberd_acme:renew_certificates().
 
 list_certificates(Verbose) ->
     case ejabberd_acme:is_valid_verbose_opt(Verbose) of
@@ -603,7 +603,7 @@ list_certificates(Verbose) ->
     end.
 
 revoke_certificate(Domain) ->
-    ejabberd_acme:revoke_certificate("http://localhost:4000", Domain).
+    ejabberd_acme:revoke_certificate(Domain).
 
 %%%
 %%% Purge DB