Skip to content

Allow setting firewall zone in advanced NM conn profile editor #45

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
ethanjli merged 1 commit into from
Apr 2, 2026
Merged

Allow setting firewall zone in advanced NM conn profile editor #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions internal/app/server/routes/internet/conn-profiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,8 @@ func parseConnProfileSettingsConnField(
return nil, errors.Errorf("autoconnect priority %d out of range [-999, 999]", value)
}
return value, nil
case "zone":
return rawValue, nil
}
}

Expand Down
216 changes: 110 additions & 106 deletions web/templates/internet/conn-profiles/settings-form.partial.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,154 +42,158 @@
</div>

<h3>Connection</h3>
<turbo-frame
id="internet_conn-profiles_{{$conn.UUID}}_connection.frame"
data-turbo-reload
refresh="morph"
>
<div class="field is-horizontal">
<div class="field-label">
<label class="label">
ID
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if $conn.ID}}
{{$conn.ID}}
{{else}}
<span class="tag is-error">none</span>
{{end}}
</div>
</div>
</div>
<div class="field is-horizontal">
<div class="field-label">
<label class="label">
ID
</label>
</div>

<div class="field is-horizontal">
<div class="field-label">
<label class="label">
UUID
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if $conn.UUID.String}}
{{$conn.UUID.String}}
{{else}}
<span class="tag is-error">none</span>
{{end}}
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if $conn.ID}}
{{$conn.ID}}
{{else}}
<span class="tag is-error">none</span>
{{end}}
</div>
</div>
</div>
</div>

{{if $conn.StableID}}
<div class="field is-horizontal">
<div class="field-label">
<label class="label">
Stable ID
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{$conn.StableID}}
</div>
</div>
<div class="field is-horizontal">
<div class="field-label">
<label class="label">
UUID
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if $conn.UUID.String}}
{{$conn.UUID.String}}
{{else}}
<span class="tag is-error">none</span>
{{end}}
</div>
</div>
{{end}}
</div>
</div>

{{if $conn.StableID}}
<div class="field is-horizontal">
<div class="field-label">
<label class="label">
Type
Stable ID
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if $conn.Type}}
{{if eq $conn.Type.Info.Short $conn.Type}}
{{$conn.Type}}
{{else}}
<abbr title="{{$conn.Type}}">{{$conn.Type.Info.Short}}</abbr>
{{end}}
{{else}}
<span class="tag is-error">none</span>
{{end}}
{{$conn.StableID}}
</div>
</div>
</div>
</div>
{{end}}

<div class="field is-horizontal">
<div class="field-label">
<label class="label">
<abbr title="the network interface which this connection is allowed for">Device</abbr>
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if $conn.InterfaceName}}
<a href="{{(urlJoin (dict
"path" (print $Meta.BasePath "internet")
"query" $Meta.Form.Encode
"fragment" (print "internet_devices_" $conn.InterfaceName ".card")
))}}" target="_top">
{{$conn.InterfaceName}}
</a>
<div class="field is-horizontal">
<div class="field-label">
<label class="label">
Type
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if $conn.Type}}
{{if eq $conn.Type.Info.Short $conn.Type}}
{{$conn.Type}}
{{else}}
<span class="tag is-info">any appropriate interface</span>
<abbr title="{{$conn.Type}}">{{$conn.Type.Info.Short}}</abbr>
{{end}}
</div>
{{else}}
<span class="tag is-error">none</span>
{{end}}
</div>
</div>
</div>
</div>

<div class="field is-horizontal">
<div class="field-label">
<label class="label">
<abbr title="when the connection was last successfully fully activated">Last used</abbr>
</label>
<div class="field is-horizontal">
<div class="field-label">
<label class="label">
<abbr title="the network interface which this connection is allowed for">Device</abbr>
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if $conn.InterfaceName}}
<a href="{{(urlJoin (dict
"path" (print $Meta.BasePath "internet")
"query" $Meta.Form.Encode
"fragment" (print "internet_devices_" $conn.InterfaceName ".card")
))}}" target="_top">
{{$conn.InterfaceName}}
</a>
{{else}}
<span class="tag is-info">any appropriate interface</span>
{{end}}
</div>
</div>
<div class="field-body">
<div class="field">
<div class="control">
</div>
</div>

<div class="field is-horizontal">
<div class="field-label">
<label class="label">
<abbr title="when the connection was last successfully fully activated">Last used</abbr>
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
<turbo-frame
id="internet_conn-profiles_{{$conn.UUID}}_connection_last-used.frame"
data-turbo-reload
refresh="morph"
>
{{if $conn.Timestamp.IsZero}}
<span class="tag is-info">never, or unknown</span>
{{else}}
<abbr title="at {{dateInZone "2006-01-2 15:04 MST" $conn.Timestamp "UTC"}}">
{{durationRound (ago $conn.Timestamp)}} ago
</abbr>
{{end}}
</div>
</turbo-frame>
</div>
</div>
</div>
</div>

<div class="field is-horizontal">
<div class="field-label">
<label class="label">
<abbr title="firewall trust level">Zone</abbr>
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
{{if and ($conn.Zone) (not (eq $conn.Zone "NULL"))}}
{{$conn.Zone}}
{{else}}
<span class="tag is-info">the firewall's default zone</span>
{{end}}
</div>
<div class="field is-horizontal">
<div class="field-label is-normal">
<label class="label">
<abbr title="firewall trust level">
Zone
</abbr>
</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
<input
class="input" type="text"
name="connection.zone"
value="{{if and ($conn.Zone) (not (eq $conn.Zone "NULL"))}}{{$conn.Zone}}{{end}}"
placeholder="the firewall's default zone"
size=40
>
</div>
</div>
</div>
</turbo-frame>
</div>

<h4>Autoconnect</h4>
<p class="mb-3">
Expand Down
Loading