Implement fix to allow root admins to view all servers.

DaneEveritt · DaneEveritt · commit 6409fffdad5c · 2017-11-05T12:38:39.000-06:00
closes pterodactyl#722
diff --git a/app/Contracts/Repository/ServerRepositoryInterface.php b/app/Contracts/Repository/ServerRepositoryInterface.php
@@ -118,7 +118,7 @@ public function filterUserAccessServers($user, $admin = false, $level = 'all', a
      * Return a server by UUID.
      *
      * @param string $uuid
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Pterodactyl\Models\Server
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
diff --git a/app/Contracts/Repository/SubuserRepositoryInterface.php b/app/Contracts/Repository/SubuserRepositoryInterface.php
@@ -13,7 +13,7 @@ interface SubuserRepositoryInterface extends RepositoryInterface
      * @param bool                        $refresh
      * @return \Pterodactyl\Models\Subuser
      */
-    public function getWithServer(Subuser $subuser, bool $refresh = false): Subuser;
+    public function loadServerAndUserRelations(Subuser $subuser, bool $refresh = false): Subuser;
 
     /**
      * Return a subuser with the associated permissions relationship.
diff --git a/app/Http/Controllers/Base/IndexController.php b/app/Http/Controllers/Base/IndexController.php
@@ -93,7 +93,7 @@ public function getIndex(Request $request)
     public function status(Request $request, $uuid)
     {
         $server = $this->repository->findFirstWhere([['uuidShort', '=', $uuid]]);
-        $token = $this->keyProviderService->handle($server->id, $request->user()->id);
+        $token = $this->keyProviderService->handle($server, $request->user());
 
         if (! $server->installed) {
             return response()->json(['status' => 20]);
diff --git a/app/Http/Middleware/AdminAuthenticate.php b/app/Http/Middleware/AdminAuthenticate.php
@@ -11,7 +11,7 @@
 
 use Closure;
 use Illuminate\Http\Request;
-use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 class AdminAuthenticate
 {
@@ -25,7 +25,7 @@ class AdminAuthenticate
     public function handle(Request $request, Closure $next)
     {
         if (! $request->user() || ! $request->user()->root_admin) {
-            throw new HttpException(403, 'Access Denied');
+            throw new AccessDeniedHttpException;
         }
 
         return $next($request);
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
@@ -20,11 +20,7 @@ class Authenticate
     public function handle(Request $request, Closure $next)
     {
         if (! $request->user()) {
-            if ($request->ajax() || $request->expectsJson()) {
-                throw new AuthenticationException();
-            } else {
-                return redirect()->route('auth.login');
-            }
+            throw new AuthenticationException;
         }
 
         return $next($request);
diff --git a/app/Http/Middleware/Daemon/DaemonAuthenticate.php b/app/Http/Middleware/Daemon/DaemonAuthenticate.php
@@ -29,6 +29,7 @@
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 class DaemonAuthenticate
 {
@@ -80,7 +81,7 @@ public function handle(Request $request, Closure $next)
         try {
             $node = $this->repository->findFirstWhere([['daemonSecret', '=', $token]]);
         } catch (RecordNotFoundException $exception) {
-            throw new HttpException(403);
+            throw new AccessDeniedHttpException;
         }
 
         $request->attributes->set('node', $node);
diff --git a/app/Http/Middleware/Server/AuthenticateAsSubuser.php b/app/Http/Middleware/Server/AuthenticateAsSubuser.php
@@ -12,9 +12,9 @@
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Session\Session;
-use Illuminate\Auth\AuthenticationException;
 use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 class AuthenticateAsSubuser
 {
@@ -56,9 +56,9 @@ public function handle(Request $request, Closure $next)
         $server = $request->attributes->get('server');
 
         try {
-            $token = $this->keyProviderService->handle($server->id, $request->user()->id);
+            $token = $this->keyProviderService->handle($server, $request->user());
         } catch (RecordNotFoundException $exception) {
-            throw new AuthenticationException('This account does not have permission to access this server.');
+            throw new AccessDeniedHttpException('This account does not have permission to access this server.');
         }
 
         $this->session->now('server_data.token', $token);
diff --git a/app/Jobs/Schedule/RunTaskJob.php b/app/Jobs/Schedule/RunTaskJob.php
@@ -92,20 +92,21 @@ public function handle(
         $this->taskRepository = $taskRepository;
 
         $task = $this->taskRepository->getTaskWithServer($this->task);
-        $server = $task->server;
+        $server = $task->getRelation('server');
+        $user = $server->getRelation('user');
 
         // Perform the provided task aganist the daemon.
         switch ($task->action) {
             case 'power':
                 $this->powerRepository->setNode($server->node_id)
                     ->setAccessServer($server->uuid)
-                    ->setAccessToken($keyProviderService->handle($server->id, $server->owner_id))
+                    ->setAccessToken($keyProviderService->handle($server, $user))
                     ->sendSignal($task->payload);
                 break;
             case 'command':
                 $this->commandRepository->setNode($server->node_id)
                     ->setAccessServer($server->uuid)
-                    ->setAccessToken($keyProviderService->handle($server->id, $server->owner_id))
+                    ->setAccessToken($keyProviderService->handle($server, $user))
                     ->send($task->payload);
                 break;
             default:
diff --git a/app/Repositories/Eloquent/SubuserRepository.php b/app/Repositories/Eloquent/SubuserRepository.php
@@ -31,12 +31,16 @@ public function model()
      * @param bool                        $refresh
      * @return \Pterodactyl\Models\Subuser
      */
-    public function getWithServer(Subuser $subuser, bool $refresh = false): Subuser
+    public function loadServerAndUserRelations(Subuser $subuser, bool $refresh = false): Subuser
     {
         if (! $subuser->relationLoaded('server') || $refresh) {
             $subuser->load('server');
         }
 
+        if (! $subuser->relationLoaded('user') || $refresh) {
+            $subuser->load('user');
+        }
+
         return $subuser;
     }
 
diff --git a/app/Repositories/Eloquent/TaskRepository.php b/app/Repositories/Eloquent/TaskRepository.php
@@ -31,7 +31,7 @@ public function getTaskWithServer($id)
     {
         Assert::integerish($id, 'First argument passed to getTaskWithServer must be numeric, received %s.');
 
-        $instance = $this->getBuilder()->with('server')->find($id, $this->getColumns());
+        $instance = $this->getBuilder()->with('server.user')->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException;
         }
diff --git a/app/Services/DaemonKeys/DaemonKeyProviderService.php b/app/Services/DaemonKeys/DaemonKeyProviderService.php
@@ -25,65 +25,55 @@
 namespace Pterodactyl\Services\DaemonKeys;
 
 use Carbon\Carbon;
-use Webmozart\Assert\Assert;
+use Pterodactyl\Models\User;
+use Pterodactyl\Models\Server;
 use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
 
 class DaemonKeyProviderService
 {
-    /**
-     * @var \Carbon\Carbon
-     */
-    protected $carbon;
-
     /**
      * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyUpdateService
      */
-    protected $keyUpdateService;
+    private $keyUpdateService;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface
      */
-    protected $repository;
+    private $repository;
 
     /**
      * GetDaemonKeyService constructor.
      *
-     * @param \Carbon\Carbon                                                 $carbon
      * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyUpdateService        $keyUpdateService
      * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository
      */
-    public function __construct(
-        Carbon $carbon,
-        DaemonKeyUpdateService $keyUpdateService,
-        DaemonKeyRepositoryInterface $repository
-    ) {
-        $this->carbon = $carbon;
+    public function __construct(DaemonKeyUpdateService $keyUpdateService, DaemonKeyRepositoryInterface $repository)
+    {
         $this->keyUpdateService = $keyUpdateService;
         $this->repository = $repository;
     }
 
     /**
      * Get the access key for a user on a specific server.
      *
-     * @param int  $server
-     * @param int  $user
-     * @param bool $updateIfExpired
+     * @param \Pterodactyl\Models\Server $server
+     * @param \Pterodactyl\Models\User   $user
+     * @param bool                       $updateIfExpired
      * @return string
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle($server, $user, $updateIfExpired = true)
+    public function handle(Server $server, User $user, $updateIfExpired = true): string
     {
-        Assert::integerish($server, 'First argument passed to handle must be an integer, received %s.');
-        Assert::integerish($user, 'Second argument passed to handle must be an integer, received %s.');
+        $userId = $user->root_admin ? $server->owner_id : $user->id;
 
         $key = $this->repository->findFirstWhere([
-            ['user_id', '=', $user],
-            ['server_id', '=', $server],
+            ['user_id', '=', $userId],
+            ['server_id', '=', $server->id],
         ]);
 
-        if (! $updateIfExpired || $this->carbon->now()->diffInSeconds($key->expires_at, false) > 0) {
+        if (! $updateIfExpired || Carbon::now()->diffInSeconds($key->expires_at, false) > 0) {
             return $key->secret;
         }
 
diff --git a/app/Services/Sftp/AuthenticateUsingPasswordService.php b/app/Services/Sftp/AuthenticateUsingPasswordService.php
@@ -84,7 +84,7 @@ public function handle(string $username, string $password, int $node, string $se
 
         return [
             'server' => $server->uuid,
-            'token' => $this->keyProviderService->handle($server->id, $user->id),
+            'token' => $this->keyProviderService->handle($server, $user),
         ];
     }
 }
diff --git a/app/Services/Subusers/SubuserUpdateService.php b/app/Services/Subusers/SubuserUpdateService.php
@@ -88,14 +88,14 @@ public function __construct(
      */
     public function handle(Subuser $subuser, array $permissions)
     {
-        $subuser = $this->repository->getWithServer($subuser);
+        $subuser = $this->repository->loadServerAndUserRelations($subuser);
 
         $this->connection->beginTransaction();
         $this->permissionRepository->deleteWhere([['subuser_id', '=', $subuser->id]]);
         $this->permissionService->handle($subuser->id, $permissions);
 
         try {
-            $token = $this->keyProviderService->handle($subuser->server_id, $subuser->user_id, false);
+            $token = $this->keyProviderService->handle($subuser->getRelation('server'), $subuser->getRelation('user'), false);
             $this->daemonRepository->setNode($subuser->getRelation('server')->node_id)->revokeAccessKey($token);
         } catch (RequestException $exception) {
             $this->connection->rollBack();
diff --git a/tests/Unit/Http/Controllers/Base/IndexControllerTest.php b/tests/Unit/Http/Controllers/Base/IndexControllerTest.php
@@ -10,17 +10,16 @@
 namespace Tests\Unit\Http\Controllers\Base;
 
 use Mockery as m;
-use Tests\TestCase;
-use Illuminate\Http\Request;
 use Pterodactyl\Models\User;
 use Pterodactyl\Models\Server;
 use Tests\Assertions\ControllerAssertionsTrait;
+use Tests\Unit\Http\Controllers\ControllerTestCase;
 use Pterodactyl\Http\Controllers\Base\IndexController;
 use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
-class IndexControllerTest extends TestCase
+class IndexControllerTest extends ControllerTestCase
 {
     use ControllerAssertionsTrait;
 
@@ -44,11 +43,6 @@ class IndexControllerTest extends TestCase
      */
     protected $repository;
 
-    /**
-     * @var \Illuminate\Http\Request|\Mockery\Mock
-     */
-    protected $request;
-
     /**
      * Setup tests.
      */
@@ -59,7 +53,6 @@ public function setUp()
         $this->daemonRepository = m::mock(DaemonServerRepositoryInterface::class);
         $this->keyProviderService = m::mock(DaemonKeyProviderService::class);
         $this->repository = m::mock(ServerRepositoryInterface::class);
-        $this->request = m::mock(Request::class);
 
         $this->controller = new IndexController($this->keyProviderService, $this->daemonRepository, $this->repository);
     }
@@ -69,9 +62,8 @@ public function setUp()
      */
     public function testIndexController()
     {
-        $model = factory(User::class)->make();
+        $model = $this->setRequestUser();
 
-        $this->request->shouldReceive('user')->withNoArgs()->andReturn($model);
         $this->request->shouldReceive('input')->with('query')->once()->andReturn('searchTerm');
         $this->repository->shouldReceive('search')->with('searchTerm')->once()->andReturnSelf()
             ->shouldReceive('filterUserAccessServers')->with(
@@ -90,12 +82,11 @@ public function testIndexController()
      */
     public function testStatusController()
     {
-        $user = factory(User::class)->make();
+        $user = $this->setRequestUser();
         $server = factory(Server::class)->make(['suspended' => 0, 'installed' => 1]);
 
-        $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn($user);
         $this->repository->shouldReceive('findFirstWhere')->with([['uuidShort', '=', $server->uuidShort]])->once()->andReturn($server);
-        $this->keyProviderService->shouldReceive('handle')->with($server->id, $user->id)->once()->andReturn('test123');
+        $this->keyProviderService->shouldReceive('handle')->with($server, $user)->once()->andReturn('test123');
 
         $this->daemonRepository->shouldReceive('setNode')->with($server->node_id)->once()->andReturnSelf()
             ->shouldReceive('setAccessServer')->with($server->uuid)->once()->andReturnSelf()
@@ -114,12 +105,11 @@ public function testStatusController()
      */
     public function testStatusControllerWhenServerNotInstalled()
     {
-        $user = factory(User::class)->make();
+        $user = $this->setRequestUser();
         $server = factory(Server::class)->make(['suspended' => 0, 'installed' => 0]);
 
-        $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn($user);
         $this->repository->shouldReceive('findFirstWhere')->with([['uuidShort', '=', $server->uuidShort]])->once()->andReturn($server);
-        $this->keyProviderService->shouldReceive('handle')->with($server->id, $user->id)->once()->andReturn('test123');
+        $this->keyProviderService->shouldReceive('handle')->with($server, $user)->once()->andReturn('test123');
 
         $response = $this->controller->status($this->request, $server->uuidShort);
         $this->assertIsJsonResponse($response);
@@ -137,7 +127,7 @@ public function testStatusControllerWhenServerIsSuspended()
 
         $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn($user);
         $this->repository->shouldReceive('findFirstWhere')->with([['uuidShort', '=', $server->uuidShort]])->once()->andReturn($server);
-        $this->keyProviderService->shouldReceive('handle')->with($server->id, $user->id)->once()->andReturn('test123');
+        $this->keyProviderService->shouldReceive('handle')->with($server, $user)->once()->andReturn('test123');
 
         $response = $this->controller->status($this->request, $server->uuidShort);
         $this->assertIsJsonResponse($response);
diff --git a/tests/Unit/Http/Middleware/AdminAuthenticateTest.php b/tests/Unit/Http/Middleware/AdminAuthenticateTest.php
@@ -4,7 +4,6 @@
 
 use Pterodactyl\Models\User;
 use Pterodactyl\Http\Middleware\AdminAuthenticate;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class AdminAuthenticateTest extends MiddlewareTestCase
 {
@@ -22,32 +21,28 @@ public function testAdminsAreAuthenticated()
 
     /**
      * Test that a missing user in the request triggers an error.
+     *
+     * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */
     public function testExceptionIsThrownIfUserDoesNotExist()
     {
         $this->request->shouldReceive('user')->withNoArgs()->once()->andReturnNull();
 
-        try {
-            $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
-        } catch (HttpException $exception) {
-            $this->assertEquals(403, $exception->getStatusCode());
-        }
+        $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
     }
 
     /**
      * Test that an exception is thrown if the user is not an admin.
+     *
+     * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */
     public function testExceptionIsThrownIfUserIsNotAnAdmin()
     {
         $user = factory(User::class)->make(['root_admin' => 0]);
 
         $this->request->shouldReceive('user')->withNoArgs()->twice()->andReturn($user);
 
-        try {
-            $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
-        } catch (HttpException $exception) {
-            $this->assertEquals(403, $exception->getStatusCode());
-        }
+        $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
     }
 
     /**
diff --git a/tests/Unit/Http/Middleware/AuthenticateTest.php b/tests/Unit/Http/Middleware/AuthenticateTest.php
diff --git a/tests/Unit/Http/Middleware/Daemon/DaemonAuthenticateTest.php b/tests/Unit/Http/Middleware/Daemon/DaemonAuthenticateTest.php
diff --git a/tests/Unit/Http/Middleware/Server/AuthenticateAsSubuserTest.php b/tests/Unit/Http/Middleware/Server/AuthenticateAsSubuserTest.php
diff --git a/tests/Unit/Jobs/Schedule/RunTaskJobTest.php b/tests/Unit/Jobs/Schedule/RunTaskJobTest.php
diff --git a/tests/Unit/Services/DaemonKeys/DaemonKeyProviderServiceTest.php b/tests/Unit/Services/DaemonKeys/DaemonKeyProviderServiceTest.php
diff --git a/tests/Unit/Services/Sftp/AuthenticateUsingPasswordServiceTest.php b/tests/Unit/Services/Sftp/AuthenticateUsingPasswordServiceTest.php
diff --git a/tests/Unit/Services/Subusers/SubuserUpdateServiceTest.php b/tests/Unit/Services/Subusers/SubuserUpdateServiceTest.php

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public function filterUserAccessServers($user, $admin = false, $level = 'all', a`
`118`	`118`	`* Return a server by UUID.`
`119`	`119`	`*`
`120`	`120`	`* @param string $uuid`
`121`		`- * @return \Illuminate\Database\Eloquent\Collection`
	`121`	`+ * @return \Pterodactyl\Models\Server`
`122`	`122`	`*`
`123`	`123`	`* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException`
`124`	`124`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function getIndex(Request $request)`
`93`	`93`	`public function status(Request $request, $uuid)`
`94`	`94`	`{`
`95`	`95`	`$server = $this->repository->findFirstWhere([['uuidShort', '=', $uuid]]);`
`96`		`- $token = $this->keyProviderService->handle($server->id, $request->user()->id);`
	`96`	`+ $token = $this->keyProviderService->handle($server, $request->user());`
`97`	`97`
`98`	`98`	`if (! $server->installed) {`
`99`	`99`	`return response()->json(['status' => 20]);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`use Closure;`
`13`	`13`	`use Illuminate\Http\Request;`
`14`		`-use Symfony\Component\HttpKernel\Exception\HttpException;`
	`14`	`+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;`
`15`	`15`
`16`	`16`	`class AdminAuthenticate`
`17`	`17`	`{`
`@@ -25,7 +25,7 @@ class AdminAuthenticate`
`25`	`25`	`public function handle(Request $request, Closure $next)`
`26`	`26`	`{`
`27`	`27`	`if (! $request->user() \|\| ! $request->user()->root_admin) {`
`28`		`- throw new HttpException(403, 'Access Denied');`
	`28`	`+ throw new AccessDeniedHttpException;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`return $next($request);`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,7 @@ class Authenticate`
`20`	`20`	`public function handle(Request $request, Closure $next)`
`21`	`21`	`{`
`22`	`22`	`if (! $request->user()) {`
`23`		`- if ($request->ajax() \|\| $request->expectsJson()) {`
`24`		`- throw new AuthenticationException();`
`25`		`- } else {`
`26`		`- return redirect()->route('auth.login');`
`27`		`- }`
	`23`	`+ throw new AuthenticationException;`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`return $next($request);`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`use Symfony\Component\HttpKernel\Exception\HttpException;`
`30`	`30`	`use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;`
`31`	`31`	`use Pterodactyl\Exceptions\Repository\RecordNotFoundException;`
	`32`	`+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;`
`32`	`33`
`33`	`34`	`class DaemonAuthenticate`
`34`	`35`	`{`
`@@ -80,7 +81,7 @@ public function handle(Request $request, Closure $next)`
`80`	`81`	`try {`
`81`	`82`	`$node = $this->repository->findFirstWhere([['daemonSecret', '=', $token]]);`
`82`	`83`	`} catch (RecordNotFoundException $exception) {`
`83`		`- throw new HttpException(403);`
	`84`	`+ throw new AccessDeniedHttpException;`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`$request->attributes->set('node', $node);`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,16 @@ public function model()`
`31`	`31`	`* @param bool $refresh`
`32`	`32`	`* @return \Pterodactyl\Models\Subuser`
`33`	`33`	`*/`
`34`		`- public function getWithServer(Subuser $subuser, bool $refresh = false): Subuser`
	`34`	`+ public function loadServerAndUserRelations(Subuser $subuser, bool $refresh = false): Subuser`
`35`	`35`	`{`
`36`	`36`	`if (! $subuser->relationLoaded('server') \|\| $refresh) {`
`37`	`37`	`$subuser->load('server');`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ if (! $subuser->relationLoaded('user') \|\| $refresh) {`
	`41`	`+ $subuser->load('user');`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`return $subuser;`
`41`	`45`	`}`
`42`	`46`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function getTaskWithServer($id)`
`31`	`31`	`{`
`32`	`32`	`Assert::integerish($id, 'First argument passed to getTaskWithServer must be numeric, received %s.');`
`33`	`33`
`34`		`- $instance = $this->getBuilder()->with('server')->find($id, $this->getColumns());`
	`34`	`+ $instance = $this->getBuilder()->with('server.user')->find($id, $this->getColumns());`
`35`	`35`	`if (! $instance) {`
`36`	`36`	`throw new RecordNotFoundException;`
`37`	`37`	`}`