Merge remote-tracking branch 'refs/remotes/origin/main'

Author: Théo LAGACHE

commands/agent.py

@@ -72,6 +72,10 @@ def agent(
     if polling == 5:
         polling = IntPrompt.ask("Polling frequency (seconds)", default=5)
 
+    add_host_gateway = Confirm.ask(
+        "Add extra_hosts mapping (localhost -> host-gateway)?", default=False
+    )
+
     raw_template = fetch_template("agent.yml")
 
     if "{{EXTRA_SERVICES}}" not in raw_template:
@@ -192,7 +196,11 @@ def agent(
                         ),
                     )
                     user = Prompt.ask("Username")
-                    password = Prompt.ask("Password", password=True)
+                    password = questionary.password(
+                        "Password", style=questionary_style
+                    ).ask()
+                    if password is None:
+                        raise typer.Exit()
 
                     add_db_to_json(
                         path,
@@ -691,6 +699,14 @@ def agent(
         "      - ./databases.json:/config/config.json", vols_str
     )
 
+    if add_host_gateway:
+        final_compose = final_compose.replace(
+            "    image: portabase/agent:latest\n",
+            '    image: portabase/agent:latest\n'
+            '    extra_hosts:\n'
+            '      - "localhost:host-gateway"\n',
+        )
+
     summary = Table(show_header=False, box=None, padding=(0, 2))
     summary.add_column("Property", style="bold cyan")
     summary.add_column("Value", style="white")
@@ -700,6 +716,7 @@ def agent(
     summary.add_row("Edge Key", f"{key[:10]}...{key[-10:]}" if len(key) > 20 else key)
     summary.add_row("Timezone", tz)
     summary.add_row("Polling", f"{polling}s")
+    summary.add_row("Host Gateway", "Yes" if add_host_gateway else "No")
 
     db_config = load_db_config(path)
     dbs = db_config.get("databases", [])

commands/dashboard.py

@@ -1,6 +1,7 @@
 import re
 import secrets
 from pathlib import Path
+from urllib.parse import quote
 
 import questionary
 import typer
@@ -84,7 +85,7 @@ def dashboard(
                 "POSTGRES_USER": "portabase",
                 "POSTGRES_PASSWORD": pg_pass,
                 "POSTGRES_HOST": "db",
-                "DATABASE_URL": f"postgresql://portabase:{pg_pass}@db:5432/portabase?schema=public",
+                "DATABASE_URL": f"postgresql://portabase:{quote(pg_pass, safe='')}@db:5432/portabase?schema=public",
                 "PG_PORT": str(pg_port),
             }
         )
@@ -95,35 +96,41 @@ def dashboard(
         db_port = IntPrompt.ask("Port", default=5432)
         db_name = Prompt.ask("Database Name", default="portabase")
         db_user = Prompt.ask("Username")
-        db_pass = Prompt.ask("Password", password=True)
+        db_pass = questionary.password("Password", style=questionary_style).ask()
+        if db_pass is None:
+            raise typer.Exit()
 
         env_vars.update(
             {
                 "POSTGRES_DB": db_name,
                 "POSTGRES_USER": db_user,
                 "POSTGRES_PASSWORD": db_pass,
                 "POSTGRES_HOST": db_host,
-                "DATABASE_URL": f"postgresql://{db_user}:{db_pass}@{db_host}:{db_port}/{db_name}?schema=public",
+                "DATABASE_URL": f"postgresql://{quote(db_user, safe='')}:{quote(db_pass, safe='')}@{db_host}:{db_port}/{db_name}?schema=public",
                 "PG_PORT": str(db_port),
             }
         )
 
         final_compose = re.sub(
-            r"[ ]{8}depends_on:.*?service_healthy\n", "", raw_template, flags=re.DOTALL
+            r"[ ]{4}depends_on:\n[ ]{6}db:\n[ ]{8}condition: service_healthy\n",
+            "",
+            raw_template,
         )
         final_compose = re.sub(
-            r"[ ]{4}db:.*?retries: 5\n", "", final_compose, flags=re.DOTALL
+            r"[ ]{2}db:.*?retries: 5\n", "", final_compose, flags=re.DOTALL
         )
-        final_compose = re.sub(r"[ ]{4}postgres-data:\n", "", final_compose)
+        final_compose = re.sub(r"[ ]{2}postgres-data:\n", "", final_compose)
         final_compose = final_compose.replace("${PROJECT_NAME}", project_name)
     else:
         final_compose = re.sub(
-            r"[ ]{8}depends_on:.*?service_healthy\n", "", raw_template, flags=re.DOTALL
+            r"[ ]{4}depends_on:\n[ ]{6}db:\n[ ]{8}condition: service_healthy\n",
+            "",
+            raw_template,
         )
         final_compose = re.sub(
-            r"[ ]{4}db:.*?retries: 5\n", "", final_compose, flags=re.DOTALL
+            r"[ ]{2}db:.*?retries: 5\n", "", final_compose, flags=re.DOTALL
         )
-        final_compose = re.sub(r"[ ]{4}postgres-data:\n", "", final_compose)
+        final_compose = re.sub(r"[ ]{2}postgres-data:\n", "", final_compose)
         final_compose = final_compose.replace("${PROJECT_NAME}", project_name)
 
     summary = Table(show_header=False, box=None, padding=(0, 2))

commands/db.py

@@ -146,7 +146,11 @@ def add_db(name: str = typer.Argument(..., help="Name of the agent")):
                     ),
                 )
                 user = Prompt.ask("Username")
-                password = Prompt.ask("Password", password=True)
+                password = questionary.password(
+                    "Password", style=questionary_style
+                ).ask()
+                if password is None:
+                    raise typer.Exit()
 
                 entry = {
                     "name": friendly_name,