Merge branch 'feature/vuejs-serverlist' into feature/vue-serverview

Author: schrej

app/Http/Controllers/Api/Client/ClientController.php

@@ -35,7 +35,9 @@ public function __construct(ServerRepositoryInterface $repository)
      */
     public function index(GetServersRequest $request): array
     {
-        $servers = $this->repository->filterUserAccessServers($request->user(), User::FILTER_LEVEL_SUBUSER);
+        $servers = $this->repository
+            ->setSearchTerm($request->input('query'))
+            ->filterUserAccessServers($request->user(), User::FILTER_LEVEL_ALL);
 
         return $this->fractal->collection($servers)
             ->transformWith($this->getTransformer(ServerTransformer::class))

app/Http/Controllers/Auth/LoginController.php

@@ -2,9 +2,11 @@
 
 namespace Pterodactyl\Http\Controllers\Auth;
 
+use Lcobucci\JWT\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Contracts\View\View;
+use Lcobucci\JWT\Signer\Hmac\Sha256;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 
 class LoginController extends AbstractLoginController
@@ -63,11 +65,26 @@ public function login(Request $request): JsonResponse
                 'request_ip' => $request->ip(),
             ], 5);
 
-            return response()->json(['complete' => false, 'token' => $token]);
+            return response()->json(['complete' => false, 'login_token' => $token]);
         }
 
+        $signer = new Sha256();
+        $token = (new Builder)->setIssuer('http://pterodactyl.local')
+            ->setAudience('http://pterodactyl.local')
+            ->setId(str_random(12), true)
+            ->setIssuedAt(time())
+            ->setNotBefore(time())
+            ->setExpiration(time() + 3600)
+            ->set('uid', $user->id)
+            ->sign($signer, env('APP_JWT_KEY'))
+            ->getToken();
+
         $this->auth->guard()->login($user, true);
 
-        return response()->json(['complete' => true]);
+        return response()->json([
+            'complete' => true,
+            'intended' => $this->redirectPath(),
+            'token' => $token->__toString(),
+        ]);
     }
 }

app/Http/Middleware/Api/AuthenticateKey.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Http\Middleware\Api;
 
 use Closure;
+use Lcobucci\JWT\Parser;
 use Cake\Chronos\Chronos;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\ApiKey;
@@ -63,6 +64,23 @@ public function handle(Request $request, Closure $next, int $keyType)
         }
 
         $raw = $request->bearerToken();
+
+        // This is an internal JWT, treat it differently to get the correct user
+        // before passing it along.
+        if (strlen($raw) > ApiKey::IDENTIFIER_LENGTH + ApiKey::KEY_LENGTH) {
+            $token = (new Parser)->parse($raw);
+
+            $model = (new ApiKey)->fill([
+                'user_id' => $token->getClaim('uid'),
+                'key_type' => ApiKey::TYPE_ACCOUNT,
+            ]);
+
+            $this->auth->guard()->loginUsingId($token->getClaim('uid'));
+            $request->attributes->set('api_key', $model);
+
+            return $next($request);
+        }
+
         $identifier = substr($raw, 0, ApiKey::IDENTIFIER_LENGTH);
         $token = substr($raw, ApiKey::IDENTIFIER_LENGTH);
 

app/Http/Middleware/Api/SetSessionDriver.php

@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Http\Request;
-use Barryvdh\Debugbar\LaravelDebugbar;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
@@ -41,10 +40,6 @@ public function __construct(Application $app, ConfigRepository $config)
      */
     public function handle(Request $request, Closure $next)
     {
-        if ($this->config->get('app.debug')) {
-            $this->app->make(LaravelDebugbar::class)->disable();
-        }
-
         $this->config->set('session.driver', 'array');
 
         return $next($request);

app/Transformers/Api/Client/ServerTransformer.php

@@ -28,7 +28,12 @@ public function transform(Server $server): array
             'identifier' => $server->uuidShort,
             'uuid' => $server->uuid,
             'name' => $server->name,
+            'node' => $server->node->name,
             'description' => $server->description,
+            'allocation' => [
+                'ip' => $server->allocation->alias,
+                'port' => $server->allocation->port,
+            ],
             'limits' => [
                 'memory' => $server->memory,
                 'swap' => $server->swap,

composer.json

@@ -26,6 +26,7 @@
         "laracasts/utilities": "^3.0",
         "laravel/framework": "5.6.*",
         "laravel/tinker": "^1.0",
+        "lcobucci/jwt": "^3.2",
         "lord/laroute": "^2.4",
         "matriphe/iso-639": "^1.2",
         "nesbot/carbon": "^1.22",

composer.lock

@@ -24,16 +24,19 @@
         "gulp-rev": "^8.1.1",
         "gulp-uglify-es": "^1.0.1",
         "jquery": "^3.3.1",
+        "jwt-decode": "^2.2.0",
         "lodash": "^4.17.5",
         "postcss": "^6.0.21",
         "postcss-import": "^11.1.0",
         "postcss-preset-env": "^3.4.0",
         "postcss-scss": "^1.0.4",
         "tailwindcss": "^0.5.1",
+        "vee-validate": "^2.0.9",
         "vue": "^2.5.7",
         "vue-axios": "^2.1.1",
         "vue-devtools": "^3.1.9",
         "vue-loader": "^14.2.2",
+        "vue-mc": "^0.2.4",
         "vue-router": "^3.0.1",
         "vue-template-compiler": "^2.5.16",
         "vueify-insert-css": "^1.0.0",

package-lock.json

@@ -13,19 +13,14 @@ import faSolid from '@fortawesome/fontawesome-free-solid';
 import FontAwesomeIcon from '@fortawesome/vue-fontawesome';
 fontawesome.library.add(faSolid);
 
-// Base Vuejs Templates
-import Login from './components/auth/Login';
-import Dashboard from './components/dashboard/Dashboard';
-import Account from './components/dashboard/Account';
-import ResetPassword from './components/auth/ResetPassword';
-import { Server, ServerConsole, ServerAllocations, ServerDatabases, ServerFiles, ServerSchedules, ServerSettings, ServerSubusers } from './components/server';
+import { routes } from './routes';
+import { storeData } from './store';
 
 window.events = new Vue;
 window.Ziggy = Ziggy;
 
 Vue.use(Vuex);
-
-const store = new Vuex.Store();
+const store = new Vuex.Store(storeData);
 const route = require('./../../../vendor/tightenco/ziggy/src/js/route').default;
 
 Vue.config.productionTip = false;
@@ -41,35 +36,7 @@ Vue.i18n.set('en');
 Vue.component('font-awesome-icon', FontAwesomeIcon);
 
 const router = new VueRouter({
-    mode: 'history',
-    routes: [
-        { name: 'login', path: '/auth/login', component: Login },
-        { name: 'forgot-password', path: '/auth/password', component: Login },
-        { name: 'checkpoint', path: '/checkpoint', component: Login },
-        {
-            name: 'reset-password',
-            path: '/auth/password/reset/:token',
-            component: ResetPassword,
-            props: function (route) {
-                return { token: route.params.token, email: route.query.email || '' };
-            }
-        },
-        { name : 'index', path: '/', component: Dashboard },
-        { name : 'account', path: '/account', component: Account },
-        { name : 'account-api', path: '/account/api', component: Account },
-        { name : 'account-security', path: '/account/security', component: Account },
-        { path: '/server/:id', component: Server,
-            children: [
-                { name: 'server', path: '', component: ServerConsole },
-                { name: 'server-files', path: 'files', component: ServerFiles },
-                { name: 'server-subusers', path: 'subusers', component: ServerSubusers },
-                { name: 'server-schedules', path: 'schedules', component: ServerSchedules },
-                { name: 'server-databases', path: 'databases', component: ServerDatabases },
-                { name: 'server-allocations', path: 'allocations', component: ServerAllocations },
-                { name: 'server-settings', path: 'settings', component: ServerSettings },
-            ]
-        }
-    ]
+    mode: 'history', routes
 });
 
 require('./bootstrap');