Skip to content

fix(webhook-listeners): revert admin check and document delegation behaviour #64678

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

Open
janepie wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −11
Open

fix(webhook-listeners): revert admin check and document delegation behaviour #64678

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
10 changes: 0 additions & 10 deletions apps/webhook_listeners/lib/Controller/WebhooksController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@
use OCP\AppFramework\OCS\OCSForbiddenException;
use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\AppFramework\OCSController;
use OCP\IGroupManager;
use OCP\IRequest;
use OCP\ISession;
use OCP\IUserSession;
use Psr\Log\LoggerInterface;

/**
Expand All @@ -44,8 +42,6 @@ public function __construct(
private WebhookListenerMapper $mapper,
private ?string $userId,
private ISession $session,
private IUserSession $userSession,
private IGroupManager $groupManager,
) {
parent::__construct($appName, $request);
}
Expand Down Expand Up @@ -154,12 +150,6 @@ public function create(
} catch (\ValueError $e) {
throw new OCSBadRequestException('This auth method does not exist');
}

$user = $this->userSession->getUser();
if (!$user || !$this->groupManager->isAdmin($user->getUID())) {
$tokenNeeded = null;
}

try {
$webhookListener = $this->mapper->addWebhookListener(
$appId,
Expand Down
2 changes: 2 additions & 0 deletions apps/webhook_listeners/lib/Service/TokenService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public function __construct(
* ]
* Created auth tokens are valid for 1 hour.
*
* With this, admin tokens can be created. Therefore, the admin delegation for webhooks is considered a full admin role. This is by design.
*
* @param WebhookListener $webhookListener
* @param ?string $triggerUserId the user that triggered the webhook call
* @return array{
Expand Down
4 changes: 3 additions & 1 deletion apps/webhook_listeners/lib/Settings/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

/**
* Empty settings class, used only for admin delegation for now as there is no UI
* ATTENTION this admin delegation can create tokens with full admin rights and is therefore considered as a full admin role
*
*/
class Admin implements IDelegatedSettings {
/**
Expand All @@ -38,7 +40,7 @@ public function getPriority(): int {
#[\Override]
public function getName(): ?string {
/* Use section name alone */
return null;
return 'Attention: can create tokens with full admin rights';
}

#[\Override]
Expand Down
Loading