Merge pull request #6424 from nextcloud/bugfix/6420/use-public-api

Use public API of trusted domain helper

Author: nickvergessen

composer.lock

@@ -24,7 +24,6 @@
 
 namespace OCA\Talk\Controller;
 
-use OC\Security\TrustedDomainHelper;
 use OCA\Talk\Chat\AutoComplete\SearchPlugin;
 use OCA\Talk\Chat\AutoComplete\Sorter;
 use OCA\Talk\Chat\ChatManager;
@@ -53,6 +52,7 @@
 use OCP\IUserManager;
 use OCP\RichObjectStrings\InvalidObjectExeption;
 use OCP\RichObjectStrings\IValidator;
+use OCP\Security\ITrustedDomainHelper;
 use OCP\User\Events\UserLiveStatusEvent;
 use OCP\UserStatus\IManager as IUserStatusManager;
 use OCP\UserStatus\IUserStatus;
@@ -110,7 +110,7 @@ class ChatController extends AEnvironmentAwareController {
 	/** @var IValidator */
 	protected $richObjectValidator;
 
-	/** @var TrustedDomainHelper */
+	/** @var ITrustedDomainHelper */
 	protected $trustedDomainHelper;
 
 	/** @var IL10N */
@@ -134,7 +134,7 @@ public function __construct(string $appName,
 								ITimeFactory $timeFactory,
 								IEventDispatcher $eventDispatcher,
 								IValidator $richObjectValidator,
-								TrustedDomainHelper $trustedDomainHelper,
+								ITrustedDomainHelper $trustedDomainHelper,
 								IL10N $l) {
 		parent::__construct($appName, $request);
 
@@ -291,14 +291,8 @@ public function shareObjectToChat(string $objectType, string $objectId, string $
 		$data['type'] = $objectType;
 		$data['id'] = $objectId;
 
-		if (isset($data['link'])) {
-			$parsedUrl = parse_url($data['link']);
-			$domain = $parsedUrl['host'] ?? '';
-			$domain .= isset($parsedUrl['port']) && $parsedUrl['port'] ? (':' . $parsedUrl['port']) : '';
-
-			if (!$this->trustedDomainHelper->isTrustedDomain($domain)) {
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-			}
+		if (isset($data['link']) && !$this->trustedDomainHelper->isTrustedUrl($data['link'])) {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
 		try {

lib/Controller/ChatController.php

@@ -25,7 +25,6 @@
 				<referencedClass name="Doctrine\DBAL\Types\Types" />
 				<referencedClass name="GuzzleHttp\Exception\ClientException" />
 				<referencedClass name="OC" />
-				<referencedClass name="OC\Security\TrustedDomainHelper" />
 				<referencedClass name="OCA\Circles\Api\v1\Circles" />
 				<referencedClass name="OCA\Circles\Events\AddingCircleMemberEvent" />
 				<referencedClass name="OCA\Circles\Events\CircleDestroyedEvent" />
@@ -47,7 +46,6 @@
 				<referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
 				<referencedClass name="Doctrine\DBAL\Schema\Table" />
 				<referencedClass name="OC\DB\ConnectionAdapter" />
-				<referencedClass name="OC\Security\TrustedDomainHelper" />
 				<referencedClass name="OCA\Circles\Model\Member" />
 				<referencedClass name="OCA\DAV\CardDAV\PhotoCache" />
 				<referencedClass name="OCA\FederatedFileSharing\AddressHandler" />

psalm.xml

@@ -23,7 +23,6 @@
 
 namespace OCA\Talk\Tests\php\Controller;
 
-use OC\Security\TrustedDomainHelper;
 use OCA\Talk\Chat\AutoComplete\SearchPlugin;
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Chat\MessageParser;
@@ -49,6 +48,7 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\RichObjectStrings\IValidator;
+use OCP\Security\ITrustedDomainHelper;
 use OCP\UserStatus\IManager as IUserStatusManager;
 use PHPUnit\Framework\Constraint\Callback;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -88,7 +88,7 @@ class ChatControllerTest extends TestCase {
 	protected $timeFactory;
 	/** @var IValidator|MockObject */
 	protected $richObjectValidator;
-	/** @var TrustedDomainHelper|MockObject */
+	/** @var ITrustedDomainHelper|MockObject */
 	protected $trustedDomainHelper;
 	/** @var IL10N|MockObject */
 	private $l;
@@ -121,7 +121,7 @@ public function setUp(): void {
 		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->richObjectValidator = $this->createMock(IValidator::class);
-		$this->trustedDomainHelper = $this->createMock(TrustedDomainHelper::class);
+		$this->trustedDomainHelper = $this->createMock(ITrustedDomainHelper::class);
 		$this->l = $this->createMock(IL10N::class);
 
 		$this->room = $this->createMock(Room::class);