From 22dc87851a98af4ee48a178d2d3cf12486e1c54d Mon Sep 17 00:00:00 2001
From: Marker689 <marker689@gmail.com>
Date: Sun, 10 May 2026 06:41:00 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20Go-=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B?=
 =?UTF-8?q?=20=D1=81=D0=BE=20=D1=81=D0=BB=D0=B5=D1=88=D0=B0=D0=BC=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=BB=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B8=20=D1=80=D0=BE=D1=83=D1=82=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Использован :path в FastAPI-роутах, имя+версия парсятся из URL.
Шаблоны urlencode-ят имена пакетов при генерации ссылок.
---
 guarddog_nexus/api/packages.py                  | 10 +++++++---
 guarddog_nexus/web/routes.py                    | 17 ++++++++++++-----
 .../web/templates/_packages_table.html          |  2 +-
 .../web/templates/dashboard_stats.html          |  2 +-
 guarddog_nexus/web/templates/scan_detail.html   |  2 +-
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/guarddog_nexus/api/packages.py b/guarddog_nexus/api/packages.py
index 7b61b10..44494fc 100644
--- a/guarddog_nexus/api/packages.py
+++ b/guarddog_nexus/api/packages.py
@@ -2,6 +2,7 @@
 
 import csv
 import io
+from urllib.parse import unquote
 
 from fastapi import APIRouter, Depends, Query, Response
 from sqlalchemy import select
@@ -108,17 +109,20 @@ async def export_packages_csv(
     )
 
 
-@router.get("/{name}/{version}")
+@router.get("/{name:path}")
 async def get_package(
     name: str,
-    version: str,
     session: AsyncSession = Depends(get_session),
 ):
+    parts = name.rsplit("/", 1)
+    pkg_name = unquote(parts[0])
+    pkg_version = unquote(parts[1]) if len(parts) == 2 else ""
+
     scans = (
         (
             await session.execute(
                 select(Scan)
-                .where(Scan.package_name == name, Scan.package_version == version)
+                .where(Scan.package_name == pkg_name, Scan.package_version == pkg_version)
                 .order_by(Scan.started_at.desc())
             )
         )
diff --git a/guarddog_nexus/web/routes.py b/guarddog_nexus/web/routes.py
index 1d4593f..d1960a0 100644
--- a/guarddog_nexus/web/routes.py
+++ b/guarddog_nexus/web/routes.py
@@ -1,5 +1,7 @@
 """Web UI routes — Jinja2 + htmx pages."""
 
+from urllib.parse import unquote
+
 from fastapi import APIRouter, Depends, Request
 from fastapi.responses import HTMLResponse
 from jinja2 import Environment, PackageLoader, select_autoescape
@@ -154,20 +156,25 @@ async def packages_list(
     )
 
 
-@router.get("/packages/{name}/{version}", response_class=HTMLResponse)
+@router.get("/packages/{name:path}", response_class=HTMLResponse)
 async def package_detail(
     name: str,
-    version: str,
     request: Request,
     session: AsyncSession = Depends(get_session),
 ):
+    # name:path captures the entire path after /packages/
+    # e.g. "eviltest/0.1.0" or "github.com/attacker/evilmodule/v0.1.0"
+    parts = name.rsplit("/", 1)
+    pkg_name = unquote(parts[0])
+    pkg_version = unquote(parts[1]) if len(parts) == 2 else ""
+
     from sqlalchemy.orm import selectinload
 
     scans = (
         (
             await session.execute(
                 select(Scan)
-                .where(Scan.package_name == name, Scan.package_version == version)
+                .where(Scan.package_name == pkg_name, Scan.package_version == pkg_version)
                 .options(selectinload(Scan.findings))
                 .order_by(Scan.started_at.desc())
             )
@@ -185,8 +192,8 @@ async def package_detail(
 
     return _render(
         "package_detail.html",
-        pkg_name=name,
-        pkg_version=version,
+        pkg_name=pkg_name,
+        pkg_version=pkg_version,
         scans=scans,
         findings=all_findings,
         request=request,
diff --git a/guarddog_nexus/web/templates/_packages_table.html b/guarddog_nexus/web/templates/_packages_table.html
index af91d22..fb79580 100644
--- a/guarddog_nexus/web/templates/_packages_table.html
+++ b/guarddog_nexus/web/templates/_packages_table.html
@@ -21,7 +21,7 @@
     <tbody>
     {% for p in packages %}
         <tr>
-            <td><a href="/packages/{{ p.pkg_name }}/{{ p.pkg_ver }}">{{ p.pkg_name }}</a></td>
+            <td><a href="/packages/{{ p.pkg_name | urlencode }}/{{ p.pkg_ver | urlencode }}">{{ p.pkg_name }}</a></td>
             <td>{{ p.pkg_ver }}</td>
             <td>{{ p.ecosystem }}</td>
             <td>{{ p.repository }}</td>
diff --git a/guarddog_nexus/web/templates/dashboard_stats.html b/guarddog_nexus/web/templates/dashboard_stats.html
index 5a66dba..19e9490 100644
--- a/guarddog_nexus/web/templates/dashboard_stats.html
+++ b/guarddog_nexus/web/templates/dashboard_stats.html
@@ -52,7 +52,7 @@
         <tbody>
         {% for s in latest_scans %}
             <tr>
-                <td><a href="/packages/{{ s.package_name }}/{{ s.package_version }}">{{ s.package_name }}</a></td>
+                <td><a href="/packages/{{ s.package_name | urlencode }}/{{ s.package_version | urlencode }}">{{ s.package_name }}</a></td>
                 <td>{{ s.package_version }}</td>
                 <td><small>{{ s.repository }}</small></td>
                 <td>
diff --git a/guarddog_nexus/web/templates/scan_detail.html b/guarddog_nexus/web/templates/scan_detail.html
index 0a2ddd4..aff200d 100644
--- a/guarddog_nexus/web/templates/scan_detail.html
+++ b/guarddog_nexus/web/templates/scan_detail.html
@@ -14,7 +14,7 @@
 
 <article class="scan-info-block">
     <div class="scan-info-grid">
-        <div><strong>Package</strong><br><a href="/packages/{{ scan.package_name }}/{{ scan.package_version }}">{{ scan.package_name }}</a></div>
+        <div><strong>Package</strong><br><a href="/packages/{{ scan.package_name | urlencode }}/{{ scan.package_version | urlencode }}">{{ scan.package_name }}</a></div>
         <div><strong>Version</strong><br>{{ scan.package_version }}</div>
         <div><strong>Ecosystem</strong><br>{{ scan.ecosystem }}</div>
         <div><strong>Repository</strong><br>{{ scan.repository }}</div>