Merge pull request pterodactyl#1963 from Sir3lit/maxconn

Add Max Concurrent Connections for database users

Author: DaneEveritt

app/Contracts/Repository/DatabaseRepositoryInterface.php

@@ -68,9 +68,10 @@ public function createDatabase(string $database): bool;
      * @param string $username
      * @param string $remote
      * @param string $password
+     * @param $max_connections
      * @return bool
      */
-    public function createUser(string $username, string $remote, string $password): bool;
+    public function createUser(string $username, string $remote, string $password, string $max_connections): bool;
 
     /**
      * Give a specific user access to a given database.

app/Http/Requests/Admin/Servers/Databases/StoreServerDatabaseRequest.php

@@ -25,6 +25,7 @@ public function rules(): array
                     $query->where('database_host_id', $this->input('database_host_id') ?? 0);
                 }),
             ],
+            'max_connections' => 'nullable',
             'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
             'database_host_id' => 'required|integer|exists:database_hosts,id',
         ];

app/Models/Database.php

@@ -30,7 +30,7 @@ class Database extends Model
      * @var array
      */
     protected $fillable = [
-        'server_id', 'database_host_id', 'database', 'username', 'password', 'remote',
+        'server_id', 'database_host_id', 'database', 'username', 'password', 'remote', 'max_connections',
     ];
 
     /**
@@ -41,6 +41,7 @@ class Database extends Model
     protected $casts = [
         'server_id' => 'integer',
         'database_host_id' => 'integer',
+        'max_connections' => 'integer',
     ];
 
     /**
@@ -51,6 +52,7 @@ class Database extends Model
         'database_host_id' => 'required|exists:database_hosts,id',
         'database' => 'required|string|alpha_dash|between:3,100',
         'username' => 'string|alpha_dash|between:3,100',
+        'max_connections' => 'nullable|integer',
         'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
         'password' => 'string',
     ];

app/Repositories/Eloquent/DatabaseRepository.php

@@ -135,11 +135,16 @@ public function createDatabase(string $database): bool
      * @param string $username
      * @param string $remote
      * @param string $password
+     * @param $max_connections
      * @return bool
      */
-    public function createUser(string $username, string $remote, string $password): bool
+    public function createUser(string $username, string $remote, string $password, $max_connections): bool
     {
-        return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\'', $username, $remote, $password));
+        if (!$max_connections) {
+            return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\'', $username, $remote, $password));
+        } else {
+            return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\' WITH MAX_USER_CONNECTIONS %s', $username, $remote, $password, $max_connections));
+        }
     }
 
     /**

app/Services/Databases/DatabaseManagementService.php

@@ -84,7 +84,8 @@ public function create($server, array $data)
             $this->repository->createUser(
                 $database->username,
                 $database->remote,
-                $this->encrypter->decrypt($database->password)
+                $this->encrypter->decrypt($database->password),
+                $database->max_connections
             );
             $this->repository->assignUserToDatabase(
                 $database->database,

app/Services/Databases/DatabasePasswordService.php

@@ -71,7 +71,7 @@ public function handle(Database $database): string
             ]);
 
             $this->repository->dropUser($database->username, $database->remote);
-            $this->repository->createUser($database->username, $database->remote, $password);
+            $this->repository->createUser($database->username, $database->remote, $password, $database->max_connections);
             $this->repository->assignUserToDatabase($database->database, $database->username, $database->remote);
             $this->repository->flush();
         });

app/Transformers/Api/Application/ServerDatabaseTransformer.php

@@ -56,6 +56,7 @@ public function transform(Database $model): array
             'database' => $model->database,
             'username' => $model->username,
             'remote' => $model->remote,
+            'max_connections' => $model->max_connections,
             'created_at' => Chronos::createFromFormat(Chronos::DEFAULT_TO_STRING_FORMAT, $model->created_at)
                 ->setTimezone(config('app.timezone'))
                 ->toIso8601String(),

app/Transformers/Api/Client/DatabaseTransformer.php

@@ -58,6 +58,7 @@ public function transform(Database $model): array
             'name' => $model->database,
             'username' => $model->username,
             'connections_from' => $model->remote,
+            'max_connections' => $model->max_connections,
         ];
     }
 

database/migrations/2020_04_22_055500_add_max_connections_column.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddMaxConnectionsColumnToDatabasesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('databases', function (Blueprint $table) {
+            $table->integer('max_connections')->nullable()->default(0)->after('password');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('databases', function (Blueprint $table) {
+            $table->dropColumn('max_connections');
+        });
+    }
+}

resources/scripts/components/server/databases/DatabaseRow.tsx

@@ -51,7 +51,7 @@ export default ({ database, className }: Props) => {
                 addError({ key: 'database:delete', message: httpErrorToHuman(error) });
             });
     };
-
+    
     return (
         <React.Fragment>
             <Formik