From 79994a1262b4cced1dd8387162c8a758bd38524a Mon Sep 17 00:00:00 2001
From: VirtuBox <contact@virtubox.net>
Date: Mon, 25 Mar 2019 12:22:25 +0100
Subject: [PATCH] increase password size

---
 CHANGELOG.md                     |  2 +
 wo/cli/plugins/secure.py         |  2 +-
 wo/cli/plugins/site_functions.py | 65 ++++++++++++++++----------------
 wo/cli/plugins/stack.py          |  2 +-
 4 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a4eca0..f9145ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - "--letsencrypt=subdomain" option
 - hardened nginx ssl_ecdh_curve
 - Update phpredisadmin
+- Increase MySQL root password size to 16 characters
+- Increase MySQL users password size to 16 characters
 
 #### Fixed
 
diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py
index ae2b9eb..cb6305a 100644
--- a/wo/cli/plugins/secure.py
+++ b/wo/cli/plugins/secure.py
@@ -50,7 +50,7 @@ class WOSecureController(CementBaseController):
         """This function secures authentication"""
         passwd = ''.join([random.choice
                           (string.ascii_letters + string.digits)
-                          for n in range(6)])
+                          for n in range(16)])
         if not self.app.pargs.user_input:
             username = input("Provide HTTP authentication user "
                              "name [{0}] :".format(WOVariables.wo_user))
diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index e84226c..28a3faa 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -306,9 +306,9 @@ def setupwordpress(self, data):
                           "\n\ndefine(\'WP_DEBUG\', false);"))
         try:
             if WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root"
-                                    .format(WOVariables.wo_wpcli_path)
-                                    + " core config "
-                                    + "--dbname=\'{0}\' --dbprefix=\'{1}\' "
+                                    .format(WOVariables.wo_wpcli_path) +
+                                    " core config " +
+                                    "--dbname=\'{0}\' --dbprefix=\'{1}\' "
                                     "--dbuser=\'{2}\' --dbhost=\'{3}\' "
                                     .format(data['wo_db_name'], wo_wp_prefix,
                                             data['wo_db_user'], data['wo_db_host']
@@ -330,11 +330,11 @@ def setupwordpress(self, data):
     else:
         Log.debug(self, "Generating wp-config for WordPress multisite")
         Log.debug(self, "bash -c \"php {0} --allow-root "
-                  .format(WOVariables.wo_wpcli_path)
-                  + "core config "
-                  + "--dbname=\'{0}\' --dbprefix=\'{1}\' --dbhost=\'{2}\' "
-                  .format(data['wo_db_name'], wo_wp_prefix, data['wo_db_host'])
-                  + "--dbuser=\'{0}\' --dbpass=\'{1}\' "
+                  .format(WOVariables.wo_wpcli_path) +
+                  "core config " +
+                  "--dbname=\'{0}\' --dbprefix=\'{1}\' --dbhost=\'{2}\' "
+                  .format(data['wo_db_name'], wo_wp_prefix, data['wo_db_host']) +
+                  "--dbuser=\'{0}\' --dbpass=\'{1}\' "
                   "--extra-php<<PHP \n {2} {3} {4} \nPHP\""
                   .format(data['wo_db_user'], data['wo_db_pass'],
                           "\ndefine(\'WPMU_ACCEL_REDIRECT\',"
@@ -380,7 +380,8 @@ def setupwordpress(self, data):
                     os.path.abspath(os.path.join(os.getcwd(), os.pardir)))
     except Exception as e:
         Log.error(self, 'Unable to move file from {0} to {1}'
-                  .format(os.getcwd()+'/wp-config.php', os.path.abspath(os.path.join(os.getcwd(), os.pardir))), False)
+                  .format(os.getcwd()+'/wp-config.php',
+                          os.path.abspath(os.path.join(os.getcwd(), os.pardir))), False)
         raise SiteError("Unable to move wp-config.php")
 
     if not wo_wp_user:
@@ -421,18 +422,18 @@ def setupwordpress(self, data):
     if not data['multisite']:
         Log.debug(self, "Creating tables for WordPress Single site")
         Log.debug(self, "php {0} --allow-root core install "
-                  .format(WOVariables.wo_wpcli_path)
-                  + "--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' "
-                  .format(data['www_domain'], wo_wp_user)
-                  + "--admin_password= --admin_email=\'{1}\'"
+                  .format(WOVariables.wo_wpcli_path) +
+                  "--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' "
+                  .format(data['www_domain'], wo_wp_user) +
+                  "--admin_password= --admin_email=\'{1}\'"
                   .format(wo_wp_pass, wo_wp_email))
         try:
             if WOShellExec.cmd_exec(self, "php {0} --allow-root core "
-                                    .format(WOVariables.wo_wpcli_path)
-                                    + "install --url=\'{0}\' --title=\'{0}\' "
+                                    .format(WOVariables.wo_wpcli_path) +
+                                    "install --url=\'{0}\' --title=\'{0}\' "
                                     "--admin_name=\'{1}\' "
-                                    .format(data['www_domain'], wo_wp_user)
-                                    + "--admin_password=\'{0}\' "
+                                    .format(data['www_domain'], wo_wp_user) +
+                                    "--admin_password=\'{0}\' "
                                     "--admin_email=\'{1}\'"
                                     .format(wo_wp_pass, wo_wp_email),
                                     log=False):
@@ -445,23 +446,23 @@ def setupwordpress(self, data):
     else:
         Log.debug(self, "Creating tables for WordPress multisite")
         Log.debug(self, "php {0} --allow-root "
-                  .format(WOVariables.wo_wpcli_path)
-                  + "core multisite-install "
+                  .format(WOVariables.wo_wpcli_path) +
+                  "core multisite-install "
                   "--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' "
-                  .format(data['www_domain'], wo_wp_user)
-                  + "--admin_password= --admin_email=\'{1}\' "
+                  .format(data['www_domain'], wo_wp_user) +
+                  "--admin_password= --admin_email=\'{1}\' "
                   "{subdomains}"
                   .format(wo_wp_pass, wo_wp_email,
                           subdomains='--subdomains'
                           if not data['wpsubdir'] else ''))
         try:
             if WOShellExec.cmd_exec(self, "php {0} --allow-root "
-                                    .format(WOVariables.wo_wpcli_path)
-                                    + "core multisite-install "
+                                    .format(WOVariables.wo_wpcli_path) +
+                                    "core multisite-install "
                                     "--url=\'{0}\' --title=\'{0}\' "
                                     "--admin_name=\'{1}\' "
-                                    .format(data['www_domain'], wo_wp_user)
-                                    + "--admin_password=\'{0}\' "
+                                    .format(data['www_domain'], wo_wp_user) +
+                                    "--admin_password=\'{0}\' "
                                     "--admin_email=\'{1}\' "
                                     "{subdomains}"
                                     .format(wo_wp_pass, wo_wp_email,
@@ -478,8 +479,8 @@ def setupwordpress(self, data):
     Log.debug(self, "Updating WordPress permalink")
     try:
         WOShellExec.cmd_exec(self, " php {0} --allow-root "
-                             .format(WOVariables.wo_wpcli_path)
-                             + "rewrite structure "
+                             .format(WOVariables.wo_wpcli_path) +
+                             "rewrite structure "
                              "/%year%/%monthnum%/%day%/%postname%/")
     except CommandExecutionError as e:
         raise SiteError("Update wordpress permalinks failed")
@@ -538,16 +539,16 @@ def installwp_plugin(self, plugin_name, data):
     WOFileUtils.chdir(self, '{0}/htdocs/'.format(wo_site_webroot))
     try:
         WOShellExec.cmd_exec(self, "php {0} plugin "
-                             .format(WOVariables.wo_wpcli_path)
-                             + "--allow-root install "
+                             .format(WOVariables.wo_wpcli_path) +
+                             "--allow-root install "
                              "{0}".format(plugin_name))
     except CommandExecutionError as e:
         raise SiteError("plugin installation failed")
 
     try:
         WOShellExec.cmd_exec(self, "php {0} plugin "
-                             .format(WOVariables.wo_wpcli_path)
-                             + "--allow-root activate "
+                             .format(WOVariables.wo_wpcli_path) +
+                             "--allow-root activate "
                              "{0} {na}"
                              .format(plugin_name,
                                      na='--network' if data['multisite']
@@ -1099,7 +1100,7 @@ def detSitePar(opts):
 
 def generate_random():
     wo_random10 = (''.join(random.sample(string.ascii_uppercase +
-                                         string.ascii_lowercase + string.digits, 10)))
+                                         string.ascii_lowercase + string.digits, 16)))
     return wo_random10
 
 
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index 87430a1..d3bef64 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -97,7 +97,7 @@ class WOStackController(CementBaseController):
                            keyserver="keyserver.ubuntu.com")
             WORepo.add_key(self, '0xF1656F24C74CD1D8',
                            keyserver="keyserver.ubuntu.com")
-            chars = ''.join(random.sample(string.ascii_letters, 8))
+            chars = ''.join(random.sample(string.ascii_letters, 16))
             Log.debug(self, "Pre-seeding MySQL")
             Log.debug(self, "echo \"mariadb-server-10.3 "
                       "mysql-server/root_password "