allow local ips on globalscale

Signed-off-by: Maxence Lange <[email protected]>
rotdrop · May 4, 2023 · 243c204 · 243c204
1 parent d052ade
commit 243c204
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/Command/CirclesRemote.php b/lib/Command/CirclesRemote.php
@@ -409,7 +409,11 @@ private function outgoingTest(string $remote, array $payload): NCSignedRequest {
 
 		$app = $this->remoteStreamService->getAppSignatory();
 		$signedRequest = $this->remoteStreamService->signOutgoingRequest($request, $app);
-		$this->doRequest($signedRequest->getOutgoingRequest());
+		$outgoingRequest = $signedRequest->getOutgoingRequest();
+		$outgoingRequest->setLocalAddressAllowed(true);
+		$outgoingRequest->setFollowLocation(true);
+
+		$this->doRequest($outgoingRequest);
 
 		return $signedRequest;
 	}
@@ -446,11 +450,12 @@ function (RemoteInstance $instance): string {
 	 * @param string $instance
 	 */
 	private function syncGSInstance(string $instance): void {
+		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
 		if ($this->configService->isLocalInstance($instance)) {
+			$this->output->writeln('<comment>instance is local</comment>');
 			return;
 		}
 
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
 		try {
 			$this->remoteStreamService->addRemoteInstance(
 				$instance,

diff --git a/lib/Controller/RemoteController.php b/lib/Controller/RemoteController.php
@@ -245,6 +245,8 @@ public function test(): DataResponse {
 
 			return new DataResponse($this->serialize($test));
 		} catch (Exception $e) {
+			$this->e($e);
+
 			return $this->exceptionResponse($e, Http::STATUS_UNAUTHORIZED);
 		}
 	}