plugins-nextcloud-mirror/spreed
1
0
Fork 0
mirror of https://github.com/nextcloud/spreed.git synced 2025-12-18 05:20:50 +01:00
Code Projects Releases Activity

Merge pull request #14206 from nextcloud/bugfix/noid/better-bot-install

Browse source 
fix(bots): Fix default and restrict features of app bots when install with event
This commit is contained in:
Anna 2025-01-27 12:55:46 +01:00 • committed by GitHub
commit 932ac148a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Command/Bot/Install.php
View file

@ -81,10 +81,10 @@ class Install extends Base {
if (!empty($input->getOption('feature'))) {
$featureFlags = Bot::featureLabelsToFlags($input->getOption('feature'));
if (str_starts_with($url, 'nextcloudapp://')) {
if (str_starts_with($url, Bot::URL_APP_PREFIX)) {
$featureFlags &= ~Bot::FEATURE_WEBHOOK;
}
} elseif (str_starts_with($url, 'nextcloudapp://')) {
} elseif (str_starts_with($url, Bot::URL_APP_PREFIX)) {
$featureFlags = Bot::FEATURE_EVENT;
} else {
$featureFlags = Bot::FEATURE_WEBHOOK + Bot::FEATURE_RESPONSE;

10
lib/Events/BotInstallEvent.php
View file

@ -17,7 +17,7 @@ class BotInstallEvent extends Event {
protected string $secret,
protected string $url,
protected string $description = '',
protected int $features = Bot::FEATURE_WEBHOOK | Bot::FEATURE_RESPONSE,
protected ?int $features = null,
) {
parent::__construct();
}
@ -39,6 +39,12 @@ class BotInstallEvent extends Event {
}
public function getFeatures(): int {
return $this->features;
if ($this->features !== null) {
return $this->features;
}
if (str_starts_with($this->url, Bot::URL_APP_PREFIX)) {
return Bot::FEATURE_EVENT;
}
return Bot::FEATURE_WEBHOOK | Bot::FEATURE_RESPONSE;
}
}

7
lib/Listener/BotListener.php
View file

@ -93,6 +93,11 @@ class BotListener implements IEventListener {
} catch (DoesNotExistException) {
}
$features = $event->getFeatures();
if (str_starts_with($event->getUrl(), Bot::URL_APP_PREFIX)) {
$features &= ~Bot::FEATURE_WEBHOOK;
}
$bot = new BotServer();
$bot->setName($event->getName());
$bot->setDescription($event->getDescription());
@ -100,7 +105,7 @@ class BotListener implements IEventListener {
$bot->setUrl($event->getUrl());
$bot->setUrlHash(sha1($event->getUrl()));
$bot->setState(Bot::STATE_ENABLED);
$bot->setFeatures($event->getFeatures());
$bot->setFeatures($features);
$this->botServerMapper->insert($bot);
}
}

1
lib/Model/Bot.php
View file

@ -23,6 +23,7 @@ class Bot {
public const FEATURE_LABEL_WEBHOOK = 'webhook';
public const FEATURE_LABEL_RESPONSE = 'response';
public const FEATURE_LABEL_EVENT = 'event';
public const URL_APP_PREFIX = 'nextcloudapp://';
public const FEATURE_MAP = [
self::FEATURE_NONE => self::FEATURE_LABEL_NONE,

2
lib/Service/BotService.php
View file

@ -406,7 +406,7 @@ class BotService {
throw new \InvalidArgumentException('The provided secret is too short (min. 40 chars, max. 128 chars)');
}
if (!$url || strlen($url) > 4000 || !(str_starts_with($url, 'http://') || str_starts_with($url, 'https://') || str_starts_with($url, 'nextcloudapp://'))) {
if (!$url || strlen($url) > 4000 || !(str_starts_with($url, 'http://') || str_starts_with($url, 'https://') || str_starts_with($url, Bot::URL_APP_PREFIX))) {
throw new \InvalidArgumentException('The provided URL is not a valid URL');
}