Fix jail banned IP loading race with AbortController

This commit is contained in:
2026-04-19 19:31:03 +02:00
parent 9e7f881a8a
commit 5446f6c3e1
4 changed files with 34 additions and 4 deletions

View File

@@ -16,7 +16,11 @@ Issues are grouped by category and ordered roughly by severity. Each entry descr
--- ---
### TASK-001 — Race condition in `useJailBannedIps`: missing AbortController ### TASK-001 — Race condition in `useJailBannedIps`: missing AbortController (done)
**Where fixed:** `frontend/src/hooks/useJailBannedIps.ts`, `frontend/src/api/jails.ts`
**Summary:** Added an `AbortController` ref to cancel stale fetches, passed the signal into `fetchJailBannedIps`, and abort on unmount.
**Where found:** `frontend/src/hooks/useJailBannedIps.ts` — the `load` callback is `async` and calls `fetchJailBannedIps` with no AbortSignal. **Where found:** `frontend/src/hooks/useJailBannedIps.ts` — the `load` callback is `async` and calls `fetchJailBannedIps` with no AbortSignal.

View File

@@ -266,6 +266,7 @@ export async function fetchJailBannedIps(
page = 1, page = 1,
pageSize = 25, pageSize = 25,
search?: string, search?: string,
signal?: AbortSignal,
): Promise<JailBannedIpsResponse> { ): Promise<JailBannedIpsResponse> {
const params: Record<string, string> = { const params: Record<string, string> = {
page: String(page), page: String(page),
@@ -275,5 +276,5 @@ export async function fetchJailBannedIps(
params.search = search; params.search = search;
} }
const query = new URLSearchParams(params).toString(); const query = new URLSearchParams(params).toString();
return get<JailBannedIpsResponse>(`${ENDPOINTS.jailBanned(jailName)}?${query}`); return get<JailBannedIpsResponse>(`${ENDPOINTS.jailBanned(jailName)}?${query}`, signal);
} }

View File

@@ -18,6 +18,7 @@ describe("useJailBannedIps", () => {
expect(result.current.loading).toBe(false); expect(result.current.loading).toBe(false);
}); });
expect(result.current.items.length).toBe(1); expect(result.current.items.length).toBe(1);
expect(fetchMock).toHaveBeenCalledWith("sshd", 1, 25, undefined, expect.any(AbortSignal));
await act(async () => { await act(async () => {
await result.current.unban("1.2.3.4"); await result.current.unban("1.2.3.4");

View File

@@ -34,8 +34,14 @@ export function useJailBannedIps(jailName: string): UseJailBannedIpsResult {
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const [opError, setOpError] = useState<string | null>(null); const [opError, setOpError] = useState<string | null>(null);
const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null); const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const abortRef = useRef<AbortController | null>(null);
const load = useCallback(async (): Promise<void> => { const load = useCallback(async (): Promise<void> => {
abortRef.current?.abort();
const controller = new AbortController();
abortRef.current = controller;
const { signal } = controller;
if (!jailName) { if (!jailName) {
setItems([]); setItems([]);
setTotal(0); setTotal(0);
@@ -47,13 +53,27 @@ export function useJailBannedIps(jailName: string): UseJailBannedIpsResult {
setError(null); setError(null);
try { try {
const resp = await fetchJailBannedIps(jailName, page, pageSize, debouncedSearch || undefined); const resp = await fetchJailBannedIps(
jailName,
page,
pageSize,
debouncedSearch || undefined,
signal,
);
if (signal.aborted) {
return;
}
setItems(resp.items); setItems(resp.items);
setTotal(resp.total); setTotal(resp.total);
} catch (err: unknown) { } catch (err: unknown) {
if (signal.aborted) {
return;
}
handleFetchError(err, setError, "Failed to fetch jailed IPs"); handleFetchError(err, setError, "Failed to fetch jailed IPs");
} finally { } finally {
setLoading(false); if (!signal.aborted) {
setLoading(false);
}
} }
}, [jailName, page, pageSize, debouncedSearch]); }, [jailName, page, pageSize, debouncedSearch]);
@@ -76,6 +96,10 @@ export function useJailBannedIps(jailName: string): UseJailBannedIpsResult {
useEffect(() => { useEffect(() => {
void load(); void load();
return (): void => {
abortRef.current?.abort();
};
}, [load]); }, [load]);
const unban = useCallback(async (ip: string): Promise<void> => { const unban = useCallback(async (ip: string): Promise<void> => {