use https & http when unsure

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Dec 2, 2020 · 7bef52e · 7bef52e
1 parent 50742f1
commit 7bef52e
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 33 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Command/CirclesTest.php b/lib/Command/CirclesTest.php
@@ -127,13 +127,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$this->configService->setAppValue(ConfigService::TEST_NC_BASE, $input->getOption('url'));
 
 		if (!$this->testRequest($output, 'GET', 'core.CSRFToken.index')) {
+			$this->configService->setAppValue(ConfigService::TEST_NC_BASE, '');
+
 			return 0;
 		}
 
 		if (!$this->testRequest(
 			$output, 'POST', 'circles.GlobalScale.asyncBroadcast',
 			['token' => 'test-dummy-token']
 		)) {
+			$this->configService->setAppValue(ConfigService::TEST_NC_BASE, '');
+
 			return 0;
 		}
 
@@ -182,6 +186,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 	private function testRequest(OutputInterface $o, string $type, string $route, array $args = []): bool {
 		$request = new NC19Request('', Request::type($type));
 		$this->configService->configureRequest($request, $route, $args);
+		$request->setFollowLocation(false);
 
 		$o->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
 		$this->doRequest($request);

diff --git a/lib/Command/MembersCreate.php b/lib/Command/MembersCreate.php
@@ -177,7 +177,6 @@ private function findUserFromLookup(string $search, string &$instance = ''): str
 
 		$request = new NC19Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
 		$this->configService->configureRequest($request);
-		$request->setProtocols(['https', 'http']);
 		$request->basedOnUrl($lookup);
 		$request->addParam('search', $search);
 

diff --git a/lib/Controller/GlobalScaleController.php b/lib/Controller/GlobalScaleController.php
@@ -100,7 +100,7 @@ public function asyncBroadcast(string $token) {
 		$this->async();
 		foreach ($wrappers as $wrapper) {
 			try {
-				$this->gsUpstreamService->broadcastWrapper($wrapper, $this->request->getServerProtocol());
+				$this->gsUpstreamService->broadcastWrapper($wrapper);
 			} catch (GSStatusException $e) {
 			}
 		}

diff --git a/lib/Controller/MembersController.php b/lib/Controller/MembersController.php
@@ -243,9 +243,6 @@ public function searchGlobal(string $search, int $order) {
 		try {
 			$this->mustHaveFrontEndEnabled();
 
-			if ($search === 't') {
-				sleep(5);
-			}
 			$result = $this->searchService->searchGlobal($search);
 		} catch (\Exception $e) {
 			return

diff --git a/lib/Search/GlobalScaleUsers.php b/lib/Search/GlobalScaleUsers.php
@@ -84,7 +84,6 @@ public function search($search) {
 
 		$request = new NC19Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
 		$this->configService->configureRequest($request);
-		$request->setProtocols(['https', 'http']);
 		$request->basedOnUrl($lookup);
 		$request->addParam('search', $search);
 

diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
@@ -592,6 +592,10 @@ public function isLocalInstance(string $instance): bool {
 	public function configureRequest(NC19Request $request, string $routeName = '', array $args = []) {
 		$this->configureRequestAddress($request, $routeName, $args);
 
+		if ($this->getForcedNcBase() === '') {
+			$request->setProtocols(['https', 'http']);
+		}
+
 		$request->setVerifyPeer($this->getAppValue(ConfigService::CIRCLES_SELF_SIGNED) !== '1');
 		$request->setLocalAddressAllowed(true);
 	}
@@ -613,11 +617,9 @@ private function configureRequestAddress(NC19Request $request, string $routeName
 			return;
 		}
 
-		$ncBase = ($this->getAppValue(self::TEST_NC_BASE)) ?
-			$this->getAppValue(self::TEST_NC_BASE) : $this->getForcedNcBase();
-
+		$ncBase = $this->getForcedNcBase();
 		if ($ncBase !== '') {
-			$absolute = rtrim($ncBase, '/') . $this->urlGenerator->linkToRoute($routeName, $args);
+			$absolute = $this->cleanLinkToRoute($ncBase, $routeName, $args);
 		} else {
 			$absolute = $this->urlGenerator->linkToRouteAbsolute($routeName, $args);
 		}
@@ -632,6 +634,10 @@ private function configureRequestAddress(NC19Request $request, string $routeName
 	 * @return string
 	 */
 	private function getForcedNcBase(): string {
+		if ($this->getAppValue(self::TEST_NC_BASE) !== '') {
+			return $this->getAppValue(self::TEST_NC_BASE);
+		}
+
 		$fromConfig = $this->config->getSystemValue('circles.force_nc_base', '');
 		if ($fromConfig !== '') {
 			return $fromConfig;
@@ -640,5 +646,26 @@ private function getForcedNcBase(): string {
 		return $this->getAppValue(self::FORCE_NC_BASE);
 	}
 
+
+	/**
+	 * sometimes, linkToRoute will include the base path to the nextcloud which will be duplicate with ncBase
+	 *
+	 * @param string $ncBase
+	 * @param string $routeName
+	 * @param array $args
+	 *
+	 * @return string
+	 */
+	private function cleanLinkToRoute(string $ncBase, string $routeName, array $args): string {
+		$link = $this->urlGenerator->linkToRoute($routeName, $args);
+		$forcedPath = rtrim(parse_url($ncBase, PHP_URL_PATH), '/');
+
+		if ($forcedPath !== '' && strpos($link, $forcedPath) === 0) {
+			$ncBase = substr($ncBase, 0, -strlen($forcedPath));
+		}
+
+		return rtrim($ncBase, '/') . $link;
+	}
+
 }
 
diff --git a/lib/Service/GSUpstreamService.php b/lib/Service/GSUpstreamService.php
@@ -162,11 +162,11 @@ public function newEvent(GSEvent $event): string {
 	 * @param GSWrapper $wrapper
 	 * @param string $protocol
 	 */
-	public function broadcastWrapper(GSWrapper $wrapper, string $protocol): void {
+	public function broadcastWrapper(GSWrapper $wrapper): void {
 		$status = GSWrapper::STATUS_FAILED;
 
 		try {
-			$this->broadcastEvent($wrapper->getEvent(), $wrapper->getInstance(), $protocol);
+			$this->broadcastEvent($wrapper->getEvent(), $wrapper->getInstance());
 			$status = GSWrapper::STATUS_DONE;
 		} catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException | RequestResultNotJsonException $e) {
 		}
@@ -192,7 +192,7 @@ public function broadcastWrapper(GSWrapper $wrapper, string $protocol): void {
 	 * @throws RequestResultSizeException
 	 * @throws RequestServerException
 	 */
-	public function broadcastEvent(GSEvent $event, string $instance, string $protocol = ''): void {
+	public function broadcastEvent(GSEvent $event, string $instance): void {
 		$this->signEvent($event);
 
 		if ($this->configService->isLocalInstance($instance)) {
@@ -202,12 +202,7 @@ public function broadcastEvent(GSEvent $event, string $instance, string $protoco
 			$path = $this->urlGenerator->linkToRoute('circles.GlobalScale.broadcast');
 			$request = new NC19Request($path, Request::TYPE_POST);
 			$this->configService->configureRequest($request);
-			$protocols = ['https', 'http'];
-			if ($protocol !== '') {
-				$protocols = [$protocol];
-			}
 			$request->setInstance($instance);
-			$request->setProtocols($protocols);
 		}
 
 		$request->setDataSerialize($event);
@@ -235,14 +230,9 @@ public function confirmEvent(GSEvent &$event): void {
 		$path = $this->urlGenerator->linkToRoute('circles.GlobalScale.event');
 
 		$request = new NC19Request($path, Request::TYPE_POST);
-		$request->basedOnUrl($owner->getInstance());
 		$this->configService->configureRequest($request);
+		$request->basedOnUrl($owner->getInstance());
 
-		if ($this->get('REQUEST_SCHEME', $_SERVER) !== '') {
-			$request->setProtocols([$_SERVER['REQUEST_SCHEME']]);
-		} else {
-			$request->setProtocols(['https', 'http']);
-		}
 		$request->setDataSerialize($event);
 
 		$result = $this->retrieveJson($request);
@@ -423,7 +413,6 @@ public function confirmCircleStatus(Circle $circle): bool {
 		$path = $this->urlGenerator->linkToRoute('circles.GlobalScale.status');
 		$request = new NC19Request($path, Request::TYPE_POST);
 		$this->configService->configureRequest($request);
-		$request->setProtocols(['https', 'http']);
 		$request->setDataSerialize($event);
 
 		$requestIssue = false;

diff --git a/lib/Service/GlobalScaleService.php b/lib/Service/GlobalScaleService.php
@@ -223,9 +223,8 @@ public function getInstances(bool $all = false): array {
 		try {
 			$lookup = $this->configService->getGSStatus(ConfigService::GS_LOOKUP);
 			$request = new NC19Request(ConfigService::GS_LOOKUP_INSTANCES, Request::TYPE_POST);
-			$request->setProtocols(['https', 'http']);
-			$request->basedOnUrl($lookup);
 			$this->configService->configureRequest($request);
+			$request->basedOnUrl($lookup);
 			$request->addData('authKey', $this->configService->getGSStatus(ConfigService::GS_KEY));
 
 			try {

diff --git a/lib/Service/MembersService.php b/lib/Service/MembersService.php
@@ -739,7 +739,6 @@ private function getGlobalScaleUserDisplayName(string $ident): string {
 
 		$request = new NC19Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
 		$this->configService->configureRequest($request);
-		$request->setProtocols(['https', 'http']);
 		$request->basedOnUrl($lookup);
 		$request->addParam('search', $ident);
 		$request->addParam('exact', '1');

diff --git a/lib/Service/SharingFrameService.php b/lib/Service/SharingFrameService.php
@@ -305,7 +305,6 @@ public function receiveFrame($token, $uniqueId, SharingFrame $frame) {
 	 */
 	public function initiateShare(string $circleUniqueId, string $frameUniqueId) {
 		$request = new NC19Request('', Request::TYPE_POST);
-		$request->setProtocols(['https', 'http']);
 		$this->configService->configureRequest($request, 'circles.Shares.initShareDelivery');
 		$request->addParam('circleId', $circleUniqueId);
 		$request->addParam('frameId', $frameUniqueId);