Skip to content

Fix occ user:add-app-password #31519

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
PVince81 merged 3 commits into from
Mar 11, 2022
Merged

Fix occ user:add-app-password #31519

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f98044d
Trigger an event to log an activity when an administrator generates a…
nickvergessen Mar 10, 2022
a6882de
Differenciate the activity depending on admin vs user action
nickvergessen Mar 10, 2022
50ccf7e
Validate the password before generating an apptoken
nickvergessen Mar 10, 2022
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
Differenciate the activity depending on admin vs user action 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Mar 10, 2022
commit a6882deebc0b4ab3bc181f97e5adb35f1bb4fcd0
6 changes: 5 additions & 1 deletion apps/settings/lib/Activity/Provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
} elseif ($event->getSubject() === self::EMAIL_CHANGED) {
$subject = $this->l->t('Your email address was changed by an administrator');
} elseif ($event->getSubject() === self::APP_TOKEN_CREATED) {
$subject = $this->l->t('You created app password "{token}"');
if ($event->getAffectedUser() === $event->getAuthor()) {
$subject = $this->l->t('You created app password "{token}"');
} else {
$subject = $this->l->t('An administrator created app password "{token}"');
}
} elseif ($event->getSubject() === self::APP_TOKEN_DELETED) {
$subject = $this->l->t('You deleted app password "{token}"');
} elseif ($event->getSubject() === self::APP_TOKEN_RENAMED) {
Expand Down
8 changes: 7 additions & 1 deletion apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use OCP\Activity\IManager as IActivityManager;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
use OCP\IUserSession;
use Psr\Log\LoggerInterface;

/**
Expand All @@ -40,12 +41,17 @@ class AppPasswordCreatedActivityListener implements IEventListener {
/** @var IActivityManager */
private $activityManager;

/** @var IUserSession */
private $userSession;

/** @var LoggerInterface */
private $logger;

public function __construct(IActivityManager $activityManager,
IUserSession $userSession,
LoggerInterface $logger) {
$this->activityManager = $activityManager;
$this->userSession = $userSession;
$this->logger = $logger;
}

Expand All @@ -58,7 +64,7 @@ public function handle(Event $event): void {
$activity->setApp('settings')
->setType('security')
->setAffectedUser($event->getToken()->getUID())
->setAuthor($event->getToken()->getUID())
->setAuthor($this->userSession->getUser() ? $this->userSession->getUser()->getUID() : '')
->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $event->getToken()->getName()])
->setObject('app_token', $event->getToken()->getId());

Expand Down