Firewall Settings

deleugpn · deleugpn · commit b5382138a61a · 2017-09-19T15:37:22.000-04:00
diff --git a/Envoy.blade.php b/Envoy.blade.php
@@ -4,8 +4,8 @@
 
     @if ($tag)
         php artisan down
-        git fetch --tags
-        git checkout {{ $tag }}
+        git pull
+        composer install --no-dev --no-interaction
         php artisan migrate
         php artisan up
     @endif
diff --git a/app/Disk.php b/app/Disk.php
@@ -29,12 +29,25 @@ public function match(File $file)
         return $this->checksum($file) == $file->checksum;
     }
 
-    protected function touch($path)
+    protected function touch($filepath)
     {
         try {
-            touch($path);
+            $this->makeFoldersForFile($filepath);
+            touch($filepath);
         } catch (\ErrorException $e) {
-            throw new PermissionDeniedException($path);
+            throw new PermissionDeniedException($filepath);
+        }
+    }
+
+    protected function makeFoldersForFile($filepath)
+    {
+        try {
+            $directory = dirname($filepath);
+            if (!is_dir($directory)) {
+                mkdir($directory, 0755, true);
+            }
+        } catch (\ErrorException $e) {
+            throw new PermissionDeniedException($filepath);
         }
     }
 }
diff --git a/app/Http/Controllers/Modules/FirewallsController.php b/app/Http/Controllers/Modules/FirewallsController.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Modules;
+
+use Facades\App\Disk;
+use App\Http\Controllers\Controller;
+use App\Models\Expressive\Firewall;
+use Illuminate\Http\Request;
+
+class FirewallsController extends Controller
+{
+    public function edit()
+    {
+        $file = Firewall::first();
+
+        return view('app.modules.firewall.edit', compact('file'));
+    }
+
+    public function update(Request $request, Firewall $firewall)
+    {
+        $firewall->sections()->first()->update([
+            'content' => $request->get('firewall')
+        ]);
+
+        // @TODO: should this be an event on File instead? Write every file as soon as they change.
+        Disk::write($firewall);
+
+        return redirect('/module/firewalls/edit')->with('success', 'Your firewall settings has been updated!');
+    }
+}
diff --git a/app/Http/ViewComposers/LayoutComposer.php b/app/Http/ViewComposers/LayoutComposer.php
@@ -30,7 +30,6 @@ protected function isUpdateAvailable()
         $dayInMinutes = Carbon::MINUTES_PER_HOUR * Carbon::HOURS_PER_DAY;
 
         return Cache::remember('updateAvailable', $dayInMinutes, function () {
-            return true;
             $latest = (new GitHub)->latestVersion();
 
             return version_compare($latest, config('app.version')) === 1;
diff --git a/app/Models/Expressive/Firewall.php b/app/Models/Expressive/Firewall.php
@@ -6,6 +6,8 @@
 
 class Firewall extends File
 {
+    use HasParentModel;
+
     const FILTER = ['path' => '/etc/rc.d/rc.firewall'];
 
     protected static function boot()
diff --git a/app/Models/Expressive/HasParentModel.php b/app/Models/Expressive/HasParentModel.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models\Expressive;
+
+use Illuminate\Support\Str;
+use ReflectionClass;
+
+/**
+ * Note: This is a preview of an upcoming package from Tighten.
+ **/
+trait HasParentModel
+{
+    public function getParentClass()
+    {
+        static $parentClassName;
+
+        return $parentClassName ?: $parentClassName = (new ReflectionClass($this))->getParentClass()->getName();
+    }
+
+    public function getTable()
+    {
+        if (!isset($this->table)) {
+            return str_replace('\\', '', Str::snake(Str::plural(class_basename($this->getParentClass()))));
+        }
+
+        return $this->table;
+    }
+
+    public function getForeignKey()
+    {
+        return Str::snake(class_basename($this->getParentClass())) . '_' . $this->primaryKey;
+    }
+
+    public function joiningTable($related)
+    {
+        $models = [
+            Str::snake(class_basename($related)),
+            Str::snake(class_basename($this->getParentClass())),
+        ];
+        sort($models);
+
+        return strtolower(implode('_', $models));
+    }
+}
diff --git a/config/app.php b/config/app.php
@@ -15,7 +15,7 @@
 
     'name' => env('APP_NAME', 'Thunderwall'),
 
-    'version' => '0.0.3',
+    'version' => '0.0.4',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/views/app/modules/firewall/edit.blade.php b/resources/views/app/modules/firewall/edit.blade.php
@@ -0,0 +1,41 @@
+@extends('layouts.app')
+
+@section('content')
+    <div class="container">
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2">
+
+                <form method="POST" action="/modules/firewall/{{ $file->id }}">
+                    {{ method_field('PUT') }}
+                    {{ csrf_field() }}
+
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <div class="level">
+                                <h5 class="flex">
+                                    {{ $file->name }} <span class="small">{{ $file->path }}</span>
+                                </h5>
+                            </div>
+                        </div>
+
+                        <div class="panel-body">
+                            @foreach($file->sections as $section)
+                                <div class="form-group">
+                                    <textarea class="form-control" name="firewall" cols="5"
+                                              rows="14">{{ $section->content }}</textarea>
+                                </div>
+                            @endforeach
+                        </div>
+
+                        <div class="panel-footer">
+                            <div class="form-group">
+                                <input type="submit" class="btn btn-primary" value="{{ __('Apply') }}">
+                            </div>
+                        </div>
+                    </div>
+
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
@@ -31,36 +31,11 @@
 Route::get('/version', 'VersionController@index');
 Route::post('/version/update', 'VersionController@update');
 
-Route::group(['namespace' => 'Modules', 'prefix' => 'module', 'middleware' => 'auth'], function () {
+Route::group(['namespace' => 'Modules', 'prefix' => 'modules', 'middleware' => 'auth'], function () {
 
-    // Reverse Engineering File Route
-    Route::get('/files/retrieve', 'RetrievesFilesController@index');
-    Route::post('/files/retrieve', 'RetrievesFilesController@store');
-
-    // File REST Route
-    Route::post('/files/{file}/commit', 'CommitsFileController@commit');
-    Route::resource('/files', 'FilesController');
-
-    // File Section Routes
-    Route::get('/files/{file}/sections', 'FileSectionsController@index');
-    Route::get('/files/{file}/sections/edit', 'FileSectionsController@edit');
-    Route::post('/files/{file}/sections', 'FileSectionsController@store');
-});
-
-Route::group(['namespace' => 'Files', 'middleware' => 'auth'], function () {
-
-    // Reverse Engineering File Route
-    Route::get('/files/retrieve', 'RetrievesFilesController@index');
-    Route::post('/files/retrieve', 'RetrievesFilesController@store');
-
-    // File REST Route
-    Route::post('/files/{file}/commit', 'CommitsFileController@commit');
-    Route::resource('/files', 'FilesController');
-
-    // File Section Routes
-    Route::get('/files/{file}/sections', 'FileSectionsController@index');
-    Route::get('/files/{file}/sections/edit', 'FileSectionsController@edit');
-    Route::post('/files/{file}/sections', 'FileSectionsController@store');
+    // Firewall Module
+    Route::get('/firewall/edit', 'FirewallsController@edit');
+    Route::put('/firewall/{firewall}', 'FirewallsController@update');
 });
 
 Route::get('{any}', 'RedirectsController@index')->where('any', '.*');
diff --git a/storage/tests/.gitignore b/storage/tests/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/tests/Fake/FakeDisk.php b/tests/Fake/FakeDisk.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Fake;
+
+use App\Disk;
+
+class FakeDisk extends Disk
+{
+    protected function touch($filepath)
+    {
+        // Remove the trailing '/'
+        $filepath = ltrim($filepath, '/');
+
+        // Store the file in local storage/tests folder
+        $filepath = storage_path("tests/$filepath");
+
+        parent::touch($filepath);
+    }
+}
diff --git a/tests/Feature/AuthenticatedTestCase.php b/tests/Feature/AuthenticatedTestCase.php
@@ -3,7 +3,10 @@
 namespace Tests;
 
 use App\Models\User;
+use Facades\App\Disk;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Cache;
+use Tests\Fake\FakeDisk;
 
 abstract class AuthenticatedTestCase extends DatabaseTestCase
 {
@@ -19,5 +22,11 @@ protected function setUp()
         parent::setUp();
 
         $this->actingAs($this->user = create(User::class));
+
+        // Redirect any file creation to /storage/tests
+        Disk::swap(new FakeDisk);
+
+        // Avoid GitHub API by Default
+        Cache::put('updateAvailable', false, 1);
     }
 }
diff --git a/tests/Feature/Firewall/FirewallTest.php b/tests/Feature/Firewall/FirewallTest.php
@@ -2,18 +2,33 @@
 
 namespace Tests\Feature;
 
+use App\Models\Expressive\Firewall;
 use Tests\AuthenticatedTestCase;
 
 class FirewallTest extends AuthenticatedTestCase
 {
     /**
      * @test
-     * @group f
      */
     public function a_user_can_see_the_firewall_form()
     {
-        $this->get('/module/firewall/edit')
+        $this->get('/modules/firewall/edit')
             ->assertSuccessful()
             ->assertSeeInput('firewall');
     }
+
+    /**
+     * @test
+     */
+    public function a_user_can_change_the_firewall_settings()
+    {
+        $file = Firewall::first();
+        $content = 'Firewall settings changed.';
+
+        $this->put('/modules/firewall/' . $file->id, ['firewall' => $content])
+            ->assertFound()
+            ->assertSessionHas('success');
+
+        $this->assertDatabaseHas('sections', ['file_id' => $file->id, 'content' => $content]);
+    }
 }
diff --git a/tests/Feature/Version/VersionTest.php b/tests/Feature/Version/VersionTest.php
@@ -14,7 +14,7 @@ class VersionTest extends AuthenticatedTestCase
     public function a_user_can_see_when_there_is_an_update()
     {
         Config::set('app.version', '0.0.0');
-        Cache::put('updateAvailable', '0.0.1');
+        Cache::put('updateAvailable', '0.0.1', 1);
 
         $this->get('/home')
             ->assertSeeText('Update')
diff --git a/tests/Unit/Eloquent/FileTest.php b/tests/Unit/Eloquent/FileTest.php
@@ -28,8 +28,8 @@ public function setUp()
      */
     public function a_file_has_a_path()
     {
-        $this->assertEquals('/files/1', $this->file->route());
-        $this->assertEquals('/files/1/something', $this->file->route('/something'));
+        $this->assertEquals("/files/{$this->file->id}", $this->file->route());
+        $this->assertEquals("/files/{$this->file->id}/something", $this->file->route('/something'));
     }
 
     /**
diff --git a/tests/Unit/WriteFileTest.php b/tests/Unit/WriteFileTest.php
@@ -2,25 +2,30 @@
 
 namespace Tests\Unit;
 
+use App\Disk;
+use Facades\App\Disk as DiskFacade;
 use App\Exceptions\PermissionDeniedException;
-use Facades\App\Disk;
 use App\Models\File;
 use Tests\DatabaseTestCase;
 
 class WriteFileTest extends DatabaseTestCase
 {
     /**
      * @test
+     * @TODO: refactor
      */
     public function writing_a_file_will_create_it()
     {
+        // Go back to original Disk implementation.
+        DiskFacade::swap(new Disk);
+
         $path = __DIR__ . '/new-file';
         $this->assertFileNotExists($path);
 
         $file = File::create(['name' => 'Commit', 'path' => $path]);
         $file->sections()->create(['content' => 'file content']);
 
-        Disk::write($file);
+        DiskFacade::write($file);
 
         $this->assertFileExists($file->path);
         $this->assertEquals($file->content(), file_get_contents($file->path));
@@ -32,19 +37,19 @@ public function writing_a_file_will_create_it()
      */
     public function writing_a_file_without_permission_will_throw_exception()
     {
-        Disk::swap(new DiskWithoutPermission());
+        DiskFacade::swap(new DiskWithoutPermission());
 
         $this->expectException(PermissionDeniedException::class);
 
         $file = create(File::class);
-        Disk::write($file);
+        DiskFacade::write($file);
     }
 }
 
-class DiskWithoutPermission extends \App\Disk
+class DiskWithoutPermission extends Disk
 {
-    protected function touch($path)
+    protected function touch($filepath)
     {
-        throw new PermissionDeniedException($path);
+        throw new PermissionDeniedException($filepath);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,25 @@ public function match(File $file)`
`29`	`29`	`return $this->checksum($file) == $file->checksum;`
`30`	`30`	`}`
`31`	`31`
`32`		`- protected function touch($path)`
	`32`	`+ protected function touch($filepath)`
`33`	`33`	`{`
`34`	`34`	`try {`
`35`		`- touch($path);`
	`35`	`+ $this->makeFoldersForFile($filepath);`
	`36`	`+ touch($filepath);`
`36`	`37`	`} catch (\ErrorException $e) {`
`37`		`- throw new PermissionDeniedException($path);`
	`38`	`+ throw new PermissionDeniedException($filepath);`
	`39`	`+ }`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ protected function makeFoldersForFile($filepath)`
	`43`	`+ {`
	`44`	`+ try {`
	`45`	`+ $directory = dirname($filepath);`
	`46`	`+ if (!is_dir($directory)) {`
	`47`	`+ mkdir($directory, 0755, true);`
	`48`	`+ }`
	`49`	`+ } catch (\ErrorException $e) {`
	`50`	`+ throw new PermissionDeniedException($filepath);`
`38`	`51`	`}`
`39`	`52`	`}`
`40`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`class Firewall extends File`
`8`	`8`	`{`
	`9`	`+ use HasParentModel;`
	`10`	`+`
`9`	`11`	`const FILTER = ['path' => '/etc/rc.d/rc.firewall'];`
`10`	`12`
`11`	`13`	`protected static function boot()`