Skip to content

Commit

Permalink
Push changes that support creations of service packs and basic listing
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaneEveritt
DaneEveritt committed Nov 16, 2016
1 parent 1f47eda commit a1bc6fa
Show file tree
Hide file tree
Showing 15 changed files with 654 additions and 49 deletions.
108 changes: 108 additions & 0 deletions app/Http/Controllers/Admin/PackController.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2016 Dane Everitt <[email protected]>
*
* 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\Http\Controllers\Admin;

use Alert;
use Log;
use Storage;

use Pterodactyl\Models;
use Pterodactyl\Repositories\ServiceRepository\Pack;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Exceptions\DisplayValidationException;
use Pterodactyl\Exceptions\DisplayException;

use Illuminate\Http\Request;

class PackController extends Controller
{
public function __construct()
{
//
}

public function list(Request $request, $id)
{
$option = Models\ServiceOptions::findOrFail($id);
return view('admin.services.packs.index', [
'packs' => Models\ServicePack::where('option', $option->id)->get(),
'service' => Models\Service::findOrFail($option->parent_service),
'option' => $option
]);
}

public function new(Request $request, $opt = null)
{
$options = Models\ServiceOptions::select(
'services.name AS p_service',
'service_options.id',
'service_options.name'
)->join('services', 'services.id', '=', 'service_options.parent_service')->get();

$array = [];
foreach($options as &$option) {
if (!array_key_exists($option->p_service, $array)) {
$array[$option->p_service] = [];
}

$array[$option->p_service] = array_merge($array[$option->p_service], [[
'id' => $option->id,
'name' => $option->name
]]);
}

return view('admin.services.packs.new', [
'services' => $array,
'packFor' => $opt,
]);
}

public function create(Request $request)
{
// dd($request->all());
try {
$repo = new Pack;
$id = $repo->create($request->except([
'_token'
]));
Alert::success('Successfully created new service!')->flash();
return redirect()->route('admin.services.packs.edit', $id)->withInput();
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.services.packs.new', $request->input('option'))->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.')->flash();
}
return redirect()->route('admin.services.packs.new', $request->input('option'))->withInput();

}

public function edit(Request $request, $id)
{
$pack = Models\ServicePack::findOrFail($id);
dd($pack, Storage::url('packs/' . $pack->uuid));
}
}
26 changes: 26 additions & 0 deletions app/Http/Routes/AdminRoutes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,32 @@ public function map(Router $router) {
]);
});

// Service Packs
$router->group([
'prefix' => 'admin/services/packs',
'middleware' => [
'auth',
'admin',
'csrf'
]
], function () use ($router) {
$router->get('/new/{option?}', [
'as' => 'admin.services.packs.new',
'uses' => 'Admin\PackController@new'
]);
$router->post('/new', [
'uses' => 'Admin\PackController@create'
]);
$router->get('/for/{option}', [
'as' => 'admin.services.packs.for',
'uses' => 'Admin\PackController@list'
]);
$router->get('/edit/{pack}', [
'as' => 'admin.services.packs.edit',
'uses' => 'Admin\PackController@edit'
]);
});

}

}
60 changes: 60 additions & 0 deletions app/Models/ServicePack.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2016 Dane Everitt <[email protected]>
*
* 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\Models;

use Illuminate\Database\Eloquent\Model;

class ServicePack extends Model
{

/**
* The table associated with the model.
*
* @var string
*/
protected $table = 'service_packs';

/**
* Fields that are not mass assignable.
*
* @var array
*/
protected $guarded = ['id', 'created_at', 'updated_at'];

/**
* Cast values to correct type.
*
* @var array
*/
protected $casts = [
'option' => 'integer',
'build_memory' => 'integer',
'build_swap' => 'integer',
'build_cpu' => 'integer',
'build_io' => 'integer',
'selectable' => 'boolean',
'visible' => 'boolean'
];

}
105 changes: 105 additions & 0 deletions app/Repositories/ServiceRepository/Pack.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2016 Dane Everitt <[email protected]>
*
* 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\Repositories\ServiceRepository;

use DB;
use Storage;
use Uuid;
use Validator;

use Pterodactyl\Models;
use Pterodactyl\Services\UuidService;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Exceptions\DisplayValidationException;

class Pack
{

public function __construct()
{
//
}

public function create(array $data)
{
$validator = Validator::make($data, [
'name' => 'required|string',
'version' => 'required|string',
'description' => 'string',
'option' => 'required|exists:service_options,id',
'selectable' => 'sometimes|boolean',
'visible' => 'sometimes|boolean',
'build_memory' => 'required|integer|min:0',
'build_swap' => 'required|integer|min:0',
'build_cpu' => 'required|integer|min:0',
'build_io' => 'required|integer|min:10|max:1000',
'build_container' => 'required|string',
'build_script' => 'sometimes|string'
]);

if ($validator->fails()) {
throw new DisplayValidationException($validator->errors());
}

if (isset($data['file_upload'])) {
if (!$data['file_upload']->isValid()) {
throw new DisplayException('The file provided does not appear to be valid.');
}

if (!in_array($data['file_upload']->getMimeType(), [
'application/zip',
'application/gzip'
])) {
throw new DisplayException('The file provided does not meet the required filetypes of application/zip or application/gzip.');
}
}

DB::transaction(function () use ($data) {
$uuid = new UuidService;
$pack = Models\ServicePack::create([
'option' => $data['option'],
'uuid' => $uuid->generate('servers', 'uuid'),
'build_memory' => $data['build_memory'],
'build_swap' => $data['build_swap'],
'build_cpu' => $data['build_swap'],
'build_io' => $data['build_io'],
'build_script' => (empty($data['build_script'])) ? null : $data['build_script'],
'build_container' => $data['build_container'],
'name' => $data['name'],
'version' => $data['version'],
'description' => (empty($data['description'])) ? null : $data['description'],
'selectable' => isset($data['selectable']),
'visible' => isset($data['visible'])
]);

$filename = ($data['file_upload']->getMimeType() === 'application/zip') ? 'archive.zip' : 'archive.tar.gz';
$data['file_upload']->storeAs('packs/' . $pack->uuid, $filename);

$pack->save();

return $pack->id;
});
}

}
15 changes: 2 additions & 13 deletions app/Repositories/ServiceRepository/Service.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ public function delete($id)

DB::beginTransaction();
try {
Storage::deleteDirectory('services/' . $service->file);

Models\ServiceVariables::whereIn('option_id', $options->get()->toArray())->delete();
$options->delete();
$service->delete();
Expand Down Expand Up @@ -128,23 +130,10 @@ public function updateFile($id, array $data)
$filepath = 'services/' . $service->file . '/' . $filename;
$backup = 'services/.bak/' . str_random(12) . '.bak';

DB::beginTransaction();

try {
Storage::move($filepath, $backup);
Storage::put($filepath, $data['contents']);

$checksum = Models\Checksum::firstOrNew([
'service' => $service->id,
'filename' => $filename
]);

$checksum->checksum = sha1_file(storage_path('app/' . $filepath));
$checksum->save();

DB::commit();
} catch(\Exception $ex) {
DB::rollback();
Storage::move($backup, $filepath);
throw $ex;
}
Expand Down
36 changes: 0 additions & 36 deletions database/migrations/2016_11_09_163911_add_checksums_table.php
View file

This file was deleted.

Loading

0 comments on commit a1bc6fa

Please sign in to comment.