fix styleci issues
This commit is contained in:
parent
cc0d54e906
commit
a661f71974
3 changed files with 43 additions and 39 deletions
|
@ -279,7 +279,8 @@ class NodesController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
public function getConfigurationToken(Request $request, $id) {
|
||||
public function getConfigurationToken(Request $request, $id)
|
||||
{
|
||||
// Check if Node exists. Will lead to 404 if not.
|
||||
Models\Node::findOrFail($id);
|
||||
|
||||
|
@ -290,10 +291,10 @@ class NodesController extends Controller
|
|||
$token->expires_at = Carbon::now()->addMinutes(5); // Expire in 5 Minutes
|
||||
$token->save();
|
||||
|
||||
$token_response = array(
|
||||
$token_response = [
|
||||
'token' => $token->token,
|
||||
'expires_at' => $token->expires_at->toDateTimeString()
|
||||
);
|
||||
'expires_at' => $token->expires_at->toDateTimeString(),
|
||||
];
|
||||
|
||||
return response(json_encode($token_response), 200)
|
||||
->header('Content-Type', 'application/json');
|
||||
|
|
|
@ -29,7 +29,6 @@ use Pterodactyl\Models;
|
|||
use Illuminate\Http\Request;
|
||||
use Pterodactyl\Http\Controllers\Controller;
|
||||
use Pterodactyl\Services\NotificationService;
|
||||
use Pterodactyl\Models\NodeConfigurationToken;
|
||||
|
||||
class RemoteController extends Controller
|
||||
{
|
||||
|
@ -110,20 +109,21 @@ class RemoteController extends Controller
|
|||
return response('', 201);
|
||||
}
|
||||
|
||||
public function getConfiguration(Request $request, $tokenString) {
|
||||
public function getConfiguration(Request $request, $tokenString)
|
||||
{
|
||||
// Try to query the token and the node from the database
|
||||
try {
|
||||
$token = Models\NodeConfigurationToken::where('token', $tokenString)->firstOrFail();
|
||||
$node = Models\Node::findOrFail($token->node);
|
||||
} catch(\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
|
||||
return response(json_encode(array('error' => 'token_invalid')), 403)
|
||||
} catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
|
||||
return response(json_encode(['error' => 'token_invalid']), 403)
|
||||
->header('Content-Type', 'application/json');
|
||||
}
|
||||
|
||||
// Check if token is expired
|
||||
if ($token->expires_at->lt(Carbon::now())) {
|
||||
$token->delete();
|
||||
return response(json_encode(array('error' => 'token_expired')), 403)
|
||||
return response(json_encode(['error' => 'token_expired']), 403)
|
||||
->header('Content-Type', 'application/json');
|
||||
}
|
||||
|
||||
|
|
|
@ -119,55 +119,58 @@ class Node extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns the configuration in JSON format
|
||||
* Returns the configuration in JSON format.
|
||||
*
|
||||
* @param boolean $pretty Wether to pretty print the JSON or not
|
||||
* @param bool $pretty Wether to pretty print the JSON or not
|
||||
* @return string The configration in JSON format
|
||||
*/
|
||||
public function getConfigurationAsJson($pretty = false) {
|
||||
$config = array(
|
||||
'web' => array(
|
||||
public function getConfigurationAsJson($pretty = false)
|
||||
{
|
||||
$config = [
|
||||
'web' => [
|
||||
'host' => '0.0.0.0',
|
||||
'listen' => $this->daemonListen,
|
||||
'ssl' => array(
|
||||
'ssl' => [
|
||||
'enabled' => $this->scheme === 'https',
|
||||
'certificate' => '/etc/letsencrypt/live/localhost/fullchain.pem',
|
||||
'key' => '/etc/letsencrypt/live/localhost/privkey.pem'
|
||||
)
|
||||
),
|
||||
'docker' => array(
|
||||
'key' => '/etc/letsencrypt/live/localhost/privkey.pem',
|
||||
],
|
||||
],
|
||||
'docker' => [
|
||||
'socket' => '/var/run/docker.sock',
|
||||
'autoupdate_images' => true
|
||||
),
|
||||
'sftp' => array(
|
||||
'autoupdate_images' => true,
|
||||
],
|
||||
'sftp' => [
|
||||
'path' => $this->daemonBase,
|
||||
'port' => $this->daemonSFTP,
|
||||
'container' => 'ptdl-sftp'
|
||||
),
|
||||
'query' => array(
|
||||
'container' => 'ptdl-sftp',
|
||||
],
|
||||
'query' => [
|
||||
'kill_on_fail' => true,
|
||||
'fail_limit' => 5
|
||||
),
|
||||
'logger' => array(
|
||||
'fail_limit' => 5,
|
||||
],
|
||||
'logger' => [
|
||||
'path' => 'logs/',
|
||||
'src' => false,
|
||||
'level' => 'info',
|
||||
'period' => '1d',
|
||||
'count' => 3
|
||||
),
|
||||
'remote' => array(
|
||||
'count' => 3,
|
||||
],
|
||||
'remote' => [
|
||||
'base' => config('app.url'),
|
||||
'download' => route('remote.download'),
|
||||
'installed' => route('remote.install')
|
||||
),
|
||||
'uploads' => array(
|
||||
'size_limit' => $this->upload_size
|
||||
),
|
||||
'keys' => array($this->daemonSecret)
|
||||
);
|
||||
'installed' => route('remote.install'),
|
||||
],
|
||||
'uploads' => [
|
||||
'size_limit' => $this->upload_size,
|
||||
],
|
||||
'keys' => [$this->daemonSecret],
|
||||
];
|
||||
|
||||
$json_options = JSON_UNESCAPED_SLASHES;
|
||||
if ($pretty) $json_options |= JSON_PRETTY_PRINT;
|
||||
if ($pretty) {
|
||||
$json_options |= JSON_PRETTY_PRINT;
|
||||
}
|
||||
|
||||
return json_encode($config, $json_options);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue