StarMC/Astral-nook
StarMC/Astral-nook
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Push initial implementations of new repository structure

Browse source 
This breaks almost the entire panel, do not pull this branch in this state.

Mostly just moved old repository files to a new folder without updating anything else in order to start doing new things. Structure is not finalized.
This commit is contained in:
Dane Everitt 2017-06-10 22:28:44 -05:00
parent 65957e7ea5
commit 5c2b9deb09
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
39 changed files with 1083 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/API/Admin/UserController.php
View file

@ -30,7 +30,7 @@ use Illuminate\Http\Request;
use Pterodactyl\Models\User;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\UserRepository;
use Pterodactyl\Repositories\oldUserRepository;
use Pterodactyl\Transformers\Admin\UserTransformer;
use Pterodactyl\Exceptions\DisplayValidationException;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@ -91,7 +91,7 @@ class UserController extends Controller
{
$this->authorize('user-create', $request->apiKey());
$repo = new UserRepository;
$repo = new oldUserRepository;
try {
$user = $repo->create($request->only([
'custom_id', 'email', 'password', 'name_first',
@ -128,7 +128,7 @@ class UserController extends Controller
{
$this->authorize('user-edit', $request->apiKey());
$repo = new UserRepository;
$repo = new oldUserRepository;
try {
$user = $repo->update($user, $request->intersect([
'email', 'password', 'name_first',
@ -165,7 +165,7 @@ class UserController extends Controller
{
$this->authorize('user-delete', $request->apiKey());
$repo = new UserRepository;
$repo = new oldUserRepository;
try {
$repo->delete($id);

36
app/Http/Controllers/Admin/OptionController.php
View file

@ -26,8 +26,10 @@ namespace Pterodactyl\Http\Controllers\Admin;
use Log;
use Alert;
use Route;
use Javascript;
use Illuminate\Http\Request;
use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
use Pterodactyl\Models\Service;
use Pterodactyl\Models\ServiceOption;
use Pterodactyl\Exceptions\DisplayException;
@ -39,6 +41,21 @@ use Pterodactyl\Http\Requests\Admin\Service\StoreOptionVariable;
class OptionController extends Controller
{
/**
* Store the repository instance.
*
* @var \Pterodactyl\Repositories\OptionRepository
*/
protected $repository;
/**
* OptionController constructor.
*/
public function __construct()
{
$this->repository = new OptionRepository(Route::current()->parameter('option'));
}
/**
* Handles request to view page for adding new option.
*
@ -227,24 +244,17 @@ class OptionController extends Controller
}
/**
* Handles POST when updating scripts for a service option.
* Handles POST when updating script for a service option.
*
* @param Request $request
* @param int $id
* @return \Illuminate\Response\RedirectResponse
* @param \Pterodactyl\Http\Requests\Admin\Service\EditOptionScript $request
* @return \Illuminate\Http\RedirectResponse
*/
public function updateScripts(Request $request, $id)
public function updateScripts(EditOptionScript $request)
{
$repo = new OptionRepository;
try {
$repo->scripts($id, $request->only([
'script_install', 'script_entry',
'script_container', 'copy_script_from',
]));
$this->repository->scripts($request->normalize());
Alert::success('Successfully updated option scripts to be run when servers are installed.')->flash();
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.services.option.scripts', $id)->withErrors(json_decode($ex->getMessage()));
} catch (DisplayException $ex) {
Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) {

112
app/Http/Controllers/Admin/UserController.php
View file

@ -25,17 +25,31 @@
namespace Pterodactyl\Http\Controllers\Admin;
use Log;
use Alert;
use Illuminate\Http\Request;
use Pterodactyl\Models\User;
use Pterodactyl\Contracts\Repositories\UserInterface;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Requests\Admin\UserFormRequest;
use Pterodactyl\Models\User;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\UserRepository;
use Pterodactyl\Exceptions\DisplayValidationException;
class UserController extends Controller
{
/**
* @var \Pterodactyl\Repositories\Eloquent\UserRepository
*/
protected $repository;
/**
* UserController constructor.
*
* @param \Pterodactyl\Contracts\Repositories\UserInterface $repository
*/
public function __construct(UserInterface $repository)
{
$this->repository = $repository;
}
/**
* Display user index page.
*
@ -44,7 +58,7 @@ class UserController extends Controller
*/
public function index(Request $request)
{
$users = User::withCount('servers', 'subuserOf');
$users = $this->repository->withCount('servers', 'subuserOf');
if (! is_null($request->input('query'))) {
$users->search($request->input('query'));
@ -58,10 +72,9 @@ class UserController extends Controller
/**
* Display new user page.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\View\View
*/
public function create(Request $request)
public function create()
{
return view('admin.users.new');
}
@ -69,96 +82,61 @@ class UserController extends Controller
/**
* Display user view page.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Pterodactyl\Models\User $user
* @return \Illuminate\View\View
*/
public function view(Request $request, $id)
public function view(User $user)
{
return view('admin.users.view', [
'user' => User::with('servers.node')->findOrFail($id),
'user' => $user,
]);
}
/**
* Delete a user.
* Delete a user from the system.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Pterodactyl\Models\User $user
* @return \Illuminate\Http\RedirectResponse
*/
public function delete(Request $request, $id)
public function delete(User $user)
{
try {
$repo = new UserRepository;
$repo->delete($id);
Alert::success('Successfully deleted user from system.')->flash();
$this->repository->delete($user->id);
return redirect()->route('admin.users');
} catch (DisplayException $ex) {
Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) {
Log::error($ex);
Alert::danger('An exception was encountered while attempting to delete this user.')->flash();
}
return redirect()->route('admin.users.view', $id);
return redirect()->route('admin.users.view', $user->id);
}
/**
* Create a user.
*
* @param \Illuminate\Http\Request $request
* @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request
* @return \Illuminate\Http\RedirectResponse
*/
public function store(Request $request)
public function store(UserFormRequest $request)
{
try {
$user = new UserRepository;
$userid = $user->create($request->only([
'email', 'password', 'name_first',
'name_last', 'username', 'root_admin',
]));
Alert::success('Account has been successfully created.')->flash();
$user = $this->repository->create($request->normalize());
Alert::success('Account has been successfully created.')->flash();
return redirect()->route('admin.users.view', $userid);
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.users.new')->withErrors(json_decode($ex->getMessage()))->withInput();
} catch (\Exception $ex) {
Log::error($ex);
Alert::danger('An error occured while attempting to add a new user.')->flash();
return redirect()->route('admin.users.new');
}
return redirect()->route('admin.users.view', $user->id);
}
/**
* Update a user.
* Update a user on the system.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request
* @param \Pterodactyl\Models\User $user
* @return \Illuminate\Http\RedirectResponse
*/
public function update(Request $request, $id)
public function update(UserFormRequest $request, User $user)
{
try {
$repo = new UserRepository;
$user = $repo->update($id, array_merge(
$request->only('root_admin'),
$request->intersect([
'email', 'password', 'name_first',
'name_last', 'username',
])
));
Alert::success('User account was successfully updated.')->flash();
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.users.view', $id)->withErrors(json_decode($ex->getMessage()));
} catch (\Exception $ex) {
Log::error($ex);
Alert::danger('An error occured while attempting to update this user.')->flash();
}
$this->repository->update($user->id, $request->normalize());
return redirect()->route('admin.users.view', $id);
return redirect()->route('admin.users.view', $user->id);
}
/**
@ -169,12 +147,12 @@ class UserController extends Controller
*/
public function json(Request $request)
{
return User::select('id', 'email', 'username', 'name_first', 'name_last')
->search($request->input('q'))
->get()->transform(function ($item) {
$item->md5 = md5(strtolower($item->email));
return $this->repository->search($request->input('q'))->all([
'id', 'email', 'username', 'name_first', 'name_last',
])->transform(function ($item) {
$item->md5 = md5(strtolower($item->email));
return $item;
});
return $item;
});
}
}

4
app/Http/Controllers/Base/AccountController.php
View file

@ -30,7 +30,7 @@ use Alert;
use Illuminate\Http\Request;
use Pterodactyl\Models\User;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\UserRepository;
use Pterodactyl\Repositories\oldUserRepository;
use Pterodactyl\Exceptions\DisplayValidationException;
class AccountController extends Controller
@ -90,7 +90,7 @@ class AccountController extends Controller
}
try {
$repo = new UserRepository;
$repo = new oldUserRepository;
$repo->update($request->user()->id, $data);
Alert::success('Your account details were successfully updated.')->flash();
} catch (DisplayValidationException $ex) {

59
app/Http/Requests/Admin/AdminFormRequest.php Normal file
View file

@ -0,0 +1,59 @@
<?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\Http\Requests\Admin;
use Pterodactyl\Models\User;
use Illuminate\Foundation\Http\FormRequest;
abstract class AdminFormRequest extends FormRequest
{
/**
* Determine if the user is an admin and has permission to access this
* form controller in the first place.
*
* @return bool
*/
public function authorize()
{
if (! $this->user() instanceof User) {
return false;
}
return $this->user()->isRootAdmin();
}
/**
* Return only the fields that we are interested in from the request.
* This will include empty fields as a null value.
*
* @return array
*/
public function normalize()
{
return $this->only(
array_keys($this->rules())
);
}
}

46
app/Http/Requests/Admin/Service/EditOptionScript.php Normal file
View file

@ -0,0 +1,46 @@
<?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\Http\Requests\Admin\Service;
use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
class EditOptionScript extends AdminFormRequest
{
/**
* Return the rules to be used when validating the sent data in the request.
*
* @return array
*/
public function rules()
{
return [
'script_install' => 'sometimes|nullable|string',
'script_is_privileged' => 'sometimes|required|boolean',
'script_entry' => 'sometimes|required|string',
'script_container' => 'sometimes|required|string',
'copy_script_from' => 'sometimes|nullable|numeric',
];
}
}

32
app/Http/Requests/Admin/Service/StoreOptionVariable.php
View file

@ -24,25 +24,10 @@
namespace Pterodactyl\Http\Requests\Admin\Service;
use Pterodactyl\Models\User;
use Illuminate\Foundation\Http\FormRequest;
use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
class StoreOptionVariable extends FormRequest
class StoreOptionVariable extends AdminFormRequest
{
/**
* Determine if user is allowed to access this request.
*
* @return bool
*/
public function authorize()
{
if (! $this->user() instanceof User) {
return false;
}
return $this->user()->isRootAdmin();
}
/**
* Set the rules to be used for data passed to the request.
*
@ -59,17 +44,4 @@ class StoreOptionVariable extends FormRequest
'options' => 'sometimes|required|array',
];
}
/**
* Return only the fields that we are interested in from the request.
* This will include empty fields as a null value.
*
* @return array
*/
public function normalize()
{
return $this->only(
array_keys($this->rules())
);
}
}

79
app/Http/Requests/Admin/UserFormRequest.php Normal file
View file

@ -0,0 +1,79 @@
<?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\Http\Requests\Admin;
use Pterodactyl\Models\User;
use Illuminate\Support\Facades\Hash;
use Pterodactyl\Contracts\Repositories\UserInterface;
class UserFormRequest extends AdminFormRequest
{
/**
* {@inheritdoc}
*/
public function repository()
{
return UserInterface::class;
}
/**
* {@inheritdoc}
*/
public function rules()
{
if ($this->method() === 'PATCH') {
return [
'email' => 'sometimes|required|email|unique:users,email,' . $this->user->id,
'username' => 'sometimes|required|alpha_dash|between:1,255|unique:users,username, ' . $this->user->id . '|' . User::USERNAME_RULES,
'name_first' => 'sometimes|required|string|between:1,255',
'name_last' => 'sometimes|required|string|between:1,255',
'password' => 'sometimes|nullable|' . User::PASSWORD_RULES,
'root_admin' => 'sometimes|required|boolean',
'language' => 'sometimes|required|string|min:1|max:5',
'use_totp' => 'sometimes|required|boolean',
'totp_secret' => 'sometimes|required|size:16',
];
}
return [
'email' => 'required|email|unique:users,email,' . $this->user->id,
'username' => 'required|alpha_dash|between:1,255|unique:users,username,' . $this->user->id . '|' . User::USERNAME_RULES,
'name_first' => 'required|string|between:1,255',
'name_last' => 'required|string|between:1,255',
'password' => 'sometimes|nullable|' . User::PASSWORD_RULES,
'root_admin' => 'required|boolean',
'external_id' => 'sometimes|nullable|numeric|unique:users,external_id',
];
}
public function normalize()
{
if ($this->has('password')) {
$this->merge(['password' => Hash::make($this->input('password'))]);
}
return parent::normalize();
}
}