From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 508D51FF0DA for ; Thu, 19 Nov 2026 20:44:34 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id AF3C021A11; Thu, 19 Nov 2026 20:42:12 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v3 26/28] ui: sdn: allow static routes for Simple zone VRFs Date: Thu, 19 Nov 2026 20:41:12 +0100 Message-ID: <20261119194116.575520-27-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261119194116.575520-1-g.goller@proxmox.com> References: <20261119194116.575520-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795117283312 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.214 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: GK3UYOMKJWJSRP4L3MVVDDUTLTEDIHGC X-Message-ID-Hash: GK3UYOMKJWJSRP4L3MVVDDUTLTEDIHGC X-MailFrom: g.goller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Allow Simple zones to reach networks outside their directly connected subnets through static routes. Routes can use a gateway, an outgoing interface, or both. IPv6 link-local gateways require an interface. Keep the routes in a separate tab so the general zone settings remain easy to use. Signed-off-by: Gabriel Goller --- www/manager6/Makefile | 1 + www/manager6/Toolkit.js | 2 +- www/manager6/sdn/StaticRoutes.js | 222 +++++++++++++++++++++++++++ www/manager6/sdn/zones/Base.js | 22 ++- www/manager6/sdn/zones/SimpleEdit.js | 12 ++ 5 files changed, 256 insertions(+), 3 deletions(-) create mode 100644 www/manager6/sdn/StaticRoutes.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index e8e2bd0b49e8..349b912b61da 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -305,6 +305,7 @@ JSSRC= \ sdn/VnetPanel.js \ sdn/SubnetEdit.js \ sdn/SubnetView.js \ + sdn/StaticRoutes.js \ sdn/ZoneContentView.js \ sdn/ZoneContentPanel.js \ sdn/ZoneBridgesPanel.js \ diff --git a/www/manager6/Toolkit.js b/www/manager6/Toolkit.js index 9cc89184188e..2fea13e4aed3 100644 --- a/www/manager6/Toolkit.js +++ b/www/manager6/Toolkit.js @@ -17,7 +17,7 @@ Ext.apply(Ext.form.field.VTypes, { IP64FullRangeCIDRAddress: function (v) { let result = Proxmox.Utils.IP64_cidr_match.exec(v); - if (result === null) { + if (result === null || result[0] !== v) { return false; } if (result[1] !== undefined) { diff --git a/www/manager6/sdn/StaticRoutes.js b/www/manager6/sdn/StaticRoutes.js new file mode 100644 index 000000000000..62e0be8c9182 --- /dev/null +++ b/www/manager6/sdn/StaticRoutes.js @@ -0,0 +1,222 @@ +Ext.define('PVE.sdn.StaticRouteEdit', { + extend: 'Proxmox.window.Edit', + + subject: gettext('Static Route'), + width: 450, + isAdd: true, + url: '#', + + fieldDefaults: { + labelWidth: 150, + }, + + items: [ + { + xtype: 'textfield', + name: 'prefix', + fieldLabel: gettext('Destination Prefix'), + vtype: 'IP64FullRangeCIDRAddress', + allowBlank: false, + }, + { + xtype: 'proxmoxtextfield', + name: 'via', + fieldLabel: gettext('Gateway'), + vtype: 'IP64Address', + skipEmptyText: true, + validator: function (value) { + let iface = this.up('window').down('[name=iface]')?.getValue(); + return value || iface + ? true + : gettext('Either a gateway or an interface is required.'); + }, + listeners: { + change: function (field) { + field.up('window').down('[name=iface]')?.validate(); + }, + }, + }, + { + xtype: 'proxmoxtextfield', + name: 'iface', + fieldLabel: gettext('Outgoing Interface'), + maxLength: 15, + regex: /^[^\s,=/]+$/, + skipEmptyText: true, + validator: function (value) { + let via = this.up('window').down('[name=via]')?.getValue(); + if (!value && !via) { + return gettext('Either a gateway or an interface is required.'); + } + if (!value && /^fe[89ab][0-9a-f]:/i.test(via)) { + return gettext('An interface is required for an IPv6 link-local gateway.'); + } + return true; + }, + listeners: { + change: function (field) { + field.up('window').down('[name=via]')?.validate(); + }, + }, + }, + { + xtype: 'proxmoxintegerfield', + name: 'distance', + fieldLabel: gettext('Distance'), + minValue: 1, + maxValue: 255, + allowBlank: true, + }, + ], + + submit: function () { + let me = this; + if (me.isValid()) { + me.onSave(me.getValues()); + me.close(); + } + }, +}); + +Ext.define('PVE.sdn.StaticRoutes', { + extend: 'Ext.grid.Panel', + alias: 'widget.pveSDNStaticRoutes', + mixins: ['Ext.form.field.Field'], + + isCreate: false, + value: [], + height: 250, + + store: { + fields: [ + 'route', + ...['prefix', 'via', 'iface', 'distance'].map((name) => ({ + name, + calculate: (data) => data.route[name], + })), + ], + data: [], + }, + + viewConfig: { + emptyText: gettext('No static routes configured'), + deferEmptyText: false, + }, + + columns: [ + { + text: gettext('Destination Prefix'), + dataIndex: 'prefix', + flex: 2, + renderer: Ext.htmlEncode, + }, + { + text: gettext('Gateway'), + dataIndex: 'via', + flex: 2, + renderer: Ext.htmlEncode, + }, + { + text: gettext('Interface'), + dataIndex: 'iface', + flex: 1, + renderer: Ext.htmlEncode, + }, + { + text: gettext('Distance'), + dataIndex: 'distance', + width: 80, + renderer: Ext.htmlEncode, + }, + ], + + editRoute: function (record) { + let me = this; + let win = Ext.create('PVE.sdn.StaticRouteEdit', { + isCreate: !record, + onSave: function (values) { + if (record) { + record.set('route', values); + } else { + me.getStore().add({ route: values }); + } + }, + }); + if (record) { + win.setValues(record.get('route')); + } + win.show(); + }, + + isEqual: function (value1, value2) { + return JSON.stringify(value1) === JSON.stringify(value2); + }, + + getValue: function () { + return this.getStore() + .getRange() + .map((record) => PVE.Parser.printPropertyString(record.get('route'))); + }, + + setValue: function (value) { + let me = this; + me.getStore().setData( + (value ?? []).map((route) => ({ route: PVE.Parser.parsePropertyString(route) })), + ); + me.checkChange(); + return me; + }, + + getSubmitData: function () { + let me = this; + if (me.disabled || !me.submitValue) { + return null; + } + let value = me.getValue(); + if (value.length) { + return { [me.getName()]: value }; + } + return me.isCreate ? null : { delete: me.getName() }; + }, + + // The grid cannot show field errors itself. Proxmox.window.Edit marks the API errors on the + // form before it shows them in the error dialog, so these must exist but need not do anything. + markInvalid: Ext.emptyFn, + clearInvalid: Ext.emptyFn, + + initComponent: function () { + let me = this; + let sm = Ext.create('Ext.selection.RowModel'); + + me.selModel = sm; + me.tbar = [ + { + text: gettext('Add'), + handler: () => me.editRoute(), + }, + { + xtype: 'proxmoxButton', + text: gettext('Edit'), + disabled: true, + selModel: sm, + handler: () => me.editRoute(sm.getSelection()[0]), + }, + { + xtype: 'proxmoxButton', + text: gettext('Remove'), + disabled: true, + selModel: sm, + handler: () => me.getStore().remove(sm.getSelection()), + }, + ]; + + me.callParent(); + me.initField(); + me.mon(me.getStore(), { + datachanged: me.checkChange, + update: me.checkChange, + scope: me, + }); + me.on('itemdblclick', (grid, record) => me.editRoute(record)); + }, +}); diff --git a/www/manager6/sdn/zones/Base.js b/www/manager6/sdn/zones/Base.js index 66f93de0dff2..ebfbc953317d 100644 --- a/www/manager6/sdn/zones/Base.js +++ b/www/manager6/sdn/zones/Base.js @@ -45,6 +45,8 @@ Ext.define('PVE.panel.SDNZoneBase', { emptyText: gettext('All') + ' (' + gettext('No restrictions') + ')', multiSelect: true, autoSelect: false, + skipEmptyText: true, + deleteEmpty: !me.isCreate, }, { xtype: 'pveSDNIpamSelector', @@ -110,10 +112,26 @@ Ext.define('PVE.sdn.zones.BaseEdit', { zone: me.zone, }); + let additionalTabs = ipanel.getAdditionalTabs?.() ?? []; + let items = [ipanel]; + if (additionalTabs.length) { + ipanel.setTitle(gettext('General')); + me.width = 760; + me.bodyPadding = 0; + items = [ + { + xtype: 'tabpanel', + bodyPadding: 10, + deferredRender: false, + items: [ipanel, ...additionalTabs], + }, + ]; + } + Ext.apply(me, { subject: PVE.Utils.format_sdnzone_type(me.type), isAdd: true, - items: [ipanel], + items, }); me.callParent(); @@ -136,7 +154,7 @@ Ext.define('PVE.sdn.zones.BaseEdit', { values.enable = values.disable ? 0 : 1; - ipanel.setValues(values); + me.setValues(values); }, }); } diff --git a/www/manager6/sdn/zones/SimpleEdit.js b/www/manager6/sdn/zones/SimpleEdit.js index 9c88668bb5d6..5b80bfcdbeec 100644 --- a/www/manager6/sdn/zones/SimpleEdit.js +++ b/www/manager6/sdn/zones/SimpleEdit.js @@ -3,6 +3,18 @@ Ext.define('PVE.sdn.zones.SimpleInputPanel', { onlineHelp: 'pvesdn_zone_plugin_simple', + getAdditionalTabs: function () { + return [ + { + xtype: 'pveSDNStaticRoutes', + title: gettext('Static Routes'), + onlineHelp: this.onlineHelp, + name: 'route', + isCreate: this.isCreate, + }, + ]; + }, + onGetValues: function (values) { var me = this; -- 2.47.3