Fix app/ spelling errors
This commit is contained in:
parent
72d88cf243
commit
e2dc0638d9
|
@ -58,7 +58,7 @@ class AppSettingsCommand extends Command
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
protected $signature = 'p:environment:setup
|
protected $signature = 'p:environment:setup
|
||||||
{--new-salt : Wether or not to generate a new salt for Hashids.}
|
{--new-salt : Whether or not to generate a new salt for Hashids.}
|
||||||
{--author= : The email that services created on this instance should be linked to.}
|
{--author= : The email that services created on this instance should be linked to.}
|
||||||
{--url= : The URL that this Panel is running on.}
|
{--url= : The URL that this Panel is running on.}
|
||||||
{--timezone= : The timezone to use for Panel times.}
|
{--timezone= : The timezone to use for Panel times.}
|
||||||
|
|
|
@ -84,7 +84,7 @@ class InfoCommand extends Command
|
||||||
['Host', $this->config->get("database.connections.{$driver}.host")],
|
['Host', $this->config->get("database.connections.{$driver}.host")],
|
||||||
['Port', $this->config->get("database.connections.{$driver}.port")],
|
['Port', $this->config->get("database.connections.{$driver}.port")],
|
||||||
['Database', $this->config->get("database.connections.{$driver}.database")],
|
['Database', $this->config->get("database.connections.{$driver}.database")],
|
||||||
['Usernamne', $this->config->get("database.connections.{$driver}.username")],
|
['Username', $this->config->get("database.connections.{$driver}.username")],
|
||||||
], 'compact');
|
], 'compact');
|
||||||
|
|
||||||
$this->output->title('Email Configuration');
|
$this->output->title('Email Configuration');
|
||||||
|
|
|
@ -31,8 +31,8 @@ class BulkPowerActionCommand extends Command
|
||||||
*/
|
*/
|
||||||
protected $signature = 'p:server:bulk-power
|
protected $signature = 'p:server:bulk-power
|
||||||
{action : The action to perform (start, stop, restart, kill)}
|
{action : The action to perform (start, stop, restart, kill)}
|
||||||
{--servers= : A comma seperated list of servers.}
|
{--servers= : A comma separated list of servers.}
|
||||||
{--nodes= : A comma seperated list of nodes.}';
|
{--nodes= : A comma separated list of nodes.}';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
|
|
|
@ -59,7 +59,7 @@ interface AllocationRepositoryInterface extends RepositoryInterface
|
||||||
public function getAssignedAllocationIds(int $server): array;
|
public function getAssignedAllocationIds(int $server): array;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a concated result set of node ips that already have at least one
|
* Return a concatenated result set of node ips that already have at least one
|
||||||
* server assigned to that IP. This allows for filtering out sets for
|
* server assigned to that IP. This allows for filtering out sets for
|
||||||
* dedicated allocation IPs.
|
* dedicated allocation IPs.
|
||||||
*
|
*
|
||||||
|
|
|
@ -62,7 +62,7 @@ interface ServerRepositoryInterface extends BaseRepositoryInterface
|
||||||
public function delete(): ResponseInterface;
|
public function delete(): ResponseInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return detials on a specific server.
|
* Return details on a specific server.
|
||||||
*
|
*
|
||||||
* @return \Psr\Http\Message\ResponseInterface
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -19,7 +19,7 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
|
||||||
public function setConnection(string $connection);
|
public function setConnection(string $connection);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the connection to execute statements aganist.
|
* Return the connection to execute statements against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -57,5 +57,5 @@ interface EggRepositoryInterface extends RepositoryInterface
|
||||||
* @param int $service
|
* @param int $service
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isCopiableScript(int $copyFromId, int $service): bool;
|
public function isCopyableScript(int $copyFromId, int $service): bool;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ interface RepositoryInterface
|
||||||
public function getBuilder();
|
public function getBuilder();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the colummns to be selected or returned by the query.
|
* Returns the columns to be selected or returned by the query.
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
|
@ -59,7 +59,7 @@ interface RepositoryInterface
|
||||||
public function withFreshModel();
|
public function withFreshModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set wether or not the repository should return a fresh model
|
* Set whether or not the repository should return a fresh model
|
||||||
* when changes are committed.
|
* when changes are committed.
|
||||||
*
|
*
|
||||||
* @param bool $fresh
|
* @param bool $fresh
|
||||||
|
|
|
@ -119,7 +119,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter
|
||||||
public function getByUuid(string $uuid): Server;
|
public function getByUuid(string $uuid): Server;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return all of the servers that should have a power action performed aganist them.
|
* Return all of the servers that should have a power action performed against them.
|
||||||
*
|
*
|
||||||
* @param int[] $servers
|
* @param int[] $servers
|
||||||
* @param int[] $nodes
|
* @param int[] $nodes
|
||||||
|
|
|
@ -41,7 +41,7 @@ class EggRetrievalController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a JSON array of Eggs and the SHA1 hash of thier configuration file.
|
* Return a JSON array of Eggs and the SHA1 hash of their configuration file.
|
||||||
*
|
*
|
||||||
* @return \Illuminate\Http\JsonResponse
|
* @return \Illuminate\Http\JsonResponse
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -96,7 +96,7 @@ class SecurityController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Verifies that 2FA token recieved is valid and will work on the account.
|
* Verifies that 2FA token received is valid and will work on the account.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
|
|
|
@ -111,7 +111,7 @@ class Kernel extends HttpKernel
|
||||||
|
|
||||||
// Server specific middleware (used for authenticating access to resources)
|
// Server specific middleware (used for authenticating access to resources)
|
||||||
//
|
//
|
||||||
// These are only used for individual server authentication, and not gloabl
|
// These are only used for individual server authentication, and not global
|
||||||
// actions from other resources. They are defined in the route files.
|
// actions from other resources. They are defined in the route files.
|
||||||
'server..database' => DatabaseBelongsToServer::class,
|
'server..database' => DatabaseBelongsToServer::class,
|
||||||
'server..subuser' => SubuserBelongsToServer::class,
|
'server..subuser' => SubuserBelongsToServer::class,
|
||||||
|
|
|
@ -10,7 +10,7 @@ class AuthenticateApplicationUser
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Authenticate that the currently authenticated user is an administrator
|
* Authenticate that the currently authenticated user is an administrator
|
||||||
* and should be allowed to proceede through the application API.
|
* and should be allowed to proceed through the application API.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @param \Closure $next
|
* @param \Closure $next
|
||||||
|
|
|
@ -25,7 +25,7 @@ class RequireTwoFactorAuthentication
|
||||||
private $alert;
|
private $alert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The names of routes that should be accessable without 2FA enabled.
|
* The names of routes that should be accessible without 2FA enabled.
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -33,7 +33,7 @@ class AuthenticateAsSubuser
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine if a subuser has permissions to access a server, if so set thier access token.
|
* Determine if a subuser has permissions to access a server, if so set their access token.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @param \Closure $next
|
* @param \Closure $next
|
||||||
|
|
|
@ -16,7 +16,7 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
|
||||||
$modelRules = ApiKey::getCreateRules();
|
$modelRules = ApiKey::getCreateRules();
|
||||||
|
|
||||||
return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {
|
return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {
|
||||||
return [AdminAcl::COLUMN_IDENTIFER . $resource => $modelRules['r_' . $resource]];
|
return [AdminAcl::COLUMN_IDENTIFIER . $resource => $modelRules['r_' . $resource]];
|
||||||
})->merge(['memo' => $modelRules['memo']])->toArray();
|
})->merge(['memo' => $modelRules['memo']])->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
|
||||||
public function getKeyPermissions(): array
|
public function getKeyPermissions(): array
|
||||||
{
|
{
|
||||||
return collect($this->validated())->filter(function ($value, $key) {
|
return collect($this->validated())->filter(function ($value, $key) {
|
||||||
return substr($key, 0, strlen(AdminAcl::COLUMN_IDENTIFER)) === AdminAcl::COLUMN_IDENTIFER;
|
return substr($key, 0, strlen(AdminAcl::COLUMN_IDENTIFIER)) === AdminAcl::COLUMN_IDENTIFIER;
|
||||||
})->toArray();
|
})->toArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
|
||||||
class MailSettingsFormRequest extends AdminFormRequest
|
class MailSettingsFormRequest extends AdminFormRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return rules to validate mail settings POST data aganist.
|
* Return rules to validate mail settings POST data against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -38,7 +38,7 @@ abstract class ApplicationApiRequest extends FormRequest
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine if the current user is authorized to perform
|
* Determine if the current user is authorized to perform
|
||||||
* the requested action aganist the API.
|
* the requested action against the API.
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*
|
*
|
||||||
|
|
|
@ -19,7 +19,7 @@ class StoreLocationRequest extends ApplicationApiRequest
|
||||||
protected $permission = AdminAcl::WRITE;
|
protected $permission = AdminAcl::WRITE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rules to validate the request aganist.
|
* Rules to validate the request against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -20,7 +20,7 @@ class UpdateLocationRequest extends StoreLocationRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rules to validate this request aganist.
|
* Rules to validate this request against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,7 +7,7 @@ use Pterodactyl\Models\Server;
|
||||||
class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
|
class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return the rules to validate this request aganist.
|
* Return the rules to validate this request against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -19,7 +19,7 @@ class UpdateServerStartupRequest extends ApplicationApiRequest
|
||||||
protected $permission = AdminAcl::WRITE;
|
protected $permission = AdminAcl::WRITE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validation rules to run the input aganist.
|
* Validation rules to run the input against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -8,7 +8,7 @@ abstract class ClientApiRequest extends ApplicationApiRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Determine if the current user is authorized to perform
|
* Determine if the current user is authorized to perform
|
||||||
* the requested action aganist the API.
|
* the requested action against the API.
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -17,7 +17,7 @@ class SendCommandRequest extends GetServerRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rules to validate this request aganist.
|
* Rules to validate this request against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -18,7 +18,7 @@ class SendPowerRequest extends ClientApiRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rules to validate this request aganist.
|
* Rules to validate this request against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\FrontendUserFormRequest;
|
||||||
class StoreAccountKeyRequest extends FrontendUserFormRequest
|
class StoreAccountKeyRequest extends FrontendUserFormRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Rules to validate the request input aganist before storing
|
* Rules to validate the request input against before storing
|
||||||
* an account API key.
|
* an account API key.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
|
|
|
@ -19,7 +19,7 @@ class DeleteServerDatabaseRequest extends ServerFormRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the user permission to validate this request aganist.
|
* Return the user permission to validate this request against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
@ -29,7 +29,7 @@ class DeleteServerDatabaseRequest extends ServerFormRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rules to validate this request aganist.
|
* Rules to validate this request against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -19,7 +19,7 @@ class StoreServerDatabaseRequest extends ServerFormRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the user permission to validate this request aganist.
|
* Return the user permission to validate this request against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
@ -29,7 +29,7 @@ class StoreServerDatabaseRequest extends ServerFormRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rules to validate this request aganist.
|
* Rules to validate this request against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -12,7 +12,7 @@ namespace Pterodactyl\Http\Requests\Server;
|
||||||
class ScheduleCreationFormRequest extends ServerFormRequest
|
class ScheduleCreationFormRequest extends ServerFormRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Permission to validate this request aganist.
|
* Permission to validate this request against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -8,7 +8,7 @@ use Pterodactyl\Http\Requests\FrontendUserFormRequest;
|
||||||
abstract class ServerFormRequest extends FrontendUserFormRequest
|
abstract class ServerFormRequest extends FrontendUserFormRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return the user permission to validate this request aganist.
|
* Return the user permission to validate this request against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\Server\ServerFormRequest;
|
||||||
class SubuserStoreFormRequest extends ServerFormRequest
|
class SubuserStoreFormRequest extends ServerFormRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return the user permission to validate this request aganist.
|
* Return the user permission to validate this request against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
@ -17,7 +17,7 @@ class SubuserStoreFormRequest extends ServerFormRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The rules to validate this request submission aganist.
|
* The rules to validate this request submission against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\Server\ServerFormRequest;
|
||||||
class SubuserUpdateFormRequest extends ServerFormRequest
|
class SubuserUpdateFormRequest extends ServerFormRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return the user permission to validate this request aganist.
|
* Return the user permission to validate this request against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
@ -17,7 +17,7 @@ class SubuserUpdateFormRequest extends ServerFormRequest
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The rules to validate this request submission aganist.
|
* The rules to validate this request submission against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -20,7 +20,7 @@ use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
|
||||||
class UpdateFileContentsFormRequest extends ServerFormRequest
|
class UpdateFileContentsFormRequest extends ServerFormRequest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Return the permission string to validate this request aganist.
|
* Return the permission string to validate this request against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -92,7 +92,7 @@ class RunTaskJob extends Job implements ShouldQueue
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Perform the provided task aganist the daemon.
|
// Perform the provided task against the daemon.
|
||||||
switch ($task->action) {
|
switch ($task->action) {
|
||||||
case 'power':
|
case 'power':
|
||||||
$this->powerRepository->setServer($server)
|
$this->powerRepository->setServer($server)
|
||||||
|
|
|
@ -95,7 +95,7 @@ class ApiKey extends Model implements CleansAttributes, ValidableContract
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rules to protect aganist invalid data entry to DB.
|
* Rules to protect against invalid data entry to DB.
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -90,7 +90,7 @@ class DatabaseHost extends Model implements CleansAttributes, ValidableContract
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the databases assocaited with this host.
|
* Gets the databases associated with this host.
|
||||||
*
|
*
|
||||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -53,7 +53,7 @@ class Location extends Model implements CleansAttributes, ValidableContract
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the nodes in a specificed location.
|
* Gets the nodes in a specified location.
|
||||||
*
|
*
|
||||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -188,7 +188,7 @@ class User extends Model implements
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Store the username as a lowecase string.
|
* Store the username as a lowercase string.
|
||||||
*
|
*
|
||||||
* @param string $value
|
* @param string $value
|
||||||
*/
|
*/
|
||||||
|
@ -198,7 +198,7 @@ class User extends Model implements
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a concated result for the accounts full name.
|
* Return a concatenated result for the accounts full name.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ class HashidsServiceProvider extends ServiceProvider
|
||||||
return new Hashids(
|
return new Hashids(
|
||||||
$config->get('hashids.salt', ''),
|
$config->get('hashids.salt', ''),
|
||||||
$config->get('hashids.length', 0),
|
$config->get('hashids.length', 0),
|
||||||
$config->get('hashids.alphabet', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
|
$config->get('hashids.alphabet', 'abcdefghijkmlnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -95,7 +95,7 @@ class ServerRepository extends BaseRepository implements ServerRepositoryInterfa
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return detials on a specific server.
|
* Return details on a specific server.
|
||||||
*
|
*
|
||||||
* @return \Psr\Http\Message\ResponseInterface
|
* @return \Psr\Http\Message\ResponseInterface
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -97,7 +97,7 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a concated result set of node ips that already have at least one
|
* Return a concatenated result set of node ips that already have at least one
|
||||||
* server assigned to that IP. This allows for filtering out sets for
|
* server assigned to that IP. This allows for filtering out sets for
|
||||||
* dedicated allocation IPs.
|
* dedicated allocation IPs.
|
||||||
*
|
*
|
||||||
|
|
|
@ -59,7 +59,7 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the connection to execute statements aganist.
|
* Return the connection to execute statements against.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -92,7 +92,7 @@ class EggRepository extends EloquentRepository implements EggRepositoryInterface
|
||||||
* @param int $service
|
* @param int $service
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isCopiableScript(int $copyFromId, int $service): bool
|
public function isCopyableScript(int $copyFromId, int $service): bool
|
||||||
{
|
{
|
||||||
return $this->getBuilder()->whereNull('copy_script_from')
|
return $this->getBuilder()->whereNull('copy_script_from')
|
||||||
->where('id', '=', $copyFromId)
|
->where('id', '=', $copyFromId)
|
||||||
|
|
|
@ -265,7 +265,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return all of the servers that should have a power action performed aganist them.
|
* Return all of the servers that should have a power action performed against them.
|
||||||
*
|
*
|
||||||
* @param int[] $servers
|
* @param int[] $servers
|
||||||
* @param int[] $nodes
|
* @param int[] $nodes
|
||||||
|
|
|
@ -37,7 +37,7 @@ abstract class Repository implements RepositoryInterface
|
||||||
{
|
{
|
||||||
$this->app = $application;
|
$this->app = $application;
|
||||||
|
|
||||||
$this->initalizeModel($this->model());
|
$this->initializeModel($this->model());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -103,7 +103,7 @@ abstract class Repository implements RepositoryInterface
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set wether or not the repository should return a fresh model
|
* Set whether or not the repository should return a fresh model
|
||||||
* when changes are committed.
|
* when changes are committed.
|
||||||
*
|
*
|
||||||
* @param bool $fresh
|
* @param bool $fresh
|
||||||
|
@ -123,7 +123,7 @@ abstract class Repository implements RepositoryInterface
|
||||||
* @param array $model
|
* @param array $model
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
protected function initalizeModel(...$model)
|
protected function initializeModel(...$model)
|
||||||
{
|
{
|
||||||
switch (count($model)) {
|
switch (count($model)) {
|
||||||
case 1:
|
case 1:
|
||||||
|
@ -131,7 +131,7 @@ abstract class Repository implements RepositoryInterface
|
||||||
case 2:
|
case 2:
|
||||||
return $this->model = call_user_func([$this->app->make($model[0]), $model[1]]);
|
return $this->model = call_user_func([$this->app->make($model[0]), $model[1]]);
|
||||||
default:
|
default:
|
||||||
throw new InvalidArgumentException('Model must be a FQCN or an array with a count of two.');
|
throw new InvalidArgumentException('Model must be a FQDN or an array with a count of two.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,9 +9,9 @@ class AdminAcl
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Resource permission columns in the api_keys table begin
|
* Resource permission columns in the api_keys table begin
|
||||||
* with this identifer.
|
* with this identifier.
|
||||||
*/
|
*/
|
||||||
const COLUMN_IDENTIFER = 'r_';
|
const COLUMN_IDENTIFIER = 'r_';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The different types of permissions available for API keys. This
|
* The different types of permissions available for API keys. This
|
||||||
|
@ -63,7 +63,7 @@ class AdminAcl
|
||||||
*/
|
*/
|
||||||
public static function check(ApiKey $key, string $resource, int $action = self::READ)
|
public static function check(ApiKey $key, string $resource, int $action = self::READ)
|
||||||
{
|
{
|
||||||
return self::can(data_get($key, self::COLUMN_IDENTIFER . $resource, self::NONE), $action);
|
return self::can(data_get($key, self::COLUMN_IDENTIFIER . $resource, self::NONE), $action);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -51,7 +51,7 @@ class KeyCreationService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new API key for the Panel using the permissions passed in the data request.
|
* Create a new API key for the Panel using the permissions passed in the data request.
|
||||||
* This will automatically generate an identifer and an encrypted token that are
|
* This will automatically generate an identifier and an encrypted token that are
|
||||||
* stored in the database.
|
* stored in the database.
|
||||||
*
|
*
|
||||||
* @param array $data
|
* @param array $data
|
||||||
|
|
|
@ -88,7 +88,7 @@ class FindViableNodesService
|
||||||
* attempt to find all nodes in the defined locations that meet the disk and
|
* attempt to find all nodes in the defined locations that meet the disk and
|
||||||
* memory availability requirements. Any nodes not meeting those requirements
|
* memory availability requirements. Any nodes not meeting those requirements
|
||||||
* are tossed out, as are any nodes marked as non-public, meaning automatic
|
* are tossed out, as are any nodes marked as non-public, meaning automatic
|
||||||
* deployments should not be done aganist them.
|
* deployments should not be done against them.
|
||||||
*
|
*
|
||||||
* @return int[]
|
* @return int[]
|
||||||
* @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableNodeException
|
* @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableNodeException
|
||||||
|
|
|
@ -15,7 +15,7 @@ use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
|
||||||
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
||||||
use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
|
use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
|
||||||
|
|
||||||
// When a mommy and a daddy pterodactyl really like eachother...
|
// When a mommy and a daddy pterodactyl really like each other...
|
||||||
class EggCreationService
|
class EggCreationService
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -47,7 +47,7 @@ class InstallScriptService
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! is_null(array_get($data, 'copy_script_from'))) {
|
if (! is_null(array_get($data, 'copy_script_from'))) {
|
||||||
if (! $this->repository->isCopiableScript(array_get($data, 'copy_script_from'), $egg->nest_id)) {
|
if (! $this->repository->isCopyableScript(array_get($data, 'copy_script_from'), $egg->nest_id)) {
|
||||||
throw new InvalidCopyFromException(trans('exceptions.nest.egg.invalid_copy_id'));
|
throw new InvalidCopyFromException(trans('exceptions.nest.egg.invalid_copy_id'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ class StartupCommandViewService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate a startup command for a server and return all of the user-viewable variables
|
* Generate a startup command for a server and return all of the user-viewable variables
|
||||||
* as well as thier assigned values.
|
* as well as their assigned values.
|
||||||
*
|
*
|
||||||
* @param int $server
|
* @param int $server
|
||||||
* @return \Illuminate\Support\Collection
|
* @return \Illuminate\Support\Collection
|
||||||
|
|
|
@ -63,7 +63,7 @@ class VariableValidatorService
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validate all of the passed data aganist the given service option variables.
|
* Validate all of the passed data against the given service option variables.
|
||||||
*
|
*
|
||||||
* @param int $egg
|
* @param int $egg
|
||||||
* @param array $fields
|
* @param array $fields
|
||||||
|
|
|
@ -52,7 +52,7 @@ class AuthenticateUsingPasswordService
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempt to authenticate a provded username and password and determine if they
|
* Attempt to authenticate a provided username and password and determine if they
|
||||||
* have permission to access a given server. This function does not account for
|
* have permission to access a given server. This function does not account for
|
||||||
* subusers currently. Only administrators and server owners can login to access
|
* subusers currently. Only administrators and server owners can login to access
|
||||||
* their files at this time.
|
* their files at this time.
|
||||||
|
|
|
@ -47,7 +47,7 @@ class UserUpdateService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update the user model instance. If the user has been removed as an administrator
|
* Update the user model instance. If the user has been removed as an administrator
|
||||||
* revoke all of the authentication tokens that have beenn assigned to their account.
|
* revoke all of the authentication tokens that have been assigned to their account.
|
||||||
*
|
*
|
||||||
* @param \Pterodactyl\Models\User $user
|
* @param \Pterodactyl\Models\User $user
|
||||||
* @param array $data
|
* @param array $data
|
||||||
|
|
|
@ -24,7 +24,7 @@ class HumanReadableTest extends TestCase
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provide data to test aganist the helper function.
|
* Provide data to test against the helper function.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,7 @@ class IsDigitTest extends TestCase
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provide data to test aganist the helper function.
|
* Provide data to test against the helper function.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -19,7 +19,7 @@ class AdminAclTest extends TestCase
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test that checking aganist a model works as expected.
|
* Test that checking against a model works as expected.
|
||||||
*/
|
*/
|
||||||
public function testCheck()
|
public function testCheck()
|
||||||
{
|
{
|
||||||
|
|
|
@ -65,7 +65,7 @@ class InstallScriptServiceTest extends TestCase
|
||||||
{
|
{
|
||||||
$this->data['copy_script_from'] = 1;
|
$this->data['copy_script_from'] = 1;
|
||||||
|
|
||||||
$this->repository->shouldReceive('isCopiableScript')->with(1, $this->model->nest_id)->once()->andReturn(true);
|
$this->repository->shouldReceive('isCopyableScript')->with(1, $this->model->nest_id)->once()->andReturn(true);
|
||||||
$this->repository->shouldReceive('withoutFreshModel')->withNoArgs()->once()->andReturnSelf()
|
$this->repository->shouldReceive('withoutFreshModel')->withNoArgs()->once()->andReturnSelf()
|
||||||
->shouldReceive('update')->with($this->model->id, $this->data)->andReturnNull();
|
->shouldReceive('update')->with($this->model->id, $this->data)->andReturnNull();
|
||||||
|
|
||||||
|
@ -73,13 +73,13 @@ class InstallScriptServiceTest extends TestCase
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test that an exception gets raised when the script is not copiable.
|
* Test that an exception gets raised when the script is not copyable.
|
||||||
*/
|
*/
|
||||||
public function testUpdateWithInvalidCopyScriptFromAttribute()
|
public function testUpdateWithInvalidCopyScriptFromAttribute()
|
||||||
{
|
{
|
||||||
$this->data['copy_script_from'] = 1;
|
$this->data['copy_script_from'] = 1;
|
||||||
|
|
||||||
$this->repository->shouldReceive('isCopiableScript')->with(1, $this->model->nest_id)->once()->andReturn(false);
|
$this->repository->shouldReceive('isCopyableScript')->with(1, $this->model->nest_id)->once()->andReturn(false);
|
||||||
try {
|
try {
|
||||||
$this->service->handle($this->model, $this->data);
|
$this->service->handle($this->model, $this->data);
|
||||||
} catch (Exception $exception) {
|
} catch (Exception $exception) {
|
||||||
|
|
|
@ -68,7 +68,7 @@ class VariableCreationServiceTest extends TestCase
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test that an empty (null) value passed in the option key is handled
|
* Test that an empty (null) value passed in the option key is handled
|
||||||
* properly as an array. Also tests the same case aganist the default_value.
|
* properly as an array. Also tests the same case against the default_value.
|
||||||
*
|
*
|
||||||
* @see https://github.com/Pterodactyl/Panel/issues/841
|
* @see https://github.com/Pterodactyl/Panel/issues/841
|
||||||
* @see https://github.com/Pterodactyl/Panel/issues/943
|
* @see https://github.com/Pterodactyl/Panel/issues/943
|
||||||
|
|
|
@ -154,7 +154,7 @@ class PackCreationServiceTest extends TestCase
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return an array of valid mimetypes to test aganist.
|
* Return an array of valid mimetypes to test against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
@ -167,7 +167,7 @@ class PackCreationServiceTest extends TestCase
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provide invalid mimetypes to test exceptions aganist.
|
* Provide invalid mimetypes to test exceptions against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -190,7 +190,7 @@ class TaskCreationServiceTest extends TestCase
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return an array of invalid schedule data to test aganist.
|
* Return an array of invalid schedule data to test against.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue