<?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
namespace Friendica\Test\src\Network;
use Friendica\Network\Probe;
use Friendica\Test\DiceHttpMockHandlerTrait;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\MockedTest;
use GuzzleHttp\Middleware;
-class ProbeTest extends FixtureTest
+class ProbeTest extends MockedTest
{
use DiceHttpMockHandlerTrait;
$this->setupHttpMockHandler();
}
+ protected function tearDown(): void
+ {
+ $this->tearDownHandler();
+
+ parent::tearDown();
+ }
+
const TEMPLATENOBASE = '
<!DOCTYPE html>
<html lang="en-us">
}
}
- public function dataUri()
+ public function dataCleanUri(): array
{
return [
'@-first' => [
- 'uri' => '@Artists4Future_Muenchen@climatejustice.global',
- 'assertUri' => 'Artists4Future_Muenchen@climatejustice.global',
+ 'expected' => 'Artists4Future_Muenchen@climatejustice.global',
+ 'uri' => '@Artists4Future_Muenchen@climatejustice.global',
+ ],
+ 'no-scheme-no-fragment' => [
+ 'expected' => 'example.com/path?arg=value',
+ 'uri' => 'example.com/path?arg=value',
+ ],
+ /* This case makes little sense, both in our expectation of receiving it in any context and in the way we
+ * do not change it in Probe::cleanUri, but it doesn't seem to be the source of any terrible security hole.
+ */
+ 'no-scheme-fragment' => [
+ 'expected' => 'example.com/path?arg=value#fragment',
+ 'uri' => 'example.com/path?arg=value#fragment',
+ ],
+ 'scheme-no-fragment' => [
+ 'expected' => 'https://example.com/path?arg=value',
+ 'uri' => 'https://example.com/path?arg=value#fragment',
+ ],
+ 'scheme-fragment' => [
+ 'expected' => 'https://example.com/path?arg=value',
+ 'uri' => 'https://example.com/path?arg=value#fragment',
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider dataCleanUri
+ */
+ public function testCleanUri(string $expected, string $uri)
+ {
+ self::assertEquals($expected, Probe::cleanURI($uri));
+ }
+
+ public function dataUri(): array
+ {
+ return [
+ 'Artists4Future_Muenchen@climatejustice.global' => [
+ 'uri' => 'Artists4Future_Muenchen@climatejustice.global',
'assertInfos' => [
'name' => 'Artists4Future München',
'nick' => 'Artists4Future_Muenchen',
/**
* @dataProvider dataUri
*/
- public function testCleanUri(string $uri, string $assertUri, array $assertInfos)
+ public function testProbeUri(string $uri, array $assertInfos)
{
self::markTestIncomplete('hard work due mocking 19 different http-requests');
$this->httpRequestHandler->push($history);
- $cleaned = Probe::cleanURI($uri);
- self::assertEquals($assertUri, $cleaned);
- self::assertArraySubset($assertInfos, Probe::uri($cleaned, '', 0));
-
+ self::assertArraySubset($assertInfos, Probe::uri($uri, '', 0));
// Iterate over the requests and responses
foreach ($container as $transaction) {
projects / friendica.git / blobdiff