Skip to content

chore(security): Log password confirmation user, backend and method #37950

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

Closed
ChristophWurst wants to merge 2 commits into from
Closed

chore(security): Log password confirmation user, backend and method #37950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e0f6be
chore(security): Log password confirmation user, backend and method
ChristophWurst Apr 27, 2023
5463091
fixup! chore(security): Log password confirmation user, backend and m…
hamza221 Apr 27, 2023
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
3 changes: 2 additions & 1 deletion lib/private/AppFramework/DependencyInjection/DIContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ public function __construct(string $appName, array $urlParams = [], ServerContai
$c->get(IControllerMethodReflector::class),
$c->get(ISession::class),
$c->get(IUserSession::class),
$c->get(ITimeFactory::class)
$c->get(ITimeFactory::class),
$c->get(LoggerInterface::class),
)
);
$dispatcher->registerMiddleware(
Expand Down
19 changes: 10 additions & 9 deletions lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
use OCP\IUserSession;
use OCP\User\Backend\IPasswordConfirmationBackend;
use ReflectionMethod;
use Psr\Log\LoggerInterface;

class PasswordConfirmationMiddleware extends Middleware {
/** @var ControllerMethodReflector */
Expand All @@ -43,25 +44,20 @@ class PasswordConfirmationMiddleware extends Middleware {
private $userSession;
/** @var ITimeFactory */
private $timeFactory;
private LoggerInterface $logger;
/** @var array */
private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];

/**
* PasswordConfirmationMiddleware constructor.
*
* @param ControllerMethodReflector $reflector
* @param ISession $session
* @param IUserSession $userSession
* @param ITimeFactory $timeFactory
*/
public function __construct(ControllerMethodReflector $reflector,
ISession $session,
IUserSession $userSession,
ITimeFactory $timeFactory) {
ITimeFactory $timeFactory,
LoggerInterface $logger) {
$this->reflector = $reflector;
$this->session = $session;
$this->userSession = $userSession;
$this->timeFactory = $timeFactory;
$this->logger = $logger;
}

/**
Expand Down Expand Up @@ -89,6 +85,11 @@ public function beforeController($controller, $methodName) {
$lastConfirm = (int) $this->session->get('last-password-confirm');
// we can't check the password against a SAML backend, so skip password confirmation in this case
if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
$this->logger->warning("User {uid} on backend {backendclass} requires password confirmation for {method}", [
"uid" => $user->getUID(),
"backendclass" => $backendClassName,
"method" => $controller::class . '::' . $methodName,
]);
throw new NotConfirmedException();
}
}
Expand Down