From 555f0e25a014a8d2370f96cf4ba5a3484ade37cf Mon Sep 17 00:00:00 2001 From: "xiaohui.lam" Date: Sat, 15 Feb 2020 14:14:48 +0800 Subject: [PATCH 1/3] enhancement --- composer.json | 7 +++++++ config/sudosu.php | 18 ++++++++++++++---- src/RouteServiceProvider.php | 2 +- src/ServiceProvider.php | 4 ++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index f93253e..71cf78e 100644 --- a/composer.json +++ b/composer.json @@ -16,5 +16,12 @@ "psr-4": { "VIACreative\\SudoSu\\": "src/" } + }, + "extra": { + "laravel": { + "providers": [ + "VIACreative\\SudoSu\\ServiceProvider" + ] + } } } \ No newline at end of file diff --git a/config/sudosu.php b/config/sudosu.php index 99298a4..0b61a51 100644 --- a/config/sudosu.php +++ b/config/sudosu.php @@ -14,7 +14,7 @@ | .local, simply add it to the arrow below. | */ - + 'allowed_tlds' => ['dev', 'local'], /* @@ -26,7 +26,17 @@ | displayed in the select dropdown. This must be an Eloquent Model instance. | */ - - 'user_model' => App\User::class - + + 'user_model' => App\User::class, + + /* + |-------------------------------------------------------------------------- + | Middleware for sudosu + |-------------------------------------------------------------------------- + | + | Define the middleware for sudosu, eg. ['web', 'can:sudoer'] means the cross + | login user must have the sudoer permission or role. + | + */ + 'middleware' => ['web',], ]; \ No newline at end of file diff --git a/src/RouteServiceProvider.php b/src/RouteServiceProvider.php index 9bc5482..2b3a5d6 100644 --- a/src/RouteServiceProvider.php +++ b/src/RouteServiceProvider.php @@ -12,7 +12,7 @@ public function map() Route::group([ 'prefix' => 'sudosu', 'namespace' => 'VIACreative\SudoSu\Controllers', - 'middleware' => ['web'] + 'middleware' => config('sudosu.middleware', ['web']), ], function () { Route::post('/sudosu/login-as-user', 'SudoSuController@loginAsUser') ->name('sudosu.login_as_user'); diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 1219600..afcc7ee 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -32,7 +32,7 @@ public function boot() $this->registerViews(); } } - + protected function registerViews() { $this->loadViewsFrom(__DIR__ . '/../resources/views', 'sudosu'); @@ -47,7 +47,7 @@ protected function registerViews() 'originalUser' => $sudosu->getOriginalUser(), 'currentUser' => Auth::user() ]); - }); + }); } protected function tldIsAllowed() From eb0b556e779bd1bbeff117f3eb00b64c2f4462f9 Mon Sep 17 00:00:00 2001 From: Xiaohui Lam Date: Tue, 3 Mar 2020 12:45:43 +0800 Subject: [PATCH 2/3] makes font-awesome be able to be configured --- resources/views/user-selector.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/user-selector.blade.php b/resources/views/user-selector.blade.php index ca0e588..24a21e9 100644 --- a/resources/views/user-selector.blade.php +++ b/resources/views/user-selector.blade.php @@ -1,4 +1,4 @@ - +
@@ -45,4 +45,4 @@ const element = document.getElementById('sudosu-js-interface'); btn.addEventListener('click', event => element.classList.toggle('hidden')); - \ No newline at end of file + From fb2f1010aa8f196155adaa123f49d5f22e969f5a Mon Sep 17 00:00:00 2001 From: Xiaohui Lam Date: Thu, 19 Mar 2020 18:00:37 +0800 Subject: [PATCH 3/3] Update ServiceProvider.php --- src/ServiceProvider.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index afcc7ee..6e46387 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -52,6 +52,9 @@ protected function registerViews() protected function tldIsAllowed() { + if (false === Config::get('sudosu.check_tlds')) { + return true; + } $requestTld = $this->getRequestTld(); $allowedTlds = Config::get('sudosu.allowed_tlds');