Skip to content

Include recent fixes that involve general and 1.5-related fixes #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jarnster merged 6 commits into from
Apr 17, 2025
Merged

Include recent fixes that involve general and 1.5-related fixes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0faced
firewall: Bug #24: Fix state output for firewall rules
l0crian1 Apr 17, 2025
ce758f0
start.sh: set executable bit
l0crian1 Apr 17, 2025
c9f616e
routing: Bug#22: Fix route maps
l0crian1 Apr 17, 2025
db2c428
Merge pull request #28 from l0crian1/fix-route-maps
Jarnster Apr 17, 2025
b28907d
Merge pull request #25 from l0crian1/fix-firewall-state-output
Jarnster Apr 17, 2025
6c84c5c
Merge pull request #27 from l0crian1/set-exe-bit-start-sh
Jarnster Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions frontend/app/firewall/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,14 +952,22 @@ export default function FirewallPage() {
{rule.state && (
<div className="flex flex-col gap-1">
<span className="text-slate-400 font-medium">State Tracking:</span>
{Object.entries(rule.state).map(([key, value]) => (
<div key={`state-${key}`} className="flex items-center gap-2 ml-2">
<span className="text-slate-400">{key}:</span>
{typeof rule.state === 'string' ? (
<div className="flex items-center gap-2 ml-2">
<span className="text-white font-mono bg-slate-800 px-2 py-1 rounded text-xs">
{typeof value === 'object' ? JSON.stringify(value) : String(value)}
{rule.state}
</span>
</div>
))}
) : (
Object.entries(rule.state).map(([key, value]) => (
<div key={`state-${key}`} className="flex items-center gap-2 ml-2">
<span className="text-slate-400">{key}:</span>
<span className="text-white font-mono bg-slate-800 px-2 py-1 rounded text-xs">
{typeof value === 'object' ? JSON.stringify(value) : String(value)}
</span>
</div>
))
)}
</div>
)}
</div>
Expand Down
70 changes: 53 additions & 17 deletions frontend/app/routing/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,26 +1322,62 @@ export default function RoutingPage() {
</TableCell>
<TableCell>
<div className="space-y-1">
{Object.entries(rule.match).map(([key, value], j) => (
<div key={j} className="flex items-center gap-1">
<span className="text-xs text-slate-400">{key}:</span>
<Badge variant="outline" className="border-purple-700 text-purple-400">
{value as string}
</Badge>
</div>
))}
{Object.entries(rule.match || {}).map(([key, value], j) => {
// Format the value into a readable string
let displayValue = value;
if (typeof value === 'object' && value !== null) {
// Handle nested objects by getting all key-value pairs
const formatNestedObject = (obj: any, parentKey?: string): string => {
const entries = Object.entries(obj);
if (entries.length === 0) return '';

const [k, v] = entries[0];
if (typeof v === 'object' && v !== null) {
return formatNestedObject(v, k);
}
return `${parentKey ? `${parentKey} ` : ''}${k} ${v}`;
};
displayValue = formatNestedObject(value);
}
return (
<div key={j} className="flex items-center gap-1">
<span className="text-xs text-muted-foreground">{key}:</span>
<Badge variant="secondary">
{String(displayValue)}
</Badge>
</div>
);
})}
</div>
</TableCell>
<TableCell>
<div className="space-y-1">
{Object.entries(rule.set).map(([key, value], j) => (
<div key={j} className="flex items-center gap-1">
<span className="text-xs text-slate-400">{key}:</span>
<Badge variant="outline" className="border-blue-700 text-blue-400">
{value as string}
</Badge>
</div>
))}
{Object.entries(rule.set || {}).map(([key, value], j) => {
// Format the value into a readable string
let displayValue = value;
if (typeof value === 'object' && value !== null) {
// Handle nested objects by getting all key-value pairs
const formatNestedObject = (obj: any, parentKey?: string): string => {
const entries = Object.entries(obj);
if (entries.length === 0) return '';

const [k, v] = entries[0];
if (typeof v === 'object' && v !== null) {
return formatNestedObject(v, k);
}
return `${parentKey ? `${parentKey} ` : ''}${k} ${v}`;
};
displayValue = formatNestedObject(value);
}
return (
<div key={j} className="flex items-center gap-1">
<span className="text-xs text-muted-foreground">{key}:</span>
<Badge variant="outline">
{String(displayValue)}
</Badge>
</div>
);
})}
</div>
</TableCell>
</TableRow>
Expand Down Expand Up @@ -1480,4 +1516,4 @@ export default function RoutingPage() {
</Dialog>
</div>
)
}
}
Empty file modified start.sh
100644 → 100755
View file
Open in desktop
Empty file.