isLocalInstance()

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

lib/Db/MembersRequest.php

@@ -61,7 +61,7 @@ class MembersRequest extends MembersRequestBuilder {
 	public function forceGetMember($circleUniqueId, $userId, $type, string $instance = '') {
 		$qb = $this->getMembersSelectSql();
 
-		if ($instance === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($instance)) {
 			$instance = '';
 		}
 
@@ -479,7 +479,7 @@ public function createMember(Member $member) {
 		}
 
 		$instance = $member->getInstance();
-		if ($instance === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($instance)) {
 			$instance = '';
 		}
 
@@ -545,7 +545,7 @@ public function getGroupsFromCircle($circleUniqueId, Member $viewer) {
 	 */
 	public function updateMemberLevel(Member $member) {
 		$instance = $member->getInstance();
-		if ($instance === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($instance)) {
 			$instance = '';
 		}
 
@@ -566,7 +566,7 @@ public function updateMemberLevel(Member $member) {
 	 */
 	public function updateMemberInfo(Member $member) {
 		$instance = $member->getInstance();
-		if ($instance === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($instance)) {
 			$instance = '';
 		}
 
@@ -625,7 +625,7 @@ public function removeAllMembershipsFromUser(Member $member) {
 		}
 
 		$instance = $member->getInstance();
-		if ($instance === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($instance)) {
 			$instance = '';
 		}
 
@@ -651,7 +651,7 @@ public function removeAllMembershipsFromUser(Member $member) {
 	 */
 	public function removeMember(Member $member) {
 		$instance = $member->getInstance();
-		if ($instance === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($instance)) {
 			$instance = '';
 		}
 

lib/GlobalScale/AGlobalScaleEvent.php

@@ -283,7 +283,7 @@ protected function compareCircles(Circle $circle1, Circle $circle2): bool {
 
 
 	protected function cleanMember(Member $member) {
-		if ($member->getInstance() === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($member->getInstance())) {
 			$member->setInstance('');
 		}
 	}

lib/GlobalScale/FileShare.php

@@ -73,7 +73,7 @@ class FileShare extends AGlobalScaleEvent {
 	 */
 	public function verify(GSEvent $event, bool $localCheck = false, bool $mustBeChecked = false): void {
 		// if event/file is local, we generate a federate share for the same circle on other instances
-		if ($event->getSource() !== $this->configService->getLocalInstance()) {
+		if (!$this->configService->isLocalInstance($event->getSource())) {
 			return;
 		}
 
@@ -108,7 +108,7 @@ public function manage(GSEvent $event): void {
 		$circle = $event->getCircle();
 
 		// if event is not local, we create a federated file to the right instance of Nextcloud, using the right token
-		if ($event->getSource() !== $this->configService->getLocalInstance()) {
+		if (!$this->configService->isLocalInstance($event->getSource())) {
 			try {
 				$share = $this->getShareFromData($event->getData());
 			} catch (Exception $e) {

lib/GlobalScale/MemberAdd.php

@@ -161,7 +161,7 @@ public function manage(GSEvent $event): void {
 		];
 
 		if ($member->getType() === Member::TYPE_CONTACT
-			&& $member->getInstance() === $this->configService->getLocalInstance()) {
+			&& $this->configService->isLocalInstance($member->getInstance())) {
 			$result['contact'] = $this->miscService->getInfosFromContact($member);
 		}
 

lib/Search/GlobalScaleUsers.php

@@ -104,7 +104,7 @@ public function search($search) {
 		$result = [];
 		foreach ($users as $user) {
 			list(, $instance) = explode('@', $this->get('federationId', $user), 2);
-			if ($instance === $this->configService->getLocalInstance()) {
+			if ($this->configService->isLocalInstance($instance)) {
 				continue;
 			}
 

lib/Service/ConfigService.php

@@ -148,6 +148,10 @@ public function __construct(
 	}
 
 
+	/**
+	 * @return string
+	 * @deprecated
+	 */
 	public function getLocalAddress() {
 		return (($this->isLocalNonSSL()) ? 'http://' : '')
 			   . $this->request->getServerHost();
@@ -561,6 +565,24 @@ public function getLocalInstance(): string {
 	}
 
 
+	/**
+	 * @param string $instance
+	 *
+	 * @return bool
+	 */
+	public function isLocalInstance(string $instance): bool {
+		if ($instance === $this->getLocalInstance()) {
+			return true;
+		}
+
+		if ($this->getAppValue(self::LOCAL_CLOUD_ID) === 'use-trusted-domain') {
+			return (in_array($instance, $this->getTrustedDomains()));
+		}
+
+		return false;
+	}
+
+
 	/**
 	 * @param NC19Request $request
 	 * @param string $routeName

lib/Service/MembersService.php

@@ -225,7 +225,7 @@ private function addSingleMember(Circle $circle, $ident, $type, $instance = '',
 			$new->setStatus(Member::STATUS_MEMBER);
 		}
 
-		if ($new->getInstance() === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($new->getInstance())) {
 			$new->setInstance('');
 		}
 
@@ -336,7 +336,7 @@ private function addContact(Member $member) {
 	 * @throws NoUserException
 	 */
 	public function verifyIdentBasedOnItsType(&$ident, $type, string $instance = '') {
-		if ($instance === $this->configService->getLocalInstance()) {
+		if ($this->configService->isLocalInstance($instance)) {
 			$instance = '';
 		}