ndev-stack 0.3.15__tar.gz → 0.3.16__tar.gz

{ndev_stack-0.3.15 → ndev_stack-0.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.15
+Version: 0.3.16
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.15 → ndev_stack-0.3.16}/ndev/__init__.py

@@ -1,7 +1,7 @@
 """
 ndev: Fast, cross-platform PHP developer environment for Windows and Linux.
 """
-__version__ = "0.3.15"
+__version__ = "0.3.16"
 
 from . import common as common
 from .common.logger import logger as logger

{ndev_stack-0.3.15 → ndev_stack-0.3.16}/ndev/linux/commands/db.py

@@ -3,9 +3,11 @@ import sys
 import shutil
 import subprocess
 import typer
+from pathlib import Path
 from typing import Optional
 from rich.console import Console
 from ndev.common.logger import logger
+from ndev.common.utils import which_binary
 
 console = Console()
 
@@ -13,7 +15,8 @@ db_app = typer.Typer(help="Manage MySQL databases and users", invoke_without_com
 
 # Shared options for commands
 def execute_sql_mysql(host: str, port: int, user: str, password: Optional[str], sql: str) -> subprocess.CompletedProcess:
-    cmd = ["mysql", "-h", host, "-P", str(port), "-u", user, "--batch", "--skip-column-names"]
+    client = which_binary("mariadb") or which_binary("mysql") or "mysql"
+    cmd = [client, "-h", host, "-P", str(port), "-u", user, "--batch", "--skip-column-names"]
     if password:
         cmd.append(f"--password={password}")
     return subprocess.run(cmd, input=sql, capture_output=True, text=True)
@@ -328,9 +331,65 @@ def configure_mariadb_root_password(new_password: str = "root", sudo_password: O
     from ndev.linux.runtime.nginx_helper import run_privileged_command
     from ndev.common.utils import which_binary
 
+    client_bin = which_binary("mariadb") or which_binary("mysql") or "mariadb"
+
+    # 1. Ensure MariaDB service is active
+    try:
+        run_privileged_command(["systemctl", "start", "mariadb"], password=sudo_password, check=False)
+    except Exception:
+        pass
+
+    # 2. Detect MariaDB unix socket path
+    socket_candidates = [
+        Path("/run/mysql/mysql.sock"),
+        Path("/run/mysqld/mysqld.sock"),
+        Path("/var/run/mysqld/mysqld.sock"),
+        Path("/var/lib/mysql/mysql.sock"),
+    ]
+    socket_args: list[str] = []
+    for s in socket_candidates:
+        if s.exists():
+            socket_args = ["-S", str(s)]
+            break
+
+    # 3. Dual auth (unix_socket + password) attempt for localhost
+    dual_auth_sql = (
+        f"ALTER USER 'root'@'localhost' IDENTIFIED VIA mysql_native_password USING PASSWORD('{new_password}') OR unix_socket; "
+        "FLUSH PRIVILEGES;"
+    )
+    try:
+        run_privileged_command([client_bin] + socket_args + ["-u", "root", "-e", dual_auth_sql], password=sudo_password, check=False)
+    except Exception as e:
+        logger.debug(f"Dual auth attempt: {e}")
+
+    # 4. Standard root password & network user creation
+    batch_sql = (
+        f"ALTER USER 'root'@'localhost' IDENTIFIED BY '{new_password}'; "
+        f"CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '{new_password}'; "
+        f"ALTER USER 'root'@'127.0.0.1' IDENTIFIED BY '{new_password}'; "
+        f"CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY '{new_password}'; "
+        f"ALTER USER 'root'@'%' IDENTIFIED BY '{new_password}'; "
+        "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION; "
+        "GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION; "
+        "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; "
+        "FLUSH PRIVILEGES;"
+    )
+
+    try:
+        run_privileged_command([client_bin] + socket_args + ["-u", "root", "-f", "-e", batch_sql], password=sudo_password, check=False)
+    except Exception as e:
+        logger.debug(f"Batch SQL config: {e}")
+
+    # Also try if root already has password set
+    try:
+        run_privileged_command([client_bin] + socket_args + ["-u", "root", f"--password={new_password}", "-f", "-e", batch_sql], password=sudo_password, check=False)
+    except Exception:
+        pass
+
+    # 5. Fallback individual statements
     sql_statements = [
-        f"ALTER USER 'root'@'localhost' IDENTIFIED VIA mysql_native_password USING PASSWORD('{new_password}') OR unix_socket;",
         f"ALTER USER 'root'@'localhost' IDENTIFIED BY '{new_password}';",
+        f"SET PASSWORD FOR 'root'@'localhost' = PASSWORD('{new_password}');",
         f"CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '{new_password}';",
         f"ALTER USER 'root'@'127.0.0.1' IDENTIFIED BY '{new_password}';",
         f"CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY '{new_password}';",
@@ -341,16 +400,14 @@ def configure_mariadb_root_password(new_password: str = "root", sudo_password: O
         "FLUSH PRIVILEGES;",
     ]
 
-    client_bin = which_binary("mariadb") or which_binary("mysql") or "mariadb"
-
     for sql in sql_statements:
         try:
-            cmd = [client_bin, "-u", "root", "-e", sql]
+            cmd = [client_bin] + socket_args + ["-u", "root", "-e", sql]
             run_privileged_command(cmd, password=sudo_password, check=False)
         except Exception:
             pass
 
-    # Verify if connection succeeds via TCP
+    # 6. Verify if connection succeeds via TCP
     for h in ["127.0.0.1", "localhost"]:
         try:
             test_cmd = [client_bin, "-h", h, "-P", "3306", "-u", "root", f"--password={new_password}", "-e", "SELECT 1;"]
@@ -369,6 +426,25 @@ def set_root_password_cmd(
     password: str = typer.Option("root", "--password", "-p", help="New root password (default: root)"),
 ):
     """Set or reset MariaDB root password and enable password login across localhost and 127.0.0.1."""
+    if os.geteuid() != 0:
+        console.print("[bold yellow]MariaDB root configuration requires administrator privileges. Elevating via sudo...[/bold yellow]")
+        cmd = [
+            "sudo",
+            sys.executable,
+            "-m",
+            "ndev",
+            "db",
+            "set-root-password",
+            "--password",
+            password,
+        ]
+        try:
+            res = subprocess.run(cmd)
+            raise typer.Exit(code=res.returncode)
+        except KeyboardInterrupt:
+            console.print("\n[red]Cancelled by user.[/red]")
+            raise typer.Exit(code=130)
+
     console.print(f"[bold yellow]Configuring MariaDB root access with password '{password}'...[/bold yellow]")
     ok = configure_mariadb_root_password(new_password=password)
     if ok:

{ndev_stack-0.3.15 → ndev_stack-0.3.16}/ndev/linux/runtime/nginx_helper.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import os
 import re
+import sys
 import socket
 import shutil
 import subprocess

{ndev_stack-0.3.15 → ndev_stack-0.3.16}/ndev_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.15
+Version: 0.3.16
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.15 → ndev_stack-0.3.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ndev-stack"
-version = "0.3.15"
+version = "0.3.16"
 description = "Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows"
 readme = "README.md"
 requires-python = ">=3.10"

{ndev_stack-0.3.15 → ndev_stack-0.3.16}/tests/test_opensuse_compat.py

@@ -559,6 +559,20 @@ class TestDatabaseCommands(unittest.TestCase):
                 self.assertTrue(ok)
                 mock_priv.assert_called()
 
+    def test_set_root_password_cmd_elevates_when_non_root(self):
+        import typer
+        from ndev.linux.commands.db import set_root_password_cmd
+        with patch("os.geteuid", return_value=1000):
+            with patch("subprocess.run") as mock_run:
+                mock_run.return_value = subprocess.CompletedProcess(args=[], returncode=0)
+                with self.assertRaises((SystemExit, typer.Exit)) as cm:
+                    set_root_password_cmd(password="root")
+                exit_code = getattr(cm.exception, "exit_code", getattr(cm.exception, "code", 0))
+                self.assertEqual(exit_code, 0)
+                mock_run.assert_called_once()
+                self.assertIn("sudo", mock_run.call_args[0][0])
+                self.assertIn("set-root-password", mock_run.call_args[0][0])
+
 
 class TestTuiEnsureSudo(unittest.TestCase):
     def test_ensure_sudo_when_not_needed(self):