Skip to content

Use public throttler #7656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Aug 3, 2022
Merged

Use public throttler #7656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/Controller/PageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

namespace OCA\Talk\Controller;

use OC\Security\Bruteforce\Throttler;
use OCA\Talk\AppInfo\Application;
use OCA\Talk\Exceptions\ParticipantNotFoundException;
use OCA\Talk\Exceptions\RoomNotFoundException;
Expand Down Expand Up @@ -57,6 +56,7 @@
use OCP\IUser;
use OCP\IUserSession;
use OCP\Notification\IManager as INotificationManager;
use OCP\Security\Bruteforce\IThrottler;
use Psr\Log\LoggerInterface;

class PageController extends Controller {
Expand All @@ -74,7 +74,7 @@ class PageController extends Controller {
private INotificationManager $notificationManager;
private IAppManager $appManager;
private IRootFolder $rootFolder;
private Throttler $throttler;
private IThrottler $throttler;

public function __construct(string $appName,
IRequest $request,
Expand All @@ -92,7 +92,7 @@ public function __construct(string $appName,
IInitialState $initialState,
ICacheFactory $memcacheFactory,
IRootFolder $rootFolder,
Throttler $throttler,
IThrottler $throttler,
Config $talkConfig,
IConfig $serverConfig) {
parent::__construct($appName, $request);
Expand Down
6 changes: 3 additions & 3 deletions lib/Controller/RoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
namespace OCA\Talk\Controller;

use InvalidArgumentException;
use OC\Security\Bruteforce\Throttler;
use OCA\Talk\Chat\ChatManager;
use OCA\Talk\Chat\MessageParser;
use OCA\Talk\Config;
Expand Down Expand Up @@ -65,6 +64,7 @@
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserManager;
use OCP\Security\Bruteforce\IThrottler;
use OCP\User\Events\UserLiveStatusEvent;
use OCP\UserStatus\IManager as IUserStatusManager;
use OCP\UserStatus\IUserStatus;
Expand Down Expand Up @@ -92,7 +92,7 @@ class RoomController extends AEnvironmentAwareController {
protected IL10N $l10n;
protected IConfig $config;
protected Config $talkConfig;
protected Throttler $throttler;
protected IThrottler $throttler;
protected LoggerInterface $logger;

protected array $commonReadMessages = [];
Expand All @@ -118,7 +118,7 @@ public function __construct(string $appName,
IConfig $config,
Config $talkConfig,
ICloudIdManager $cloudIdManager,
Throttler $throttler,
IThrottler $throttler,
LoggerInterface $logger) {
parent::__construct($appName, $request);
$this->session = $session;
Expand Down
6 changes: 3 additions & 3 deletions lib/Middleware/InjectionMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

namespace OCA\Talk\Middleware;

use OC\Security\Bruteforce\Throttler;
use OCA\Talk\Controller\AEnvironmentAwareController;
use OCA\Talk\Exceptions\ParticipantNotFoundException;
use OCA\Talk\Exceptions\PermissionsException;
Expand All @@ -46,20 +45,21 @@
use OCP\AppFramework\OCSController;
use OCP\AppFramework\Utility\IControllerMethodReflector;
use OCP\IRequest;
use OCP\Security\Bruteforce\IThrottler;

class InjectionMiddleware extends Middleware {
private IRequest $request;
private IControllerMethodReflector $reflector;
private TalkSession $talkSession;
private Manager $manager;
private Throttler $throttler;
private IThrottler $throttler;
private ?string $userId;

public function __construct(IRequest $request,
IControllerMethodReflector $reflector,
TalkSession $talkSession,
Manager $manager,
Throttler $throttler,
IThrottler $throttler,
?string $userId) {
$this->request = $request;
$this->reflector = $reflector;
Expand Down
1 change: 0 additions & 1 deletion psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<referencedClass name="GuzzleHttp\Exception\ServerException" />
<referencedClass name="GuzzleHttp\Exception\ConnectException" />
<referencedClass name="OC" />
<referencedClass name="OC\Security\Bruteforce\Throttler" />
<referencedClass name="OCA\Circles\Api\v1\Circles" />
<referencedClass name="OCA\Circles\CirclesManager" />
<referencedClass name="OCA\Circles\Events\AddingCircleMemberEvent" />
Expand Down