Initial pass at deleting as much removed logic as possible; still need to migrate old keys and permissions over

app/Http/Middleware/Api/AuthenticateIPAccess.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace Pterodactyl\Http\Middleware\Api;
-
-use Closure;
-use IPTools\IP;
-use IPTools\Range;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-
-class AuthenticateIPAccess
-{
-    /**
-     * Determine if a request IP has permission to access the API.
-     *
-     * @return mixed
-     *
-     * @throws \Exception
-     * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        $model = $request->attributes->get('api_key');
-
-        if (is_null($model->allowed_ips) || empty($model->allowed_ips)) {
-            return $next($request);
-        }
-
-        $find = new IP($request->ip());
-        foreach ($model->allowed_ips as $ip) {
-            if (Range::parse($ip)->contains($find)) {
-                return $next($request);
-            }
-        }
-
-        throw new AccessDeniedHttpException('This IP address (' . $request->ip() . ') does not have permission to access the API using these credentials.');
-    }
-}

app/Http/Middleware/Api/AuthenticateKey.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace Pterodactyl\Http\Middleware\Api;
-
-use Closure;
-use Carbon\CarbonImmutable;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\User;
-use Pterodactyl\Models\ApiKey;
-use Illuminate\Auth\AuthManager;
-use Illuminate\Contracts\Encryption\Encrypter;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
-use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-
-class AuthenticateKey
-{
-    private AuthManager $auth;
-    private Encrypter $encrypter;
-    private ApiKeyRepositoryInterface $repository;
-
-    /**
-     * AuthenticateKey constructor.
-     */
-    public function __construct(ApiKeyRepositoryInterface $repository, AuthManager $auth, Encrypter $encrypter)
-    {
-        $this->auth = $auth;
-        $this->encrypter = $encrypter;
-        $this->repository = $repository;
-    }
-
-    /**
-     * Handle an API request by verifying that the provided API key
-     * is in a valid format and exists in the database.
-     *
-     * @return mixed
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function handle(Request $request, Closure $next, int $keyType)
-    {
-        if (is_null($request->bearerToken()) && is_null($request->user())) {
-            throw new HttpException(401, null, null, ['WWW-Authenticate' => 'Bearer']);
-        }
-
-        $raw = $request->bearerToken();
-
-        // This is a request coming through using cookies, we have an authenticated user not using
-        // an API key. Make some fake API key models and continue on through the process.
-        if (empty($raw) && $request->user() instanceof User) {
-            $model = (new ApiKey())->forceFill([
-                'user_id' => $request->user()->id,
-                'key_type' => ApiKey::TYPE_ACCOUNT,
-            ]);
-        } else {
-            $model = $this->authenticateApiKey($raw, $keyType);
-            $this->auth->guard()->loginUsingId($model->user_id);
-        }
-
-        $request->attributes->set('api_key', $model);
-
-        return $next($request);
-    }
-
-    /**
-     * Authenticate an API key.
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    protected function authenticateApiKey(string $key, int $keyType): ApiKey
-    {
-        $identifier = substr($key, 0, ApiKey::IDENTIFIER_LENGTH);
-        $token = substr($key, ApiKey::IDENTIFIER_LENGTH);
-
-        try {
-            $model = $this->repository->findFirstWhere([
-                ['identifier', '=', $identifier],
-                ['key_type', '=', $keyType],
-            ]);
-        } catch (RecordNotFoundException $exception) {
-            throw new AccessDeniedHttpException();
-        }
-
-        if (!hash_equals($this->encrypter->decrypt($model->token), $token)) {
-            throw new AccessDeniedHttpException();
-        }
-
-        $this->repository->withoutFreshModel()->update($model->id, ['last_used_at' => CarbonImmutable::now()]);
-
-        return $model;
-    }
-}

app/Http/Middleware/Api/SetSessionDriver.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Pterodactyl\Http\Middleware\Api;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Contracts\Config\Repository as ConfigRepository;
-
-class SetSessionDriver
-{
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    private $config;
-
-    /**
-     * SetSessionDriver constructor.
-     */
-    public function __construct(ConfigRepository $config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * Set the session for API calls to only last for the one request.
-     *
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        $this->config->set('session.driver', 'array');
-
-        return $next($request);
-    }
-}