From patchwork Fri Mar 22 05:01:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 7658 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4V19D62ZP4z3wkd for ; Fri, 22 Mar 2024 05:01:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4V19D35qFGz10q; Fri, 22 Mar 2024 05:01:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4V19D33crWz32v1; Fri, 22 Mar 2024 05:01:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4V19D06ckTz30Gb for ; Fri, 22 Mar 2024 05:01:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4V19Cz6G2GzN4; Fri, 22 Mar 2024 05:01:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1711083712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8sK+1uvuLZlyM+SYDhmRxbBk2fHDCDEpbR4aQu/4k0g=; b=0GaHIpNoKEyvRSHgSZYPSOfzkOtYHOpLInzy+JJRol7+aNoTVdnDiMTWYDjFwEPgGEKr02 n6CLzkyOqz8W//Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1711083712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8sK+1uvuLZlyM+SYDhmRxbBk2fHDCDEpbR4aQu/4k0g=; b=RtBw1AB4v9cDZexr4E93SgnNhPnJQjOjQGX8m+wDKa1J749PV17Sztp4yloVKiCsrWg3wq mZuuPpNmcZSoJjDnRxoVsiB1UKZxTGuCoQCudjYlgsBhd0bdoFVgoN1B+SdpQTBfMAilyh wmNIYoT/aDse12R6NHDOiEBHHsdWwjbyrkgSg2Tv6I87j9huH1uy30HBSk/s338aLhjjC5 thZNuvVlahpw4r9+jUmRIEmvFxKH7mErYYebBjS4Gvg10698veNldlOdizJl190u9NYq7l vVlkG1Hjqr53OO7IQg9zafidkktb54c7MuRIxzDcCvIdplXff7zBDb7RSJg0iw== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] ids.cgi: Improve add provider logic Date: Fri, 22 Mar 2024 06:01:45 +0100 Message-Id: <20240322050145.3155-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 4X2EPNX3HNLYKX3PEDW27CWIDZAXY4KC X-Message-ID-Hash: 4X2EPNX3HNLYKX3PEDW27CWIDZAXY4KC X-MailFrom: stefan.schantl@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Do not longer add unsupported/removed providers as an option when adding a new/first ruleset provider. Signed-off-by: Stefan Schantl --- html/cgi-bin/ids.cgi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 2d4ac6fc3..edab97195 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -1711,6 +1711,12 @@ END # Grab the provider handle. my $provider = $tmphash{$provider_name}; + # Check if we are not in edit mode. + if ($cgiparams{'PROVIDERS'} ne "$Lang::tr{'edit'}") { + # Skip unsupported ruleset provider. + next unless(exists($IDS::Ruleset::Providers{$provider}{"dl_url"})); + } + # Pre-select the provider if one is given. if (($used_providers{$cgiparams{'ID'}}[0] eq "$provider") || ($cgiparams{'PROVIDER'} eq "$provider")) { $selected{$provider} = "selected='selected'";