nextcloud / server

lib/private/Collaboration/Collaborators/RemotePlugin.php

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
 							$searchResult->markExactIdMatch($resultType);
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'uuid' => $contact['UID'],
 							'name' => $contact['FN'],
 							'type' => $cloudIdType,
@@ -124,7 +124,7 @@ 
 						];
 					} else {
 						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'uuid' => $contact['UID'],
 							'name' => $contact['FN'],
 							'type' => $cloudIdType,
@@ -154,7 +154,7 @@ 
 				$localUser = $this->userManager->get($remoteUser);
 				if ($localUser === null || $search !== $localUser->getCloudId()) {
 					$result['exact'][] = [
-						'label' => $remoteUser . " ($serverUrl)",
+						'label' => $remoteUser." ($serverUrl)",
 						'uuid' => $remoteUser,
 						'name' => $remoteUser,
 						'value' => [

Indentation +135 added lines, -135 removed lines

@@ -16,150 +16,150 @@
 use OCP\Share\IShare;
 
 class RemotePlugin implements ISearchPlugin {
-	protected bool $shareeEnumeration;
+    protected bool $shareeEnumeration;
 
-	private string $userId;
+    private string $userId;
 
-	public function __construct(
-		private IManager $contactsManager,
-		private ICloudIdManager $cloudIdManager,
-		private IConfig $config,
-		private IUserManager $userManager,
-		IUserSession $userSession,
-	) {
-		$this->userId = $userSession->getUser()?->getUID() ?? '';
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
+    public function __construct(
+        private IManager $contactsManager,
+        private ICloudIdManager $cloudIdManager,
+        private IConfig $config,
+        private IUserManager $userManager,
+        IUserSession $userSession,
+    ) {
+        $this->userId = $userSession->getUser()?->getUID() ?? '';
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remotes');
+    public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remotes');
 
-		// Search in contacts
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN'], [
-			'limit' => $limit,
-			'offset' => $offset,
-			'enumeration' => false,
-			'fullmatch' => false,
-		]);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (is_string($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					$cloudIdType = '';
-					if (\is_array($cloudId)) {
-						$cloudIdData = $cloudId;
-						$cloudId = $cloudIdData['value'];
-						$cloudIdType = $cloudIdData['type'];
-					}
-					try {
-						[$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
-					} catch (\InvalidArgumentException $e) {
-						continue;
-					}
+        // Search in contacts
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN'], [
+            'limit' => $limit,
+            'offset' => $offset,
+            'enumeration' => false,
+            'fullmatch' => false,
+        ]);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (is_string($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    $cloudIdType = '';
+                    if (\is_array($cloudId)) {
+                        $cloudIdData = $cloudId;
+                        $cloudId = $cloudIdData['value'];
+                        $cloudIdType = $cloudIdData['type'];
+                    }
+                    try {
+                        [$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
+                    } catch (\InvalidArgumentException $e) {
+                        continue;
+                    }
 
-					$localUser = $this->userManager->get($remoteUser);
-					/**
-					 * Add local share if remote cloud id matches a local user ones
-					 */
-					if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
-						$result['wide'][] = [
-							'label' => $contact['FN'],
-							'uuid' => $contact['UID'],
-							'value' => [
-								'shareType' => IShare::TYPE_USER,
-								'shareWith' => $remoteUser
-							],
-							'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
-						];
-					}
+                    $localUser = $this->userManager->get($remoteUser);
+                    /**
+                     * Add local share if remote cloud id matches a local user ones
+                     */
+                    if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'],
+                            'uuid' => $contact['UID'],
+                            'value' => [
+                                'shareType' => IShare::TYPE_USER,
+                                'shareWith' => $remoteUser
+                            ],
+                            'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
+                        ];
+                    }
 
-					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$searchResult->markExactIdMatch($resultType);
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $cloudIdType,
-							'value' => [
-								'shareType' => IShare::TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $cloudIdType,
-							'value' => [
-								'shareType' => IShare::TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
+                    if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $searchResult->markExactIdMatch($resultType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $cloudIdType,
+                            'value' => [
+                                'shareType' => IShare::TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $cloudIdType,
+                            'value' => [
+                                'shareType' => IShare::TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
 
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		} else {
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-		}
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        } else {
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+        }
 
-		/**
-		 * Add generic share with remote item for valid cloud ids that are not users of the local instance
-		 */
-		if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			try {
-				[$remoteUser, $serverUrl] = $this->splitUserRemote($search);
-				$localUser = $this->userManager->get($remoteUser);
-				if ($localUser === null || $search !== $localUser->getCloudId()) {
-					$result['exact'][] = [
-						'label' => $remoteUser . " ($serverUrl)",
-						'uuid' => $remoteUser,
-						'name' => $remoteUser,
-						'value' => [
-							'shareType' => IShare::TYPE_REMOTE,
-							'shareWith' => $search,
-							'server' => $serverUrl,
-						],
-					];
-				}
-			} catch (\InvalidArgumentException $e) {
-			}
-		}
+        /**
+         * Add generic share with remote item for valid cloud ids that are not users of the local instance
+         */
+        if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            try {
+                [$remoteUser, $serverUrl] = $this->splitUserRemote($search);
+                $localUser = $this->userManager->get($remoteUser);
+                if ($localUser === null || $search !== $localUser->getCloudId()) {
+                    $result['exact'][] = [
+                        'label' => $remoteUser . " ($serverUrl)",
+                        'uuid' => $remoteUser,
+                        'name' => $remoteUser,
+                        'value' => [
+                            'shareType' => IShare::TYPE_REMOTE,
+                            'shareWith' => $search,
+                            'server' => $serverUrl,
+                        ],
+                    ];
+                }
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitUserRemote(string $address): array {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $this->cloudIdManager->removeProtocolFromUrl($cloudId->getRemote(), true)];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitUserRemote(string $address): array {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $this->cloudIdManager->removeProtocolFromUrl($cloudId->getRemote(), true)];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

lib/private/Color.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC;
 
 class Color {
-	public $r;
-	public $g;
-	public $b;
-	public function __construct($r, $g, $b) {
-		$this->r = $r;
-		$this->g = $g;
-		$this->b = $b;
-	}
+    public $r;
+    public $g;
+    public $b;
+    public function __construct($r, $g, $b) {
+        $this->r = $r;
+        $this->g = $g;
+        $this->b = $b;
+    }
 }

lib/private/Lock/MemcacheLockingProvider.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 		} elseif ($existing === 'exclusive') {
 			return $existing;
 		} else {
-			return $existing . ' shared locks';
+			return $existing.' shared locks';
 		}
 	}
 }

Indentation +164 added lines, -164 removed lines

@@ -14,168 +14,168 @@
 use OCP\Lock\LockedException;
 
 class MemcacheLockingProvider extends AbstractLockingProvider {
-	/** @var array<string, array{time: int, ttl: int}> */
-	private array $oldTTLs = [];
-
-	public function __construct(
-		private IMemcache $memcache,
-		private ITimeFactory $timeFactory,
-		int $ttl = 3600,
-	) {
-		parent::__construct($ttl);
-	}
-
-	private function setTTL(string $path, ?int $ttl = null, mixed $compare = null): void {
-		if (is_null($ttl)) {
-			$ttl = $this->ttl;
-		}
-		if ($this->memcache instanceof IMemcacheTTL) {
-			if ($compare !== null) {
-				$this->memcache->compareSetTTL($path, $compare, $ttl);
-			} else {
-				$this->memcache->setTTL($path, $ttl);
-			}
-		}
-	}
-
-	private function getTTL(string $path): int {
-		if ($this->memcache instanceof IMemcacheTTL) {
-			$ttl = $this->memcache->getTTL($path);
-			return $ttl === false ? -1 : $ttl;
-		} else {
-			return -1;
-		}
-	}
-
-	public function isLocked(string $path, int $type): bool {
-		$lockValue = $this->memcache->get($path);
-		if ($type === self::LOCK_SHARED) {
-			return is_int($lockValue) && $lockValue > 0;
-		} elseif ($type === self::LOCK_EXCLUSIVE) {
-			return $lockValue === 'exclusive';
-		} else {
-			return false;
-		}
-	}
-
-	public function acquireLock(string $path, int $type, ?string $readablePath = null): void {
-		if ($type === self::LOCK_SHARED) {
-			// save the old TTL to for `restoreTTL`
-			$this->oldTTLs[$path] = [
-				'ttl' => $this->getTTL($path),
-				'time' => $this->timeFactory->getTime()
-			];
-			if (!$this->memcache->inc($path)) {
-				throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath);
-			}
-		} else {
-			// when getting exclusive locks, we know there are no old TTLs to restore
-			$this->memcache->add($path, 0);
-			// ttl is updated automatically when the `set` succeeds
-			if (!$this->memcache->cas($path, 0, 'exclusive')) {
-				throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath);
-			}
-			unset($this->oldTTLs[$path]);
-		}
-		$this->setTTL($path);
-		$this->markAcquire($path, $type);
-	}
-
-	public function releaseLock(string $path, int $type): void {
-		if ($type === self::LOCK_SHARED) {
-			$ownSharedLockCount = $this->getOwnSharedLockCount($path);
-			$newValue = 0;
-			if ($ownSharedLockCount === 0) { // if we are not holding the lock, don't try to release it
-				return;
-			}
-			if ($ownSharedLockCount === 1) {
-				$removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
-				if (!$removed) { //someone else also has a shared lock, decrease only
-					$newValue = $this->memcache->dec($path);
-				}
-			} else {
-				// if we own more than one lock ourselves just decrease
-				$newValue = $this->memcache->dec($path);
-			}
-
-			if ($newValue > 0) {
-				$this->restoreTTL($path);
-			} else {
-				unset($this->oldTTLs[$path]);
-			}
-
-			// if we somehow release more locks then exists, reset the lock
-			if ($newValue < 0) {
-				$this->memcache->cad($path, $newValue);
-			}
-		} elseif ($type === self::LOCK_EXCLUSIVE) {
-			$this->memcache->cad($path, 'exclusive');
-		}
-		$this->markRelease($path, $type);
-	}
-
-	public function changeLock(string $path, int $targetType): void {
-		if ($targetType === self::LOCK_SHARED) {
-			if (!$this->memcache->cas($path, 'exclusive', 1)) {
-				throw new LockedException($path, null, $this->getExistingLockForException($path));
-			}
-		} elseif ($targetType === self::LOCK_EXCLUSIVE) {
-			// we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
-			if (!$this->memcache->cas($path, 1, 'exclusive')) {
-				$this->restoreTTL($path);
-				throw new LockedException($path, null, $this->getExistingLockForException($path));
-			}
-			unset($this->oldTTLs[$path]);
-		}
-		$this->setTTL($path);
-		$this->markChange($path, $targetType);
-	}
-
-	/**
-	 * With shared locks, each time the lock is acquired, the ttl for the path is reset.
-	 *
-	 * Due to this "ttl extension" when a shared lock isn't freed correctly for any reason
-	 * the lock won't expire until no shared locks are required for the path for 1h.
-	 * This can lead to a client repeatedly trying to upload a file, and failing forever
-	 * because the lock never gets the opportunity to expire.
-	 *
-	 * To help the lock expire in this case, we lower the TTL back to what it was before we
-	 * took the shared lock *only* if nobody else got a shared lock after we did.
-	 *
-	 * This doesn't handle all cases where multiple requests are acquiring shared locks
-	 * but it should handle some of the more common ones and not hurt things further
-	 */
-	private function restoreTTL(string $path): void {
-		if (isset($this->oldTTLs[$path])) {
-			$saved = $this->oldTTLs[$path];
-			$elapsed = $this->timeFactory->getTime() - $saved['time'];
-
-			// old value to compare to when setting ttl in case someone else changes the lock in the middle of this function
-			$value = $this->memcache->get($path);
-
-			$currentTtl = $this->getTTL($path);
-
-			// what the old ttl would be given the time elapsed since we acquired the lock
-			// note that if this gets negative the key will be expired directly when we set the ttl
-			$remainingOldTtl = $saved['ttl'] - $elapsed;
-			// what the currently ttl would be if nobody else acquired a lock since we did (+1 to cover rounding errors)
-			$expectedTtl = $this->ttl - $elapsed + 1;
-
-			// check if another request has acquired a lock (and didn't release it yet)
-			if ($currentTtl <= $expectedTtl) {
-				$this->setTTL($path, $remainingOldTtl, $value);
-			}
-		}
-	}
-
-	private function getExistingLockForException(string $path): string {
-		$existing = $this->memcache->get($path);
-		if (!$existing) {
-			return 'none';
-		} elseif ($existing === 'exclusive') {
-			return $existing;
-		} else {
-			return $existing . ' shared locks';
-		}
-	}
+    /** @var array<string, array{time: int, ttl: int}> */
+    private array $oldTTLs = [];
+
+    public function __construct(
+        private IMemcache $memcache,
+        private ITimeFactory $timeFactory,
+        int $ttl = 3600,
+    ) {
+        parent::__construct($ttl);
+    }
+
+    private function setTTL(string $path, ?int $ttl = null, mixed $compare = null): void {
+        if (is_null($ttl)) {
+            $ttl = $this->ttl;
+        }
+        if ($this->memcache instanceof IMemcacheTTL) {
+            if ($compare !== null) {
+                $this->memcache->compareSetTTL($path, $compare, $ttl);
+            } else {
+                $this->memcache->setTTL($path, $ttl);
+            }
+        }
+    }
+
+    private function getTTL(string $path): int {
+        if ($this->memcache instanceof IMemcacheTTL) {
+            $ttl = $this->memcache->getTTL($path);
+            return $ttl === false ? -1 : $ttl;
+        } else {
+            return -1;
+        }
+    }
+
+    public function isLocked(string $path, int $type): bool {
+        $lockValue = $this->memcache->get($path);
+        if ($type === self::LOCK_SHARED) {
+            return is_int($lockValue) && $lockValue > 0;
+        } elseif ($type === self::LOCK_EXCLUSIVE) {
+            return $lockValue === 'exclusive';
+        } else {
+            return false;
+        }
+    }
+
+    public function acquireLock(string $path, int $type, ?string $readablePath = null): void {
+        if ($type === self::LOCK_SHARED) {
+            // save the old TTL to for `restoreTTL`
+            $this->oldTTLs[$path] = [
+                'ttl' => $this->getTTL($path),
+                'time' => $this->timeFactory->getTime()
+            ];
+            if (!$this->memcache->inc($path)) {
+                throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath);
+            }
+        } else {
+            // when getting exclusive locks, we know there are no old TTLs to restore
+            $this->memcache->add($path, 0);
+            // ttl is updated automatically when the `set` succeeds
+            if (!$this->memcache->cas($path, 0, 'exclusive')) {
+                throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath);
+            }
+            unset($this->oldTTLs[$path]);
+        }
+        $this->setTTL($path);
+        $this->markAcquire($path, $type);
+    }
+
+    public function releaseLock(string $path, int $type): void {
+        if ($type === self::LOCK_SHARED) {
+            $ownSharedLockCount = $this->getOwnSharedLockCount($path);
+            $newValue = 0;
+            if ($ownSharedLockCount === 0) { // if we are not holding the lock, don't try to release it
+                return;
+            }
+            if ($ownSharedLockCount === 1) {
+                $removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
+                if (!$removed) { //someone else also has a shared lock, decrease only
+                    $newValue = $this->memcache->dec($path);
+                }
+            } else {
+                // if we own more than one lock ourselves just decrease
+                $newValue = $this->memcache->dec($path);
+            }
+
+            if ($newValue > 0) {
+                $this->restoreTTL($path);
+            } else {
+                unset($this->oldTTLs[$path]);
+            }
+
+            // if we somehow release more locks then exists, reset the lock
+            if ($newValue < 0) {
+                $this->memcache->cad($path, $newValue);
+            }
+        } elseif ($type === self::LOCK_EXCLUSIVE) {
+            $this->memcache->cad($path, 'exclusive');
+        }
+        $this->markRelease($path, $type);
+    }
+
+    public function changeLock(string $path, int $targetType): void {
+        if ($targetType === self::LOCK_SHARED) {
+            if (!$this->memcache->cas($path, 'exclusive', 1)) {
+                throw new LockedException($path, null, $this->getExistingLockForException($path));
+            }
+        } elseif ($targetType === self::LOCK_EXCLUSIVE) {
+            // we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
+            if (!$this->memcache->cas($path, 1, 'exclusive')) {
+                $this->restoreTTL($path);
+                throw new LockedException($path, null, $this->getExistingLockForException($path));
+            }
+            unset($this->oldTTLs[$path]);
+        }
+        $this->setTTL($path);
+        $this->markChange($path, $targetType);
+    }
+
+    /**
+     * With shared locks, each time the lock is acquired, the ttl for the path is reset.
+     *
+     * Due to this "ttl extension" when a shared lock isn't freed correctly for any reason
+     * the lock won't expire until no shared locks are required for the path for 1h.
+     * This can lead to a client repeatedly trying to upload a file, and failing forever
+     * because the lock never gets the opportunity to expire.
+     *
+     * To help the lock expire in this case, we lower the TTL back to what it was before we
+     * took the shared lock *only* if nobody else got a shared lock after we did.
+     *
+     * This doesn't handle all cases where multiple requests are acquiring shared locks
+     * but it should handle some of the more common ones and not hurt things further
+     */
+    private function restoreTTL(string $path): void {
+        if (isset($this->oldTTLs[$path])) {
+            $saved = $this->oldTTLs[$path];
+            $elapsed = $this->timeFactory->getTime() - $saved['time'];
+
+            // old value to compare to when setting ttl in case someone else changes the lock in the middle of this function
+            $value = $this->memcache->get($path);
+
+            $currentTtl = $this->getTTL($path);
+
+            // what the old ttl would be given the time elapsed since we acquired the lock
+            // note that if this gets negative the key will be expired directly when we set the ttl
+            $remainingOldTtl = $saved['ttl'] - $elapsed;
+            // what the currently ttl would be if nobody else acquired a lock since we did (+1 to cover rounding errors)
+            $expectedTtl = $this->ttl - $elapsed + 1;
+
+            // check if another request has acquired a lock (and didn't release it yet)
+            if ($currentTtl <= $expectedTtl) {
+                $this->setTTL($path, $remainingOldTtl, $value);
+            }
+        }
+    }
+
+    private function getExistingLockForException(string $path): string {
+        $existing = $this->memcache->get($path);
+        if (!$existing) {
+            return 'none';
+        } elseif ($existing === 'exclusive') {
+            return $existing;
+        } else {
+            return $existing . ' shared locks';
+        }
+    }
 }

lib/public/Collaboration/Collaborators/SearchResultType.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	 * @since 13.0.0
 	 */
 	protected function getValidatedType($type) {
-		$type = trim((string)$type);
+		$type = trim((string) $type);
 
 		if ($type === '') {
 			throw new \InvalidArgumentException('Type must not be empty');

Indentation +40 added lines, -40 removed lines

@@ -12,44 +12,44 @@
  * @since 13.0.0
  */
 class SearchResultType {
-	/** @var string */
-	protected $label;
-
-	/**
-	 * SearchResultType constructor.
-	 *
-	 * @param string $label
-	 * @since 13.0.0
-	 */
-	public function __construct($label) {
-		$this->label = $this->getValidatedType($label);
-	}
-
-	/**
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
-	/**
-	 * @param $type
-	 * @return string
-	 * @throws \InvalidArgumentException
-	 * @since 13.0.0
-	 */
-	protected function getValidatedType($type) {
-		$type = trim((string)$type);
-
-		if ($type === '') {
-			throw new \InvalidArgumentException('Type must not be empty');
-		}
-
-		if ($type === 'exact') {
-			throw new \InvalidArgumentException('Provided type is a reserved word');
-		}
-
-		return $type;
-	}
+    /** @var string */
+    protected $label;
+
+    /**
+     * SearchResultType constructor.
+     *
+     * @param string $label
+     * @since 13.0.0
+     */
+    public function __construct($label) {
+        $this->label = $this->getValidatedType($label);
+    }
+
+    /**
+     * @return string
+     * @since 13.0.0
+     */
+    public function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     * @param $type
+     * @return string
+     * @throws \InvalidArgumentException
+     * @since 13.0.0
+     */
+    protected function getValidatedType($type) {
+        $type = trim((string)$type);
+
+        if ($type === '') {
+            throw new \InvalidArgumentException('Type must not be empty');
+        }
+
+        if ($type === 'exact') {
+            throw new \InvalidArgumentException('Provided type is a reserved word');
+        }
+
+        return $type;
+    }
 }

lib/private/IntegrityCheck/Helpers/FileAccessHelper.php

Indentation +49 added lines, -49 removed lines

@@ -34,57 +34,57 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class FileAccessHelper {
-	/**
-	 * Wrapper around file_get_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @return string|false
-	 */
-	public function file_get_contents(string $filename) {
-		return file_get_contents($filename);
-	}
+    /**
+     * Wrapper around file_get_contents($filename, $data)
+     *
+     * @param string $filename
+     * @return string|false
+     */
+    public function file_get_contents(string $filename) {
+        return file_get_contents($filename);
+    }
 
-	/**
-	 * Wrapper around file_exists($filename)
-	 *
-	 * @param string $filename
-	 * @return bool
-	 */
-	public function file_exists(string $filename): bool {
-		return file_exists($filename);
-	}
+    /**
+     * Wrapper around file_exists($filename)
+     *
+     * @param string $filename
+     * @return bool
+     */
+    public function file_exists(string $filename): bool {
+        return file_exists($filename);
+    }
 
-	/**
-	 * Wrapper around file_put_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @param string $data
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function file_put_contents(string $filename, string $data): int {
-		$bytesWritten = @file_put_contents($filename, $data);
-		if ($bytesWritten === false || $bytesWritten !== \strlen($data)) {
-			throw new \Exception('Failed to write into ' . $filename);
-		}
-		return $bytesWritten;
-	}
+    /**
+     * Wrapper around file_put_contents($filename, $data)
+     *
+     * @param string $filename
+     * @param string $data
+     * @return int
+     * @throws \Exception
+     */
+    public function file_put_contents(string $filename, string $data): int {
+        $bytesWritten = @file_put_contents($filename, $data);
+        if ($bytesWritten === false || $bytesWritten !== \strlen($data)) {
+            throw new \Exception('Failed to write into ' . $filename);
+        }
+        return $bytesWritten;
+    }
 
-	/**
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_writable(string $path): bool {
-		return is_writable($path);
-	}
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function is_writable(string $path): bool {
+        return is_writable($path);
+    }
 
-	/**
-	 * @param string $path
-	 * @throws \Exception
-	 */
-	public function assertDirectoryExists(string $path) {
-		if (!is_dir($path)) {
-			throw new \Exception('Directory ' . $path . ' does not exist.');
-		}
-	}
+    /**
+     * @param string $path
+     * @throws \Exception
+     */
+    public function assertDirectoryExists(string $path) {
+        if (!is_dir($path)) {
+            throw new \Exception('Directory ' . $path . ' does not exist.');
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 	public function file_put_contents(string $filename, string $data): int {
 		$bytesWritten = @file_put_contents($filename, $data);
 		if ($bytesWritten === false || $bytesWritten !== \strlen($data)) {
-			throw new \Exception('Failed to write into ' . $filename);
+			throw new \Exception('Failed to write into '.$filename);
 		}
 		return $bytesWritten;
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	public function assertDirectoryExists(string $path) {
 		if (!is_dir($path)) {
-			throw new \Exception('Directory ' . $path . ' does not exist.');
+			throw new \Exception('Directory '.$path.' does not exist.');
 		}
 	}
 }

lib/private/Federation/CloudFederationNotification.php

Indentation +29 added lines, -29 removed lines

@@ -33,35 +33,35 @@
  * @since 14.0.0
  */
 class CloudFederationNotification implements ICloudFederationNotification {
-	private $message = [];
+    private $message = [];
 
-	/**
-	 * add a message to the notification
-	 *
-	 * @param string $notificationType (e.g. SHARE_ACCEPTED)
-	 * @param string $resourceType (e.g. file, calendar, contact,...)
-	 * @param string $providerId id of the share
-	 * @param array $notification payload of the notification
-	 *
-	 * @since 14.0.0
-	 */
-	public function setMessage($notificationType, $resourceType, $providerId, array $notification) {
-		$this->message = [
-			'notificationType' => $notificationType,
-			'resourceType' => $resourceType,
-			'providerId' => $providerId,
-			'notification' => $notification,
-		];
-	}
+    /**
+     * add a message to the notification
+     *
+     * @param string $notificationType (e.g. SHARE_ACCEPTED)
+     * @param string $resourceType (e.g. file, calendar, contact,...)
+     * @param string $providerId id of the share
+     * @param array $notification payload of the notification
+     *
+     * @since 14.0.0
+     */
+    public function setMessage($notificationType, $resourceType, $providerId, array $notification) {
+        $this->message = [
+            'notificationType' => $notificationType,
+            'resourceType' => $resourceType,
+            'providerId' => $providerId,
+            'notification' => $notification,
+        ];
+    }
 
-	/**
-	 * get message, ready to send out
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
+    /**
+     * get message, ready to send out
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getMessage() {
+        return $this->message;
+    }
 }

lib/private/Security/FeaturePolicy/FeaturePolicy.php

Indentation +36 added lines, -36 removed lines

@@ -27,51 +27,51 @@
 namespace OC\Security\FeaturePolicy;
 
 class FeaturePolicy extends \OCP\AppFramework\Http\FeaturePolicy {
-	public function getAutoplayDomains(): array {
-		return $this->autoplayDomains;
-	}
+    public function getAutoplayDomains(): array {
+        return $this->autoplayDomains;
+    }
 
-	public function setAutoplayDomains(array $autoplayDomains): void {
-		$this->autoplayDomains = $autoplayDomains;
-	}
+    public function setAutoplayDomains(array $autoplayDomains): void {
+        $this->autoplayDomains = $autoplayDomains;
+    }
 
-	public function getCameraDomains(): array {
-		return $this->cameraDomains;
-	}
+    public function getCameraDomains(): array {
+        return $this->cameraDomains;
+    }
 
-	public function setCameraDomains(array $cameraDomains): void {
-		$this->cameraDomains = $cameraDomains;
-	}
+    public function setCameraDomains(array $cameraDomains): void {
+        $this->cameraDomains = $cameraDomains;
+    }
 
-	public function getFullscreenDomains(): array {
-		return $this->fullscreenDomains;
-	}
+    public function getFullscreenDomains(): array {
+        return $this->fullscreenDomains;
+    }
 
-	public function setFullscreenDomains(array $fullscreenDomains): void {
-		$this->fullscreenDomains = $fullscreenDomains;
-	}
+    public function setFullscreenDomains(array $fullscreenDomains): void {
+        $this->fullscreenDomains = $fullscreenDomains;
+    }
 
-	public function getGeolocationDomains(): array {
-		return $this->geolocationDomains;
-	}
+    public function getGeolocationDomains(): array {
+        return $this->geolocationDomains;
+    }
 
-	public function setGeolocationDomains(array $geolocationDomains): void {
-		$this->geolocationDomains = $geolocationDomains;
-	}
+    public function setGeolocationDomains(array $geolocationDomains): void {
+        $this->geolocationDomains = $geolocationDomains;
+    }
 
-	public function getMicrophoneDomains(): array {
-		return $this->microphoneDomains;
-	}
+    public function getMicrophoneDomains(): array {
+        return $this->microphoneDomains;
+    }
 
-	public function setMicrophoneDomains(array $microphoneDomains): void {
-		$this->microphoneDomains = $microphoneDomains;
-	}
+    public function setMicrophoneDomains(array $microphoneDomains): void {
+        $this->microphoneDomains = $microphoneDomains;
+    }
 
-	public function getPaymentDomains(): array {
-		return $this->paymentDomains;
-	}
+    public function getPaymentDomains(): array {
+        return $this->paymentDomains;
+    }
 
-	public function setPaymentDomains(array $paymentDomains): void {
-		$this->paymentDomains = $paymentDomains;
-	}
+    public function setPaymentDomains(array $paymentDomains): void {
+        $this->paymentDomains = $paymentDomains;
+    }
 }

lib/private/Security/CSRF/CsrfToken.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	public function getEncryptedValue(): string {
 		if ($this->encryptedValue === '') {
 			$sharedSecret = random_bytes(\strlen($this->value));
-			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
+			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret).':'.base64_encode($sharedSecret);
 		}
 
 		return $this->encryptedValue;

Indentation +32 added lines, -32 removed lines

@@ -17,40 +17,40 @@
  * @package OC\Security\CSRF
  */
 class CsrfToken {
-	private string $encryptedValue = '';
+    private string $encryptedValue = '';
 
-	/**
-	 * @param string $value Value of the token. Can be encrypted or not encrypted.
-	 */
-	public function __construct(
-		private string $value,
-	) {
-	}
+    /**
+     * @param string $value Value of the token. Can be encrypted or not encrypted.
+     */
+    public function __construct(
+        private string $value,
+    ) {
+    }
 
-	/**
-	 * Encrypted value of the token. This is used to mitigate BREACH alike
-	 * vulnerabilities. For display measures do use this functionality.
-	 */
-	public function getEncryptedValue(): string {
-		if ($this->encryptedValue === '') {
-			$sharedSecret = random_bytes(\strlen($this->value));
-			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
-		}
+    /**
+     * Encrypted value of the token. This is used to mitigate BREACH alike
+     * vulnerabilities. For display measures do use this functionality.
+     */
+    public function getEncryptedValue(): string {
+        if ($this->encryptedValue === '') {
+            $sharedSecret = random_bytes(\strlen($this->value));
+            $this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
+        }
 
-		return $this->encryptedValue;
-	}
+        return $this->encryptedValue;
+    }
 
-	/**
-	 * The unencrypted value of the token. Used for decrypting an already
-	 * encrypted token.
-	 */
-	public function getDecryptedValue(): string {
-		$token = explode(':', $this->value);
-		if (\count($token) !== 2) {
-			return '';
-		}
-		$obfuscatedToken = $token[0];
-		$secret = $token[1];
-		return base64_decode($obfuscatedToken) ^ base64_decode($secret);
-	}
+    /**
+     * The unencrypted value of the token. Used for decrypting an already
+     * encrypted token.
+     */
+    public function getDecryptedValue(): string {
+        $token = explode(':', $this->value);
+        if (\count($token) !== 2) {
+            return '';
+        }
+        $obfuscatedToken = $token[0];
+        $secret = $token[1];
+        return base64_decode($obfuscatedToken) ^ base64_decode($secret);
+    }
 }

lib/private/Command/QueueBus.php

Indentation +40 added lines, -40 removed lines

@@ -27,48 +27,48 @@
 use OCP\Command\ICommand;
 
 class QueueBus implements IBus {
-	/**
-	 * @var ICommand[]|callable[]
-	 */
-	private $queue = [];
+    /**
+     * @var ICommand[]|callable[]
+     */
+    private $queue = [];
 
-	/**
-	 * Schedule a command to be fired
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	public function push($command) {
-		$this->queue[] = $command;
-	}
+    /**
+     * Schedule a command to be fired
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    public function push($command) {
+        $this->queue[] = $command;
+    }
 
-	/**
-	 * Require all commands using a trait to be run synchronous
-	 *
-	 * @param string $trait
-	 */
-	public function requireSync($trait) {
-	}
+    /**
+     * Require all commands using a trait to be run synchronous
+     *
+     * @param string $trait
+     */
+    public function requireSync($trait) {
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	private function runCommand($command) {
-		if ($command instanceof ICommand) {
-			// ensure the command can be serialized
-			$serialized = serialize($command);
-			if (strlen($serialized) > 4000) {
-				throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
-			}
-			$unserialized = unserialize($serialized);
-			$unserialized->handle();
-		} else {
-			$command();
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    private function runCommand($command) {
+        if ($command instanceof ICommand) {
+            // ensure the command can be serialized
+            $serialized = serialize($command);
+            if (strlen($serialized) > 4000) {
+                throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
+            }
+            $unserialized = unserialize($serialized);
+            $unserialized->handle();
+        } else {
+            $command();
+        }
+    }
 
-	public function run() {
-		while ($command = array_shift($this->queue)) {
-			$this->runCommand($command);
-		}
-	}
+    public function run() {
+        while ($command = array_shift($this->queue)) {
+            $this->runCommand($command);
+        }
+    }
 }