merge testing->tomerge/main #7

Open
anti wants to merge 242 commits from testing into tomerge/main
6 changed files with 78 additions and 15 deletions
Showing only changes of commit 24e0d98425 - Show all commits

View File

@@ -133,11 +133,12 @@ class BaseRepository(ABC):
offset: int = 0, offset: int = 0,
search: Optional[str] = None, search: Optional[str] = None,
sort_by: str = "recent", sort_by: str = "recent",
service: Optional[str] = None,
) -> list[dict[str, Any]]: ) -> list[dict[str, Any]]:
"""Retrieve paginated attacker profile records.""" """Retrieve paginated attacker profile records."""
pass pass
@abstractmethod @abstractmethod
async def get_total_attackers(self, search: Optional[str] = None) -> int: async def get_total_attackers(self, search: Optional[str] = None, service: Optional[str] = None) -> int:
"""Retrieve the total count of attacker profile records, optionally filtered.""" """Retrieve the total count of attacker profile records, optionally filtered."""
pass pass

View File

@@ -484,6 +484,7 @@ class SQLiteRepository(BaseRepository):
offset: int = 0, offset: int = 0,
search: Optional[str] = None, search: Optional[str] = None,
sort_by: str = "recent", sort_by: str = "recent",
service: Optional[str] = None,
) -> List[dict[str, Any]]: ) -> List[dict[str, Any]]:
order = { order = {
"active": desc(Attacker.event_count), "active": desc(Attacker.event_count),
@@ -493,6 +494,8 @@ class SQLiteRepository(BaseRepository):
statement = select(Attacker).order_by(order).offset(offset).limit(limit) statement = select(Attacker).order_by(order).offset(offset).limit(limit)
if search: if search:
statement = statement.where(Attacker.ip.like(f"%{search}%")) statement = statement.where(Attacker.ip.like(f"%{search}%"))
if service:
statement = statement.where(Attacker.services.like(f'%"{service}"%'))
async with self.session_factory() as session: async with self.session_factory() as session:
result = await session.execute(statement) result = await session.execute(statement)
@@ -501,10 +504,12 @@ class SQLiteRepository(BaseRepository):
for a in result.scalars().all() for a in result.scalars().all()
] ]
async def get_total_attackers(self, search: Optional[str] = None) -> int: async def get_total_attackers(self, search: Optional[str] = None, service: Optional[str] = None) -> int:
statement = select(func.count()).select_from(Attacker) statement = select(func.count()).select_from(Attacker)
if search: if search:
statement = statement.where(Attacker.ip.like(f"%{search}%")) statement = statement.where(Attacker.ip.like(f"%{search}%"))
if service:
statement = statement.where(Attacker.services.like(f'%"{service}"%'))
async with self.session_factory() as session: async with self.session_factory() as session:
result = await session.execute(statement) result = await session.execute(statement)

View File

@@ -22,6 +22,7 @@ async def get_attackers(
offset: int = Query(0, ge=0, le=2147483647), offset: int = Query(0, ge=0, le=2147483647),
search: Optional[str] = None, search: Optional[str] = None,
sort_by: str = Query("recent", pattern="^(recent|active|traversals)$"), sort_by: str = Query("recent", pattern="^(recent|active|traversals)$"),
service: Optional[str] = None,
current_user: str = Depends(get_current_user), current_user: str = Depends(get_current_user),
) -> dict[str, Any]: ) -> dict[str, Any]:
"""Retrieve paginated attacker profiles.""" """Retrieve paginated attacker profiles."""
@@ -31,6 +32,7 @@ async def get_attackers(
return v return v
s = _norm(search) s = _norm(search)
_data = await repo.get_attackers(limit=limit, offset=offset, search=s, sort_by=sort_by) svc = _norm(service)
_total = await repo.get_total_attackers(search=s) _data = await repo.get_attackers(limit=limit, offset=offset, search=s, sort_by=sort_by, service=svc)
_total = await repo.get_total_attackers(search=s, service=svc)
return {"total": _total, "limit": limit, "offset": offset, "data": _data} return {"total": _total, "limit": limit, "offset": offset, "data": _data}

View File

@@ -331,7 +331,13 @@ const AttackerDetail: React.FC = () => {
</div> </div>
<div style={{ padding: '16px', display: 'flex', flexWrap: 'wrap', gap: '8px' }}> <div style={{ padding: '16px', display: 'flex', flexWrap: 'wrap', gap: '8px' }}>
{attacker.services.length > 0 ? attacker.services.map((svc) => ( {attacker.services.length > 0 ? attacker.services.map((svc) => (
<span key={svc} className="service-badge" style={{ fontSize: '0.85rem', padding: '4px 12px' }}> <span
key={svc}
className="service-badge"
style={{ fontSize: '0.85rem', padding: '4px 12px', cursor: 'pointer' }}
onClick={() => navigate(`/attackers?service=${encodeURIComponent(svc)}`)}
title={`Filter attackers by ${svc.toUpperCase()}`}
>
{svc.toUpperCase()} {svc.toUpperCase()}
</span> </span>
)) : ( )) : (

View File

@@ -39,6 +39,7 @@ const Attackers: React.FC = () => {
const [searchParams, setSearchParams] = useSearchParams(); const [searchParams, setSearchParams] = useSearchParams();
const query = searchParams.get('q') || ''; const query = searchParams.get('q') || '';
const sortBy = searchParams.get('sort_by') || 'recent'; const sortBy = searchParams.get('sort_by') || 'recent';
const serviceFilter = searchParams.get('service') || '';
const page = parseInt(searchParams.get('page') || '1'); const page = parseInt(searchParams.get('page') || '1');
const [attackers, setAttackers] = useState<AttackerEntry[]>([]); const [attackers, setAttackers] = useState<AttackerEntry[]>([]);
@@ -54,6 +55,7 @@ const Attackers: React.FC = () => {
const offset = (page - 1) * limit; const offset = (page - 1) * limit;
let url = `/attackers?limit=${limit}&offset=${offset}&sort_by=${sortBy}`; let url = `/attackers?limit=${limit}&offset=${offset}&sort_by=${sortBy}`;
if (query) url += `&search=${encodeURIComponent(query)}`; if (query) url += `&search=${encodeURIComponent(query)}`;
if (serviceFilter) url += `&service=${encodeURIComponent(serviceFilter)}`;
const res = await api.get(url); const res = await api.get(url);
setAttackers(res.data.data); setAttackers(res.data.data);
@@ -67,19 +69,28 @@ const Attackers: React.FC = () => {
useEffect(() => { useEffect(() => {
fetchAttackers(); fetchAttackers();
}, [query, sortBy, page]); }, [query, sortBy, serviceFilter, page]);
const _params = (overrides: Record<string, string> = {}) => {
const base: Record<string, string> = { q: query, sort_by: sortBy, service: serviceFilter, page: '1' };
return Object.fromEntries(Object.entries({ ...base, ...overrides }).filter(([, v]) => v !== ''));
};
const handleSearch = (e: React.FormEvent) => { const handleSearch = (e: React.FormEvent) => {
e.preventDefault(); e.preventDefault();
setSearchParams({ q: searchInput, sort_by: sortBy, page: '1' }); setSearchParams(_params({ q: searchInput }));
}; };
const setPage = (p: number) => { const setPage = (p: number) => {
setSearchParams({ q: query, sort_by: sortBy, page: p.toString() }); setSearchParams(_params({ page: p.toString() }));
}; };
const setSort = (s: string) => { const setSort = (s: string) => {
setSearchParams({ q: query, sort_by: s, page: '1' }); setSearchParams(_params({ sort_by: s }));
};
const clearService = () => {
setSearchParams(_params({ service: '' }));
}; };
const totalPages = Math.ceil(total / limit); const totalPages = Math.ceil(total / limit);
@@ -125,6 +136,19 @@ const Attackers: React.FC = () => {
<div className="section-header" style={{ justifyContent: 'space-between' }}> <div className="section-header" style={{ justifyContent: 'space-between' }}>
<div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}> <div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}>
<span className="matrix-text" style={{ fontSize: '0.8rem' }}>{total} THREATS PROFILED</span> <span className="matrix-text" style={{ fontSize: '0.8rem' }}>{total} THREATS PROFILED</span>
{serviceFilter && (
<button
onClick={clearService}
style={{
display: 'inline-flex', alignItems: 'center', gap: '6px',
fontSize: '0.75rem', padding: '2px 10px', letterSpacing: '1px',
border: '1px solid var(--accent-color)', color: 'var(--accent-color)',
background: 'rgba(238, 130, 238, 0.1)', cursor: 'pointer',
}}
>
{serviceFilter.toUpperCase()} &times;
</button>
)}
</div> </div>
<div style={{ display: 'flex', alignItems: 'center', gap: '16px' }}> <div style={{ display: 'flex', alignItems: 'center', gap: '16px' }}>
@@ -196,7 +220,14 @@ const Attackers: React.FC = () => {
{/* Services */} {/* Services */}
<div style={{ display: 'flex', flexWrap: 'wrap', gap: '4px', marginBottom: '8px' }}> <div style={{ display: 'flex', flexWrap: 'wrap', gap: '4px', marginBottom: '8px' }}>
{a.services.map((svc) => ( {a.services.map((svc) => (
<span key={svc} className="service-badge">{svc.toUpperCase()}</span> <span
key={svc}
className="service-badge"
style={{ cursor: 'pointer' }}
onClick={(e) => { e.stopPropagation(); setSearchParams(_params({ service: svc })); }}
>
{svc.toUpperCase()}
</span>
))} ))}
</div> </div>

View File

@@ -84,9 +84,9 @@ class TestGetAttackers:
) )
mock_repo.get_attackers.assert_awaited_once_with( mock_repo.get_attackers.assert_awaited_once_with(
limit=50, offset=0, search="192.168", sort_by="recent", limit=50, offset=0, search="192.168", sort_by="recent", service=None,
) )
mock_repo.get_total_attackers.assert_awaited_once_with(search="192.168") mock_repo.get_total_attackers.assert_awaited_once_with(search="192.168", service=None)
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_null_search_normalized(self): async def test_null_search_normalized(self):
@@ -102,7 +102,7 @@ class TestGetAttackers:
) )
mock_repo.get_attackers.assert_awaited_once_with( mock_repo.get_attackers.assert_awaited_once_with(
limit=50, offset=0, search=None, sort_by="recent", limit=50, offset=0, search=None, sort_by="recent", service=None,
) )
@pytest.mark.asyncio @pytest.mark.asyncio
@@ -119,7 +119,7 @@ class TestGetAttackers:
) )
mock_repo.get_attackers.assert_awaited_once_with( mock_repo.get_attackers.assert_awaited_once_with(
limit=50, offset=0, search=None, sort_by="active", limit=50, offset=0, search=None, sort_by="active", service=None,
) )
@pytest.mark.asyncio @pytest.mark.asyncio
@@ -136,9 +136,27 @@ class TestGetAttackers:
) )
mock_repo.get_attackers.assert_awaited_once_with( mock_repo.get_attackers.assert_awaited_once_with(
limit=50, offset=0, search=None, sort_by="recent", limit=50, offset=0, search=None, sort_by="recent", service=None,
) )
@pytest.mark.asyncio
async def test_service_filter_forwarded(self):
from decnet.web.router.attackers.api_get_attackers import get_attackers
with patch("decnet.web.router.attackers.api_get_attackers.repo") as mock_repo:
mock_repo.get_attackers = AsyncMock(return_value=[])
mock_repo.get_total_attackers = AsyncMock(return_value=0)
await get_attackers(
limit=50, offset=0, search=None, sort_by="recent",
service="https", current_user="test-user",
)
mock_repo.get_attackers.assert_awaited_once_with(
limit=50, offset=0, search=None, sort_by="recent", service="https",
)
mock_repo.get_total_attackers.assert_awaited_once_with(search=None, service="https")
# ─── GET /attackers/{uuid} ─────────────────────────────────────────────────── # ─── GET /attackers/{uuid} ───────────────────────────────────────────────────