Skip to content

Move admin_audit to proper event listeners v2 #47865

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
come-nc merged 8 commits into from
Sep 13, 2024
Merged

Move admin_audit to proper event listeners v2 #47865

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2150bd
feat: Add mimetype into BeforePreviewFetchedEvent event
tcitworld Mar 13, 2023
82ba7d7
chore: Code cleanup in lib/private/Console/Application
tcitworld Mar 13, 2023
986a3d4
feat(user_ldap): Introduce user id assigned typed events for LDAP usage
CarlSchwan Mar 13, 2023
f532d3b
feat(admin_audit): Move admin_audit hooks to modern event listeners
tcitworld Mar 13, 2023
ec37338
chore(admin_audit): Fix License headers on new files
come-nc Sep 10, 2024
957ac81
fix(admin_audit): Remove now unused methods and classes
come-nc Sep 10, 2024
7d881b1
chore: Add descriptions for new events and fix copyright year
come-nc Sep 10, 2024
d767455
fix: Fix phpdoc wording
come-nc Sep 13, 2024
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
Prev Previous commit
Next Next commit
feat(user_ldap): Introduce user id assigned typed events for LDAP usage 
Based on work from #32019

Signed-off-by: Thomas Citharel <[email protected]>
  • Loading branch information
@CarlSchwan @come-nc
CarlSchwan authored and come-nc committed Sep 10, 2024
commit 986a3d45f8fab60c8e7dddc7015bd60c6ee356d4
15 changes: 12 additions & 3 deletions apps/user_ldap/ajax/clearMappings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/

use OCA\User_LDAP\Mapping\GroupMapping;
use OCA\User_LDAP\Mapping\UserMapping;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Server;
use OCP\User\Events\BeforeUserIdUnassignedEvent;
use OCP\User\Events\UserIdUnassignedEvent;

// Check user and app status
\OC_JSON::checkAdminUser();
Expand All @@ -17,12 +22,16 @@
$mapping = null;
try {
if ($subject === 'user') {
$mapping = \OCP\Server::get(UserMapping::class);
$mapping = Server::get(UserMapping::class);
/** @var IEventDispatcher $dispatcher */
$dispatcher = Server::get(IEventDispatcher::class);
$result = $mapping->clearCb(
function ($uid) {
function (string $uid) use ($dispatcher): void {
$dispatcher->dispatchTyped(new BeforeUserIdUnassignedEvent($uid));
\OC::$server->getUserManager()->emit('\OC\User', 'preUnassignedUserId', [$uid]);
},
function ($uid) {
function (string $uid) use ($dispatcher): void {
$dispatcher->dispatchTyped(new UserIdUnassignedEvent($uid));
\OC::$server->getUserManager()->emit('\OC\User', 'postUnassignedUserId', [$uid]);
}
);
Expand Down
19 changes: 10 additions & 9 deletions apps/user_ldap/lib/Access.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
use OCA\User_LDAP\Mapping\AbstractMapping;
use OCA\User_LDAP\User\Manager;
use OCA\User_LDAP\User\OfflineUser;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\HintException;
use OCP\IAppConfig;
use OCP\IConfig;
use OCP\IUserManager;
use OCP\User\Events\UserIdAssignedEvent;
use Psr\Log\LoggerInterface;
use function strlen;
use function substr;
Expand All @@ -42,6 +44,7 @@ class Access extends LDAPUtility {

/** @var ?AbstractMapping */
protected $groupMapper;

private string $lastCookie = '';

public function __construct(
Expand All @@ -53,15 +56,10 @@ public function __construct(
private IUserManager $ncUserManager,
private LoggerInterface $logger,
private IAppConfig $appConfig,
private IEventDispatcher $dispatcher,
) {
parent::__construct($ldap);
$this->connection = $connection;
$this->userManager = $userManager;
$this->userManager->setLdapAccess($this);
$this->helper = $helper;
$this->config = $config;
$this->ncUserManager = $ncUserManager;
$this->logger = $logger;
}

/**
Expand Down Expand Up @@ -630,10 +628,13 @@ public function mapAndAnnounceIfApplicable(
bool $isUser
): bool {
if ($mapper->map($fdn, $name, $uuid)) {
if ($this->ncUserManager instanceof PublicEmitter && $isUser) {
if ($isUser) {
$this->cacheUserExists($name);
$this->ncUserManager->emit('\OC\User', 'assignedUserId', [$name]);
} elseif (!$isUser) {
$this->dispatcher->dispatchTyped(new UserIdAssignedEvent($name));
if ($this->ncUserManager instanceof PublicEmitter) {
$this->ncUserManager->emit('\OC\User', 'assignedUserId', [$name]);

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OC\Hooks\PublicEmitter::emit has been marked as deprecated
}
} else {
$this->cacheGroupExists($name);
}
return true;
Expand Down
8 changes: 3 additions & 5 deletions apps/user_ldap/lib/AccessFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
namespace OCA\User_LDAP;

use OCA\User_LDAP\User\Manager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IAppConfig;
use OCP\IConfig;
use OCP\IUserManager;
Expand All @@ -21,12 +22,8 @@ public function __construct(
private IAppConfig $appConfig,
private IUserManager $ncUserManager,
private LoggerInterface $logger,
private IEventDispatcher $dispatcher,
) {
$this->ldap = $ldap;
$this->helper = $helper;
$this->config = $config;
$this->ncUserManager = $ncUserManager;
$this->logger = $logger;
}

public function get(Connection $connection): Access {
Expand All @@ -40,6 +37,7 @@ public function get(Connection $connection): Access {
$this->ncUserManager,
$this->logger,
$this->appConfig,
$this->dispatcher,
);
}
}
Loading