X-Git-Url: https://git.rapsys.eu/acme/blobdiff_plain/4259269fa8033fcdab0d1867b7e33b3846dc656b..0534a0d534bcd4fad8ac2daedf01c554bc163b30:/www/acme-challenge.php

diff --git a/www/acme-challenge.php b/www/acme-challenge.php
index c41a3d5..bdd1561 100644
--- a/www/acme-challenge.php
+++ b/www/acme-challenge.php
@@ -1,15 +1,15 @@
 <?php
 //Config file to read
-$conf = '/etc/acmepl/config';
+$conf = '/etc/acme/config';
 
 //Unable to show key.thumbprint couple
 if (
+	//Handle get key parsing
+	empty($_GET['key']) || !preg_match('/^[-_a-zA-Z0-9]+$/', $_GET['key']) ||
 	//Handle config parsing
 	!is_readable($conf) || ($config = file_get_contents($conf)) === false || ($config = json_decode($config)) === null ||
 	//Handle thumbprint file read
-	!is_readable($config->thumbprint) || ($thumbprint = file_get_contents($config->thumbprint)) === false ||
-	//Handle get key parsing
-	empty($_GET['key']) || !preg_match('/^[-_a-zA-Z0-9]+$/', $_GET['key'])
+	!is_readable($config->thumbprint) || empty($thumbprint = file_get_contents($config->thumbprint))
 ) {
 	header((!empty($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:'HTTP/1.0').' 404 Not Found');
 	exit;
@@ -19,4 +19,4 @@ if (
 header('Content-Type: text/plain');
 
 //Display key.thumbprint couple
-echo $_GET['key'].$thumbprint;
+echo $_GET['key'].'.'.$thumbprint;