feat: add limit:burst and connlimit:mask fields to policies
This commit is contained in:
23
backend/alembic/versions/0008_policy_add_limit_connlimit.py
Normal file
23
backend/alembic/versions/0008_policy_add_limit_connlimit.py
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
"""add limit_burst and connlimit_mask to policies
|
||||||
|
|
||||||
|
Revision ID: 0008
|
||||||
|
Revises: 0007
|
||||||
|
Create Date: 2026-03-01
|
||||||
|
"""
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
revision = "0008"
|
||||||
|
down_revision = "0007"
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
op.add_column("policies", sa.Column("limit_burst", sa.String(64), server_default="''", nullable=False))
|
||||||
|
op.add_column("policies", sa.Column("connlimit_mask", sa.String(32), server_default="''", nullable=False))
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
op.drop_column("policies", "connlimit_mask")
|
||||||
|
op.drop_column("policies", "limit_burst")
|
||||||
@@ -76,6 +76,8 @@ class Policy(Base):
|
|||||||
dst_zone_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("zones.id"), nullable=True)
|
dst_zone_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("zones.id"), nullable=True)
|
||||||
policy: Mapped[str] = mapped_column(String(16), nullable=False)
|
policy: Mapped[str] = mapped_column(String(16), nullable=False)
|
||||||
log_level: Mapped[str] = mapped_column(String(16), default="")
|
log_level: Mapped[str] = mapped_column(String(16), default="")
|
||||||
|
limit_burst: Mapped[str] = mapped_column(String(64), default="")
|
||||||
|
connlimit_mask: Mapped[str] = mapped_column(String(32), default="")
|
||||||
comment: Mapped[str] = mapped_column(Text, default="")
|
comment: Mapped[str] = mapped_column(Text, default="")
|
||||||
position: Mapped[int] = mapped_column(Integer, default=0)
|
position: Mapped[int] = mapped_column(Integer, default=0)
|
||||||
|
|
||||||
|
|||||||
@@ -93,6 +93,8 @@ class PolicyCreate(BaseModel):
|
|||||||
dst_zone_id: Optional[int] = None
|
dst_zone_id: Optional[int] = None
|
||||||
policy: str
|
policy: str
|
||||||
log_level: str = ""
|
log_level: str = ""
|
||||||
|
limit_burst: str = ""
|
||||||
|
connlimit_mask: str = ""
|
||||||
comment: str = ""
|
comment: str = ""
|
||||||
position: int = 0
|
position: int = 0
|
||||||
|
|
||||||
@@ -102,6 +104,8 @@ class PolicyUpdate(BaseModel):
|
|||||||
dst_zone_id: Optional[int] = None
|
dst_zone_id: Optional[int] = None
|
||||||
policy: Optional[str] = None
|
policy: Optional[str] = None
|
||||||
log_level: Optional[str] = None
|
log_level: Optional[str] = None
|
||||||
|
limit_burst: Optional[str] = None
|
||||||
|
connlimit_mask: Optional[str] = None
|
||||||
comment: Optional[str] = None
|
comment: Optional[str] = None
|
||||||
position: Optional[int] = None
|
position: Optional[int] = None
|
||||||
|
|
||||||
@@ -113,6 +117,8 @@ class PolicyOut(BaseModel):
|
|||||||
dst_zone_id: Optional[int]
|
dst_zone_id: Optional[int]
|
||||||
policy: str
|
policy: str
|
||||||
log_level: str
|
log_level: str
|
||||||
|
limit_burst: str
|
||||||
|
connlimit_mask: str
|
||||||
comment: str
|
comment: str
|
||||||
position: int
|
position: int
|
||||||
|
|
||||||
|
|||||||
@@ -33,11 +33,21 @@ class ShorewallGenerator:
|
|||||||
return "".join(lines)
|
return "".join(lines)
|
||||||
|
|
||||||
def policy(self) -> str:
|
def policy(self) -> str:
|
||||||
lines = [self._header("policy"), "#SOURCE".ljust(16) + "DEST".ljust(16) + "POLICY".ljust(16) + "LOG LEVEL\n"]
|
lines = [
|
||||||
|
self._header("policy"),
|
||||||
|
"#SOURCE".ljust(16) + "DEST".ljust(16) + "POLICY".ljust(16)
|
||||||
|
+ "LOG LEVEL".ljust(16) + "LIMIT:BURST".ljust(20) + "CONNLIMIT:MASK\n",
|
||||||
|
]
|
||||||
for p in sorted(self._config.policies, key=lambda x: x.position):
|
for p in sorted(self._config.policies, key=lambda x: x.position):
|
||||||
src = p.src_zone.name if p.src_zone else "all"
|
src = p.src_zone.name if p.src_zone else "all"
|
||||||
dst = p.dst_zone.name if p.dst_zone else "all"
|
dst = p.dst_zone.name if p.dst_zone else "all"
|
||||||
lines.append(self._col(src, dst, p.policy, p.log_level or "-"))
|
lines.append(self._col(
|
||||||
|
src, dst, p.policy,
|
||||||
|
p.log_level or "-",
|
||||||
|
p.limit_burst or "-",
|
||||||
|
p.connlimit_mask or "-",
|
||||||
|
width=16,
|
||||||
|
))
|
||||||
return "".join(lines)
|
return "".join(lines)
|
||||||
|
|
||||||
def rules(self) -> str:
|
def rules(self) -> str:
|
||||||
|
|||||||
@@ -113,6 +113,8 @@ export default function ConfigDetail() {
|
|||||||
},
|
},
|
||||||
{ key: 'policy' as const, label: 'Policy' },
|
{ key: 'policy' as const, label: 'Policy' },
|
||||||
{ key: 'log_level' as const, label: 'Log Level' },
|
{ key: 'log_level' as const, label: 'Log Level' },
|
||||||
|
{ key: 'limit_burst' as const, label: 'Limit:Burst' },
|
||||||
|
{ key: 'connlimit_mask' as const, label: 'ConnLimit:Mask' },
|
||||||
{ key: 'position' as const, label: 'Position' },
|
{ key: 'position' as const, label: 'Position' },
|
||||||
] as Column<AnyEntity>[],
|
] as Column<AnyEntity>[],
|
||||||
fields: [
|
fields: [
|
||||||
@@ -120,6 +122,8 @@ export default function ConfigDetail() {
|
|||||||
{ name: 'dst_zone_id', label: 'Destination Zone', type: 'select' as const, options: [{ value: '', label: 'all' }, ...zoneOptions] },
|
{ name: 'dst_zone_id', label: 'Destination Zone', type: 'select' as const, options: [{ value: '', label: 'all' }, ...zoneOptions] },
|
||||||
{ name: 'policy', label: 'Policy', required: true, type: 'select' as const, options: [{ value: 'ACCEPT', label: 'ACCEPT' }, { value: 'DROP', label: 'DROP' }, { value: 'REJECT', label: 'REJECT' }, { value: 'CONTINUE', label: 'CONTINUE' }] },
|
{ name: 'policy', label: 'Policy', required: true, type: 'select' as const, options: [{ value: 'ACCEPT', label: 'ACCEPT' }, { value: 'DROP', label: 'DROP' }, { value: 'REJECT', label: 'REJECT' }, { value: 'CONTINUE', label: 'CONTINUE' }] },
|
||||||
{ name: 'log_level', label: 'Log Level' },
|
{ name: 'log_level', label: 'Log Level' },
|
||||||
|
{ name: 'limit_burst', label: 'Limit:Burst', placeholder: 'e.g. 10/sec:20' },
|
||||||
|
{ name: 'connlimit_mask', label: 'ConnLimit:Mask', placeholder: 'e.g. 10:24' },
|
||||||
{ name: 'comment', label: 'Comment' },
|
{ name: 'comment', label: 'Comment' },
|
||||||
{ name: 'position', label: 'Position', type: 'number' as const },
|
{ name: 'position', label: 'Position', type: 'number' as const },
|
||||||
] as FieldDef[],
|
] as FieldDef[],
|
||||||
|
|||||||
Reference in New Issue
Block a user