aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Support
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Support')
-rw-r--r--lib/private/Support/CrashReport/Registry.php49
-rw-r--r--lib/private/Support/Subscription/Assertion.php23
-rw-r--r--lib/private/Support/Subscription/Registry.php50
3 files changed, 17 insertions, 105 deletions
diff --git a/lib/private/Support/CrashReport/Registry.php b/lib/private/Support/CrashReport/Registry.php
index f2a35069288..4fbbb8448ca 100644
--- a/lib/private/Support/CrashReport/Registry.php
+++ b/lib/private/Support/CrashReport/Registry.php
@@ -3,32 +3,15 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
+
namespace OC\Support\CrashReport;
use Exception;
use OCP\AppFramework\QueryException;
-use OCP\IServerContainer;
+use OCP\Server;
use OCP\Support\CrashReport\ICollectBreadcrumbs;
use OCP\Support\CrashReport\IMessageReporter;
use OCP\Support\CrashReport\IRegistry;
@@ -44,17 +27,8 @@ class Registry implements IRegistry {
/** @var IReporter[] */
private $reporters = [];
- /** @var IServerContainer */
- private $serverContainer;
-
- public function __construct(IServerContainer $serverContainer) {
- $this->serverContainer = $serverContainer;
- }
-
/**
* Register a reporter instance
- *
- * @param IReporter $reporter
*/
public function register(IReporter $reporter): void {
$this->reporters[] = $reporter;
@@ -67,10 +41,6 @@ class Registry implements IRegistry {
/**
* Delegate breadcrumb collection to all registered reporters
*
- * @param string $message
- * @param string $category
- * @param array $context
- *
* @since 15.0.0
*/
public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
@@ -87,7 +57,6 @@ class Registry implements IRegistry {
* Delegate crash reporting to all registered reporters
*
* @param Exception|Throwable $exception
- * @param array $context
*/
public function delegateReport($exception, array $context = []): void {
$this->loadLazyProviders();
@@ -100,9 +69,6 @@ class Registry implements IRegistry {
/**
* Delegate a message to all reporters that implement IMessageReporter
*
- * @param string $message
- * @param array $context
- *
* @return void
*/
public function delegateMessage(string $message, array $context = []): void {
@@ -119,15 +85,16 @@ class Registry implements IRegistry {
while (($class = array_shift($this->lazyReporters)) !== null) {
try {
/** @var IReporter $reporter */
- $reporter = $this->serverContainer->query($class);
+ $reporter = Server::get($class);
} catch (QueryException $e) {
/*
* There is a circular dependency between the logger and the registry, so
* we can not inject it. Thus the static call.
*/
- \OC::$server->get(LoggerInterface::class)->critical('Could not load lazy crash reporter: ' . $e->getMessage(), [
+ Server::get(LoggerInterface::class)->critical('Could not load lazy crash reporter: ' . $e->getMessage(), [
'exception' => $e,
]);
+ return;
}
/**
* Try to register the loaded reporter. Theoretically it could be of a wrong
@@ -140,7 +107,7 @@ class Registry implements IRegistry {
* There is a circular dependency between the logger and the registry, so
* we can not inject it. Thus the static call.
*/
- \OC::$server->get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
+ Server::get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
'exception' => $e,
]);
}
diff --git a/lib/private/Support/Subscription/Assertion.php b/lib/private/Support/Subscription/Assertion.php
index 451afe83bd3..04a0dde739f 100644
--- a/lib/private/Support/Subscription/Assertion.php
+++ b/lib/private/Support/Subscription/Assertion.php
@@ -1,29 +1,10 @@
<?php
declare(strict_types=1);
-
/**
- * @copyright Copyright (c) 2022 Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OC\Support\Subscription;
use OCP\HintException;
diff --git a/lib/private/Support/Subscription/Registry.php b/lib/private/Support/Subscription/Registry.php
index 008cded5dd3..34f24d1d026 100644
--- a/lib/private/Support/Subscription/Registry.php
+++ b/lib/private/Support/Subscription/Registry.php
@@ -3,31 +3,11 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2016 Morris Jobke <hey@morrisjobke.de>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OC\Support\Subscription;
-use OC\User\Backend;
use OCP\AppFramework\QueryException;
use OCP\IConfig;
use OCP\IGroupManager;
@@ -38,8 +18,6 @@ use OCP\Support\Subscription\Exception\AlreadyRegisteredException;
use OCP\Support\Subscription\IRegistry;
use OCP\Support\Subscription\ISubscription;
use OCP\Support\Subscription\ISupportedApps;
-use OCP\User\Backend\ICountMappedUsersBackend;
-use OCP\User\Backend\ICountUsersBackend;
use Psr\Log\LoggerInterface;
class Registry implements IRegistry {
@@ -160,8 +138,8 @@ class Registry implements IRegistry {
*/
public function delegateIsHardUserLimitReached(?IManager $notificationManager = null): bool {
$subscription = $this->getSubscription();
- if ($subscription instanceof ISubscription &&
- $subscription->hasValidSubscription()) {
+ if ($subscription instanceof ISubscription
+ && $subscription->hasValidSubscription()) {
$userLimitReached = $subscription->isHardUserLimitReached();
if ($userLimitReached && $notificationManager instanceof IManager) {
$this->notifyAboutReachedUserLimit($notificationManager);
@@ -186,22 +164,8 @@ class Registry implements IRegistry {
}
private function getUserCount(): int {
- $userCount = 0;
- $backends = $this->userManager->getBackends();
- foreach ($backends as $backend) {
- if ($backend instanceof ICountMappedUsersBackend) {
- $userCount += $backend->countMappedUsers();
- } elseif ($backend->implementsActions(Backend::COUNT_USERS)) {
- /** @var ICountUsersBackend $backend */
- $backendUsers = $backend->countUsers();
- if ($backendUsers !== false) {
- $userCount += $backendUsers;
- } else {
- // TODO what if the user count can't be determined?
- $this->logger->warning('Can not determine user count for ' . get_class($backend), ['app' => 'lib']);
- }
- }
- }
+ /* We cannot limit because we substract disabled users afterward. But we limit to mapped users so should be not too expensive. */
+ $userCount = (int)$this->userManager->countUsersTotal(0, true);
$disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
$disabledUsersCount = count($disabledUsers);
@@ -239,7 +203,7 @@ class Registry implements IRegistry {
$notificationManager->notify($notification);
}
- $this->logger->warning('The user limit was reached and the new user was not created', ['app' => 'lib']);
+ $this->logger->warning('The account limit was reached and the new account was not created', ['app' => 'lib']);
}
protected function reIssue(): bool {
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 18:37:29 +0000