Perform expiration date checking before returning share data for token.

diff --git a/lib/public/share.php b/lib/public/share.php
index 0a88ea4ea441594c0b3f4104a204934b34ec96fa..ea4116eaa76cdda0a21ec684b903f70ad59c50b0 100644 (file)
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -293,7 +293,18 @@ class Share {
                if (\OC_DB::isError($result)) {
                        \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR);
                }
-               return $result->fetchRow();
+               $row = $result->fetchRow();
+
+               if (!empty($row['expiration'])) {
+                       $now = new \DateTime();
+                       $expirationDate = new \DateTime($row['expiration'], new \DateTimeZone('UTC'));
+                       if ($now > $expirationDate) {
+                               self::delete($row['id']);
+                               return false;
+                       }
+               }
+
+               return $row;
        }
 
        /**