Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow Null = 0

Browse source 
Allow Value to be nullable, will autofill 0 if value is null or 0, to facilitate "unlimited" connections.
This commit is contained in:
Charles Morgan 2020-04-23 10:45:44 -04:00
parent 0ecfb40f5e
commit 82dd7dc8e3
8 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Contracts/Repository/DatabaseRepositoryInterface.php
View file

@ -68,7 +68,7 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
* @param string $username * @param string $username
* @param string $remote * @param string $remote
* @param string $password * @param string $password
* @param string $max_connections * @param $max_connections
* @return bool * @return bool
*/ */
public function createUser(string $username, string $remote, string $password, string $max_connections): bool; public function createUser(string $username, string $remote, string $password, string $max_connections): bool;

1
app/Http/Requests/Admin/Servers/Databases/StoreServerDatabaseRequest.php
View file

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

2
app/Models/Database.php
View file

@ -51,7 +51,7 @@ class Database extends Model
'database_host_id' => 'required|exists:database_hosts,id', 'database_host_id' => 'required|exists:database_hosts,id',
'database' => 'required|string|alpha_dash|between:3,100', 'database' => 'required|string|alpha_dash|between:3,100',
'username' => 'string|alpha_dash|between:3,100', 'username' => 'string|alpha_dash|between:3,100',
'max_connections' => 'string', 'max_connections' => 'nullable',
'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/', 'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
'password' => 'string', 'password' => 'string',
]; ];

10
app/Repositories/Eloquent/DatabaseRepository.php
View file

@ -135,12 +135,16 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
* @param string $username * @param string $username
* @param string $remote * @param string $remote
* @param string $password * @param string $password
* @param string $max_connections * @param $max_connections
* @return bool * @return bool
*/ */
public function createUser(string $username, string $remote, string $password, string $max_connections): bool public function createUser(string $username, string $remote, string $password, $max_connections): bool
{ {
return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\' WITH MAX_USER_CONNECTIONS %s', $username, $remote, $password, $max_connections)); 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));
}
} }
/** /**

2
database/migrations/2020_04_22_055500_add_max_connections_column.php
View file

@ -14,7 +14,7 @@ class AddMaxConnectionsColumnToDatabasesTable extends Migration
public function up() public function up()
{ {
Schema::table('databases', function (Blueprint $table) { Schema::table('databases', function (Blueprint $table) {
$table->integer('max_connections')->nullable(false)->default(0)->after('password'); $table->integer('max_connections')->nullable()->default(0)->after('password');
}); });
} }

3
resources/scripts/components/server/databases/DatabaseRow.tsx
View file

@ -51,6 +51,9 @@ export default ({ database, className }: Props) => {
addError({ key: 'database:delete', message: httpErrorToHuman(error) }); addError({ key: 'database:delete', message: httpErrorToHuman(error) });
}); });
}; };
if (!database.maxConnections){
database.maxConnections = "Unlimited"
}
return ( return (
<React.Fragment> <React.Fragment>

6
resources/views/admin/databases/view.blade.php
View file

@ -108,7 +108,11 @@
<td class="middle">{{ $database->database }}</td> <td class="middle">{{ $database->database }}</td>
<td class="middle">{{ $database->username }}</td> <td class="middle">{{ $database->username }}</td>
<td class="middle">{{ $database->remote }}</td> <td class="middle">{{ $database->remote }}</td>
<td class="middle">{{ $database->max_connections }}</td> @if($database->max_connections != null)
<td class="middle">{{ $database->max_connections }}</td>
@else
<td class="middle">Unlimited</td>
@endif
<td class="text-center"> <td class="text-center">
<a href="{{ route('admin.servers.view.database', $database->getRelation('server')->id) }}"> <a href="{{ route('admin.servers.view.database', $database->getRelation('server')->id) }}">
<button class="btn btn-xs btn-primary">Manage</button> <button class="btn btn-xs btn-primary">Manage</button>

12
resources/views/admin/servers/view/database.blade.php
View file

@ -46,7 +46,11 @@
<td>{{ $database->username }}</td> <td>{{ $database->username }}</td>
<td>{{ $database->remote }}</td> <td>{{ $database->remote }}</td>
<td><code>{{ $database->host->host }}:{{ $database->host->port }}</code></td> <td><code>{{ $database->host->host }}:{{ $database->host->port }}</code></td>
<td>{{ $database->max_connections }}</td> @if($database->max_connections != null)
<td>{{ $database->max_connections }}</td>
@else
<td>Unlimited</td>
@endif
<td class="text-center"> <td class="text-center">
<button data-action="reset-password" data-id="{{ $database->id }}" class="btn btn-xs btn-primary"><i class="fa fa-refresh"></i></button> <button data-action="reset-password" data-id="{{ $database->id }}" class="btn btn-xs btn-primary"><i class="fa fa-refresh"></i></button>
<button data-action="remove" data-id="{{ $database->id }}" class="btn btn-xs btn-danger"><i class="fa fa-trash"></i></button> <button data-action="remove" data-id="{{ $database->id }}" class="btn btn-xs btn-danger"><i class="fa fa-trash"></i></button>
@ -86,9 +90,9 @@
<p class="text-muted small">This should reflect the IP address that connections are allowed from. Uses standard MySQL notation. If unsure leave as <code>%</code>.</p> <p class="text-muted small">This should reflect the IP address that connections are allowed from. Uses standard MySQL notation. If unsure leave as <code>%</code>.</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="pmax_connections" class="control-label">Max Concurrent Connections</label> <label for="pmax_connections" class="control-label">Concurrent Connections</label>
<input id="pmax_connections" type="text" name="max_connections" class="form-control" value="150" /> <input id="pmax_connections" type="text" name="max_connections" class="form-control"/>
<p class="text-muted small">This should reflect the max number of concurrent connections from this user to the database. Use <code>0</code> for unlimited</p> <p class="text-muted small">This should reflect the max number of concurrent connections from this user to the database. Leave empty for unlimited.</p>
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">