From 829f4bd231fb97b55903ffaeb0c7747d6478d4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn?= <me@tentakelfabrik.de>
Date: Tue, 1 Sep 2020 17:08:41 +0200
Subject: [PATCH] adding #35

---
 app/Commands/MariadbAddCommand.php     | 32 +++++++++++++++-----------
 app/Commands/MariadbInstallCommand.php | 29 ++++++++++++-----------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/app/Commands/MariadbAddCommand.php b/app/Commands/MariadbAddCommand.php
index c4d8d4e..50cfbac 100644
--- a/app/Commands/MariadbAddCommand.php
+++ b/app/Commands/MariadbAddCommand.php
@@ -52,7 +52,7 @@ class MariadbAddCommand extends Command
     public function handle()
     {
         // enter root password
-        $password = $this->secret('Enter root password');
+        $password = $this->secret('Root Password');
 
         // connect database
         try {
@@ -64,18 +64,20 @@ class MariadbAddCommand extends Command
 
         $this->info('Mariadb Create Database...');
 
-        // generate password
-        $generator = new ComputerPasswordGenerator();
-        $generator->setRandomGenerator(new Php7RandomGenerator())
-            ->setUppercase()
-            ->setLowercase()
-            ->setUppercase()
-            ->setNumbers()
-            ->setSymbols(false)
-            ->setLength(self::PASSWORD_LENGTH);
+        // setting password for root, repeat until
+        do {
+            $password = $this->secret('New Password');
+            $passwordRepeat = $this->secret('Repeat Password');
 
-        // getting password
-        $password = $generator->generatePasswords(1)[0];
+            if ($password !== $passwordRepeat) {
+                $this->error('Password not equal! Try again!');
+            }
+
+            if (empty($password)) {
+                $this->error('Password is empty! Try again!');
+            }
+
+        } while ($password !== $passwordRepeat || empty($password));
 
         $generator = new ComputerPasswordGenerator();
         $generator->setRandomGenerator(new Php7RandomGenerator())
@@ -92,6 +94,9 @@ class MariadbAddCommand extends Command
         $database = 'db'.$names[0];
         $username = 'u'.$names[1];
 
+        $this->info('Database: '.$database);
+        $this->info('Username: '.$username);
+
         // getting option for ssl
         $ssl = $this->option('ssl');
 
@@ -131,7 +136,6 @@ class MariadbAddCommand extends Command
         $mysqli->query("FLUSH PRIVILEGES");
         $mysqli->close();
 
-        $this->info('Success! \o/ Check /root/mcp.log');
-        file_put_contents(self::MCP_LOG_FILE, "Mariadb $database created\nuser: $username\npassword: $password\n--\n", FILE_APPEND);
+        $this->info('Success! \o/');
     }
 }
diff --git a/app/Commands/MariadbInstallCommand.php b/app/Commands/MariadbInstallCommand.php
index 703953e..43a1ada 100644
--- a/app/Commands/MariadbInstallCommand.php
+++ b/app/Commands/MariadbInstallCommand.php
@@ -79,22 +79,24 @@ class MariadbInstallCommand extends Command
         // @TODO apt add a Warning for no good, in a later version output will be scanned for helpfull infos
         $this->line(implode("\n", Install::filterAptMessages($output)));
 
-        if (Install::isReady('mariadb-server mariadb-client')) {
+        if (Install::isReady('mariadb-server') && Install::isReady('mariadb-client')) {
 
             $this->info('Mariadb setup...');
 
-            // generate password
-            $generator = new ComputerPasswordGenerator();
-            $generator->setRandomGenerator(new Php7RandomGenerator())
-                ->setUppercase()
-                ->setLowercase()
-                ->setUppercase()
-                ->setNumbers()
-                ->setSymbols(false)
-                ->setLength(self::PASSWORD_LENGTH);
+            // setting password for root, repeat until
+            do {
+                $password = $this->secret('Root Password');
+                $passwordRepeat = $this->secret('Repeat Root Password');
 
-            // getting password for root
-            $password = $generator->generatePasswords()[0];
+                if ($password !== $passwordRepeat) {
+                    $this->error('Password not equal! Try again!');
+                }
+
+                if (empty($password)) {
+                    $this->error('Password is empty! Try again!');
+                }
+
+            } while ($password !== $passwordRepeat || empty($password));
 
             // make sure root can only access from local
             $this->info('Mariadb make sure root can ony access from local...');
@@ -119,8 +121,7 @@ class MariadbInstallCommand extends Command
                 system('sudo mysql -u root -e "UPDATE mysql.user SET plugin=\'\' where User=\'root\';"');
             }
 
-            file_put_contents(self::MCP_LOG_FILE, "Mariadb installed\nuser: root\npassword: $password\n--\n", FILE_APPEND);
-            $this->info('Mariadb installing...Success! \o/ Check '.self::MCP_LOG_FILE);
+            $this->info('Mariadb installing...Success! \o/');
 
         } else {
             $this->error('Failed! Please check log-file!');