More service classes for pack management
This commit is contained in:
parent
9d3dca87f2
commit
280633b28a
13 changed files with 568 additions and 52 deletions
|
@ -24,7 +24,9 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Exceptions\Service\Pack;
|
namespace Pterodactyl\Exceptions\Service\Pack;
|
||||||
|
|
||||||
class InvalidFileMimeTypeException extends \Exception
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
|
||||||
|
class InvalidFileMimeTypeException extends DisplayException
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,9 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Exceptions\Service\Pack;
|
namespace Pterodactyl\Exceptions\Service\Pack;
|
||||||
|
|
||||||
class InvalidFileUploadException extends \Exception
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
|
||||||
|
class InvalidFileUploadException extends DisplayException
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pterodactyl\Exceptions\Service\Pack;
|
||||||
|
|
||||||
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
|
||||||
|
class InvalidPackArchiveFormatException extends DisplayException
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
|
@ -0,0 +1,32 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pterodactyl\Exceptions\Service\Pack;
|
||||||
|
|
||||||
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
|
||||||
|
class UnreadableZipArchiveException extends DisplayException
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
31
app/Exceptions/Service/Pack/ZipExtractionException.php
Normal file
31
app/Exceptions/Service/Pack/ZipExtractionException.php
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pterodactyl\Exceptions\Service\Pack;
|
||||||
|
|
||||||
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
|
||||||
|
class ZipExtractionException extends DisplayException
|
||||||
|
{
|
||||||
|
}
|
|
@ -26,6 +26,12 @@ namespace Pterodactyl\Http\Controllers\Admin;
|
||||||
|
|
||||||
use Log;
|
use Log;
|
||||||
use Alert;
|
use Alert;
|
||||||
|
use Prologue\Alerts\AlertsMessageBag;
|
||||||
|
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
|
||||||
|
use Pterodactyl\Services\Packs\PackCreationService;
|
||||||
|
use Pterodactyl\Services\Packs\PackDeletionService;
|
||||||
|
use Pterodactyl\Services\Packs\PackUpdateService;
|
||||||
|
use Pterodactyl\Services\Packs\TemplateUploadService;
|
||||||
use Storage;
|
use Storage;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Pterodactyl\Models\Pack;
|
use Pterodactyl\Models\Pack;
|
||||||
|
@ -37,6 +43,62 @@ use Pterodactyl\Exceptions\DisplayValidationException;
|
||||||
|
|
||||||
class PackController extends Controller
|
class PackController extends Controller
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var \Prologue\Alerts\AlertsMessageBag
|
||||||
|
*/
|
||||||
|
protected $alert;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Packs\PackCreationService
|
||||||
|
*/
|
||||||
|
protected $creationService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Packs\PackDeletionService
|
||||||
|
*/
|
||||||
|
protected $deletionService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\PackRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Packs\PackUpdateService
|
||||||
|
*/
|
||||||
|
protected $packUpdateService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Packs\TemplateUploadService
|
||||||
|
*/
|
||||||
|
protected $templateUploadService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PackController constructor.
|
||||||
|
*
|
||||||
|
* @param \Prologue\Alerts\AlertsMessageBag $alert
|
||||||
|
* @param \Pterodactyl\Services\Packs\PackCreationService $creationService
|
||||||
|
* @param \Pterodactyl\Services\Packs\PackDeletionService $deletionService
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository
|
||||||
|
* @param \Pterodactyl\Services\Packs\PackUpdateService $packUpdateService
|
||||||
|
* @param \Pterodactyl\Services\Packs\TemplateUploadService $templateUploadService
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
AlertsMessageBag $alert,
|
||||||
|
PackCreationService $creationService,
|
||||||
|
PackDeletionService $deletionService,
|
||||||
|
PackRepositoryInterface $repository,
|
||||||
|
PackUpdateService $packUpdateService,
|
||||||
|
TemplateUploadService $templateUploadService
|
||||||
|
) {
|
||||||
|
$this->alert = $alert;
|
||||||
|
$this->creationService = $creationService;
|
||||||
|
$this->deletionService = $deletionService;
|
||||||
|
$this->repository = $repository;
|
||||||
|
$this->packUpdateService = $packUpdateService;
|
||||||
|
$this->templateUploadService = $templateUploadService;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display listing of all packs on the system.
|
* Display listing of all packs on the system.
|
||||||
*
|
*
|
||||||
|
@ -85,33 +147,25 @@ class PackController extends Controller
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @return \Illuminate\View\View
|
* @return \Illuminate\View\View
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
|
||||||
*/
|
*/
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
$repo = new PackRepository;
|
if ($request->has('from_template')) {
|
||||||
|
$pack = $this->templateUploadService->handle($request->input('option_id'), $request->input('file_upload'));
|
||||||
try {
|
|
||||||
if ($request->input('action') === 'from_template') {
|
|
||||||
$pack = $repo->createWithTemplate($request->intersect(['option_id', 'file_upload']));
|
|
||||||
} else {
|
} else {
|
||||||
$pack = $repo->create($request->intersect([
|
$pack = $this->creationService->handle($request->normalize(), $request->input('file_upload'));
|
||||||
'name', 'description', 'version', 'option_id',
|
|
||||||
'selectable', 'visible', 'locked', 'file_upload',
|
|
||||||
]));
|
|
||||||
}
|
}
|
||||||
Alert::success('Pack successfully created on the system.')->flash();
|
|
||||||
|
$this->alert->success(trans('admin/pack.notices.pack_created'))->flash();
|
||||||
|
|
||||||
return redirect()->route('admin.packs.view', $pack->id);
|
return redirect()->route('admin.packs.view', $pack->id);
|
||||||
} catch (DisplayValidationException $ex) {
|
|
||||||
return redirect()->route('admin.packs.new')->withErrors(json_decode($ex->getMessage()))->withInput();
|
|
||||||
} catch (DisplayException $ex) {
|
|
||||||
Alert::danger($ex->getMessage())->flash();
|
|
||||||
} catch (\Exception $ex) {
|
|
||||||
Log::error($ex);
|
|
||||||
Alert::danger('An error occured while attempting to add a new service pack. This error has been logged.')->flash();
|
|
||||||
}
|
|
||||||
|
|
||||||
return redirect()->route('admin.packs.new')->withInput();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -24,20 +24,20 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Services\Packs;
|
namespace Pterodactyl\Services\Packs;
|
||||||
|
|
||||||
|
use Illuminate\Http\UploadedFile;
|
||||||
use Ramsey\Uuid\Uuid;
|
use Ramsey\Uuid\Uuid;
|
||||||
use Illuminate\Database\ConnectionInterface;
|
use Illuminate\Database\ConnectionInterface;
|
||||||
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
|
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
|
||||||
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
|
||||||
use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
|
use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
|
||||||
use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
|
use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
|
||||||
use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
|
use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
|
||||||
|
|
||||||
class PackCreationService
|
class PackCreationService
|
||||||
{
|
{
|
||||||
/**
|
const VALID_UPLOAD_TYPES = [
|
||||||
* @var \Illuminate\Contracts\Config\Repository
|
'application/gzip',
|
||||||
*/
|
'application/x-gzip',
|
||||||
protected $config;
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var \Illuminate\Database\ConnectionInterface
|
* @var \Illuminate\Database\ConnectionInterface
|
||||||
|
@ -57,18 +57,15 @@ class PackCreationService
|
||||||
/**
|
/**
|
||||||
* PackCreationService constructor.
|
* PackCreationService constructor.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Contracts\Config\Repository $config
|
|
||||||
* @param \Illuminate\Database\ConnectionInterface $connection
|
* @param \Illuminate\Database\ConnectionInterface $connection
|
||||||
* @param \Illuminate\Contracts\Filesystem\Factory $storage
|
* @param \Illuminate\Contracts\Filesystem\Factory $storage
|
||||||
* @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository
|
* @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
ConfigRepository $config,
|
|
||||||
ConnectionInterface $connection,
|
ConnectionInterface $connection,
|
||||||
FilesystemFactory $storage,
|
FilesystemFactory $storage,
|
||||||
PackRepositoryInterface $repository
|
PackRepositoryInterface $repository
|
||||||
) {
|
) {
|
||||||
$this->config = $config;
|
|
||||||
$this->connection = $connection;
|
$this->connection = $connection;
|
||||||
$this->repository = $repository;
|
$this->repository = $repository;
|
||||||
$this->storage = $storage;
|
$this->storage = $storage;
|
||||||
|
@ -85,15 +82,17 @@ class PackCreationService
|
||||||
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
|
||||||
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
|
||||||
*/
|
*/
|
||||||
public function handle(array $data, $file = null)
|
public function handle(array $data, UploadedFile $file = null)
|
||||||
{
|
{
|
||||||
if (! is_null($file)) {
|
if (! is_null($file)) {
|
||||||
if (! $file->isValid()) {
|
if (! $file->isValid()) {
|
||||||
throw new InvalidFileUploadException;
|
throw new InvalidFileUploadException(trans('admin/exceptions.packs.invalid_upload'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! in_array($file->getMimeType(), $this->config->get('pterodactyl.files.pack_types'))) {
|
if (! in_array($file->getMimeType(), self::VALID_UPLOAD_TYPES)) {
|
||||||
throw new InvalidFileMimeTypeException;
|
throw new InvalidFileMimeTypeException(trans('admin/exceptions.packs.invalid_mime', [
|
||||||
|
'type' => implode(', ', self::VALID_UPLOAD_TYPES),
|
||||||
|
]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -107,7 +106,7 @@ class PackCreationService
|
||||||
['uuid' => Uuid::uuid4()], $data
|
['uuid' => Uuid::uuid4()], $data
|
||||||
));
|
));
|
||||||
|
|
||||||
$this->storage->disk('default')->makeDirectory('packs/' . $pack->uuid);
|
$this->storage->disk()->makeDirectory('packs/' . $pack->uuid);
|
||||||
if (! is_null($file)) {
|
if (! is_null($file)) {
|
||||||
$file->storeAs('packs/' . $pack->uuid, 'archive.tar.gz');
|
$file->storeAs('packs/' . $pack->uuid, 'archive.tar.gz');
|
||||||
}
|
}
|
||||||
|
|
100
app/Services/Packs/PackDeletionService.php
Normal file
100
app/Services/Packs/PackDeletionService.php
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pterodactyl\Services\Packs;
|
||||||
|
|
||||||
|
use Pterodactyl\Models\Pack;
|
||||||
|
use Illuminate\Database\ConnectionInterface;
|
||||||
|
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
|
||||||
|
use Pterodactyl\Exceptions\Service\HasActiveServersException;
|
||||||
|
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||||
|
use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
|
||||||
|
|
||||||
|
class PackDeletionService
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Database\ConnectionInterface
|
||||||
|
*/
|
||||||
|
protected $connection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\PackRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $serverRepository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Illuminate\Contracts\Filesystem\Factory
|
||||||
|
*/
|
||||||
|
protected $storage;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PackDeletionService constructor.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Database\ConnectionInterface $connection
|
||||||
|
* @param \Illuminate\Contracts\Filesystem\Factory $storage
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
ConnectionInterface $connection,
|
||||||
|
FilesystemFactory $storage,
|
||||||
|
PackRepositoryInterface $repository,
|
||||||
|
ServerRepositoryInterface $serverRepository
|
||||||
|
) {
|
||||||
|
$this->connection = $connection;
|
||||||
|
$this->repository = $repository;
|
||||||
|
$this->serverRepository = $serverRepository;
|
||||||
|
$this->storage = $storage;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete a pack from the database as well as the archive stored on the server.
|
||||||
|
*
|
||||||
|
* @param int|\Pterodactyl\Models\Pack$pack
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
|
*/
|
||||||
|
public function handle($pack)
|
||||||
|
{
|
||||||
|
if (! $pack instanceof Pack) {
|
||||||
|
$pack = $this->repository->withColumns(['id', 'uuid'])->find($pack);
|
||||||
|
}
|
||||||
|
|
||||||
|
$count = $this->serverRepository->findCountWhere([['pack_id', '=', $pack]]);
|
||||||
|
if ($count !== 0) {
|
||||||
|
throw new HasActiveServersException(trans('admin/exceptions.packs.delete_has_servers'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->connection->beginTransaction();
|
||||||
|
$this->repository->delete($pack->id);
|
||||||
|
$this->storage->disk()->deleteDirectory('packs/' . $pack->uuid);
|
||||||
|
$this->connection->commit();
|
||||||
|
}
|
||||||
|
}
|
90
app/Services/Packs/PackUpdateService.php
Normal file
90
app/Services/Packs/PackUpdateService.php
Normal file
|
@ -0,0 +1,90 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pterodactyl\Services\Packs;
|
||||||
|
|
||||||
|
use Pterodactyl\Models\Pack;
|
||||||
|
use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
|
||||||
|
use Pterodactyl\Exceptions\Service\HasActiveServersException;
|
||||||
|
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||||
|
|
||||||
|
class PackUpdateService
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\PackRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
|
||||||
|
*/
|
||||||
|
protected $serverRepository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PackUpdateService constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository
|
||||||
|
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
PackRepositoryInterface $repository,
|
||||||
|
ServerRepositoryInterface $serverRepository
|
||||||
|
) {
|
||||||
|
$this->repository = $repository;
|
||||||
|
$this->serverRepository = $serverRepository;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update a pack.
|
||||||
|
*
|
||||||
|
* @param int|\Pterodactyl\Models\Pack $pack
|
||||||
|
* @param array $data
|
||||||
|
* @return bool
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||||
|
*/
|
||||||
|
public function handle($pack, array $data)
|
||||||
|
{
|
||||||
|
if (! $pack instanceof Pack) {
|
||||||
|
$pack = $this->repository->withColumns(['id', 'option_id'])->find($pack);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((int) array_get($data, 'option_id', $pack->option_id) !== $pack->option_id) {
|
||||||
|
$count = $this->serverRepository->findCountWhere([['pack_id', '=', $pack->id]]);
|
||||||
|
|
||||||
|
if ($count !== 0) {
|
||||||
|
throw new HasActiveServersException(trans('admin/exceptions.packs.update_has_servers'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Transform values to boolean
|
||||||
|
$data['selectable'] = isset($data['selectable']);
|
||||||
|
$data['visible'] = isset($data['visible']);
|
||||||
|
$data['locked'] = isset($data['locked']);
|
||||||
|
|
||||||
|
return $this->repository->withoutFresh()->update($pack->id, $data);
|
||||||
|
}
|
||||||
|
}
|
140
app/Services/Packs/TemplateUploadService.php
Normal file
140
app/Services/Packs/TemplateUploadService.php
Normal file
|
@ -0,0 +1,140 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pterodactyl\Services\Packs;
|
||||||
|
|
||||||
|
use ZipArchive;
|
||||||
|
use Illuminate\Http\UploadedFile;
|
||||||
|
use Pterodactyl\Exceptions\Service\Pack\ZipExtractionException;
|
||||||
|
use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
|
||||||
|
use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
|
||||||
|
use Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException;
|
||||||
|
use Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException;
|
||||||
|
|
||||||
|
class TemplateUploadService
|
||||||
|
{
|
||||||
|
const VALID_UPLOAD_TYPES = [
|
||||||
|
'application/zip',
|
||||||
|
'text/plain',
|
||||||
|
'application/json',
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \ZipArchive
|
||||||
|
*/
|
||||||
|
protected $archive;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Services\Packs\PackCreationService
|
||||||
|
*/
|
||||||
|
protected $creationService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TemplateUploadService constructor.
|
||||||
|
*
|
||||||
|
* @param \Pterodactyl\Services\Packs\PackCreationService $creationService
|
||||||
|
* @param \ZipArchive $archive
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
PackCreationService $creationService,
|
||||||
|
ZipArchive $archive
|
||||||
|
) {
|
||||||
|
$this->archive = $archive;
|
||||||
|
$this->creationService = $creationService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Process an uploaded file to create a new pack from a JSON or ZIP format.
|
||||||
|
*
|
||||||
|
* @param int $option
|
||||||
|
* @param \Illuminate\Http\UploadedFile $file
|
||||||
|
* @return \Pterodactyl\Models\Pack
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
|
||||||
|
*/
|
||||||
|
public function handle($option, UploadedFile $file)
|
||||||
|
{
|
||||||
|
if (! $file->isValid()) {
|
||||||
|
throw new InvalidFileUploadException(trans('admin/exceptions.packs.invalid_upload'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! in_array($file->getMimeType(), self::VALID_UPLOAD_TYPES)) {
|
||||||
|
throw new InvalidFileMimeTypeException(trans('admin/exceptions.packs.invalid_mime', [
|
||||||
|
'type' => implode(', ', self::VALID_UPLOAD_TYPES),
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($file->getMimeType() === 'application/zip') {
|
||||||
|
return $this->handleArchive($option, $file);
|
||||||
|
} else {
|
||||||
|
$json = json_decode($file->openFile()->fread($file->getSize()), true);
|
||||||
|
$json['option_id'] = $option;
|
||||||
|
|
||||||
|
return $this->creationService->handle($json);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Process a ZIP file to create a pack and stored archive.
|
||||||
|
*
|
||||||
|
* @param int $option
|
||||||
|
* @param \Illuminate\Http\UploadedFile $file
|
||||||
|
* @return \Pterodactyl\Models\Pack
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
|
||||||
|
*/
|
||||||
|
protected function handleArchive($option, $file)
|
||||||
|
{
|
||||||
|
if (! $this->archive->open($file->getRealPath())) {
|
||||||
|
throw new UnreadableZipArchiveException(trans('admin/exceptions.packs.unreadable'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $this->archive->locateName('import.json') || ! $this->archive->locateName('archive.tar.gz')) {
|
||||||
|
throw new InvalidPackArchiveFormatException(trans('admin/exceptions.packs.invalid_archive_exception'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$json = json_decode($this->archive->getFromName('import.json'), true);
|
||||||
|
$json['option_id'] = $option;
|
||||||
|
|
||||||
|
$pack = $this->creationService->handle($json);
|
||||||
|
if (! $this->archive->extractTo(storage_path('app/packs/' . $pack->uuid), 'archive.tar.gz')) {
|
||||||
|
// @todo delete the pack that was created.
|
||||||
|
throw new ZipExtractionException(trans('admin/exceptions.packs.zip_extraction'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->archive->close();
|
||||||
|
|
||||||
|
return $pack;
|
||||||
|
}
|
||||||
|
}
|
|
@ -156,10 +156,6 @@ return [
|
||||||
'text/x-perl',
|
'text/x-perl',
|
||||||
'text/x-shellscript',
|
'text/x-shellscript',
|
||||||
],
|
],
|
||||||
'pack_types' => [
|
|
||||||
'application/gzip',
|
|
||||||
'application/x-gzip',
|
|
||||||
],
|
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -45,4 +45,13 @@ return [
|
||||||
'reserved_name' => 'The environment variable :name is protected and cannot be assigned to a variable.',
|
'reserved_name' => 'The environment variable :name is protected and cannot be assigned to a variable.',
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
'packs' => [
|
||||||
|
'delete_has_servers' => 'Cannot delete a pack that is attached to active servers.',
|
||||||
|
'update_has_servers' => 'Cannot modify the associated option ID when servers are currently attached to a pack.',
|
||||||
|
'invalid_upload' => 'The file provided does not appear to be valid.',
|
||||||
|
'invalid_mime' => 'The file provided does not meet the required type :type',
|
||||||
|
'unreadable' => 'The archive provided could not be opened by the server.',
|
||||||
|
'zip_extraction' => 'An exception was encountered while attempting to extract the archive provided onto the server.',
|
||||||
|
'invalid_archive_exception' => 'The pack archive provided appears to be missing a required archive.tar.gz or import.json file in the base directory.',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|
29
resources/lang/en/admin/pack.php
Normal file
29
resources/lang/en/admin/pack.php
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
return [
|
||||||
|
'notices' => [
|
||||||
|
'pack_created' => 'A new pack was successfully created on the system and is now available for deployment to servers.',
|
||||||
|
],
|
||||||
|
];
|
Loading…
Reference in a new issue