Merge pull request #5229 from owncloud/more-link-expiration-stable5

Backport of #4856 to stable5: Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/public/share.php b/lib/public/share.php
index c9807126742..d7569933458 100644
--- 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;
 	}
 
 	/**