From 1ad715f1a3192524efff9ec5e241d431ec94d5b1 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 26 Nov 2016 17:34:14 -0500
Subject: [PATCH] Improve database management for servers, fixes #181

---
 app/Repositories/DatabaseRepository.php      | 40 +++++++++++++-------
 resources/views/admin/servers/view.blade.php |  2 +-
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/Repositories/DatabaseRepository.php b/app/Repositories/DatabaseRepository.php
index c1c9b4e37..8861549be 100644
--- a/app/Repositories/DatabaseRepository.php
+++ b/app/Repositories/DatabaseRepository.php
@@ -56,13 +56,12 @@ class DatabaseRepository {
         }
 
         DB::beginTransaction();
-
         try {
             $db = new Models\Database;
             $db->fill([
                 'server_id' => $server->id,
                 'db_server' => $options['db_server'],
-                'database' => $server->uuidShort . '_' . $options['database'],
+                'database' => "s{$server->id}_{$options['database']}",
                 'username' => $server->uuidShort . '_' . str_random(7),
                 'remote' => $options['remote'],
                 'password' => Crypt::encrypt(str_random(20))
@@ -90,16 +89,29 @@ class DatabaseRepository {
 
             $capsule->setAsGlobal();
 
-            Capsule::statement('CREATE DATABASE ' . $db->database);
-            Capsule::statement('CREATE USER \'' . $db->username . '\'@\'' . $db->remote . '\' IDENTIFIED BY \'' . Crypt::decrypt($db->password) . '\'');
-            Capsule::statement('GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, INDEX ON ' . $db->database . '.* TO \'' . $db->username . '\'@\'' . $db->remote . '\'');
-            Capsule::statement('FLUSH PRIVILEGES');
-
-            DB::commit();
-            return true;
         } catch (\Exception $ex) {
-            DB::rollback();
-            throw $ex;
+            DB::rollBack();
+            throw new DisplayException('There was an error while connecting to the Database Host Server. Please check the error logs.', $ex);
+        }
+
+        try {
+            Capsule::statement('CREATE DATABASE `' . $db->database . '`');
+            Capsule::statement('CREATE USER `' . $db->username . '`@`' . $db->remote . '` IDENTIFIED BY \'' . Crypt::decrypt($db->password) . '\'');
+            Capsule::statement('GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, INDEX ON `' . $db->database . '`.* TO `' . $db->username . '`@`' . $db->remote . '`');
+            Capsule::statement('FLUSH PRIVILEGES');
+            DB::commit();
+        } catch (\Exception $ex) {
+            try {
+                Capsule::statement('DROP DATABASE `' . $db->database . '`');
+                Capsule::statement('DROP USER `' . $db->username . '`@`' . $db->remote . '`');
+            } catch (\Exception $exi) {
+                // ignore it, if it fails its probably
+                // because we failed to ever make the DB
+                // or the user on the system.
+            } finally {
+                DB::rollBack();
+                throw $ex;
+            }
         }
     }
 
@@ -138,7 +150,7 @@ class DatabaseRepository {
 
             $capsule->setAsGlobal();
             Capsule::statement(sprintf(
-                'SET PASSWORD FOR \'%s\'@\'%s\' = PASSWORD(\'%s\')',
+                'SET PASSWORD FOR `%s`@`%s` = PASSWORD(\'%s\')',
                 $db->username,
                 $db->remote,
                 $password
@@ -182,8 +194,8 @@ class DatabaseRepository {
 
             $capsule->setAsGlobal();
 
-            Capsule::statement('DROP USER \'' . $db->username . '\'@\'' . $db->remote . '\'');
-            Capsule::statement('DROP DATABASE ' . $db->database);
+            Capsule::statement('DROP USER `' . $db->username . '`@`' . $db->remote . '`');
+            Capsule::statement('DROP DATABASE `' . $db->database . '`');
 
             $db->delete();
 
diff --git a/resources/views/admin/servers/view.blade.php b/resources/views/admin/servers/view.blade.php
index d6178d872..cb429ebe9 100644
--- a/resources/views/admin/servers/view.blade.php
+++ b/resources/views/admin/servers/view.blade.php
@@ -373,7 +373,7 @@
                                 <div class="form-group col-md-6">
                                     <label class="control-label">Database Name:</label>
                                     <div class="input-group">
-                                        <div class="input-group-addon">{{ $server->uuidShort }}_</div>
+                                        <div class="input-group-addon">s{{ $server->id }}_</div>
                                         <input type="text" name="database" value="{{ old('database') }}" class="form-control">
                                     </div>
                                 </div>