Config page tasks 1-4: dropdowns, key props, inactive jail full GUI, banaction fix
Task 1: Backend/LogEncoding/DatePattern dropdowns in JailConfigDetail
- Added BACKENDS, LOG_ENCODINGS, DATE_PATTERN_PRESETS constants
- Backend and Log Encoding: <Input readOnly> → <Select> (editable, auto-saves)
- Date Pattern: <Input> → <Combobox freeform> with presets
- Extended JailConfigUpdate model (backend, log_encoding) and service
- Added readOnly prop to JailConfigDetail (all fields, toggles, buttons)
- Extended RegexList with readOnly prop
Task 2: Fix raw action/filter config always blank
- Added key={selectedAction.name} to ActionDetail in ActionsTab
- Added key={selectedFilter.name} to FilterDetail in FiltersTab
Task 3: Inactive jail full GUI same as active jails
- Extended InactiveJail Pydantic model with all config fields
- Added _parse_time_to_seconds helper to config_file_service
- Updated _build_inactive_jail to populate all extended fields
- Extended InactiveJail TypeScript type to match
- Rewrote InactiveJailDetail to reuse JailConfigDetail (readOnly=true)
Task 4: Fix banaction interpolation error when activating jails
- _write_local_override_sync now includes banaction=iptables-multiport
and banaction_allports=iptables-allports in every .local file
This commit is contained in:
@@ -77,6 +77,8 @@ export interface JailConfigUpdate {
|
||||
prefregex?: string | null;
|
||||
date_pattern?: string | null;
|
||||
dns_mode?: string | null;
|
||||
backend?: string | null;
|
||||
log_encoding?: string | null;
|
||||
enabled?: boolean | null;
|
||||
bantime_escalation?: BantimeEscalationUpdate | null;
|
||||
}
|
||||
@@ -498,6 +500,26 @@ export interface InactiveJail {
|
||||
findtime: string | null;
|
||||
/** Number of failures before a ban is issued, or null. */
|
||||
maxretry: number | null;
|
||||
/** Ban duration in seconds, parsed from bantime. */
|
||||
ban_time_seconds: number;
|
||||
/** Failure-counting window in seconds, parsed from findtime. */
|
||||
find_time_seconds: number;
|
||||
/** Log encoding, e.g. ``"auto"`` or ``"utf-8"``. */
|
||||
log_encoding: string;
|
||||
/** Log-monitoring backend. */
|
||||
backend: string;
|
||||
/** Date pattern for log parsing, or null for auto-detect. */
|
||||
date_pattern: string | null;
|
||||
/** DNS resolution mode. */
|
||||
use_dns: string;
|
||||
/** Prefix regex prepended to every failregex. */
|
||||
prefregex: string;
|
||||
/** List of failure regex patterns. */
|
||||
fail_regex: string[];
|
||||
/** List of ignore regex patterns. */
|
||||
ignore_regex: string[];
|
||||
/** Ban-time escalation configuration, or null. */
|
||||
bantime_escalation: BantimeEscalation | null;
|
||||
/** Absolute path to the config file where this jail is defined. */
|
||||
source_file: string;
|
||||
/** Effective ``enabled`` value — always ``false`` for inactive jails. */
|
||||
|
||||
Reference in New Issue
Block a user