Improve multisite Glide support #2379

statamic · Sep 7, 2020 · 50dbd51 · 50dbd51
1 parent b1df359
commit 50dbd51
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/routes/web.php b/routes/web.php
@@ -2,18 +2,26 @@
 
 use Illuminate\Support\Facades\Route;
 use Statamic\Facades\OAuth;
+use Statamic\Facades\Site;
+use Statamic\Facades\URL;
 use Statamic\Statamic;
 
 Route::name('statamic.')->group(function () {
     /**
      * Glide
      * On-the-fly URL-based image transforms.
      */
-    Route::group(['prefix' => Config::get('statamic.assets.image_manipulation.route')], function () {
-        Route::get('/asset/{container}/{path?}', 'GlideController@generateByAsset')->where('path', '.*');
-        Route::get('/http/{url}/{filename?}', 'GlideController@generateByUrl');
-        Route::get('{path}', 'GlideController@generateByPath')->where('path', '.*');
-    });
+    if (! config('statamic.assets.image_manipulation.cache')) {
+        Site::all()->map(function ($site) {
+            return URL::makeRelative($site->url());
+        })->unique()->each(function ($sitePrefix) {
+            Route::group(['prefix' => $sitePrefix.'/'.config('statamic.assets.image_manipulation.route')], function () {
+                Route::get('/asset/{container}/{path?}', 'GlideController@generateByAsset')->where('path', '.*');
+                Route::get('/http/{url}/{filename?}', 'GlideController@generateByUrl');
+                Route::get('{path}', 'GlideController@generateByPath')->where('path', '.*');
+            });
+        });
+    }
 
     Route::group(['prefix' => config('statamic.routes.action')], function () {
         Route::post('forms/{form}', 'FormController@submit')->name('forms.submit');

diff --git a/src/Http/Controllers/GlideController.php b/src/Http/Controllers/GlideController.php
@@ -10,6 +10,7 @@
 use Statamic\Facades\Asset;
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Config;
+use Statamic\Facades\Site;
 use Statamic\Imaging\ImageGenerator;
 use Statamic\Support\Str;
 
@@ -141,8 +142,10 @@ private function validateSignature()
             return;
         }
 
+        $path = Str::after($this->request->url(), Site::current()->absoluteUrl());
+
         try {
-            SignatureFactory::create(Config::getAppKey())->validateRequest($this->request->path(), $_GET);
+            SignatureFactory::create(Config::getAppKey())->validateRequest($path, $_GET);
         } catch (SignatureException $e) {
             abort(400, $e->getMessage());
         }

diff --git a/src/Providers/GlideServiceProvider.php b/src/Providers/GlideServiceProvider.php
@@ -8,12 +8,12 @@
 use Statamic\Contracts\Imaging\ImageManipulator;
 use Statamic\Contracts\Imaging\UrlBuilder;
 use Statamic\Facades\Config;
-use Statamic\Facades\URL;
 use Statamic\Imaging\GlideImageManipulator;
 use Statamic\Imaging\GlideUrlBuilder;
 use Statamic\Imaging\ImageGenerator;
 use Statamic\Imaging\PresetGenerator;
 use Statamic\Imaging\StaticUrlBuilder;
+use Statamic\Support\Str;
 
 class GlideServiceProvider extends ServiceProvider
 {
@@ -49,7 +49,7 @@ private function getBuilder()
 
         if (Config::get('statamic.assets.image_manipulation.cache')) {
             return new StaticUrlBuilder($this->app->make(ImageGenerator::class), [
-                'route' => URL::prependSiteUrl($route),
+                'route' => Str::start($route, '/'),
             ]);
         }