Update LaravelLogViewer.php

rap2hpoutre · web-flow · commit 971243e8a98c · 2017-05-28T17:51:16.000+02:00
diff --git a/src/Rap2hpoutre/LaravelLogViewer/LaravelLogViewer.php b/src/Rap2hpoutre/LaravelLogViewer/LaravelLogViewer.php
@@ -78,14 +78,16 @@ public static function setFile($file)
      */
     public static function pathToLogFile($file)
     {
-        if (!starts_with('/', $file)) {
-            $logsPath = storage_path('logs');
+        $logsPath = storage_path('logs');
 
-            $file = $logsPath . '/' . $file;
+        if (app('files')->exists($file)) { // try the absolute path
+            return $file;
         }
+        
+        $file = $logsPath . '/' . $file;
 
         // check if requested file is really in the logs directory
-        if (dirname(realpath($file)) !== $logsPath) {
+        if (dirname($file) !== $logsPath) {
             throw new \Exception('No such log file');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -78,14 +78,16 @@ public static function setFile($file)`
`78`	`78`	`*/`
`79`	`79`	`public static function pathToLogFile($file)`
`80`	`80`	`{`
`81`		`- if (!starts_with('/', $file)) {`
`82`		`- $logsPath = storage_path('logs');`
	`81`	`+ $logsPath = storage_path('logs');`
`83`	`82`
`84`		`- $file = $logsPath . '/' . $file;`
	`83`	`+ if (app('files')->exists($file)) { // try the absolute path`
	`84`	`+ return $file;`
`85`	`85`	`}`
	`86`	`+`
	`87`	`+ $file = $logsPath . '/' . $file;`
`86`	`88`
`87`	`89`	`// check if requested file is really in the logs directory`
`88`		`- if (dirname(realpath($file)) !== $logsPath) {`
	`90`	`+ if (dirname($file) !== $logsPath) {`
`89`	`91`	`throw new \Exception('No such log file');`
`90`	`92`	`}`
`91`	`93`