zebra-day 1.0.2__py3-none-any.whl → 2.0.0__py3-none-any.whl

zebra_day/cli/gui.py

@@ -20,7 +20,11 @@ console = Console()
 # PID and log file locations
 STATE_DIR = xdg.get_state_dir()
 LOG_DIR = xdg.get_logs_dir()
+CONFIG_DIR = xdg.get_config_dir()
 PID_FILE = STATE_DIR / "gui.pid"
+DEFAULT_CERT_DIR = CONFIG_DIR / "certs"
+DEFAULT_CERT_FILE = DEFAULT_CERT_DIR / "server.crt"
+DEFAULT_KEY_FILE = DEFAULT_CERT_DIR / "server.key"
 
 
 def _ensure_dirs():
@@ -62,6 +66,43 @@ def _check_auth_dependencies() -> bool:
         return False
 
 
+def _resolve_ssl_paths(
+    cert: Optional[str], key: Optional[str]
+) -> tuple[Optional[str], Optional[str], bool]:
+    """
+    Resolve SSL certificate and key paths.
+
+    Priority:
+    1. Explicit --cert/--key arguments
+    2. SSL_CERT_PATH/SSL_KEY_PATH environment variables
+    3. Default paths in ~/.config/zebra_day/certs/
+
+    Returns:
+        Tuple of (cert_path, key_path, use_https)
+    """
+    cert_path = cert
+    key_path = key
+
+    # Check environment variables
+    if not cert_path:
+        cert_path = os.environ.get("SSL_CERT_PATH")
+    if not key_path:
+        key_path = os.environ.get("SSL_KEY_PATH")
+
+    # Check default paths
+    if not cert_path and DEFAULT_CERT_FILE.exists():
+        cert_path = str(DEFAULT_CERT_FILE)
+    if not key_path and DEFAULT_KEY_FILE.exists():
+        key_path = str(DEFAULT_KEY_FILE)
+
+    # Validate both exist
+    if cert_path and key_path:
+        if Path(cert_path).exists() and Path(key_path).exists():
+            return cert_path, key_path, True
+
+    return None, None, False
+
+
 @gui_app.command("start")
 def start(
     port: int = typer.Option(8118, "--port", "-p", help="Port to run the server on"),
@@ -69,8 +110,19 @@ def start(
     auth: str = typer.Option("none", "--auth", "-a", help="Authentication mode: none or cognito"),
     reload: bool = typer.Option(False, "--reload", "-r", help="Enable auto-reload (foreground)"),
     background: bool = typer.Option(True, "--background/--foreground", "-b/-f", help="Run in background"),
+    cert: Optional[str] = typer.Option(None, "--cert", help="Path to SSL certificate file"),
+    key: Optional[str] = typer.Option(None, "--key", help="Path to SSL private key file"),
+    no_https: bool = typer.Option(False, "--no-https", help="Disable HTTPS even if certificates are available"),
 ):
-    """Start the zebra_day web UI server."""
+    """Start the zebra_day web UI server.
+
+    By default, HTTPS is enabled if certificates are found in:
+    - Explicit --cert/--key arguments
+    - SSL_CERT_PATH/SSL_KEY_PATH environment variables
+    - ~/.config/zebra_day/certs/server.crt and server.key
+
+    Use --no-https to force HTTP mode.
+    """
     _ensure_dirs()
 
     # Validate auth option
@@ -105,17 +157,45 @@ def start(
             raise typer.Exit(1)
         console.print("[green]✓[/green]  Cognito authentication enabled")
 
-    # Build command
+    # Resolve SSL paths
+    cert_path, key_path, use_https = _resolve_ssl_paths(cert, key)
+
+    if no_https:
+        use_https = False
+        cert_path = None
+        key_path = None
+
+    protocol = "https" if use_https else "http"
+
+    if use_https:
+        console.print(f"[green]✓[/green]  HTTPS enabled")
+        console.print(f"   Certificate: [dim]{cert_path}[/dim]")
+        console.print(f"   Private key: [dim]{key_path}[/dim]")
+    else:
+        console.print("[yellow]⚠[/yellow]  Running in HTTP mode (insecure)")
+        console.print("   For HTTPS, generate certificates with mkcert:")
+        console.print(f"   [dim]mkdir -p {DEFAULT_CERT_DIR}[/dim]")
+        console.print(f"   [dim]mkcert -cert-file {DEFAULT_CERT_FILE} -key-file {DEFAULT_KEY_FILE} localhost 127.0.0.1 ::1[/dim]")
+
+    # Build command with SSL parameters
+    ssl_args = ""
+    if use_https and cert_path and key_path:
+        ssl_args = f", ssl_certfile='{cert_path}', ssl_keyfile='{key_path}'"
+
     cmd = [
         sys.executable,
         "-c",
-        f"from zebra_day.web.app import run_server; run_server(host='{host}', port={port}, reload={reload}, auth='{auth}')",
+        f"from zebra_day.web.app import run_server; run_server(host='{host}', port={port}, reload={reload}, auth='{auth}'{ssl_args})",
     ]
 
     # Set up environment
     env = os.environ.copy()
     env["PYTHONUNBUFFERED"] = "1"
     env["ZEBRA_DAY_AUTH_MODE"] = auth
+    if cert_path:
+        env["SSL_CERT_PATH"] = cert_path
+    if key_path:
+        env["SSL_KEY_PATH"] = key_path
 
     if reload:
         background = False
@@ -149,10 +229,10 @@ def start(
 
         PID_FILE.write_text(str(proc.pid))
         console.print(f"[green]✓[/green]  Server started (PID {proc.pid})")
-        console.print(f"   URL: [cyan]http://{host}:{port}[/cyan]")
+        console.print(f"   URL: [cyan]{protocol}://{host}:{port}[/cyan]")
         console.print(f"   Logs: [dim]{log_file}[/dim]")
     else:
-        console.print(f"[green]✓[/green]  Starting server on [cyan]http://{host}:{port}[/cyan]")
+        console.print(f"[green]✓[/green]  Starting server on [cyan]{protocol}://{host}:{port}[/cyan]")
         console.print("   Press Ctrl+C to stop\n")
         try:
             result = subprocess.run(cmd, cwd=Path.cwd(), env=env)
@@ -197,8 +277,11 @@ def status():
     pid = _get_pid()
     if pid:
         log_file = _get_latest_log()
+        # Check if HTTPS is likely enabled based on cert availability
+        _, _, use_https = _resolve_ssl_paths(None, None)
+        protocol = "https" if use_https else "http"
         console.print(f"[green]●[/green]  Server is [green]running[/green] (PID {pid})")
-        console.print(f"   URL: [cyan]http://0.0.0.0:8118[/cyan]")
+        console.print(f"   URL: [cyan]{protocol}://0.0.0.0:8118[/cyan]")
         if log_file:
             console.print(f"   Logs: [dim]{log_file}[/dim]")
     else:

zebra_day/etc/printer_config.json

@@ -1,16 +1,4 @@
 {
-    "labs": {
-        "scan-results": {
-            "Download-Label-png": {
-                "ip_address": "dl_png",
-                "label_zpl_styles": [
-                    "tube_2inX1in"
-                ],
-                "print_method": "generate png",
-                "model": "na",
-                "serial": "na",
-                "arp_data": "na"
-            }
-        }
-    }
+    "schema_version": "2.0.0",
+    "labs": {}
 }

zebra_day/etc/printer_config.template.json

@@ -1,15 +1,23 @@
 {
+    "schema_version": "2.0.0",
     "labs": {
         "scan-results": {
-            "Download-Label-png": {
-                "ip_address": "dl_png",
-                "label_zpl_styles": [
-                    "tube_2inX1in"
-                ],
-                "print_method": "generate png",
-                "model": "na",
-                "serial": "na",
-		"arp_data": "na"
+            "lab_name": "Scan Results",
+            "available_locations": [],
+            "printers": {
+                "Download-Label-png": {
+                    "ip_address": "dl_png",
+                    "printer_name": "Download Label as PNG",
+                    "lab_location": null,
+                    "manufacturer": "virtual",
+                    "model": "na",
+                    "serial": "na",
+                    "label_zpl_styles": ["tube_2inX1in"],
+                    "default_label_style": "tube_2inX1in",
+                    "print_method": "generate png",
+                    "arp_data": "na",
+                    "notes": ""
+                }
             }
         }
     }

zebra_day/etc/tmp_printers120.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers145.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers207.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers469.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers485.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers531.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers540.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers542.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers552.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers715.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}

zebra_day/etc/tmp_printers972.json

@@ -0,0 +1,10 @@
+{
+    "schema_version": "2.0.0",
+    "labs": {
+        "test": {
+            "lab_name": "Test Lab",
+            "available_locations": [],
+            "printers": {}
+        }
+    }
+}