Skip to content

Commit dfeed01

Browse files
committed
Server API obey's the subuser permissions as well
1 parent 9fd8a08 commit dfeed01

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

app/Http/Controllers/API/User/ServerController.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*/
2424
namespace Pterodactyl\Http\Controllers\API\User;
2525

26+
use Auth;
2627
use Log;
2728
use Pterodactyl\Models;
2829
use Illuminate\Http\Request;
@@ -79,7 +80,7 @@ public function info(Request $request, $uuid)
7980
],
8081
'allocations' => $allocations,
8182
'sftp' => [
82-
'username' => $server->username
83+
'username' => (Auth::user()->can('view-sftp', $server)) ? $server->username : null
8384
],
8485
'daemon' => [
8586
'token' => ($request->secure()) ? $server->daemonSecret : false,
@@ -94,6 +95,8 @@ public function power(Request $request, $uuid)
9495
$node = Models\Node::getByID($server->node);
9596
$client = Models\Node::guzzleRequest($server->node);
9697

98+
Auth::user()->can('power-' . $request->input('action'), $server);
99+
97100
$res = $client->request('PUT', '/server/power', [
98101
'headers' => [
99102
'X-Access-Server' => $server->uuid,

app/Models/Server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
use Pterodactyl\Models\Subuser;
2828
use Illuminate\Database\Eloquent\Model;
2929

30-
use Pterodactyl\Exception\DisplayException;
30+
use Pterodactyl\Exceptions\DisplayException;
3131

3232
class Server extends Model
3333
{

0 commit comments

Comments
 (0)