Feature/fil001 141 redirect url validation (#15)

* Add url validation rules

* Redirect regardless of protocol of url

* Test the protocol redirect adjustments

Author: thibautdeg

src/Filament/RedirectResource.php

@@ -24,9 +24,11 @@ public static function form(Form $form): Form
         return $form
             ->schema([
                 Forms\Components\TextInput::make('from')
+                    ->rules(['url', 'required'])
                     ->required(),
 
                 Forms\Components\TextInput::make('to')
+                    ->rules(['url', 'required'])
                     ->required(),
 
                 Forms\Components\Select::make('status')

src/Http/Middleware/Redirects.php

@@ -30,24 +30,32 @@ public function handle(Request $request, Closure $next)
         $uri = Str::ascii($uri);
         $requestUri = Str::ascii($requestUri);
 
+        $uriWithoutProtocol = Str::after($uri, '://');
+
         $current = [
             'full' => $uri,
             'fullNoQuery' => Str::beforeLast($uri, '?'),
             'fullWithTrailingSlash' => Str::finish($uri, '/'),
             'fullWithoutTrailingSlash' => Str::replaceEnd('/', '', $uri),
+            'fullWithoutProtocol' => $uriWithoutProtocol,
+            'fullWithoutProtocolNoQuery' => Str::beforeLast($uriWithoutProtocol, '?'),
             'path' => $requestUri,
             'pathNoQuery' => Str::beforeLast($requestUri, '?'),
         ];
 
         $activeRedirect = $urlMaps->first(function ($redirect) use ($current) {
             $from = $redirect->clean_from;
+            $fromWithoutProtocol = preg_replace('~^https?://~', '', $from);
 
             $hasWildcard = Str::contains($from, config('filament-redirects.route-wildcard', '*'));
 
             return
                 ($hasWildcard && Str::is($from, $current['path'])) ||
                 ($hasWildcard && Str::is($from, $current['full'])) ||
-                (in_array($from, $current));
+                ($hasWildcard && Str::is($fromWithoutProtocol, $current['fullWithoutProtocol'])) ||
+                (in_array($from, $current)) ||
+                ($fromWithoutProtocol === $current['fullWithoutProtocol']) ||
+                ($fromWithoutProtocol === $current['fullWithoutProtocolNoQuery']);
         });
 
         if (! $activeRedirect || $activeRedirect->clean_from === $activeRedirect->to) {

tests/Feature/Filament/RedirectResource/Pages/ManageRedirectsTest.php

@@ -1,21 +1,23 @@
 <?php
 
 use Codedor\FilamentRedirects\Filament\RedirectResource\Pages\ManageRedirects;
+use Codedor\FilamentRedirects\Http\Middleware\Redirects;
 use Codedor\FilamentRedirects\Models\Redirect;
 use Filament\Notifications\Notification;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
 use function Pest\Livewire\livewire;
 
 beforeEach(function () {
     $this->redirects = Redirect::factory()->createMany([
         [
-            'from' => '/one',
-            'to' => '/two',
+            'from' => 'http://example.com/one',
+            'to' => 'http://example.com/two',
         ],
         [
-            'from' => '/foo',
-            'to' => '/bar',
+            'from' => 'https://example.com/foo',
+            'to' => 'https://example.com/bar',
         ],
     ]);
 
@@ -66,8 +68,8 @@
 
     $this->assertDatabaseCount(Redirect::class, 3);
     $this->assertDatabaseHas(Redirect::class, [
-        'from' => '/from',
-        'to' => '/to',
+        'from' => 'https://example.com/from',
+        'to' => 'https://example.com/to',
         'status' => 301,
     ]);
 });
@@ -85,16 +87,121 @@
     livewire(ManageRedirects::class)
         ->assertActionExists('create')
         ->callAction('create', [
-            'from' => '/from',
-            'to' => '/to',
+            'from' => 'https://example.com/from',
+            'to' => 'https://example.com/to',
             'status' => 410,
         ])
         ->assertHasNoActionErrors();
 
     $this->assertDatabaseCount(Redirect::class, 3);
     $this->assertDatabaseHas(Redirect::class, [
-        'from' => '/from',
-        'to' => '/to',
+        'from' => 'https://example.com/from',
+        'to' => 'https://example.com/to',
         'status' => 410,
     ]);
 });
+
+it('can create a redirect with validation errors for invalid URLs', function () {
+    livewire(ManageRedirects::class)
+        ->assertActionExists('create')
+        ->callAction('create', [
+            'from' => 'invalid-url',
+            'to' => 'another-invalid-url',
+        ])
+        ->assertHasActionErrors(['from' => 'url', 'to' => 'url']);
+});
+
+it('can create a redirect with different protocols', function () {
+    livewire(ManageRedirects::class)
+        ->assertActionExists('create')
+        ->callAction('create', [
+            'from' => 'http://example.com/old',
+            'to' => 'https://example.com/new',
+            'status' => 301,
+        ])
+        ->assertHasNoActionErrors();
+
+    $this->assertDatabaseHas(Redirect::class, [
+        'from' => 'http://example.com/old',
+        'to' => 'https://example.com/new',
+        'status' => 301,
+    ]);
+});
+
+it('redirects correctly regardless of protocol', function ($fromProtocol, $toProtocol) {
+    $redirect = Redirect::create([
+        'from' => "{$fromProtocol}://example.com/test",
+        'to' => "{$toProtocol}://example.com/result",
+        'status' => 301,
+        'online' => true,
+    ]);
+
+    $request = Request::create($redirect->from);
+
+    $middleware = new Redirects;
+    $response = $middleware->handle($request, fn () => response('This is a secret place'));
+
+    expect($response->getStatusCode())
+        ->toBe(301)
+        ->and($response->headers->get('Location'))
+        ->toBe($redirect->to);
+
+    $redirect->from = $fromProtocol === 'http'
+        ? 'https://example.com/test'
+        : 'http://example.com/test';
+
+    $request = Request::create($redirect->from);
+
+    $response = $middleware->handle($request, fn () => response('This is a secret place'));
+
+    expect($response->getStatusCode())
+        ->toBe(301)
+        ->and($response->headers->get('Location'))
+        ->toBe($redirect->to);
+})
+    ->with([
+        'http to http' => ['http', 'http'],
+        'http to https' => ['http', 'https'],
+        'https to http' => ['https', 'http'],
+        'https to https' => ['https', 'https'],
+    ]);
+
+it('redirects correctly with query parameters', function () {
+    $redirect = Redirect::create([
+        'from' => 'http://example.com/query',
+        'to' => 'https://example.com/result',
+        'status' => 301,
+        'pass_query_string' => true,
+        'online' => true,
+    ]);
+
+    $query = '?param=value';
+    $request = Request::create("{$redirect->from}{$query}", 'GET');
+
+    $middleware = new Redirects;
+    $response = $middleware->handle($request, fn () => response('This is a secret place'));
+
+    expect($response->getStatusCode())
+        ->toBe(301)
+        ->and($response->headers->get('Location'))
+        ->toBe("{$redirect->to}{$query}");
+});
+
+it('handles wildcard redirects', function () {
+    $redirect = Redirect::create([
+        'from' => 'http://example.com/wildcard*',
+        'to' => 'https://example.com/result',
+        'status' => 301,
+        'online' => true,
+    ]);
+
+    $request = Request::create('http://example.com/wildcard-test', 'GET');
+
+    $middleware = new Redirects;
+    $response = $middleware->handle($request, fn () => response('This is a secret place'));
+
+    expect($response->getStatusCode())
+        ->toBe(301)
+        ->and($response->headers->get('Location'))
+        ->toBe($redirect->to);
+});