From d40d1f30b63fa21d73d6be2239d6235885d0e725 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 9 Jan 2018 14:50:52 +0100
Subject: [PATCH] make it a setting to switch between ACME v1 and v2

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 actions/admin/settings/131.ssl.php             | 17 +++++++++++++++--
 install/froxlor.sql                            |  3 ++-
 install/updates/froxlor/0.9/update_0.9.inc.php |  9 +++++++++
 lib/version.inc.php                            |  2 +-
 scripts/jobs/cron_letsencrypt.php              |  6 ++++++
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/actions/admin/settings/131.ssl.php b/actions/admin/settings/131.ssl.php
index 68f2a9e8..b9b2d459 100644
--- a/actions/admin/settings/131.ssl.php
+++ b/actions/admin/settings/131.ssl.php
@@ -100,6 +100,19 @@ return array(
 					'cronmodule' => 'froxlor/letsencrypt',
 					'save_method' => 'storeSettingField'
 				),
+				'system_leapiversion' => array(
+					'label' => $lng['serversettings']['leapiversion'],
+					'settinggroup' => 'system',
+					'varname' => 'leapiversion',
+					'type' => 'option',
+					'default' => '1',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'1' => 'ACME v1',
+						'2' => 'ACME v2'
+					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_letsencryptacmeconf' => array(
 					'label' => $lng['serversettings']['letsencryptacmeconf'],
 					'settinggroup' => 'system',
@@ -117,8 +130,8 @@ return array(
 					'default' => 'testing',
 					'option_mode' => 'one',
 					'option_options' => array(
-						'testing' => 'https://acme-staging.api.letsencrypt.org (Test)',
-						'production' => 'https://acme-v01.api.letsencrypt.org (Live)'
+						'testing' => 'https://acme-staging'.(Settings::Get('system.leapiversion') == '2' ? '-v02' : '').'.api.letsencrypt.org (Test)',
+						'production' => 'https://acme-v0'.Settings::Get('system.leapiversion').'.api.letsencrypt.org (Live)'
 					),
 					'save_method' => 'storeSettingField'
 				),
diff --git a/install/froxlor.sql b/install/froxlor.sql
index 3fdc57dd..e96c62b6 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -534,6 +534,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'letsencryptkeysize', '4096'),
 	('system', 'letsencryptreuseold', 0),
 	('system', 'leenabled', '0'),
+	('system', 'leapiversion', '1'),
 	('system', 'backupenabled', '0'),
 	('system', 'dnsenabled', '0'),
 	('system', 'dns_server', 'bind'),
@@ -588,7 +589,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
 	('panel', 'version', '0.9.38.8'),
-	('panel', 'db_version', '201801080');
+	('panel', 'db_version', '201801090');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index 0483ba44..de39f9e3 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -3725,3 +3725,12 @@ if (isDatabaseVersion('201801070')) {
 
 	updateToDbVersion('201801080');
 }
+
+if (isDatabaseVersion('201801080')) {
+
+	showUpdateStep("Adding new setting for Let's Encrypt ACME version");
+	Settings::AddNew('system.leapiversion', '1');
+	lastStepStatus(0);
+
+	updateToDbVersion('201801090');
+}
diff --git a/lib/version.inc.php b/lib/version.inc.php
index 5f433e8b..2632a02f 100644
--- a/lib/version.inc.php
+++ b/lib/version.inc.php
@@ -19,7 +19,7 @@
 $version = '0.9.38.8';
 
 // Database version (YYYYMMDDC where C is a daily counter)
-$dbversion = '201801080';
+$dbversion = '201801090';
 
 // Distribution branding-tag (used for Debian etc.)
 $branding = '';
diff --git a/scripts/jobs/cron_letsencrypt.php b/scripts/jobs/cron_letsencrypt.php
index 126d7dcd..b25b9a8d 100644
--- a/scripts/jobs/cron_letsencrypt.php
+++ b/scripts/jobs/cron_letsencrypt.php
@@ -20,6 +20,12 @@ if (! defined('MASTER_CRONJOB'))
  *
  */
 
+if (Settings::Get('system.leapiversion') == '2') {
+	// use ACME v2 is specified
+	require_once __DIR__ . '/cron_letsencrypt_v2.php';
+	exit;
+}
+
 $cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating Let's Encrypt certificates");
 
 if (! extension_loaded('curl')) {