From 630cecd740762cc6111468b46644fcae85a360b3 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Tue, 5 Mar 2024 20:52:16 +0100
Subject: Libzot: get_rpost_path was broken for URL's with no port.

---
 Zotlabs/Lib/Libzot.php        |  9 +++++++--
 tests/unit/Lib/ZotlibTest.php | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/Lib/ZotlibTest.php

diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 89157bf5e..bc944c97c 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -2569,9 +2569,14 @@ class Libzot {
 		if (!$observer)
 			return '';
 
-		$parsed = parse_url($observer['xchan_url']);
+		$url = $observer['xchan_url'];
+		if (preg_match('|^https?://|', $url) === 0) {
+			$url = "https://{$url}";
+		}
+
+		$parsed = parse_url($url);
 
-		return $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f=';
+		return $parsed['scheme'] . '://' . $parsed['host'] . (isset($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f=';
 	}
 
 	/**
diff --git a/tests/unit/Lib/ZotlibTest.php b/tests/unit/Lib/ZotlibTest.php
new file mode 100644
index 000000000..05522678f
--- /dev/null
+++ b/tests/unit/Lib/ZotlibTest.php
@@ -0,0 +1,34 @@
+<?php
+class LibzotTest extends \Zotlabs\Tests\Unit\UnitTestCase {
+	/**
+	 * Test the `get_rpost_path` function.
+	 *
+	 * @dataProvider get_rpost_path_provider
+	 */
+	public function test_get_rpost_path(string $expected, string $xchan_url) : void {
+		$observer = [ 'xchan_url' => $xchan_url ];
+
+		$this->assertEquals($expected, \Zotlabs\Lib\Libzot::get_rpost_path($observer));
+	}
+
+	private function get_rpost_path_provider() : array {
+		return [
+			'xchan_url without port' => [
+				'https://example.com/rpost?f=',
+				'https://example.com'
+			],
+			'xchan_url with port' => [
+				'https://example.com:666/rpost?f=',
+				'https://example.com:666'
+			],
+			'xchan_url ignores path and args' => [
+				'https://example.com/rpost?f=',
+				'https://example.com/path?arg1=balle'
+			],
+			'xchan_url with no scheme should default to https' => [
+				'https://example.com/rpost?f=',
+				'example.com',
+			],
+		];
+	}
+}
-- 
cgit v1.2.3