LDAP: Added TLS support

[bookstack] / app / Providers / AppServiceProvider.php

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 3ca59dcb33453a2bb7cf71dd9b1b20690ec4526a..f418153997286e5636e754279be147e753171ec7 100644 (file)
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,14 +3,16 @@
 use Blade;
 use BookStack\Entities\Book;
 use BookStack\Entities\Bookshelf;
 use Blade;
 use BookStack\Entities\Book;
 use BookStack\Entities\Bookshelf;

+use BookStack\Entities\BreadcrumbsViewComposer;

 use BookStack\Entities\Chapter;
 use BookStack\Entities\Page;
 use BookStack\Settings\Setting;
 use BookStack\Settings\SettingService;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use BookStack\Entities\Chapter;
 use BookStack\Entities\Page;
 use BookStack\Settings\Setting;
 use BookStack\Settings\SettingService;
 use Illuminate\Database\Eloquent\Relations\Relation;

-use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\View;

 use Illuminate\Support\ServiceProvider;
 use Schema;
 use Illuminate\Support\ServiceProvider;
 use Schema;

+use URL;

 use Validator;
 
 class AppServiceProvider extends ServiceProvider
 use Validator;
 
 class AppServiceProvider extends ServiceProvider


@@ -22,9 +24,17 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
      */
     public function boot()
     {

+        // Set root URL
+        $appUrl = config('app.url');
+        if ($appUrl) {
+            $isHttps = (strpos($appUrl, 'https://') === 0);
+            URL::forceRootUrl($appUrl);
+            URL::forceScheme($isHttps ? 'https' : 'http');
+        }
+

         // Custom validation methods
         Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) {
         // Custom validation methods
         Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) {

-            $validImageExtensions = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'tiff', 'webp'];
+            $validImageExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp'];

             return in_array(strtolower($value->getClientOriginalExtension()), $validImageExtensions);
         });
 
             return in_array(strtolower($value->getClientOriginalExtension()), $validImageExtensions);
         });
 


@@ -33,12 +43,26 @@ class AppServiceProvider extends ServiceProvider
             return substr_count($uploadName, '.') < 2;
         });
 
             return substr_count($uploadName, '.') < 2;
         });
 

+        Validator::extend('safe_url', function ($attribute, $value, $parameters, $validator) {
+            $cleanLinkName = strtolower(trim($value));
+            $isJs = strpos($cleanLinkName, 'javascript:') === 0;
+            $isData = strpos($cleanLinkName, 'data:') === 0;
+            return !$isJs && !$isData;
+        });

 
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
             return "<?php echo icon($expression); ?>";
         });
 
 
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
             return "<?php echo icon($expression); ?>";
         });
 

+        Blade::directive('exposeTranslations', function ($expression) {
+            return "<?php \$__env->startPush('translations'); ?>" .
+                "<?php foreach({$expression} as \$key): ?>" .
+                '<meta name="translation" key="<?php echo e($key); ?>" value="<?php echo e(trans($key)); ?>">' . "\n" .
+                "<?php endforeach; ?>" .
+                '<?php $__env->stopPush(); ?>';
+        });
+

         // Allow longer string lengths after upgrade to utf8mb4
         Schema::defaultStringLength(191);
 
         // Allow longer string lengths after upgrade to utf8mb4
         Schema::defaultStringLength(191);
 


@@ -49,6 +73,9 @@ class AppServiceProvider extends ServiceProvider
             'BookStack\\Chapter' => Chapter::class,
             'BookStack\\Page' => Page::class,
         ]);
             'BookStack\\Chapter' => Chapter::class,
             'BookStack\\Page' => Page::class,
         ]);

+
+        // View Composers
+        View::composer('partials.breadcrumbs', BreadcrumbsViewComposer::class);

     }
 
     /**
     }
 
     /**