diff --git a/frontend/src/features/adversaries/pages/AdversariesPage.tsx b/frontend/src/features/adversaries/pages/AdversariesPage.tsx index ff3166026..c2fea60f1 100644 --- a/frontend/src/features/adversaries/pages/AdversariesPage.tsx +++ b/frontend/src/features/adversaries/pages/AdversariesPage.tsx @@ -28,7 +28,7 @@ export function AdversariesPage() { const { data, loading, error, refresh } = useAdversaries(filters) return ( -
+
@@ -53,6 +53,7 @@ export function AdversariesPage() { setCustomFilters((c) => [...c, f])} + onUpdate={(i, f) => setCustomFilters((c) => c.map((x, idx) => (idx === i ? f : x)))} onRemove={(i) => setCustomFilters((c) => c.filter((_, idx) => idx !== i))} onClear={() => setCustomFilters([])} /> diff --git a/frontend/src/features/alerts/components/add-filter-button.tsx b/frontend/src/features/alerts/components/add-filter-button.tsx deleted file mode 100644 index c5a8893c5..000000000 --- a/frontend/src/features/alerts/components/add-filter-button.tsx +++ /dev/null @@ -1,127 +0,0 @@ -import { useEffect, useRef, useState } from 'react' -import { ListFilter, Loader2, Search } from 'lucide-react' -import { useTranslation } from 'react-i18next' -import { cn } from '@/shared/lib/utils' -import { Button } from '@/shared/components/ui/button' -import { Input } from '@/shared/components/ui/input' -import { alertsHttpService as svc } from '../services/alerts-http.service' -import { FILTER_FIELDS, FILTER_OPS, SELECT_CLS, fieldKey } from '../lib/alert-meta' -import type { CustomFilter } from '../types/alert.types' - -export function AddFilterButton({ onAdd }: { onAdd: (f: CustomFilter) => void }) { - const { t } = useTranslation() - const [open, setOpen] = useState(false) - const [field, setField] = useState(FILTER_FIELDS[0].field) - const [operator, setOperator] = useState('IS') - const [values, setValues] = useState<{ value: string; count: number }[]>([]) - const [loadingValues, setLoadingValues] = useState(false) - const [vq, setVq] = useState('') - const ref = useRef(null) - - const op = FILTER_OPS.find((o) => o.id === operator) - const needsValue = op?.needsValue ?? true - - useEffect(() => { - if (!open) return - const onDoc = (e: MouseEvent) => ref.current && !ref.current.contains(e.target as Node) && setOpen(false) - document.addEventListener('mousedown', onDoc) - return () => document.removeEventListener('mousedown', onDoc) - }, [open]) - - // Fetch the field's real existing values when the field changes. - useEffect(() => { - if (!open || !needsValue) return - setLoadingValues(true) - setValues([]) - svc - .fieldValues(field) - .then(setValues) - .catch(() => setValues([])) - .finally(() => setLoadingValues(false)) - }, [open, field, needsValue]) - - const add = (value: string) => { - const fdef = FILTER_FIELDS.find((f) => f.field === field)! - onAdd({ field, label: fdef.label, operator, value }) - setOpen(false) - setVq('') - } - - const filtered = values.filter((v) => (vq ? String(v.value).toLowerCase().includes(vq.toLowerCase()) : true)) - - return ( -
- - {open && ( -
-
- - - - {needsValue ? ( - <> -
- - setVq(e.target.value)} - placeholder={t('alerts.filters.filterValues')} - className="h-8 pl-8 text-xs" - autoFocus - /> -
-
- {loadingValues ? ( -
- {t('alerts.filters.loadingValues')} -
- ) : filtered.length === 0 ? ( -
{t('alerts.filters.noValues')}
- ) : ( - filtered.map((v) => ( - - )) - )} -
-

{t('alerts.filters.pickValue')}

- - ) : ( -
- - -
- )} -
-
- )} -
- ) -} diff --git a/frontend/src/features/alerts/components/alerts-filter-bar.tsx b/frontend/src/features/alerts/components/alerts-filter-bar.tsx index 26e27a111..40f5b1182 100644 --- a/frontend/src/features/alerts/components/alerts-filter-bar.tsx +++ b/frontend/src/features/alerts/components/alerts-filter-bar.tsx @@ -1,51 +1,59 @@ -import { X } from 'lucide-react' +import { useMemo } from 'react' import { useTranslation } from 'react-i18next' -import { FILTER_OPS, fieldKey } from '../lib/alert-meta' -import type { CustomFilter } from '../types/alert.types' -import { AddFilterButton } from './add-filter-button' +import { CustomFilterBar } from '@/shared/components/filters/CustomFilterBar' +import type { CustomFilter, FilterFieldDef, FilterOpDef } from '@/shared/components/filters/custom-filter.types' +import { alertsHttpService } from '../services/alerts-http.service' +import { FILTER_FIELDS, FILTER_OPS, fieldKey } from '../lib/alert-meta' export function AlertsFilterBar({ filters, onAdd, + onUpdate, onRemove, onClear, }: { filters: CustomFilter[] onAdd: (f: CustomFilter) => void + onUpdate?: (i: number, f: CustomFilter) => void onRemove: (i: number) => void onClear: () => void }) { const { t } = useTranslation() + + const fields = useMemo( + () => FILTER_FIELDS.map((f) => ({ field: f.field, label: t(`alerts.fields.${fieldKey(f.field)}`) })), + [t], + ) + const operators = useMemo( + () => FILTER_OPS.map((o) => ({ id: o.id, label: t(`alerts.ops.${o.id}`), needsValue: o.needsValue })), + [t], + ) + const labels = useMemo( + () => ({ + add: t('alerts.filters.add'), + clearAll: t('alerts.filters.clearAll'), + filterValues: t('alerts.filters.filterValues'), + loadingValues: t('alerts.filters.loadingValues'), + noValues: t('alerts.filters.noValues'), + pickValue: t('alerts.filters.pickValue'), + empty: t('alerts.filters.empty'), + cancel: t('alerts.filters.cancel'), + addBtn: t('alerts.filters.addBtn'), + }), + [t], + ) + return ( -
- {filters.map((f, i) => { - const op = FILTER_OPS.find((o) => o.id === f.operator) - return ( - - {t(`alerts.fields.${fieldKey(f.field)}`)} - {op ? t(`alerts.ops.${op.id}`) : f.operator} - {op?.needsValue && {f.value}} - - - ) - })} - - {filters.length > 1 && ( - - )} -
+ alertsHttpService.fieldValues(field)} + labels={labels} + /> ) } diff --git a/frontend/src/features/alerts/pages/AlertsPage.tsx b/frontend/src/features/alerts/pages/AlertsPage.tsx index 1a853f731..c415f8ca1 100644 --- a/frontend/src/features/alerts/pages/AlertsPage.tsx +++ b/frontend/src/features/alerts/pages/AlertsPage.tsx @@ -248,6 +248,7 @@ export function AlertsPage() { }) const addFilter = (cf: CustomFilter) => { setCustomFilters((c) => [...c, cf]); setPage(0) } + const updateFilter = (i: number, cf: CustomFilter) => { setCustomFilters((c) => c.map((f, idx) => (idx === i ? cf : f))); setPage(0) } const removeFilter = (i: number) => { setCustomFilters((c) => c.filter((_, idx) => idx !== i)); setPage(0) } // Register a new tag in the catalog, then apply it to the given alerts. @@ -286,6 +287,7 @@ export function AlertsPage() { { setCustomFilters([]); setPage(0) }} /> diff --git a/frontend/src/features/alerts/types/alert.types.ts b/frontend/src/features/alerts/types/alert.types.ts index 57555a649..327607751 100644 --- a/frontend/src/features/alerts/types/alert.types.ts +++ b/frontend/src/features/alerts/types/alert.types.ts @@ -128,9 +128,4 @@ export const STATUS_TABS = ['all', 'open', 'in_review', 'completed', 'auto'] as export type StatusTab = (typeof STATUS_TABS)[number] /** A user-defined filter row in the page filter bar. */ -export interface CustomFilter { - field: string - label: string - operator: string - value: string -} +export type { CustomFilter } from '@/shared/components/filters/custom-filter.types' diff --git a/frontend/src/features/log-explorer/components/AddFilterButton.tsx b/frontend/src/features/log-explorer/components/AddFilterButton.tsx deleted file mode 100644 index c9227424a..000000000 --- a/frontend/src/features/log-explorer/components/AddFilterButton.tsx +++ /dev/null @@ -1,138 +0,0 @@ -import { useEffect, useMemo, useRef, useState } from 'react' -import { Filter, Loader2, Search } from 'lucide-react' -import { useTranslation } from 'react-i18next' -import { cn } from '@/shared/lib/utils' -import { Button } from '@/shared/components/ui/button' -import { Input } from '@/shared/components/ui/input' -import { logExplorerHttpService as svc } from '../services/log-explorer-http.service' -import type { - FilterOperator, - FilterType, - IndexField, - IndexPattern, - TopValues, -} from '../types/log-explorer.types' -import { OP_KEY, SELECT_CLS } from './log-explorer.constants' - -/* Explicit field/operator/value filter builder — pick a field, an operator, and - * a value from the field's real existing values (fetched via top-x-values). */ -const BUILDER_OPS: { id: FilterOperator; label: string; needsValue: boolean }[] = [ - { id: 'IS', label: 'is', needsValue: true }, - { id: 'IS_NOT', label: 'is not', needsValue: true }, - { id: 'CONTAIN', label: 'contains', needsValue: true }, - { id: 'EXIST', label: 'exists', needsValue: false }, -] - -export function AddFilterButton({ - pattern, - fields, - filters, - onAdd, -}: { - pattern: IndexPattern - fields: IndexField[] - filters: FilterType[] - onAdd: (f: FilterType) => void -}) { - const { t } = useTranslation() - const selectable = useMemo( - () => fields.filter((f) => !f.name.endsWith('.keyword')).sort((a, b) => a.name.localeCompare(b.name)), - [fields] - ) - const [open, setOpen] = useState(false) - const [field, setField] = useState('') - const [operator, setOperator] = useState('IS') - const [values, setValues] = useState([]) - const [loadingValues, setLoadingValues] = useState(false) - const [vq, setVq] = useState('') - const ref = useRef(null) - - useEffect(() => { - if (open && !field && selectable.length) setField(selectable[0].name) - }, [open, field, selectable]) - - useEffect(() => { - if (!open) return - const onDoc = (e: MouseEvent) => ref.current && !ref.current.contains(e.target as Node) && setOpen(false) - document.addEventListener('mousedown', onDoc) - return () => document.removeEventListener('mousedown', onDoc) - }, [open]) - - const op = BUILDER_OPS.find((o) => o.id === operator) - const needsValue = op?.needsValue ?? true - const fieldDef = selectable.find((f) => f.name === field) - const aggField = fieldDef?.type === 'text' && !field.endsWith('.keyword') ? `${field}.keyword` : field - - useEffect(() => { - if (!open || !needsValue || !field) return - setLoadingValues(true) - setValues([]) - svc - .topValues(pattern.pattern, aggField, filters, 100) - .then((r) => setValues(r.top ?? [])) - .catch(() => setValues([])) - .finally(() => setLoadingValues(false)) - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [open, field, needsValue]) - - const add = (value: string) => { - onAdd({ field, operator, value: needsValue ? value : undefined }) - setOpen(false) - setVq('') - } - const filtered = values.filter((v) => (vq ? String(v.value).toLowerCase().includes(vq.toLowerCase()) : true)) - - return ( -
- - {open && ( -
-
- - - {needsValue ? ( - <> -
- - setVq(e.target.value)} placeholder={t('logExplorer.builder.filterValues')} className="h-8 pl-8 text-xs" autoFocus /> -
-
- {loadingValues ? ( -
{t('logExplorer.builder.loadingValues')}
- ) : filtered.length === 0 ? ( -
{t('logExplorer.builder.noValues')}
- ) : ( - filtered.map((v) => ( - - )) - )} -
- - ) : ( -
- - -
- )} -
-
- )} -
- ) -} diff --git a/frontend/src/features/log-explorer/components/FilterChips.tsx b/frontend/src/features/log-explorer/components/FilterChips.tsx deleted file mode 100644 index 983761966..000000000 --- a/frontend/src/features/log-explorer/components/FilterChips.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import { Filter, X } from 'lucide-react' -import { useTranslation } from 'react-i18next' -import { cn } from '@/shared/lib/utils' -import type { FilterType } from '../types/log-explorer.types' -import { OP_KEY } from './log-explorer.constants' - -export function FilterChips({ - filters, - onRemove, - onClear, -}: { - filters: FilterType[] - onRemove: (i: number) => void - onClear: () => void -}) { - const { t } = useTranslation() - return ( -
- - {t('logExplorer.filters.label')} - - {filters.map((f, i) => { - const neg = f.operator === 'IS_NOT' - return ( - - {f.field} - - {OP_KEY[f.operator] ? t(`logExplorer.ops.${OP_KEY[f.operator]}`) : f.operator} - - {f.value != null && f.operator !== 'EXIST' && ( - - {Array.isArray(f.value) ? t('logExplorer.related.nLogs', { count: f.value.length }) : String(f.value)} - - )} - - - ) - })} - {filters.length > 1 && ( - - )} -
- ) -} diff --git a/frontend/src/features/log-explorer/components/LogExplorerView.tsx b/frontend/src/features/log-explorer/components/LogExplorerView.tsx index 007527a82..8ffc3788f 100644 --- a/frontend/src/features/log-explorer/components/LogExplorerView.tsx +++ b/frontend/src/features/log-explorer/components/LogExplorerView.tsx @@ -1,26 +1,27 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react' -import { AlertTriangle, Loader2 } from 'lucide-react' +import { AlertTriangle, Loader2, X } from 'lucide-react' import { toast } from 'sonner' import { useTranslation } from 'react-i18next' import { useLocation, useNavigate } from 'react-router-dom' import { Button } from '@/shared/components/ui/button' import { presetRange, type TimeRange } from '@/shared/components/ui/time-range-picker' import { ResultsHeader, ResultRow, flattenDoc } from './log-results' +import { CustomFilterBar } from '@/shared/components/filters/CustomFilterBar' +import type { CustomFilter, FilterOpDef } from '@/shared/components/filters/custom-filter.types' import { QueryBar } from './QueryBar' -import { AddFilterButton } from './AddFilterButton' -import { FilterChips } from './FilterChips' import { FieldSidebar } from './FieldSidebar' import { RowMessage } from './RowMessage' import { ViewToggle } from './ViewToggle' import { SavedSearches, type SavedSearchState } from './SavedSearches' import { HistogramStrip } from './HistogramStrip' import { ChartPanel } from './ChartPanel' -import { TS } from './log-explorer.constants' +import { OP_KEY, TS } from './log-explorer.constants' import { logExplorerHttpService as svc, LogExplorerHttpError, } from '../services/log-explorer-http.service' import type { + FilterOperator, FilterType, IndexField, IndexPattern, @@ -81,6 +82,22 @@ interface RelatedLogsSeed { truncated?: boolean } +const BUILDER_OPS: FilterOpDef[] = [ + { id: 'IS', label: 'is', needsValue: true }, + { id: 'IS_NOT', label: 'is not', needsValue: true }, + { id: 'CONTAIN', label: 'contains', needsValue: true }, + { id: 'EXIST', label: 'exists', needsValue: false }, +] + +function toCustom(f: FilterType): CustomFilter { + return { field: f.field, label: f.field, operator: f.operator, value: typeof f.value === 'string' ? f.value : '' } +} + +function toFilter(cf: CustomFilter): FilterType { + const op = BUILDER_OPS.find((o) => o.id === cf.operator) + return { field: cf.field, operator: cf.operator as FilterOperator, value: op?.needsValue ? cf.value : undefined } +} + interface LogExplorerViewProps { initial: LogExplorerTabConfig onConfigChange: (patch: Partial) => void @@ -400,11 +417,80 @@ export function LogExplorerView({ initial, onConfigChange }: LogExplorerViewProp const removeFilter = useCallback((i: number) => { setFilters((cur) => cur.filter((_, idx) => idx !== i)) }, []) - const clearFilters = useCallback(() => setFilters([]), []) const toggleExpanded = useCallback((i: number) => { setExpanded((prev) => (prev === i ? null : i)) }, []) + // Adapters: CustomFilterBar works with CustomFilter; FilterType is the internal type. + // IS_ONE_OF_TERMS (array value) is excluded — rendered separately as terms chips. + const simpleFilters = useMemo(() => filters.filter((f) => f.operator !== 'IS_ONE_OF_TERMS'), [filters]) + const termsFilters = useMemo(() => filters.filter((f) => f.operator === 'IS_ONE_OF_TERMS'), [filters]) + + const customFilters = useMemo(() => simpleFilters.map(toCustom), [simpleFilters]) + + const barFields = useMemo( + () => + fields + .filter((f) => !f.name.endsWith('.keyword')) + .sort((a, b) => a.name.localeCompare(b.name)) + .map((f) => ({ field: f.name, label: f.name })), + [fields] + ) + + const barOperators = useMemo( + () => BUILDER_OPS.map((o) => ({ ...o, label: t(`logExplorer.ops.${OP_KEY[o.id] ?? o.id}`) })), + [t] + ) + + const fetchValues = useCallback( + (field: string) => { + if (!pattern) return Promise.resolve([]) + const fieldDef = fields.find((f) => f.name === field) + const aggField = fieldDef?.type === 'text' && !field.endsWith('.keyword') ? `${field}.keyword` : field + return svc.topValues(pattern.pattern, aggField, activeFilterList, 100).then((r) => r.top ?? []) + }, + [fields, pattern, activeFilterList] + ) + + const barLabels = useMemo( + () => ({ + add: t('logExplorer.builder.add'), + clearAll: t('logExplorer.filters.clearAll'), + filterValues: t('logExplorer.builder.filterValues'), + loadingValues: t('logExplorer.builder.loadingValues'), + noValues: t('logExplorer.builder.noValues'), + pickValue: t('logExplorer.builder.pickValue'), + empty: t('logExplorer.fields.empty'), + cancel: t('logExplorer.builder.cancel'), + addBtn: t('logExplorer.builder.confirm'), + }), + [t] + ) + + const onBarAdd = useCallback( + (cf: CustomFilter) => addFilter(toFilter(cf)), + [addFilter] + ) + + const onBarUpdate = useCallback( + (i: number, cf: CustomFilter) => { + // i is the index within simpleFilters; map back to the full filters array + const target = simpleFilters[i] + setFilters((cur) => cur.map((f) => (f === target ? toFilter(cf) : f))) + }, + [simpleFilters] + ) + + const onBarRemove = useCallback( + (i: number) => { + const target = simpleFilters[i] + setFilters((cur) => cur.filter((f) => f !== target)) + }, + [simpleFilters] + ) + + const onBarClear = useCallback(() => setFilters([]), []) + return (
@@ -447,10 +533,37 @@ export function LogExplorerView({ initial, onConfigChange }: LogExplorerViewProp
{!sqlMode && pattern && ( - + )} + {termsFilters.map((f, idx) => ( + + {f.field} + {t('logExplorer.ops.isOneOf')} + + {Array.isArray(f.value) ? t('logExplorer.related.nLogs', { count: f.value.length }) : String(f.value)} + + + + ))} {!sqlMode && } - {filters.length > 0 && }
diff --git a/frontend/src/features/user-auditor/pages/UserAuditorPage.tsx b/frontend/src/features/user-auditor/pages/UserAuditorPage.tsx index 5eefb29b2..881c05d4b 100644 --- a/frontend/src/features/user-auditor/pages/UserAuditorPage.tsx +++ b/frontend/src/features/user-auditor/pages/UserAuditorPage.tsx @@ -11,7 +11,6 @@ import { ExternalLink, Fingerprint, LayoutGrid, - ListFilter, ListIcon, Loader2, RefreshCw, @@ -28,14 +27,20 @@ import { cn } from '@/shared/lib/utils' import { Button } from '@/shared/components/ui/button' import { Input } from '@/shared/components/ui/input' import { InfiniteScrollSentinel } from '@/shared/components/ui/infinite-scroll' +import { CustomFilterBar } from '@/shared/components/filters/CustomFilterBar' +import type { + CustomFilter, + FilterFieldDef, + FilterOpDef, +} from '@/shared/components/filters/custom-filter.types' import { adAuditHttpService } from '../services/ad-audit-http.service' -import type { ADUser, ADUserStats, ADUserStatus } from '../types/ad-user.types' +import type { ADUser, ADUserSource, ADUserStats, ADUserStatus } from '../types/ad-user.types' const SIZE = 50 const STALE_MS = 30 * 86_400_000 -type ViewId = 'all' | ADUserStatus -const VIEW_IDS: ViewId[] = ['all', 'active', 'disabled', 'deleted', 'service', 'stale'] +type ViewId = 'all' | ADUserSource +const VIEW_IDS: ViewId[] = ['all', 'windows', 'linux'] /* ─── Derived (per-row, display-only) ──────────────────────────────────── */ @@ -50,7 +55,23 @@ function isStale(u: ADUser): boolean { return statusOf(u) === 'active' && !!u.lastLogon && Date.now() - new Date(u.lastLogon).getTime() > STALE_MS } function isService(u: ADUser): boolean { - return /^svc/i.test(u.samAccountName) + return u.source === 'windows' && /^svc/i.test(u.samAccountName ?? '') +} + +/* Windows accounts key off SID + samAccountName; Linux accounts off username + uid@host. */ +function accountName(u: ADUser): string { + return (u.source === 'linux' ? u.username : u.samAccountName) ?? '—' +} +function accountIdentity(u: ADUser): string { + if (u.source === 'linux') { + const uid = u.uidNumber ? `uid=${u.uidNumber}` : '' + const host = u.hostname ?? '' + return [uid, host].filter(Boolean).join(' · ') || '—' + } + return u.sid ?? '—' +} +function accountScope(u: ADUser): string { + return (u.source === 'linux' ? u.hostname : u.domain) ?? '—' } const STATUS_DOT: Record = { @@ -66,6 +87,8 @@ const STATUS_TEXT: Record = { /* ─── Page ─────────────────────────────────────────────────────────────── */ +const STATUS_VALUES: ADUserStatus[] = ['active', 'disabled', 'deleted', 'stale', 'service'] + export function UserAuditorPage() { const { t } = useTranslation() const [view, setView] = useState('all') @@ -74,6 +97,7 @@ export function UserAuditorPage() { const [tenant, setTenant] = useState('') // '' = all const [layout, setLayout] = useState<'list' | 'cards'>('list') const [page, setPage] = useState(0) + const [customFilters, setCustomFilters] = useState([]) const [users, setUsers] = useState([]) const [total, setTotal] = useState(0) @@ -82,6 +106,26 @@ export function UserAuditorPage() { const [stats, setStats] = useState(null) const [openUser, setOpenUser] = useState(null) + const filterFields: FilterFieldDef[] = [ + { field: 'status', label: t('userAuditor.filterFields.status') }, + ] + const filterOps: FilterOpDef[] = [{ id: 'IS', label: t('userAuditor.ops.is'), needsValue: true }] + const filterLabels = { + add: t('userAuditor.filters.add'), + clearAll: t('userAuditor.filters.clearAll'), + filterValues: t('userAuditor.filters.filterValues'), + loadingValues: t('userAuditor.filters.loadingValues'), + noValues: t('userAuditor.filters.noValues'), + pickValue: t('userAuditor.filters.pickValue'), + empty: t('userAuditor.filters.empty'), + cancel: t('userAuditor.filters.cancel'), + addBtn: t('userAuditor.filters.addBtn'), + } + const fetchFilterValues = async (field: string) => { + if (field === 'status') return STATUS_VALUES.map((v) => ({ value: v, count: 0 })) + return [] + } + // Debounce the search box. useEffect(() => { const id = setTimeout(() => setSearch(searchInput.trim()), 300) @@ -91,7 +135,7 @@ export function UserAuditorPage() { // Any filter change resets to the first page. useEffect(() => { setPage(0) - }, [view, search, tenant]) + }, [view, search, tenant, customFilters]) const loadStats = useCallback(async () => { try { @@ -105,10 +149,12 @@ export function UserAuditorPage() { setLoading(true) setError(false) try { + const statusFilter = customFilters.find((f) => f.field === 'status' && f.operator === 'IS')?.value const res = await adAuditHttpService.list({ search: search || undefined, tenantId: tenant || undefined, - status: view === 'all' ? undefined : view, + source: view === 'all' ? undefined : view, + status: statusFilter ? (statusFilter as ADUserStatus) : undefined, sort: 'recent', page, size: SIZE, @@ -122,7 +168,7 @@ export function UserAuditorPage() { } finally { setLoading(false) } - }, [search, tenant, view, page]) + }, [search, tenant, view, page, customFilters]) useEffect(() => { void load() @@ -138,11 +184,8 @@ export function UserAuditorPage() { const counts: Record = { all: stats?.total ?? 0, - active: stats?.active ?? 0, - disabled: stats?.disabled ?? 0, - deleted: stats?.deleted ?? 0, - service: stats?.service ?? 0, - stale: stats?.stale ?? 0, + windows: stats?.by_source?.windows ?? 0, + linux: stats?.by_source?.linux ?? 0, } return ( @@ -170,6 +213,20 @@ export function UserAuditorPage() { t={t} /> +
+ setCustomFilters((c) => [...c, f])} + onUpdate={(i, f) => setCustomFilters((c) => c.map((x, idx) => (idx === i ? f : x)))} + onRemove={(i) => setCustomFilters((c) => c.filter((_, idx) => idx !== i))} + onClear={() => setCustomFilters([])} + fields={filterFields} + operators={filterOps} + fetchValues={fetchFilterValues} + labels={filterLabels} + /> +
+ {error ? (
@@ -391,10 +448,6 @@ function Toolbar({
)} -
-
@@ -636,14 +710,25 @@ function UserDrawer({ user, onClose, t }: { user: ADUser; onClose: () => void; t
- {user.samAccountName} + {accountName(user)} - - {user.domain} - - - {user.sid} + + {accountScope(user)} + {isLinux ? ( + <> + + {user.uidNumber ?? '—'} + + + {user.machineId ?? '—'} + + + ) : ( + + {user.sid ?? '—'} + + )} {user.tenantId} diff --git a/frontend/src/features/user-auditor/services/ad-audit-http.service.ts b/frontend/src/features/user-auditor/services/ad-audit-http.service.ts index 61633266b..cc976a5c3 100644 --- a/frontend/src/features/user-auditor/services/ad-audit-http.service.ts +++ b/frontend/src/features/user-auditor/services/ad-audit-http.service.ts @@ -9,6 +9,7 @@ function listQuery(q: ADUserListQuery): string { const p = new URLSearchParams() if (q.search) p.set('search', q.search) if (q.tenantId) p.set('tenantId', q.tenantId) + if (q.source) p.set('source', q.source) if (q.status) p.set('status', q.status) if (q.sort) p.set('sort', q.sort) p.set('page', String(q.page ?? 0)) diff --git a/frontend/src/features/user-auditor/types/ad-user.types.ts b/frontend/src/features/user-auditor/types/ad-user.types.ts index 3797307d0..5648f544a 100644 --- a/frontend/src/features/user-auditor/types/ad-user.types.ts +++ b/frontend/src/features/user-auditor/types/ad-user.types.ts @@ -1,12 +1,22 @@ /* Types mirror the backend adaudit DTOs (modules/adaudit/dto, domain.ADUser). */ -/** One Active Directory account observed in ingested Windows security logs. */ +export type ADUserSource = 'windows' | 'linux' + +/** One user account observed in ingested Windows or Linux logs. */ export interface ADUser { id: number tenantId: string - sid: string - samAccountName: string - domain: string + source: ADUserSource + /* Windows-only fields */ + sid?: string + samAccountName?: string + domain?: string + /* Linux-only fields */ + machineId?: string + uidNumber?: string + hostname?: string + username?: string + /* Shared lifecycle */ active: boolean accountCreatedAt?: string lastLogon?: string @@ -22,6 +32,7 @@ export type ADUserSort = 'recent' | 'name' export interface ADUserListQuery { search?: string tenantId?: string + source?: ADUserSource status?: ADUserStatus sort?: ADUserSort page?: number // zero-based @@ -33,6 +44,11 @@ export interface DomainCount { count: number } +export interface SourceCount { + windows: number + linux: number +} + /** GET /ad-audit/stats — inventory roll-up for the overview. */ export interface ADUserStats { total: number @@ -42,6 +58,7 @@ export interface ADUserStats { stale: number service: number seen_24h: number + by_source: SourceCount by_domain: DomainCount[] tenants: string[] } diff --git a/frontend/src/shared/components/filters/AddCustomFilterButton.tsx b/frontend/src/shared/components/filters/AddCustomFilterButton.tsx new file mode 100644 index 000000000..4b892723a --- /dev/null +++ b/frontend/src/shared/components/filters/AddCustomFilterButton.tsx @@ -0,0 +1,60 @@ +import { useEffect, useRef, useState } from 'react' +import { ListFilter } from 'lucide-react' +import { FilterEditorPanel } from './FilterEditorPanel' +import type { + CustomFilter, + FilterBarLabels, + FilterFieldDef, + FilterOpDef, + FilterValue, +} from './custom-filter.types' + +export function AddCustomFilterButton({ + onAdd, + fields, + operators, + fetchValues, + labels, +}: { + onAdd: (f: CustomFilter) => void + fields: FilterFieldDef[] + operators: FilterOpDef[] + fetchValues?: (field: string) => Promise + labels: FilterBarLabels +}) { + const [open, setOpen] = useState(false) + const ref = useRef(null) + + useEffect(() => { + if (!open) return + const onDoc = (e: MouseEvent) => ref.current && !ref.current.contains(e.target as Node) && setOpen(false) + document.addEventListener('mousedown', onDoc) + return () => document.removeEventListener('mousedown', onDoc) + }, [open]) + + return ( +
+ + {open && ( +
+ setOpen(false)} + onSubmit={(f) => { + onAdd(f) + setOpen(false) + }} + /> +
+ )} +
+ ) +} diff --git a/frontend/src/shared/components/filters/CustomFilterBar.tsx b/frontend/src/shared/components/filters/CustomFilterBar.tsx new file mode 100644 index 000000000..a1ee9cf3e --- /dev/null +++ b/frontend/src/shared/components/filters/CustomFilterBar.tsx @@ -0,0 +1,103 @@ +import { useEffect, useRef, useState } from 'react' +import { X } from 'lucide-react' +import { AddCustomFilterButton } from './AddCustomFilterButton' +import { FilterEditorPanel } from './FilterEditorPanel' +import type { + CustomFilter, + FilterBarLabels, + FilterFieldDef, + FilterOpDef, + FilterValue, +} from './custom-filter.types' + +export function CustomFilterBar({ + filters, + onAdd, + onUpdate, + onRemove, + onClear, + fields, + operators, + fetchValues, + labels, +}: { + filters: CustomFilter[] + onAdd: (f: CustomFilter) => void + onUpdate?: (i: number, f: CustomFilter) => void + onRemove: (i: number) => void + onClear: () => void + fields: FilterFieldDef[] + operators: FilterOpDef[] + fetchValues?: (field: string) => Promise + labels: FilterBarLabels +}) { + const [editing, setEditing] = useState(null) + const editRef = useRef(null) + + useEffect(() => { + if (editing === null) return + const onDoc = (e: MouseEvent) => editRef.current && !editRef.current.contains(e.target as Node) && setEditing(null) + document.addEventListener('mousedown', onDoc) + return () => document.removeEventListener('mousedown', onDoc) + }, [editing]) + + return ( +
+ {filters.map((f, i) => { + const op = operators.find((o) => o.id === f.operator) + const isEditing = editing === i + return ( +
+ + + + + {isEditing && onUpdate && ( +
+ setEditing(null)} + onSubmit={(next) => { + onUpdate(i, next) + setEditing(null) + }} + /> +
+ )} +
+ ) + })} + + {filters.length > 1 && ( + + )} +
+ ) +} diff --git a/frontend/src/shared/components/filters/FilterEditorPanel.tsx b/frontend/src/shared/components/filters/FilterEditorPanel.tsx new file mode 100644 index 000000000..ffabd18a8 --- /dev/null +++ b/frontend/src/shared/components/filters/FilterEditorPanel.tsx @@ -0,0 +1,156 @@ +import { useEffect, useState } from 'react' +import { Loader2, Search } from 'lucide-react' +import { cn } from '@/shared/lib/utils' +import { Button } from '@/shared/components/ui/button' +import { Input } from '@/shared/components/ui/input' +import type { + CustomFilter, + FilterBarLabels, + FilterFieldDef, + FilterOpDef, + FilterValue, +} from './custom-filter.types' + +const SELECT_CLS = + 'h-9 cursor-pointer rounded-md border border-input bg-popover px-2 text-sm text-popover-foreground transition-colors focus-visible:border-ring focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring' + +export function FilterEditorPanel({ + initial, + fields, + operators, + fetchValues, + labels, + onSubmit, + onCancel, +}: { + initial?: CustomFilter + fields: FilterFieldDef[] + operators: FilterOpDef[] + fetchValues?: (field: string) => Promise + labels: FilterBarLabels + onSubmit: (f: CustomFilter) => void + onCancel: () => void +}) { + const [field, setField] = useState(initial?.field ?? fields[0]?.field ?? '') + const [operator, setOperator] = useState(initial?.operator ?? operators[0]?.id ?? 'IS') + const [freeValue, setFreeValue] = useState(initial?.value ?? '') + const [values, setValues] = useState([]) + const [loadingValues, setLoadingValues] = useState(false) + const [vq, setVq] = useState('') + + const op = operators.find((o) => o.id === operator) + const needsValue = op?.needsValue ?? true + + useEffect(() => { + if (!needsValue || !fetchValues) return + setLoadingValues(true) + setValues([]) + fetchValues(field) + .then(setValues) + .catch(() => setValues([])) + .finally(() => setLoadingValues(false)) + }, [field, needsValue, fetchValues]) + + const submit = (value: string) => { + const fdef = fields.find((f) => f.field === field) + if (!fdef) return + onSubmit({ field, label: fdef.label, operator, value }) + } + + const filtered = values.filter((v) => (vq ? v.value.toLowerCase().includes(vq.toLowerCase()) : true)) + + return ( +
+
+ + + + {needsValue ? ( + fetchValues ? ( + <> +
+ + setVq(e.target.value)} + placeholder={labels.filterValues} + className="h-8 pl-8 text-xs" + autoFocus + /> +
+
+ {loadingValues ? ( +
+ {labels.loadingValues} +
+ ) : filtered.length === 0 ? ( +
{labels.noValues}
+ ) : ( + filtered.map((v) => { + const selected = initial?.value === v.value + return ( + + ) + }) + )} +
+

{labels.pickValue}

+ + ) : ( + <> + setFreeValue(e.target.value)} + placeholder={labels.filterValues} + className="h-8 text-xs" + autoFocus + onKeyDown={(e) => e.key === 'Enter' && freeValue && submit(freeValue)} + /> +
+ + +
+ + ) + ) : ( +
+ + +
+ )} +
+
+ ) +} diff --git a/frontend/src/shared/components/filters/custom-filter.types.ts b/frontend/src/shared/components/filters/custom-filter.types.ts new file mode 100644 index 000000000..b0a25c89a --- /dev/null +++ b/frontend/src/shared/components/filters/custom-filter.types.ts @@ -0,0 +1,34 @@ +export interface CustomFilter { + field: string + label: string + operator: string + value: string +} + +export interface FilterFieldDef { + field: string + label: string +} + +export interface FilterOpDef { + id: string + label: string + needsValue: boolean +} + +export interface FilterValue { + value: string + count: number +} + +export interface FilterBarLabels { + add: string + clearAll: string + filterValues: string + loadingValues: string + noValues: string + pickValue: string + empty: string + cancel: string + addBtn: string +} diff --git a/frontend/src/shared/i18n/locales/de.json b/frontend/src/shared/i18n/locales/de.json index 4caa257a4..0fdb104dc 100644 --- a/frontend/src/shared/i18n/locales/de.json +++ b/frontend/src/shared/i18n/locales/de.json @@ -1100,15 +1100,28 @@ }, "views": { "all": "Alle Konten", - "active": "Aktiv", - "disabled": "Deaktiviert", - "deleted": "Gelöscht", - "service": "Dienstkonten", - "stale": "Inaktiv (30T+)" + "windows": "Windows", + "linux": "Linux" }, - "searchPlaceholder": "Nach Kontoname oder SID suchen…", + "searchPlaceholder": "Nach Kontoname, SID oder Benutzername suchen…", "allTenants": "Alle Mandanten", - "filters": "Filter", + "filters": { + "add": "Filter hinzufügen", + "clearAll": "Alle löschen", + "filterValues": "Werte filtern…", + "loadingValues": "Werte werden geladen…", + "noValues": "Keine Werte gefunden.", + "pickValue": "Wähle einen Wert, um den Filter hinzuzufügen.", + "empty": "(leer)", + "cancel": "Abbrechen", + "addBtn": "Hinzufügen" + }, + "filterFields": { + "status": "Lebenszyklus-Status" + }, + "ops": { + "is": "ist" + }, "refresh": "Aktualisieren", "layout": { "list": "Liste", @@ -1116,6 +1129,7 @@ }, "list": { "account": "Konto", + "identity": "Kennung", "sid": "SID", "status": "Status", "lastLogon": "Letzte Anmeldung", @@ -1144,11 +1158,15 @@ "stale": "inaktiv 30T+", "viewInLogs": "Ereignisse im Log Explorer ansehen", "copySid": "SID kopieren", + "copyUid": "Kennung kopieren", "copied": "Kopiert", "identity": "Identität", "accountName": "Kontoname", "domain": "Domäne", + "hostname": "Hostname", "sid": "SID", + "uidNumber": "UID", + "machineId": "Maschinen-ID", "tenant": "Mandant", "adStatus": "AD-Status", "enabled": "Aktiviert", diff --git a/frontend/src/shared/i18n/locales/en.json b/frontend/src/shared/i18n/locales/en.json index 439cf01bc..77593cdf1 100644 --- a/frontend/src/shared/i18n/locales/en.json +++ b/frontend/src/shared/i18n/locales/en.json @@ -1252,15 +1252,28 @@ }, "views": { "all": "All accounts", - "active": "Active", - "disabled": "Disabled", - "deleted": "Deleted", - "service": "Service accounts", - "stale": "Stale (30d+)" + "windows": "Windows", + "linux": "Linux" }, - "searchPlaceholder": "Search by account name or SID…", + "searchPlaceholder": "Search by account name, SID or username…", "allTenants": "All tenants", - "filters": "Filters", + "filters": { + "add": "Add filter", + "clearAll": "Clear all", + "filterValues": "Filter values…", + "loadingValues": "Loading values…", + "noValues": "No values found.", + "pickValue": "Pick a value to add the filter.", + "empty": "(empty)", + "cancel": "Cancel", + "addBtn": "Add" + }, + "filterFields": { + "status": "Lifecycle status" + }, + "ops": { + "is": "is" + }, "refresh": "Refresh", "layout": { "list": "List", @@ -1268,6 +1281,7 @@ }, "list": { "account": "Account", + "identity": "Identity", "sid": "SID", "status": "Status", "lastLogon": "Last logon", @@ -1296,11 +1310,15 @@ "stale": "stale 30d+", "viewInLogs": "View events in Log Explorer", "copySid": "Copy SID", + "copyUid": "Copy identity", "copied": "Copied", "identity": "Identity", "accountName": "Account name", "domain": "Domain", + "hostname": "Hostname", "sid": "SID", + "uidNumber": "UID", + "machineId": "Machine ID", "tenant": "Tenant", "adStatus": "AD status", "enabled": "Enabled", @@ -1779,6 +1797,7 @@ "filterValues": "Filter values…", "loadingValues": "Loading values…", "noValues": "No values found.", + "pickValue": "Pick a value to add the filter.", "cancel": "Cancel", "confirm": "Add" }, diff --git a/frontend/src/shared/i18n/locales/es.json b/frontend/src/shared/i18n/locales/es.json index 81e057463..51d6c1081 100644 --- a/frontend/src/shared/i18n/locales/es.json +++ b/frontend/src/shared/i18n/locales/es.json @@ -1100,15 +1100,28 @@ }, "views": { "all": "Todas las cuentas", - "active": "Activas", - "disabled": "Deshabilitadas", - "deleted": "Borradas", - "service": "Cuentas de servicio", - "stale": "Inactivas (30d+)" + "windows": "Windows", + "linux": "Linux" }, - "searchPlaceholder": "Buscar por nombre de cuenta o SID…", + "searchPlaceholder": "Buscar por nombre de cuenta, SID o usuario…", "allTenants": "Todos los tenants", - "filters": "Filtros", + "filters": { + "add": "Añadir filtro", + "clearAll": "Borrar todos", + "filterValues": "Filtrar valores…", + "loadingValues": "Cargando valores…", + "noValues": "Sin valores.", + "pickValue": "Elige un valor para añadir el filtro.", + "empty": "(vacío)", + "cancel": "Cancelar", + "addBtn": "Añadir" + }, + "filterFields": { + "status": "Estado de ciclo de vida" + }, + "ops": { + "is": "es" + }, "refresh": "Actualizar", "layout": { "list": "Lista", @@ -1116,6 +1129,7 @@ }, "list": { "account": "Cuenta", + "identity": "Identidad", "sid": "SID", "status": "Estado", "lastLogon": "Último inicio", @@ -1144,11 +1158,15 @@ "stale": "inactiva 30d+", "viewInLogs": "Ver eventos en el Log Explorer", "copySid": "Copiar SID", + "copyUid": "Copiar identidad", "copied": "Copiado", "identity": "Identidad", "accountName": "Nombre de cuenta", "domain": "Dominio", + "hostname": "Hostname", "sid": "SID", + "uidNumber": "UID", + "machineId": "ID de máquina", "tenant": "Tenant", "adStatus": "Estado en AD", "enabled": "Habilitada", diff --git a/frontend/src/shared/i18n/locales/fr.json b/frontend/src/shared/i18n/locales/fr.json index d5d926982..4c0473e04 100644 --- a/frontend/src/shared/i18n/locales/fr.json +++ b/frontend/src/shared/i18n/locales/fr.json @@ -1100,15 +1100,28 @@ }, "views": { "all": "Tous les comptes", - "active": "Actifs", - "disabled": "Désactivés", - "deleted": "Supprimés", - "service": "Comptes de service", - "stale": "Inactifs (30j+)" + "windows": "Windows", + "linux": "Linux" }, - "searchPlaceholder": "Rechercher par nom de compte ou SID…", + "searchPlaceholder": "Rechercher par nom de compte, SID ou nom d’utilisateur…", "allTenants": "Tous les locataires", - "filters": "Filtres", + "filters": { + "add": "Ajouter un filtre", + "clearAll": "Tout effacer", + "filterValues": "Filtrer les valeurs…", + "loadingValues": "Chargement des valeurs…", + "noValues": "Aucune valeur trouvée.", + "pickValue": "Choisis une valeur pour ajouter le filtre.", + "empty": "(vide)", + "cancel": "Annuler", + "addBtn": "Ajouter" + }, + "filterFields": { + "status": "Statut du cycle de vie" + }, + "ops": { + "is": "est" + }, "refresh": "Actualiser", "layout": { "list": "Liste", @@ -1116,6 +1129,7 @@ }, "list": { "account": "Compte", + "identity": "Identité", "sid": "SID", "status": "Statut", "lastLogon": "Dernière connexion", @@ -1144,11 +1158,15 @@ "stale": "inactif 30j+", "viewInLogs": "Voir les événements dans le Log Explorer", "copySid": "Copier le SID", + "copyUid": "Copier l’identité", "copied": "Copié", "identity": "Identité", "accountName": "Nom du compte", "domain": "Domaine", + "hostname": "Nom d’hôte", "sid": "SID", + "uidNumber": "UID", + "machineId": "ID de machine", "tenant": "Locataire", "adStatus": "Statut AD", "enabled": "Activé", diff --git a/frontend/src/shared/i18n/locales/it.json b/frontend/src/shared/i18n/locales/it.json index 5318980f4..461ad5331 100644 --- a/frontend/src/shared/i18n/locales/it.json +++ b/frontend/src/shared/i18n/locales/it.json @@ -1100,15 +1100,28 @@ }, "views": { "all": "Tutti gli account", - "active": "Attivi", - "disabled": "Disabilitati", - "deleted": "Eliminati", - "service": "Account di servizio", - "stale": "Inattivi (30g+)" + "windows": "Windows", + "linux": "Linux" }, - "searchPlaceholder": "Cerca per nome account o SID…", + "searchPlaceholder": "Cerca per nome account, SID o utente…", "allTenants": "Tutti i tenant", - "filters": "Filtri", + "filters": { + "add": "Aggiungi filtro", + "clearAll": "Cancella tutto", + "filterValues": "Filtra valori…", + "loadingValues": "Caricamento valori…", + "noValues": "Nessun valore trovato.", + "pickValue": "Scegli un valore per aggiungere il filtro.", + "empty": "(vuoto)", + "cancel": "Annulla", + "addBtn": "Aggiungi" + }, + "filterFields": { + "status": "Stato del ciclo di vita" + }, + "ops": { + "is": "è" + }, "refresh": "Aggiorna", "layout": { "list": "Elenco", @@ -1116,6 +1129,7 @@ }, "list": { "account": "Account", + "identity": "Identità", "sid": "SID", "status": "Stato", "lastLogon": "Ultimo accesso", @@ -1144,11 +1158,15 @@ "stale": "inattivo 30g+", "viewInLogs": "Vedi eventi nel Log Explorer", "copySid": "Copia SID", + "copyUid": "Copia identità", "copied": "Copiato", "identity": "Identità", "accountName": "Nome account", "domain": "Dominio", + "hostname": "Hostname", "sid": "SID", + "uidNumber": "UID", + "machineId": "ID macchina", "tenant": "Tenant", "adStatus": "Stato AD", "enabled": "Abilitato", diff --git a/frontend/src/shared/i18n/locales/pt.json b/frontend/src/shared/i18n/locales/pt.json index cee96782f..cb42f64a3 100644 --- a/frontend/src/shared/i18n/locales/pt.json +++ b/frontend/src/shared/i18n/locales/pt.json @@ -1100,15 +1100,28 @@ }, "views": { "all": "Todas as contas", - "active": "Ativas", - "disabled": "Desativadas", - "deleted": "Excluídas", - "service": "Contas de serviço", - "stale": "Inativas (30d+)" + "windows": "Windows", + "linux": "Linux" }, - "searchPlaceholder": "Pesquisar por nome de conta ou SID…", + "searchPlaceholder": "Pesquisar por nome de conta, SID ou usuário…", "allTenants": "Todos os tenants", - "filters": "Filtros", + "filters": { + "add": "Adicionar filtro", + "clearAll": "Limpar tudo", + "filterValues": "Filtrar valores…", + "loadingValues": "Carregando valores…", + "noValues": "Nenhum valor encontrado.", + "pickValue": "Escolha um valor para adicionar o filtro.", + "empty": "(vazio)", + "cancel": "Cancelar", + "addBtn": "Adicionar" + }, + "filterFields": { + "status": "Status do ciclo de vida" + }, + "ops": { + "is": "é" + }, "refresh": "Atualizar", "layout": { "list": "Lista", @@ -1116,6 +1129,7 @@ }, "list": { "account": "Conta", + "identity": "Identidade", "sid": "SID", "status": "Status", "lastLogon": "Último logon", @@ -1144,11 +1158,15 @@ "stale": "inativa 30d+", "viewInLogs": "Ver eventos no Log Explorer", "copySid": "Copiar SID", + "copyUid": "Copiar identidade", "copied": "Copiado", "identity": "Identidade", "accountName": "Nome da conta", "domain": "Domínio", + "hostname": "Hostname", "sid": "SID", + "uidNumber": "UID", + "machineId": "ID da máquina", "tenant": "Tenant", "adStatus": "Status no AD", "enabled": "Habilitada", diff --git a/frontend/src/shared/i18n/locales/ru.json b/frontend/src/shared/i18n/locales/ru.json index b0e95ef59..a9d7d8b40 100644 --- a/frontend/src/shared/i18n/locales/ru.json +++ b/frontend/src/shared/i18n/locales/ru.json @@ -1112,15 +1112,28 @@ }, "views": { "all": "Все учётные записи", - "active": "Активные", - "disabled": "Отключённые", - "deleted": "Удалённые", - "service": "Служебные учётные записи", - "stale": "Устаревшие (30+ дн.)" + "windows": "Windows", + "linux": "Linux" }, - "searchPlaceholder": "Поиск по имени учётной записи или SID…", + "searchPlaceholder": "Поиск по имени учётной записи, SID или пользователю…", "allTenants": "Все арендаторы", - "filters": "Фильтры", + "filters": { + "add": "Добавить фильтр", + "clearAll": "Очистить всё", + "filterValues": "Фильтровать значения…", + "loadingValues": "Загрузка значений…", + "noValues": "Значения не найдены.", + "pickValue": "Выберите значение, чтобы добавить фильтр.", + "empty": "(пусто)", + "cancel": "Отмена", + "addBtn": "Добавить" + }, + "filterFields": { + "status": "Статус жизненного цикла" + }, + "ops": { + "is": "равно" + }, "refresh": "Обновить", "layout": { "list": "Список", @@ -1128,6 +1141,7 @@ }, "list": { "account": "Учётная запись", + "identity": "Идентификатор", "sid": "SID", "status": "Статус", "lastLogon": "Последний вход", @@ -1156,11 +1170,15 @@ "stale": "устарела 30+ дн.", "viewInLogs": "Открыть события в обозревателе логов", "copySid": "Копировать SID", + "copyUid": "Копировать идентификатор", "copied": "Скопировано", "identity": "Идентификация", "accountName": "Имя учётной записи", "domain": "Домен", + "hostname": "Имя хоста", "sid": "SID", + "uidNumber": "UID", + "machineId": "ID машины", "tenant": "Арендатор", "adStatus": "Статус AD", "enabled": "Включена",