Merge pull request #1 from shellrent/dnschallenge-fix

Fixed DNS-01 and HTTP-01 challenges
shellrent · May 20, 2021 · ede5e99 · ede5e99
2 parents ecb4787 + df7150f
commit ede5e99
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/LEFunctions.php b/src/LEFunctions.php
@@ -235,7 +235,9 @@ public static function checkDNSChallenge($domain, $DNSDigest)
 			{
 				if($answer->type === 16)
 				{
+					/* Since May 19th, this check always fails because the comparison should take place without the quotes; let's keep both just to be sure */
 					if($answer->data === ('"' . $DNSDigest . '"')) return true;
+					if($answer->data === $DNSDigest) return true;
 				}
 			}
 		}

diff --git a/src/LEOrder.php b/src/LEOrder.php
@@ -51,6 +51,7 @@ class LEOrder
 	public $expires;
 	public $identifiers;
 	private $authorizationURLs;
+	/** @var LEAuthorization[] */
 	public $authorizations;
 	public $finalizeURL;
 	public $certificateURL;
@@ -414,11 +415,27 @@ public function verifyPendingOrderAuthorization($identifier, $type, $localcheck
 											}
 											elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
 										}
+
+										$i = 1;
+
 										while($auth->status == 'pending')
 										{
+											if( $i > 6 )
+											{
+												break;
+											}
+
 											sleep(1);
 											$auth->updateData();
+
+											$i++;
+										}
+
+										if($auth->status == 'pending')
+										{
+											return false;
 										}
+
 										return true;
 									}
 								}
@@ -447,11 +464,27 @@ public function verifyPendingOrderAuthorization($identifier, $type, $localcheck
 											}
 											elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
 										}
+
+										$i = 1;
+
 										while($auth->status == 'pending')
 										{
+											if( $i > 6 )
+											{
+												break;
+											}
+
 											sleep(1);
 											$auth->updateData();
+
+											$i++;
+										}
+
+										if($auth->status == 'pending')
+										{
+											return false;
 										}
+
 										return true;
 									}
 								}