Merge pull request #560 from portabilis/portabilis-patch-2019-04-26

Portabilis patch 26/04/2019

.travis.yml

@@ -39,4 +39,3 @@ matrix:
 
       script:
         - vendor/bin/phpunit
-        - php artisan dusk

app/Exceptions/Handler.php

@@ -5,6 +5,8 @@
 use Exception;
 use iEducar\Modules\ErrorTracking\Tracker;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class Handler extends ExceptionHandler
 {
@@ -30,12 +32,15 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param Exception $exception
+     *
      * @return void
+     *
+     * @throws Exception
      */
     public function report(Exception $exception)
     {
-        if (config('app.trackerror')) {
+        if (config('app.trackerror') && $this->shouldReport($exception)) {
             app(Tracker::class)->notify($exception, $this->getContext());
         }
 
@@ -45,19 +50,25 @@ public function report(Exception $exception)
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @param Request   $request
+     * @param Exception $exception
+     *
+     * @return Response
      */
     public function render($request, Exception $exception)
     {
         return parent::render($request, $exception);
     }
 
+    /**
+     * Return context data for the error.
+     *
+     * @return array
+     */
     private function getContext()
     {
         if (app()->runningInConsole()) {
-            return null;
+            return [];
         }
 
         return app('request')->all();

app/Http/Controllers/Auth/LoginController.php

@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
@@ -30,11 +31,17 @@ class LoginController extends Controller
     /**
      * Create a new controller instance.
      *
+     * @param Request $request
+     *
      * @return void
      */
-    public function __construct()
+    public function __construct(Request $request)
     {
         $this->middleware('guest')->except('logout');
+
+        if (empty($request->query('force'))) {
+            $this->middleware('ieducar.suspended')->except('login');
+        }
     }
 
     /**

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -56,7 +56,7 @@ protected function rules()
     protected function validationErrorMessages()
     {
         return [
-            'password.required' => 'O campo senha é obritório.',
+            'password.required' => 'O campo senha é obrigatório.',
             'password.confirmed' => 'As senhas não são iguais.',
             'password.min' => 'A senha deve conter ao menos 8 caracteres.',
         ];

app/Http/Controllers/LegacyController.php

@@ -117,23 +117,13 @@ private function loadLegacyFile($filename)
      *
      * @return void
      *
-     * @throws HttpResponseException
-     * @throws HttpException
      * @throws Exception
      */
     private function loadFileOrAbort($filename)
     {
         try {
             require_once $filename;
             return;
-        } catch (HttpResponseException $exception) {
-
-            // Para evitar encerrar a aplicação com `die` ou `exit`, é lançada
-            // uma exceção do tipo `HttpResponseException` com uma `Response`
-            // interna que será a resposta devolvida pela aplicação.
-
-            throw $exception;
-
         } catch (Exception $exception) {
 
             // A maioria das vezes será pega a Exception neste catch, apenas
@@ -154,11 +144,7 @@ private function loadFileOrAbort($filename)
             );
         }
 
-        if (config('app.debug')) {
-            throw $exception;
-        }
-
-        throw new HttpException(500, 'Error in legacy code.', $exception);
+        throw $exception;
     }
 
     /**

app/Http/Kernel.php

@@ -69,6 +69,7 @@ class Kernel extends HttpKernel
         'ieducar.menu' => \App\Http\Middleware\Menu::class,
         'ieducar.footer' => \App\Http\Middleware\Footer::class,
         'ieducar.xssbypass' => \App\Http\Middleware\XssByPass::class,
+        'ieducar.suspended' => \App\Http\Middleware\Suspended::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
 
@@ -89,5 +90,6 @@ class Kernel extends HttpKernel
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,
         \App\Http\Middleware\ChangeAppName::class,
+        \App\Http\Middleware\Suspended::class,
     ];
 }

app/Http/Middleware/ConnectTenantDatabase.php

@@ -61,9 +61,9 @@ public function getTenant(Request $request)
     public function getDefaultTenantResolver()
     {
         return function (Request $request) {
-            return Str::replaceFirst(
-                '.' . config('app.default_host'), '', $request->getHost()
-            );
+            $host = str_replace('-', '', $request->getHost());
+
+            return Str::replaceFirst('.' . config('app.default_host'), '', $host);
         };
     }
 

app/Http/Middleware/Suspended.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Session;
+
+class Suspended
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request $request
+     * @param Closure $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $active = Config::get('legacy.config.active_on_ieducar');
+        $level = Session::get('nivel');
+
+        if ($active || $level === 1) {
+            return $next($request);
+        }
+
+        return new RedirectResponse('/intranet/suspenso.php');
+    }
+}