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.php69
-rw-r--r--lib/private/Support/Subscription/Assertion.php36
-rw-r--r--lib/private/Support/Subscription/Registry.php109
3 files changed, 98 insertions, 116 deletions
diff --git a/lib/private/Support/CrashReport/Registry.php b/lib/private/Support/CrashReport/Registry.php
index bff62705ceb..4fbbb8448ca 100644
--- a/lib/private/Support/CrashReport/Registry.php
+++ b/lib/private/Support/CrashReport/Registry.php
@@ -3,62 +3,32 @@
declare(strict_types=1);
/**
- *
- *
- * @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\ILogger;
-use OCP\IServerContainer;
+use OCP\Server;
use OCP\Support\CrashReport\ICollectBreadcrumbs;
use OCP\Support\CrashReport\IMessageReporter;
use OCP\Support\CrashReport\IRegistry;
use OCP\Support\CrashReport\IReporter;
+use Psr\Log\LoggerInterface;
use Throwable;
+use function array_shift;
class Registry implements IRegistry {
-
/** @var string[] */
private $lazyReporters = [];
/** @var IReporter[] */
private $reporters = [];
- /** @var IServerContainer */
- private $serverContainer;
-
- /** @var ILogger */
- private $logger;
-
- public function __construct(IServerContainer $serverContainer) {
- $this->serverContainer = $serverContainer;
- }
-
/**
* Register a reporter instance
- *
- * @param IReporter $reporter
*/
public function register(IReporter $reporter): void {
$this->reporters[] = $reporter;
@@ -71,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 {
@@ -91,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();
@@ -104,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 {
@@ -120,20 +82,19 @@ class Registry implements IRegistry {
}
private function loadLazyProviders(): void {
- $classes = $this->lazyReporters;
- foreach ($classes as $class) {
+ 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->getLogger()->logException($e, [
- 'message' => 'Could not load lazy crash reporter: ' . $e->getMessage(),
- 'level' => ILogger::FATAL,
+ 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
@@ -146,12 +107,14 @@ 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->getLogger()->logException($e, [
- 'message' => 'Could not register lazy crash reporter: ' . $e->getMessage(),
- 'level' => ILogger::FATAL,
+ Server::get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
+ 'exception' => $e,
]);
}
}
- $this->lazyReporters = [];
+ }
+
+ public function hasReporters(): bool {
+ return !empty($this->lazyReporters) || !empty($this->reporters);
}
}
diff --git a/lib/private/Support/Subscription/Assertion.php b/lib/private/Support/Subscription/Assertion.php
new file mode 100644
index 00000000000..04a0dde739f
--- /dev/null
+++ b/lib/private/Support/Subscription/Assertion.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OC\Support\Subscription;
+
+use OCP\HintException;
+use OCP\L10N\IFactory;
+use OCP\Notification\IManager;
+use OCP\Support\Subscription\IAssertion;
+use OCP\Support\Subscription\IRegistry;
+
+class Assertion implements IAssertion {
+ private IRegistry $registry;
+ private IFactory $l10nFactory;
+ private IManager $notificationManager;
+
+ public function __construct(IRegistry $registry, IFactory $l10nFactory, IManager $notificationManager) {
+ $this->registry = $registry;
+ $this->l10nFactory = $l10nFactory;
+ $this->notificationManager = $notificationManager;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function createUserIsLegit(): void {
+ if ($this->registry->delegateIsHardUserLimitReached($this->notificationManager)) {
+ $l = $this->l10nFactory->get('lib');
+ throw new HintException($l->t('The user was not created because the user limit has been reached. Check your notifications to learn more.'));
+ }
+ }
+}
diff --git a/lib/private/Support/Subscription/Registry.php b/lib/private/Support/Subscription/Registry.php
index 72bae2adc8e..34f24d1d026 100644
--- a/lib/private/Support/Subscription/Registry.php
+++ b/lib/private/Support/Subscription/Registry.php
@@ -3,32 +3,11 @@
declare(strict_types=1);
/**
- *
- *
- * @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;
@@ -42,7 +21,6 @@ use OCP\Support\Subscription\ISupportedApps;
use Psr\Log\LoggerInterface;
class Registry implements IRegistry {
-
/** @var ISubscription */
private $subscription = null;
@@ -60,21 +38,17 @@ class Registry implements IRegistry {
private $groupManager;
/** @var LoggerInterface */
private $logger;
- /** @var IManager */
- private $notificationManager;
public function __construct(IConfig $config,
- IServerContainer $container,
- IUserManager $userManager,
- IGroupManager $groupManager,
- LoggerInterface $logger,
- IManager $notificationManager) {
+ IServerContainer $container,
+ IUserManager $userManager,
+ IGroupManager $groupManager,
+ LoggerInterface $logger) {
$this->config = $config;
$this->container = $container;
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->logger = $logger;
- $this->notificationManager = $notificationManager;
}
private function getSubscription(): ?ISubscription {
@@ -159,15 +133,16 @@ class Registry implements IRegistry {
/**
* Indicates if a hard user limit is reached and no new users should be created
*
+ * @param IManager|null $notificationManager
* @since 21.0.0
*/
- public function delegateIsHardUserLimitReached(): bool {
+ 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) {
- $this->notifyAboutReachedUserLimit();
+ if ($userLimitReached && $notificationManager instanceof IManager) {
+ $this->notifyAboutReachedUserLimit($notificationManager);
}
return $userLimitReached;
}
@@ -179,29 +154,18 @@ class Registry implements IRegistry {
}
$userCount = $this->getUserCount();
- $hardUserLimit = $this->config->getSystemValue('one-click-instance.user-limit', 50);
+ $hardUserLimit = $this->config->getSystemValueInt('one-click-instance.user-limit', 50);
$userLimitReached = $userCount >= $hardUserLimit;
- if ($userLimitReached) {
- $this->notifyAboutReachedUserLimit();
+ if ($userLimitReached && $notificationManager instanceof IManager) {
+ $this->notifyAboutReachedUserLimit($notificationManager);
}
return $userLimitReached;
}
private function getUserCount(): int {
- $userCount = 0;
- $backends = $this->userManager->getBackends();
- foreach ($backends as $backend) {
- if ($backend->implementsActions(Backend::COUNT_USERS)) {
- $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);
@@ -217,19 +181,38 @@ class Registry implements IRegistry {
return $userCount;
}
- private function notifyAboutReachedUserLimit() {
+ private function notifyAboutReachedUserLimit(IManager $notificationManager): void {
$admins = $this->groupManager->get('admin')->getUsers();
+
+ $notification = $notificationManager->createNotification();
+ $notification->setApp('core')
+ ->setObject('user_limit_reached', '1')
+ ->setSubject('user_limit_reached');
+
+ if ($notificationManager->getCount($notification) > 0
+ && !$this->reIssue()
+ ) {
+ return;
+ }
+
+ $notificationManager->markProcessed($notification);
+ $notification->setDateTime(new \DateTime());
+
foreach ($admins as $admin) {
- $notification = $this->notificationManager->createNotification();
-
- $notification->setApp('core')
- ->setUser($admin->getUID())
- ->setDateTime(new \DateTime())
- ->setObject('user_limit_reached', '1')
- ->setSubject('user_limit_reached');
- $this->notificationManager->notify($notification);
+ $notification->setUser($admin->getUID());
+ $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 {
+ $lastNotification = (int)$this->config->getAppValue('lib', 'last_subscription_reminder', '0');
+
+ if ((time() - $lastNotification) >= 86400) {
+ $this->config->setAppValue('lib', 'last_subscription_reminder', (string)time());
+ return true;
+ }
+ return false;
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-16 16:19:41 +0000