feat core routes kernel: Add new routes options to allow for extending the Pterodactyl API and make routes work.

app/Http/Kernel.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace Pterodactyl\Http;
+
+use Illuminate\Auth\Middleware\Authorize;
+use Illuminate\Http\Middleware\HandleCors;
+use Illuminate\Auth\Middleware\Authenticate;
+use Illuminate\Http\Middleware\TrustProxies;
+use Pterodactyl\Http\Middleware\TrimStrings;
+use Illuminate\Session\Middleware\StartSession;
+use Pterodactyl\Http\Middleware\EncryptCookies;
+use Pterodactyl\Http\Middleware\Api\IsValidJson;
+use Pterodactyl\Http\Middleware\VerifyCsrfToken;
+use Pterodactyl\Http\Middleware\VerifyReCaptcha;
+use Illuminate\Routing\Middleware\ThrottleRequests;
+use Pterodactyl\Http\Middleware\LanguageMiddleware;
+use Illuminate\Foundation\Http\Kernel as HttpKernel;
+use Illuminate\Routing\Middleware\SubstituteBindings;
+use Pterodactyl\Http\Middleware\Activity\TrackAPIKey;
+use Illuminate\Session\Middleware\AuthenticateSession;
+use Illuminate\View\Middleware\ShareErrorsFromSession;
+use Pterodactyl\Http\Middleware\MaintenanceMiddleware;
+use Pterodactyl\Http\Middleware\EnsureStatefulRequests;
+use Pterodactyl\Http\Middleware\RedirectIfAuthenticated;
+use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
+use Pterodactyl\Http\Middleware\Api\AuthenticateIPAccess;
+use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
+use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
+use Pterodactyl\Http\Middleware\Api\Daemon\DaemonAuthenticate;
+use Pterodactyl\Http\Middleware\Api\Client\RequireClientApiKey;
+use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
+use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
+use Pterodactyl\Http\Middleware\Api\Client\SubstituteClientBindings;
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance;
+use Pterodactyl\Http\Middleware\Api\Application\AuthenticateApplicationUser;
+
+class Kernel extends HttpKernel
+{
+    /**
+     * The application's global HTTP middleware stack.
+     */
+    protected $middleware = [
+        TrustProxies::class,
+        HandleCors::class,
+        PreventRequestsDuringMaintenance::class,
+        ValidatePostSize::class,
+        TrimStrings::class,
+        ConvertEmptyStringsToNull::class,
+    ];
+
+    /**
+     * The application's route middleware groups.
+     */
+    protected $middlewareGroups = [
+        /* Blueprint middleware */
+        'blueprint' => [ EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, LanguageMiddleware::class, ],
+        'blueprint/api' => [ EnsureStatefulRequests::class, 'auth:sanctum', IsValidJson::class, TrackAPIKey::class, RequireTwoFactorAuthentication::class, AuthenticateIPAccess::class, ],
+        'blueprint/application-api' => [ SubstituteBindings::class, AuthenticateApplicationUser::class, ],
+        'blueprint/client-api' => [ SubstituteClientBindings::class, RequireClientApiKey::class, ],
+
+        /* Pterodactyl middleware */
+        'web' => [
+            EncryptCookies::class,
+            AddQueuedCookiesToResponse::class,
+            StartSession::class,
+            ShareErrorsFromSession::class,
+            VerifyCsrfToken::class,
+            SubstituteBindings::class,
+            LanguageMiddleware::class,
+        ],
+        'api' => [
+            EnsureStatefulRequests::class,
+            'auth:sanctum',
+            IsValidJson::class,
+            TrackAPIKey::class,
+            RequireTwoFactorAuthentication::class,
+            AuthenticateIPAccess::class,
+        ],
+        'application-api' => [
+            SubstituteBindings::class,
+            AuthenticateApplicationUser::class,
+        ],
+        'client-api' => [
+            SubstituteClientBindings::class,
+            RequireClientApiKey::class,
+        ],
+        'daemon' => [
+            SubstituteBindings::class,
+            DaemonAuthenticate::class,
+        ],
+    ];
+
+    /**
+     * The application's route middleware.
+     */
+    protected $middlewareAliases = [
+        'auth' => Authenticate::class,
+        'auth.basic' => AuthenticateWithBasicAuth::class,
+        'auth.session' => AuthenticateSession::class,
+        'guest' => RedirectIfAuthenticated::class,
+        'csrf' => VerifyCsrfToken::class,
+        'throttle' => ThrottleRequests::class,
+        'can' => Authorize::class,
+        'bindings' => SubstituteBindings::class,
+        'recaptcha' => VerifyReCaptcha::class,
+        'node.maintenance' => MaintenanceMiddleware::class,
+    ];
+}

app/Providers/RouteServiceProvider.php

@@ -35,6 +35,25 @@ class RouteServiceProvider extends ServiceProvider
         Route::model('database', Database::class);
 
         $this->routes(function () {
+            /* Blueprint web routes */
+            Route::middleware('blueprint')
+                ->prefix('/extensions')
+                ->group(base_path('routes/blueprint/web.php'));
+
+            /* Blueprint API routes */
+            Route::middleware(['blueprint/api', RequireTwoFactorAuthentication::class])->group(function () {
+                /* Application API */
+                Route::middleware(['blueprint/application-api', 'throttle:api.application'])
+                    ->prefix('/api/application/extensions')
+                    ->scopeBindings()
+                    ->group(base_path('routes/api-application.php'));
+                /* Client API */
+                Route::middleware(['blueprint/client-api', 'throttle:api.client'])
+                    ->prefix('/api/client/extensions')
+                    ->scopeBindings()
+                    ->group(base_path('routes/api-client.php'));
+            });           
+
             Route::middleware('web')->group(function () {
                 Route::middleware(['auth.session', RequireTwoFactorAuthentication::class])
                     ->group(base_path('routes/base.php'));
@@ -63,11 +82,6 @@ class RouteServiceProvider extends ServiceProvider
                 ->prefix('/api/remote')
                 ->scopeBindings()
                 ->group(base_path('routes/api-remote.php'));
-
-            /* Import Blueprint wildcard router */
-            Route::middleware('blueprint')
-                ->prefix('/extensions')
-                ->group(base_path('routes/blueprint/wildcard.php'));
         });
     }
 

blueprint.sh

@@ -406,7 +406,9 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
 
   requests_views="$conf_requests_views"; #(optional)
   requests_controllers="$conf_requests_controllers"; #(optional)
-  requests_router="$conf_requests_router"; #(optional)
+  requests_routers_application="$conf_requests_routers_application"; #(optional)
+  requests_routers_client="$conf_requests_routers_client"; #(optional)
+  requests_routers_web="$conf_requests_routers_web"; #(optional)
 
   database_migrations="$conf_database_migrations"; #(optional)
   
@@ -423,7 +425,9 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
   || [[ ( $data_public                  == "/"* ) || ( $data_public                  == *"/.."* ) || ( $data_public                  == *"../"* ) || ( $data_public                  == *"/../"* ) || ( $data_public                  == *"~"* ) || ( $data_public                  == *"\n"* ) ]] \
   || [[ ( $requests_views               == "/"* ) || ( $requests_views               == *"/.."* ) || ( $requests_views               == *"../"* ) || ( $requests_views               == *"/../"* ) || ( $requests_views               == *"~"* ) || ( $requests_views               == *"\n"* ) ]] \
   || [[ ( $requests_controllers         == "/"* ) || ( $requests_controllers         == *"/.."* ) || ( $requests_controllers         == *"../"* ) || ( $requests_controllers         == *"/../"* ) || ( $requests_controllers         == *"~"* ) || ( $requests_controllers         == *"\n"* ) ]] \
-  || [[ ( $requests_router      == "/"* ) || ( $requests_router      == *"/.."* ) || ( $requests_router      == *"../"* ) || ( $requests_router      == *"/../"* ) || ( $requests_router      == *"~"* ) || ( $requests_router      == *"\n"* ) ]] \
+  || [[ ( $requests_routers_application == "/"* ) || ( $requests_routers_application == *"/.."* ) || ( $requests_routers_application == *"../"* ) || ( $requests_routers_application == *"/../"* ) || ( $requests_routers_application == *"~"* ) || ( $requests_routers_application == *"\n"* ) ]] \
+  || [[ ( $requests_routers_client      == "/"* ) || ( $requests_routers_client      == *"/.."* ) || ( $requests_routers_client      == *"../"* ) || ( $requests_routers_client      == *"/../"* ) || ( $requests_routers_client      == *"~"* ) || ( $requests_routers_client      == *"\n"* ) ]] \
+  || [[ ( $requests_routers_web         == "/"* ) || ( $requests_routers_web         == *"/.."* ) || ( $requests_routers_web         == *"../"* ) || ( $requests_routers_web         == *"/../"* ) || ( $requests_routers_web         == *"~"* ) || ( $requests_routers_web         == *"\n"* ) ]] \
   || [[ ( $database_migrations          == "/"* ) || ( $database_migrations          == *"/.."* ) || ( $database_migrations          == *"../"* ) || ( $database_migrations          == *"/../"* ) || ( $database_migrations          == *"~"* ) || ( $database_migrations          == *"\n"* ) ]]; then
     rm -R ".blueprint/tmp/$n"
     PRINT FATAL "Config file paths cannot escape the extension bundle."
@@ -596,7 +600,9 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
      [[ ( ! -d ".blueprint/tmp/$n/$data_public"                  ) && ( ${data_public} != ""                  ) ]] ||    # folder: data_public                  (optional)
      [[ ( ! -d ".blueprint/tmp/$n/$requests_views"               ) && ( ${requests_views} != ""               ) ]] ||    # folder: requests_views               (optional)
      [[ ( ! -d ".blueprint/tmp/$n/$requests_controllers"         ) && ( ${requests_controllers} != ""         ) ]] ||    # folder: requests_controllers         (optional)
-     [[ ( ! -f ".blueprint/tmp/$n/$requests_router"      ) && ( ${requests_router} != ""      ) ]] ||    # file:   requests_router      (optional)
+     [[ ( ! -f ".blueprint/tmp/$n/$requests_routers_application" ) && ( ${requests_routers_application} != "" ) ]] ||    # file:   requests_routers_application (optional)
+     [[ ( ! -f ".blueprint/tmp/$n/$requests_routers_client"      ) && ( ${requests_routers_client} != ""      ) ]] ||    # file:   requests_routers_client      (optional)
+     [[ ( ! -f ".blueprint/tmp/$n/$requests_routers_web"         ) && ( ${requests_routers_web} != ""         ) ]] ||    # file:   requests_routers_web         (optional)
      [[ ( ! -d ".blueprint/tmp/$n/$database_migrations"          ) && ( ${database_migrations} != ""          ) ]];then  # folder: database_migrations          (optional)
     rm -R ".blueprint/tmp/$n"
     PRINT FATAL "Extension configuration points towards one or more files that do not exist."
@@ -643,11 +649,26 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
   fi
 
   # Place routes directory.
-  if [[ $requests_router != "" ]]; then
+  if [[ $requests_routers_application != "" ]] \
-    PRINT INFO "Cloning and linking router file.."
+  || [[ $requests_routers_client      != "" ]] \
+  || [[ $requests_routers_web         != "" ]]; then
+    PRINT INFO "Cloning and linking router files.."
     mkdir -p ".blueprint/extensions/$identifier/routers"
-    cp -R ".blueprint/tmp/$n/$requests_router" ".blueprint/extensions/$identifier/routers/$identifier.php" 2>> $BLUEPRINT__DEBUG
+
-    ln -T ".blueprint/extensions/$identifier/routers/$identifier.php" "$FOLDER/routes/blueprint/extensions/$identifier.php" 2>> $BLUEPRINT__DEBUG
+    if [[ $requests_routers_application != "" ]]; then
+      cp -R ".blueprint/tmp/$n/$requests_routers_application" ".blueprint/extensions/$identifier/routers/application.php" 2>> $BLUEPRINT__DEBUG
+      ln -T ".blueprint/extensions/$identifier/routers/application.php" "$FOLDER/routes/blueprint/application/$identifier.php" 2>> $BLUEPRINT__DEBUG
+    fi
+
+    if [[ $requests_routers_client != "" ]]; then
+      cp -R ".blueprint/tmp/$n/$requests_routers_client" ".blueprint/extensions/$identifier/routers/client.php" 2>> $BLUEPRINT__DEBUG
+      ln -T ".blueprint/extensions/$identifier/routers/client.php" "$FOLDER/routes/blueprint/client/$identifier.php" 2>> $BLUEPRINT__DEBUG
+    fi
+
+    if [[ $requests_routers_web != "" ]]; then
+      cp -R ".blueprint/tmp/$n/$requests_routers_web" ".blueprint/extensions/$identifier/routers/web.php" 2>> $BLUEPRINT__DEBUG
+      ln -T ".blueprint/extensions/$identifier/routers/web.php" "$FOLDER/routes/blueprint/web/$identifier.php" 2>> $BLUEPRINT__DEBUG
+    fi
   fi
 
   # Create, link and connect components directory.
@@ -1334,7 +1355,9 @@ if [[ ( $2 == "-r" ) || ( $2 == "-remove" ) ]]; then VCMD="y"
 
     requests_views="$conf_requests_views"; #(optional)
     requests_controllers="$conf_requests_controllers"; #(optional)
-    requests_router="$conf_requests_router"; #(optional)
+    requests_routers_application="$conf_requests_routers_application"; #(optional)
+    requests_routers_client="$conf_requests_routers_client"; #(optional)
+    requests_routers_web="$conf_requests_routers_web"; #(optional)
 
     database_migrations="$conf_database_migrations"; #(optional)
   else 
@@ -1551,11 +1574,16 @@ if [[ ( $2 == "-r" ) || ( $2 == "-remove" ) ]]; then VCMD="y"
   fi
 
   # Remove router files
-  if [[ $requests_router != "" ]]; then
+  if [[ $requests_routers_application != "" ]] \
+  || [[ $requests_routers_client      != "" ]] \
+  || [[ $requests_routers_web         != "" ]]; then
     PRINT INFO "Removing and unlinking router files.."
     rm -R \
       ".blueprint/extensions/$identifier/routers" \
-      "routes/blueprint/extensions/$identifier"
+      "routes/blueprint/application/$identifier" \
+      "routes/blueprint/client/$identifier" \
+      "routes/blueprint/web/$identifier" \
+      &>> $BLUEPRINT__DEBUG
   fi
 
   # Remove private folder

routes/blueprint/application.php

@@ -0,0 +1,9 @@
+<?php
+
+foreach (File::allFiles(__DIR__ . '/application') as $partial) {
+  if ($partial->getExtension() == 'php') {
+    Route::prefix('/'.basename($partial->getFilename(), '.php'))
+      ->group(function () use ($partial) {require_once $partial->getPathname();}
+    );
+  }
+}

routes/blueprint/client.php

@@ -1,6 +1,6 @@
 <?php
 
-foreach (File::allFiles(__DIR__ . '/extensions') as $partial) {
+foreach (File::allFiles(__DIR__ . '/client') as $partial) {
   if ($partial->getExtension() == 'php') {
     Route::prefix('/'.basename($partial->getFilename(), '.php'))
       ->group(function () use ($partial) {require_once $partial->getPathname();}

routes/blueprint/web.php

@@ -0,0 +1,9 @@
+<?php
+
+foreach (File::allFiles(__DIR__ . '/web') as $partial) {
+  if ($partial->getExtension() == 'php') {
+    Route::prefix('/'.basename($partial->getFilename(), '.php'))
+      ->group(function () use ($partial) {require_once $partial->getPathname();}
+    );
+  }
+}