fix invalid date input and add translations (#22833: Short-term admin accounts)

Author: lfolco

app/code/Magento/Security/Model/UserExpiration/Validator.php

@@ -51,11 +51,15 @@ public function isValid($value)
         $expiresAt = $value;
         $label = 'Expiration date';
         if (\Zend_Validate::is($expiresAt, 'NotEmpty')) {
-            $currentTime = $this->dateTime->gmtTimestamp();
-            $utcExpiresAt = $this->timezone->convertConfigTimeToUtc($expiresAt);
-            $expiresAt = $this->timezone->date($utcExpiresAt)->getTimestamp();
-            if ($expiresAt < $currentTime) {
-                $messages['expires_at'] = __('"%1" must be later than the current date.', $label);
+            if (strtotime($expiresAt)) {
+                $currentTime = $this->dateTime->gmtTimestamp();
+                $utcExpiresAt = $this->timezone->convertConfigTimeToUtc($expiresAt);
+                $expiresAt = $this->timezone->date($utcExpiresAt)->getTimestamp();
+                if ($expiresAt < $currentTime) {
+                    $messages['expires_at'] = __('"%1" must be later than the current date.', $label);
+                }
+            } else {
+                $messages['expires_at'] = __('"%1" is not a valid date.', $label);
             }
         }
         $this->_addMessages($messages);

app/code/Magento/Security/Test/Unit/Model/UserExpiration/ValidatorTest.php

@@ -46,13 +46,24 @@ protected function setUp()
         );
     }
 
+    public function testWithInvalidDate()
+    {
+        $expireDate = 'invalid_date';
+
+        static::assertFalse($this->validator->isValid($expireDate));
+        static::assertContains(
+            '"Expiration date" is not a valid date.',
+            $this->validator->getMessages()
+        );
+    }
+
     public function testWithPastDate()
     {
         /** @var \DateTime|\PHPUnit_Framework_MockObject_MockObject $dateObject */
         $dateObject = $this->createMock(\DateTime::class);
         $this->timezoneMock->expects(static::once())
-                    ->method('date')
-                    ->will(static::returnValue($dateObject));
+            ->method('date')
+            ->will(static::returnValue($dateObject));
 
         $currentDate = new \DateTime();
         $currentDate = $currentDate->getTimestamp();
@@ -74,8 +85,8 @@ public function testWithFutureDate()
         /** @var \DateTime|\PHPUnit_Framework_MockObject_MockObject $dateObject */
         $dateObject = $this->createMock(\DateTime::class);
         $this->timezoneMock->expects(static::once())
-                    ->method('date')
-                    ->will(static::returnValue($dateObject));
+            ->method('date')
+            ->will(static::returnValue($dateObject));
         $currentDate = new \DateTime();
         $currentDate = $currentDate->getTimestamp();
         $expireDate = new \DateTime();

app/code/Magento/Security/i18n/en_US.csv

@@ -27,3 +27,5 @@ None,None
 "Min Time Between Password Reset Requests","Min Time Between Password Reset Requests"
 "Delay in minutes between password reset requests. Use 0 to disable.","Delay in minutes between password reset requests. Use 0 to disable."
 """%1"" must be later than the current date.","""%1"" must be later than the current date."
+"User Expiration","User Expiration"
+"""%1"" is not a valid date.","""%1"" is not a valid date."