Narrow jail config types with explicit union values
This commit is contained in:
@@ -12,7 +12,7 @@ import {
|
||||
import { KVEditor } from "./KVEditor";
|
||||
import { StringListEditor } from "./StringListEditor";
|
||||
import { useConfigStyles } from "./configStyles";
|
||||
import type { JailSectionConfig } from "../../types/config";
|
||||
import type { BackendType, JailSectionConfig } from "../../types/config";
|
||||
|
||||
const BACKENDS = ["", "auto", "polling", "gamin", "pyinotify", "systemd"] as const;
|
||||
|
||||
@@ -64,7 +64,9 @@ export function JailSectionPanel({ jailName, section, onChange }: JailSectionPan
|
||||
<Select
|
||||
size="small"
|
||||
value={section.backend ?? ""}
|
||||
onChange={(_e, d) => { update({ backend: d.value || null }); }}
|
||||
onChange={(_e, d) => {
|
||||
update({ backend: d.value ? (d.value as BackendType) : null });
|
||||
}}
|
||||
>
|
||||
{BACKENDS.map((b) => (
|
||||
<option key={b} value={b}>
|
||||
|
||||
@@ -34,11 +34,14 @@ import {
|
||||
import { ApiError } from "../../api/client";
|
||||
import type {
|
||||
AddLogPathRequest,
|
||||
BackendType,
|
||||
DNSMode,
|
||||
InactiveJail,
|
||||
JailConfig,
|
||||
JailConfigUpdate,
|
||||
JailValidationIssue,
|
||||
JailValidationResult,
|
||||
LogEncoding,
|
||||
} from "../../types/config";
|
||||
import { useAutoSave } from "../../hooks/useAutoSave";
|
||||
import { useConfigActiveStatus } from "../../hooks/useConfigActiveStatus";
|
||||
@@ -127,9 +130,9 @@ function JailConfigDetail({
|
||||
const [ignoreRegex, setIgnoreRegex] = useState<string[]>(jail.ignore_regex);
|
||||
const [logPaths, setLogPaths] = useState<string[]>(jail.log_paths);
|
||||
const [datePattern, setDatePattern] = useState(jail.date_pattern ?? "");
|
||||
const [dnsMode, setDnsMode] = useState(jail.use_dns);
|
||||
const [backend, setBackend] = useState(jail.backend);
|
||||
const [logEncoding, setLogEncoding] = useState(jail.log_encoding);
|
||||
const [dnsMode, setDnsMode] = useState<DNSMode>(jail.use_dns);
|
||||
const [backend, setBackend] = useState<BackendType>(jail.backend);
|
||||
const [logEncoding, setLogEncoding] = useState<LogEncoding>(jail.log_encoding);
|
||||
const [prefRegex, setPrefRegex] = useState(jail.prefregex);
|
||||
const [deletingPath, setDeletingPath] = useState<string | null>(null);
|
||||
const [newLogPath, setNewLogPath] = useState("");
|
||||
@@ -302,7 +305,7 @@ function JailConfigDetail({
|
||||
value={backend}
|
||||
disabled={readOnly}
|
||||
onChange={(_e, d) => {
|
||||
setBackend(d.value);
|
||||
setBackend(d.value as BackendType);
|
||||
}}
|
||||
>
|
||||
{BACKENDS.map((b) => (
|
||||
@@ -315,7 +318,7 @@ function JailConfigDetail({
|
||||
value={logEncoding.toLowerCase()}
|
||||
disabled={readOnly}
|
||||
onChange={(_e, d) => {
|
||||
setLogEncoding(d.value);
|
||||
setLogEncoding(d.value as LogEncoding);
|
||||
}}
|
||||
>
|
||||
{LOG_ENCODINGS.map((e) => (
|
||||
@@ -350,7 +353,7 @@ function JailConfigDetail({
|
||||
value={dnsMode}
|
||||
disabled={readOnly}
|
||||
onChange={(_e, d) => {
|
||||
setDnsMode(d.value);
|
||||
setDnsMode(d.value as DNSMode);
|
||||
}}
|
||||
>
|
||||
<option value="yes">yes — resolve hostnames</option>
|
||||
|
||||
@@ -39,6 +39,10 @@ export interface BantimeEscalationUpdate {
|
||||
// Jail Configuration
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
export type DNSMode = "yes" | "warn" | "no" | "raw";
|
||||
export type LogEncoding = "auto" | "ascii" | "utf-8" | "UTF-8" | "latin-1";
|
||||
export type BackendType = "auto" | "polling" | "pyinotify" | "systemd" | "gamin";
|
||||
|
||||
export interface JailConfig {
|
||||
name: string;
|
||||
ban_time: number;
|
||||
@@ -48,10 +52,10 @@ export interface JailConfig {
|
||||
ignore_regex: string[];
|
||||
log_paths: string[];
|
||||
date_pattern: string | null;
|
||||
log_encoding: string;
|
||||
backend: string;
|
||||
log_encoding: LogEncoding;
|
||||
backend: BackendType;
|
||||
/** DNS look-up mode reported by fail2ban: "yes" | "warn" | "no" | "raw". */
|
||||
use_dns: string;
|
||||
use_dns: DNSMode;
|
||||
/** Prefix regex prepended to every failregex; empty string means disabled. */
|
||||
prefregex: string;
|
||||
actions: string[];
|
||||
@@ -76,9 +80,9 @@ export interface JailConfigUpdate {
|
||||
/** Prefix regex; undefined/null = skip, "" = clear, non-empty = set. */
|
||||
prefregex?: string | null;
|
||||
date_pattern?: string | null;
|
||||
dns_mode?: string | null;
|
||||
backend?: string | null;
|
||||
log_encoding?: string | null;
|
||||
dns_mode?: DNSMode | null;
|
||||
backend?: BackendType | null;
|
||||
log_encoding?: LogEncoding | null;
|
||||
enabled?: boolean | null;
|
||||
bantime_escalation?: BantimeEscalationUpdate | null;
|
||||
}
|
||||
@@ -454,7 +458,7 @@ export interface JailSectionConfig {
|
||||
findtime: number | null;
|
||||
bantime: number | null;
|
||||
action: string[];
|
||||
backend: string | null;
|
||||
backend: BackendType | null;
|
||||
extra: Record<string, string>;
|
||||
}
|
||||
|
||||
@@ -505,13 +509,13 @@ export interface InactiveJail {
|
||||
/** Failure-counting window in seconds, parsed from findtime. */
|
||||
find_time_seconds: number;
|
||||
/** Log encoding, e.g. ``"auto"`` or ``"utf-8"``. */
|
||||
log_encoding: string;
|
||||
log_encoding: LogEncoding;
|
||||
/** Log-monitoring backend. */
|
||||
backend: string;
|
||||
backend: BackendType;
|
||||
/** Date pattern for log parsing, or null for auto-detect. */
|
||||
date_pattern: string | null;
|
||||
/** DNS resolution mode. */
|
||||
use_dns: string;
|
||||
use_dns: DNSMode;
|
||||
/** Prefix regex prepended to every failregex. */
|
||||
prefregex: string;
|
||||
/** List of failure regex patterns. */
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* - `backend/app/models/geo.py` (GeoDetail / IpLookupResponse)
|
||||
*/
|
||||
|
||||
import type { BantimeEscalation } from "./config";
|
||||
import type { BantimeEscalation, BackendType, LogEncoding } from "./config";
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Jail statistics
|
||||
@@ -48,7 +48,7 @@ export interface JailSummary {
|
||||
/** Whether the jail is in idle mode (monitoring paused). */
|
||||
idle: boolean;
|
||||
/** Backend type used for log access (e.g. `"systemd"`, `"polling"`). */
|
||||
backend: string;
|
||||
backend: BackendType;
|
||||
/** Observation window in seconds before a ban is triggered. */
|
||||
find_time: number;
|
||||
/** Duration of a ban in seconds (negative = permanent). */
|
||||
@@ -88,7 +88,7 @@ export interface Jail {
|
||||
/** Whether the jail is in idle mode. */
|
||||
idle: boolean;
|
||||
/** Backend type (systemd, polling, etc.). */
|
||||
backend: string;
|
||||
backend: BackendType;
|
||||
/** Log file paths monitored by this jail. */
|
||||
log_paths: string[];
|
||||
/** Fail-regex patterns used to identify offenders. */
|
||||
@@ -98,7 +98,7 @@ export interface Jail {
|
||||
/** Date-pattern used for timestamp parsing, or empty string. */
|
||||
date_pattern: string;
|
||||
/** Log file encoding (e.g. `"UTF-8"`). */
|
||||
log_encoding: string;
|
||||
log_encoding: LogEncoding;
|
||||
/** Action names attached to this jail. */
|
||||
actions: string[];
|
||||
/** Observation window in seconds. */
|
||||
|
||||
Reference in New Issue
Block a user