From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 6DFF01FF168 for ; Tue, 12 Nov 2024 13:33:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 58B892836A; Tue, 12 Nov 2024 13:33:44 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Tue, 12 Nov 2024 13:26:10 +0100 Message-Id: <20241112122615.88854-14-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241112122615.88854-1-s.hanreich@proxmox.com> References: <20241112122615.88854-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.242 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH pve-manager v3 13/18] firewall: add vnet to firewall options component X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Add the configuration options for vnet-level firewalls to the options component. Additionally add the new policy_forward configuration option to the datacenter-level firewall as well. Signed-off-by: Stefan Hanreich --- www/manager6/grid/FirewallOptions.js | 38 +++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/www/manager6/grid/FirewallOptions.js b/www/manager6/grid/FirewallOptions.js index 6aacb47be..fa482e0e4 100644 --- a/www/manager6/grid/FirewallOptions.js +++ b/www/manager6/grid/FirewallOptions.js @@ -2,7 +2,7 @@ Ext.define('PVE.FirewallOptions', { extend: 'Proxmox.grid.ObjectGrid', alias: ['widget.pveFirewallOptions'], - fwtype: undefined, // 'dc', 'node' or 'vm' + fwtype: undefined, // 'dc', 'node', 'vm' or 'vnet' base_url: undefined, @@ -13,14 +13,14 @@ Ext.define('PVE.FirewallOptions', { throw "missing base_url configuration"; } - if (me.fwtype === 'dc' || me.fwtype === 'node' || me.fwtype === 'vm') { - if (me.fwtype === 'node') { - me.cwidth1 = 250; - } - } else { + if (!['dc', 'node', 'vm', 'vnet'].includes(me.fwtype)) { throw "unknown firewall option type"; } + if (me.fwtype === 'node') { + me.cwidth1 = 250; + } + let caps = Ext.state.Manager.get('GuiCap'); let canEdit = caps.vms['VM.Config.Network'] || caps.dc['Sys.Modify'] || caps.nodes['Sys.Modify']; @@ -81,6 +81,7 @@ Ext.define('PVE.FirewallOptions', { 'nf_conntrack_tcp_timeout_established', 7875, 250); add_log_row('log_level_in'); add_log_row('log_level_out'); + add_log_row('log_level_forward'); add_log_row('tcp_flags_log_level', 120); add_log_row('smurf_log_level'); add_boolean_row('nftables', gettext('nftables (tech preview)'), 0); @@ -114,6 +115,9 @@ Ext.define('PVE.FirewallOptions', { defaultValue: 'enable=1', }, }; + } else if (me.fwtype === 'vnet') { + add_boolean_row('enable', gettext('Firewall'), 0); + add_log_row('log_level_forward'); } if (me.fwtype === 'dc' || me.fwtype === 'vm') { @@ -150,6 +154,28 @@ Ext.define('PVE.FirewallOptions', { }; } + if (me.fwtype === 'vnet' || me.fwtype === 'dc') { + me.rows.policy_forward = { + header: gettext('Forward Policy'), + required: true, + defaultValue: 'ACCEPT', + editor: { + xtype: 'proxmoxWindowEdit', + subject: gettext('Forward Policy'), + items: { + xtype: 'pveFirewallPolicySelector', + name: 'policy_forward', + value: 'ACCEPT', + fieldLabel: gettext('Forward Policy'), + comboItems: [ + ['ACCEPT', 'ACCEPT'], + ['DROP', 'DROP'], + ], + }, + }, + }; + } + var edit_btn = new Ext.Button({ text: gettext('Edit'), disabled: true, -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel