Merge pull request #20 from aryehraber/encrypt-filepaths

Encrypt filepaths

Author: aryehraber

composer.json

@@ -30,7 +30,7 @@
         "statamic": {
             "name": "Logbook",
             "description": "Manage and view log files in the CP.",
-            "version": "3.0.0"
+            "version": "3.2.0"
         },
         "laravel": {
             "providers": [

resources/views/show.blade.php

@@ -19,7 +19,7 @@
                     <div class="select-input-container">
                         <select class="select-input" name="log">
                             @foreach($files as $file)
-                                <option value="{{ urlencode($file) }}" @if($file === $currentFile) selected @endif>{{ $file }}</option>
+                                <option value="{{ \Illuminate\Support\Facades\Crypt::encrypt($file) }}" @if($file === $currentFile) selected @endif>{{ $file }}</option>
                             @endforeach
                         </select>
 
@@ -35,15 +35,15 @@
                             <form class="flex" method="GET" action="{{ cp_route('utilities.logbook.show') }}">
                                 <input type="hidden" name="download">
 
-                                <button class="btn-primary" name="log" value="{{ urlencode($currentFile) }}">{{ __('Download Log') }}</button>
+                                <button class="btn-primary" name="log" value="{{ \Illuminate\Support\Facades\Crypt::encrypt($currentFile) }}">{{ __('Download Log') }}</button>
                             </form>
                         @endif
 
                         <form method="POST" action="{{ cp_route('utilities.logbook.destroy') }}">
                             @csrf
                             @method('delete')
 
-                            <button class="btn-danger ml-2" name="log" value="{{ urlencode($currentFile) }}" data-delete>{{ __('Delete Log') }}</button>
+                            <button class="btn-danger ml-2" name="log" value="{{ \Illuminate\Support\Facades\Crypt::encrypt($currentFile) }}" data-delete>{{ __('Delete Log') }}</button>
                         </form>
                     </div>
                 @endif

src/LogbookController.php

@@ -3,6 +3,7 @@
 namespace AryehRaber\Logbook;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\File;
 use Rap2hpoutre\LaravelLogViewer\LaravelLogViewer;
 use Statamic\Http\Controllers\Controller;
@@ -11,12 +12,12 @@ class LogbookController extends Controller
 {
     public function show(Request $request, LaravelLogViewer $logviewer)
     {
-        if ($file = $request->log) {
-            $logviewer->setFile(urldecode($file));
+        if ($file = $request->input('log')) {
+            $logviewer->setFile(Crypt::decrypt($file));
         }
 
         if ($request->has('download')) {
-            return response()->download($logviewer->pathToLogFile(urldecode($file)));
+            return response()->download($logviewer->pathToLogFile(Crypt::decrypt($file)));
         }
 
         return view('logbook::show', [
@@ -32,7 +33,7 @@ public function destroy(Request $request, LaravelLogViewer $logviewer)
             return redirect(cp_route('utilities.logbook.show'));
         }
 
-        File::delete($logviewer->pathToLogFile(urldecode($file)));
+        File::delete($logviewer->pathToLogFile(Crypt::decrypt($file)));
 
         return redirect(cp_route('utilities.logbook.show'))->with('success', 'Log file deleted.');
     }