Merge pull request #11119 from nanaya/media-url-middleware

Clean up media/wiki image url handling

Author: notbakaneko

app/Http/Controllers/BeatmapDiscussionsController.php

@@ -120,7 +120,11 @@ public function index()
 
     public function mediaUrl()
     {
-        $url = get_string(request('url'));
+        $url = presence(get_string(request('url')));
+
+        if (!isset($url)) {
+            return response('Missing url parameter', 422);
+        }
 
         // Tell browser not to request url for a while.
         return redirect(proxy_media($url))->header('Cache-Control', 'max-age=600');

app/Http/Controllers/WikiController.php

@@ -123,16 +123,16 @@ public function image($path)
             return response('Invalid file format', 422);
         }
 
-        $image = Wiki\Image::lookupForController($path, Request::url(), Request::header('referer'));
-
-        request()->attributes->set('strip_cookies', true);
+        $image = (new Wiki\Image($path))->sync();
 
         if (!$image->isVisible()) {
             return response('Not found', 404);
         }
 
-        return response($image->get()['content'], 200)
-            ->header('Content-Type', $image->get()['type'])
+        $imageData = $image->get();
+
+        return response($imageData['content'], 200)
+            ->header('Content-Type', $imageData['type'])
             // 10 years max-age
             ->header('Cache-Control', 'max-age=315360000, public');
     }

app/Http/Kernel.php

@@ -27,7 +27,6 @@ class Kernel extends HttpKernel
             Middleware\VerifyUserAlways::class,
         ],
         'web' => [
-            Middleware\StripCookies::class,
             Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,

app/Http/Middleware/StripCookies.php

@@ -18,23 +18,6 @@ class Image implements WikiObject
 
     private $cache;
 
-    public static function lookupForController($path, $url = null, $referrer = null)
-    {
-        $url = presence($url);
-        $referrer = presence($referrer);
-        $image = (new static($path))->sync();
-
-        if (!$image->isVisible()) {
-            if ($url !== null && $referrer !== null && starts_with($url, $referrer)) {
-                $newPath = 'shared/'.substr($url, strlen($referrer));
-
-                return (new static($newPath))->sync();
-            }
-        }
-
-        return $image;
-    }
-
     public function __construct($path)
     {
         $this->path = OsuWiki::cleanPath($path);

app/Models/Wiki/Image.php

@@ -5,6 +5,9 @@
 
 use App\Http\Middleware\ThrottleRequests;
 
+Route::get('wiki/images/{path}', 'WikiController@image')->name('wiki.image')->where('path', '.+');
+Route::get('beatmapsets/discussions/media-url', 'BeatmapDiscussionsController@mediaUrl')->name('beatmapsets.discussions.media-url');
+
 Route::group(['middleware' => ['web']], function () {
     Route::group(['as' => 'admin.', 'prefix' => 'admin', 'namespace' => 'Admin'], function () {
         Route::get('/beatmapsets/{beatmapset}/covers', 'BeatmapsetsController@covers')->name('beatmapsets.covers');
@@ -70,7 +73,6 @@
         Route::resource('watches', 'BeatmapsetWatchesController', ['only' => ['update', 'destroy']]);
 
         Route::group(['prefix' => 'discussions', 'as' => 'discussions.'], function () {
-            Route::get('media-url', 'BeatmapDiscussionsController@mediaUrl')->name('media-url');
             Route::put('{discussion}/vote', 'BeatmapDiscussionsController@vote')->name('vote');
             Route::post('{discussion}/restore', 'BeatmapDiscussionsController@restore')->name('restore');
             Route::post('{discussion}/deny-kudosu', 'BeatmapDiscussionsController@denyKudosu')->name('deny-kudosu');
@@ -325,7 +327,6 @@
     Route::resource('users', 'UsersController', ['only' => ['store']]);
 
     Route::get('wiki/{locale}/Sitemap', 'WikiController@sitemap')->name('wiki.sitemap');
-    Route::get('wiki/images/{path}', 'WikiController@image')->name('wiki.image')->where('path', '.+');
     Route::get('wiki/{locale?}/{path?}', 'WikiController@show')->name('wiki.show')->where('path', '.+');
     Route::put('wiki/{locale}/{path}', 'WikiController@update')->where('path', '.+');
     Route::get('wiki-suggestions', 'WikiController@suggestions')->name('wiki-suggestions');