Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-12-17 05:49:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Comprehensive MariaDB socket authentication support

Browse Source 
- Add execute_mysql_command() helper in install.py for robust auth fallback
- Update mysqlUtilities.py with socket auth fallback for all operations:
  * Database creation
  * User creation
  * Privilege granting
  * Privilege flushing
- Fix PowerDNS database setup to use new authentication helper
- Improve cyberpanel user connection verification
- Add proper error handling and logging throughout

This ensures the installation works correctly when MariaDB is pre-installed
with socket authentication (common with dependency installations).

Fixes the 'Cannot update settings with empty passwords' installation failure.
This commit is contained in:
usmannasir
2025-09-29 12:18:03 +05:00
parent aff2f5f9c2
commit 236ecd7ea8
2 changed files with 112 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
install/mysqlUtilities.py
View File

@@ -32,13 +32,21 @@ class mysqlUtilities:
except:
passFile = "/etc/cyberpanel/mysqlPassword"
f = open(passFile)
data = f.read()
password = data.split('\n', 1)[0]
try:
f = open(passFile)
data = f.read()
password = data.split('\n', 1)[0]
f.close()
initCommand = 'mariadb -u root -p' + password + ' -e "'
remote = 0
logging.InstallLog.writeToFile("Using local MySQL configuration")
# Try password-based authentication first
initCommand = 'mariadb -u root -p' + password + ' -e "'
remote = 0
logging.InstallLog.writeToFile("Using local MySQL configuration with password")
except:
# Fallback to socket authentication for fresh MariaDB installs
initCommand = 'sudo mariadb -e "'
remote = 0
logging.InstallLog.writeToFile("Using local MySQL configuration with socket authentication")
command = initCommand + createDB + '"'
@@ -51,6 +59,14 @@ class mysqlUtilities:
cmd = shlex.split(command)
res = subprocess.call(cmd)
# If command failed and we're using password auth, try socket auth as fallback
if res != 0 and not remote and 'sudo' not in initCommand:
logging.InstallLog.writeToFile(f"Password-based auth failed (code {res}), trying socket authentication...")
initCommand = 'sudo mariadb -e "'
command = initCommand + createDB + '"'
cmd = shlex.split(command)
res = subprocess.call(cmd)
if res != 0:
logging.InstallLog.writeToFile(f"ERROR: Database creation failed with return code: {res}")
return 0
@@ -89,6 +105,14 @@ class mysqlUtilities:
cmd = shlex.split(command)
res = subprocess.call(cmd)
# If user creation failed and we're using password auth, try socket auth as fallback
if res != 0 and not remote and 'sudo' not in initCommand:
logging.InstallLog.writeToFile(f"User creation with password failed (code {res}), trying socket authentication...")
initCommand = 'sudo mariadb -e "'
command = initCommand + createUser + '"'
cmd = shlex.split(command)
res = subprocess.call(cmd)
if res != 0:
logging.InstallLog.writeToFile(f"ERROR: User creation failed with return code: {res}")
return 0
@@ -135,6 +159,14 @@ class mysqlUtilities:
cmd = shlex.split(command)
res = subprocess.call(cmd)
# If privilege granting failed and we're using password auth, try socket auth as fallback
if res != 0 and not remote and 'sudo' not in initCommand:
logging.InstallLog.writeToFile(f"Grant privileges with password failed (code {res}), trying socket authentication...")
initCommand = 'sudo mariadb -e "'
command = initCommand + grantPrivileges + '"'
cmd = shlex.split(command)
res = subprocess.call(cmd)
if res != 0:
logging.InstallLog.writeToFile(f"ERROR: Grant privileges failed with return code: {res}")
return 0
@@ -148,6 +180,13 @@ class mysqlUtilities:
cmd = shlex.split(flushCommand)
res = subprocess.call(cmd)
# If flush failed and we're using password auth, try socket auth as fallback
if res != 0 and not remote and 'sudo' not in initCommand:
logging.InstallLog.writeToFile(f"FLUSH PRIVILEGES with password failed (code {res}), trying socket authentication...")
flushCommand = 'sudo mariadb -e "FLUSH PRIVILEGES"'
cmd = shlex.split(flushCommand)
res = subprocess.call(cmd)
if res != 0:
logging.InstallLog.writeToFile(f"WARNING: FLUSH PRIVILEGES failed with return code: {res}")
else: