Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Server API obey's the subuser permissions as well

Browse source
This commit is contained in:
Dane Everitt 2016-10-20 17:04:58 -04:00
parent 9fd8a087b8
commit dfeed013ba
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/API/User/ServerController.php
View file

@ -23,6 +23,7 @@
*/ */
namespace Pterodactyl\Http\Controllers\API\User; namespace Pterodactyl\Http\Controllers\API\User;
use Auth;
use Log; use Log;
use Pterodactyl\Models; use Pterodactyl\Models;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -79,7 +80,7 @@ class ServerController extends BaseController
], ],
'allocations' => $allocations, 'allocations' => $allocations,
'sftp' => [ 'sftp' => [
'username' => $server->username 'username' => (Auth::user()->can('view-sftp', $server)) ? $server->username : null
], ],
'daemon' => [ 'daemon' => [
'token' => ($request->secure()) ? $server->daemonSecret : false, 'token' => ($request->secure()) ? $server->daemonSecret : false,
@ -94,6 +95,8 @@ class ServerController extends BaseController
$node = Models\Node::getByID($server->node); $node = Models\Node::getByID($server->node);
$client = Models\Node::guzzleRequest($server->node); $client = Models\Node::guzzleRequest($server->node);
Auth::user()->can('power-' . $request->input('action'), $server);
$res = $client->request('PUT', '/server/power', [ $res = $client->request('PUT', '/server/power', [
'headers' => [ 'headers' => [
'X-Access-Server' => $server->uuid, 'X-Access-Server' => $server->uuid,

2
app/Models/Server.php
View file

@ -27,7 +27,7 @@ use Auth;
use Pterodactyl\Models\Subuser; use Pterodactyl\Models\Subuser;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Pterodactyl\Exception\DisplayException; use Pterodactyl\Exceptions\DisplayException;
class Server extends Model class Server extends Model
{ {