]> git.ipfire.org Git - ipfire-2.x.git/log
ipfire-2.x.git
4 years agoupdate-ids-ruleset: Port script to work with multiple providers.
Stefan Schantl [Fri, 2 Apr 2021 09:45:00 +0000 (11:45 +0200)] 
update-ids-ruleset: Port script to work with multiple providers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agolangs-de.pl: Fix grammar.
Stefan Schantl [Fri, 2 Apr 2021 09:24:03 +0000 (11:24 +0200)] 
langs-de.pl: Fix grammar.

Even as a native speaker, it seems german sometimes is a very difficult language......

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add code to handle the reset of a provider to it's defaults.
Stefan Schantl [Fri, 2 Apr 2021 09:21:00 +0000 (11:21 +0200)] 
ids.cgi: Add code to handle the reset of a provider to it's defaults.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Make backend code for forced ruleset update working again.
Stefan Schantl [Fri, 2 Apr 2021 09:00:17 +0000 (11:00 +0200)] 
ids.cgi: Make backend code for forced ruleset update working again.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add section for additional provider actions.
Stefan Schantl [Fri, 2 Apr 2021 08:47:55 +0000 (10:47 +0200)] 
ids.cgi: Add section for additional provider actions.

This section only will be displayed when an existing provider will be
edited and allows to reset a provider back to it's defaults or to force
a ruleset update.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Fix display issue with colum backgound colour in provider list.
Stefan Schantl [Fri, 2 Apr 2021 08:12:02 +0000 (10:12 +0200)] 
ids.cgi: Fix display issue with colum backgound colour in provider list.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Handle oinkmaster provider includes when deleting a provider.
Stefan Schantl [Fri, 2 Apr 2021 08:05:12 +0000 (10:05 +0200)] 
ids.cgi: Handle oinkmaster provider includes when deleting a provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Fix function call of get_used_provider_rulesfile_file().
Stefan Schantl [Fri, 2 Apr 2021 08:04:21 +0000 (10:04 +0200)] 
ids.cgi: Fix function call of get_used_provider_rulesfile_file().

The function is locatated in the IDS module and therefore needs to be
called from there.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add/Remove provider file include in oinkmaster providers
Stefan Schantl [Fri, 2 Apr 2021 07:35:42 +0000 (09:35 +0200)] 
ids.cgi: Add/Remove provider file include in oinkmaster providers
include file when toggeling a provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Check if the file exists bevore adding it to the
Stefan Schantl [Fri, 2 Apr 2021 07:34:28 +0000 (09:34 +0200)] 
ids-functions.pl: Check if the file exists bevore adding it to the
oinkmaster provider includes file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce alter_oinkmaster_provider_includes_file().
Stefan Schantl [Fri, 2 Apr 2021 07:13:17 +0000 (09:13 +0200)] 
ids-functions.pl: Introduce alter_oinkmaster_provider_includes_file().

This function can be used to directly modify the desired file.

It takes two arguments:
 * An action which could be "add" or "remove"
 * A provider handle, which should be added or removed.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Use get_oinkmaster_provider_modified_sids_file() function.
Stefan Schantl [Fri, 2 Apr 2021 06:06:53 +0000 (08:06 +0200)] 
ids.cgi: Use get_oinkmaster_provider_modified_sids_file() function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce get_oinkmaster_provider_modified_sids_file()
Stefan Schantl [Fri, 2 Apr 2021 06:04:46 +0000 (08:04 +0200)] 
ids-functions.pl: Introduce get_oinkmaster_provider_modified_sids_file()
function.

This function simply returns the gernerated path and filename for the
provider specific modified sids file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoIDS: Redesign backend for enabled/disabled sids in rulefiles.
Stefan Schantl [Thu, 1 Apr 2021 18:02:48 +0000 (20:02 +0200)] 
IDS: Redesign backend for enabled/disabled sids in rulefiles.

The enabled or disabled sids now will be written to an own
provider exclusive configuration file which dynamically will
be included by oinkmaster if needed.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Bring back usage of whitelist.rules and local.rules
Stefan Schantl [Thu, 1 Apr 2021 14:36:13 +0000 (16:36 +0200)] 
ids-functions.pl: Bring back usage of whitelist.rules and local.rules
files.

They now automatically will be included as static includes if the files
are present.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Use get_ruleset_date() from ids-functions.pl.
Stefan Schantl [Thu, 1 Apr 2021 14:02:50 +0000 (16:02 +0200)] 
ids.cgi: Use get_ruleset_date() from ids-functions.pl.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce get_ruleset_date() function.
Stefan Schantl [Thu, 1 Apr 2021 14:02:04 +0000 (16:02 +0200)] 
ids-functions.pl: Introduce get_ruleset_date() function.

This function is used to get the creation date of the stored rules files
of a given provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Prevent from chainging the provider when editing an existing
Stefan Schantl [Thu, 1 Apr 2021 13:48:44 +0000 (15:48 +0200)] 
ids.cgi: Prevent from chainging the provider when editing an existing
one.

This commit locks the dropdown menu for selecting a provider, in case
an existing one should be edited.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add hardcoded error message to language files.
Stefan Schantl [Thu, 1 Apr 2021 13:13:30 +0000 (15:13 +0200)] 
ids.cgi: Add hardcoded error message to language files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Fix check and message when trying to enable suricata without
Stefan Schantl [Thu, 1 Apr 2021 13:09:59 +0000 (15:09 +0200)] 
ids.cgi: Fix check and message when trying to enable suricata without
any enabled or no provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Lock the CGI when a provder will be deleted.
Stefan Schantl [Thu, 1 Apr 2021 10:02:45 +0000 (12:02 +0200)] 
ids.cgi: Lock the CGI when a provder will be deleted.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Drop old code to handle the settings of the ruleset section.
Stefan Schantl [Thu, 1 Apr 2021 09:55:40 +0000 (11:55 +0200)] 
ids.cgi: Drop old code to handle the settings of the ruleset section.

This entirely has been replaced by the providers section and the code to
handle the actions of this section.

Therefore this code is not longer needed.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Finish code to handle the removal of a provider from the list.
Stefan Schantl [Thu, 1 Apr 2021 09:50:44 +0000 (11:50 +0200)] 
ids.cgi: Finish code to handle the removal of a provider from the list.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Finish code to handle toggeling a provider enabled/disabled.
Stefan Schantl [Thu, 1 Apr 2021 09:46:11 +0000 (11:46 +0200)] 
ids.cgi: Finish code to handle toggeling a provider enabled/disabled.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoIDS: Redesign backend for used provider rulesfiles.
Stefan Schantl [Thu, 1 Apr 2021 09:39:57 +0000 (11:39 +0200)] 
IDS: Redesign backend for used provider rulesfiles.

The selected rulesfiles of a provider now will be written to an own
provider exclusive yaml file, which will be included dynamically when
the provider is enabled or not.

This allows very easy handling to enable or disable a provider, in this
case the file which keeps the enabled providers rulesets only needs to
be included in the main file or even not.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add action if a new provider is added.
Stefan Schantl [Wed, 31 Mar 2021 11:41:28 +0000 (13:41 +0200)] 
ids.cgi: Add action if a new provider is added.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce move_tmp_ruleset() function.
Stefan Schantl [Wed, 31 Mar 2021 11:39:43 +0000 (13:39 +0200)] 
ids-functions.pl: Introduce move_tmp_ruleset() function.

This function is used to move an extracted temporary ruleset to
the rules location.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Fix another typo.
Stefan Schantl [Wed, 31 Mar 2021 10:31:18 +0000 (12:31 +0200)] 
ids-functions.pl: Fix another typo.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Remove accidently commited debug code.
Stefan Schantl [Wed, 31 Mar 2021 10:22:17 +0000 (12:22 +0200)] 
ids-functions.pl: Remove accidently commited debug code.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Rework oinkmaster() to use get_enabled_providers
Stefan Schantl [Wed, 31 Mar 2021 10:21:41 +0000 (12:21 +0200)] 
ids-functions.pl: Rework oinkmaster() to use get_enabled_providers
function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce get_enabled_providers() function.
Stefan Schantl [Wed, 31 Mar 2021 10:16:24 +0000 (12:16 +0200)] 
ids-functions.pl: Introduce get_enabled_providers() function.

This function simply returns an array with all enabled ruleset
providers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Fix typo.
Stefan Schantl [Wed, 31 Mar 2021 10:16:01 +0000 (12:16 +0200)] 
ids-functions.pl: Fix typo.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Use get_used_rulesfiles function from ids-functions.pl.
Stefan Schantl [Wed, 31 Mar 2021 10:02:27 +0000 (12:02 +0200)] 
ids.cgi: Use get_used_rulesfiles function from ids-functions.pl.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce get_used_rulesfiles() function.
Stefan Schantl [Wed, 31 Mar 2021 10:01:22 +0000 (12:01 +0200)] 
ids-functions.pl: Introduce get_used_rulesfiles() function.

This function simply returns an array which contains the used rulesfiles
files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce drop_dl_rulesfile().
Stefan Schantl [Wed, 31 Mar 2021 09:26:24 +0000 (11:26 +0200)] 
ids-functions.pl: Introduce drop_dl_rulesfile().

This tiny function is used, to delete the stored rulesfile in case a
provider will be deleted.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Rework function for modify-sid file to be more
Stefan Schantl [Wed, 31 Mar 2021 08:49:19 +0000 (10:49 +0200)] 
ids-functions.pl: Rework function for modify-sid file to be more
generic.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Add cleanup_tmp_directory() function.
Stefan Schantl [Wed, 31 Mar 2021 08:45:14 +0000 (10:45 +0200)] 
ids-functions.pl: Add cleanup_tmp_directory() function.

As the name of the function already says, it is responsible to
delete all temporary files after ruleset generation.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Remove config files on rulesdir cleanup.
Stefan Schantl [Mon, 29 Mar 2021 14:53:52 +0000 (16:53 +0200)] 
ids-functions.pl: Remove config files on rulesdir cleanup.

They every time oinkmaster is called will be generated.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Rework oinkmaster() function.
Stefan Schantl [Mon, 29 Mar 2021 14:51:18 +0000 (16:51 +0200)] 
ids-functions.pl: Rework oinkmaster() function.

Rework the function to work with the latest changes and multiple
providers.

The function now does the following:

* Extract the stored rules tarballs for all enabled providers.
* Copy rules files for enabled providers which provide plain files.
* Still calls oinkmaster to set up the rules and modify them.
* Calls the merge functions for classification and sid to msg files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Assign temporary rules and conf path to variables.
Stefan Schantl [Mon, 29 Mar 2021 13:50:04 +0000 (15:50 +0200)] 
ids-functions.pl: Assign temporary rules and conf path to variables.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce merge_sid_msg() function.
Stefan Schantl [Mon, 29 Mar 2021 13:27:42 +0000 (15:27 +0200)] 
ids-functions.pl: Introduce merge_sid_msg() function.

This function is used to merge the sid to message mapping files
from various providers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Fix typo.
Stefan Schantl [Sun, 28 Mar 2021 10:49:56 +0000 (12:49 +0200)] 
ids-functions.pl: Fix typo.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce merge_classifications() function.
Stefan Schantl [Sun, 28 Mar 2021 10:47:23 +0000 (12:47 +0200)] 
ids-functions.pl: Introduce merge_classifications() function.

This function is used to merge the individual classification files
provided by the providers.

The result will be written to the classification.config which will be
used by the IDS.

Fixes #11884.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce extraceruleset() function.
Stefan Schantl [Sat, 27 Mar 2021 11:07:45 +0000 (12:07 +0100)] 
ids-functions.pl: Introduce extraceruleset() function.

This function is used to extract the required config and rules files
from the stored rules tarball for a given ruleset provider.

* The files will be extracted to a temporary directory layout in
  "/tmp/ids_tmp".

* Names of config files will be adjusted in case multiple providers
  offers the same config files, which is very common.

* The name of the single rulefiles will be adjusted to start with
  the vendors name to allow assigning them very easily to a single
  ruleset provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Always delete temporary file.
Stefan Schantl [Sat, 27 Mar 2021 11:07:13 +0000 (12:07 +0100)] 
ids-functions.pl: Always delete temporary file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Fix typo.
Stefan Schantl [Sat, 27 Mar 2021 11:06:44 +0000 (12:06 +0100)] 
ids-functions.pl: Fix typo.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoruleset-sources: Rename file to plain.
Stefan Schantl [Fri, 26 Mar 2021 12:27:48 +0000 (13:27 +0100)] 
ruleset-sources: Rename file to plain.

This is used if a provider offers a plain rulefile instead an archive.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Allow downloadruleset() function to deal with
Stefan Schantl [Fri, 26 Mar 2021 12:24:26 +0000 (13:24 +0100)] 
ids-functions.pl: Allow downloadruleset() function to deal with
multiple ruleset providers.

When calling the function now a single ruleset provider handle
can be specified to only download this ruleset or by adding "all" or
leaving the handle blank a download of all configured rulesets can be
triggered.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce private _get_dl_rulesfile() function.
Stefan Schantl [Fri, 26 Mar 2021 12:19:58 +0000 (13:19 +0100)] 
ids-functions.pl: Introduce private _get_dl_rulesfile() function.

This function can be used to generate/get the absolute file and path
for a given ruleset provider.

The files will be stored in the usual "/var/tmp" folder with a new
file format based on the dl_file type and the provider.

Examples could be:
* /var/ipfire/idsrules-emerging.tar.gz
* /var/ipfire/idsrules-registered.tar.gz
* /var/ipfire/idsrules-somprovider.rules

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Run in perl strict mode.
Stefan Schantl [Fri, 26 Mar 2021 12:17:59 +0000 (13:17 +0100)] 
ids-functions.pl: Run in perl strict mode.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoruleset-sources: Fix website url for community ruleset.
Stefan Schantl [Fri, 26 Mar 2021 12:16:40 +0000 (13:16 +0100)] 
ruleset-sources: Fix website url for community ruleset.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoruleset-sources: Replace subscription code placeholder.
Stefan Schantl [Fri, 26 Mar 2021 12:15:04 +0000 (13:15 +0100)] 
ruleset-sources: Replace subscription code placeholder.

Replace the <oinkcode> placeholder by the more generic
<subscription_code>.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add code to handle enable/disable a provider.
Stefan Schantl [Tue, 23 Mar 2021 16:42:07 +0000 (17:42 +0100)] 
ids.cgi: Add code to handle enable/disable a provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add code to handle enable/disable autoupdate for a provider.
Stefan Schantl [Tue, 23 Mar 2021 16:40:44 +0000 (17:40 +0100)] 
ids.cgi: Add code to handle enable/disable autoupdate for a provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Fix type in method.
Stefan Schantl [Tue, 23 Mar 2021 16:40:12 +0000 (17:40 +0100)] 
ids.cgi: Fix type in method.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Remove accidently commited commented code snipped.
Stefan Schantl [Tue, 23 Mar 2021 16:39:32 +0000 (17:39 +0100)] 
ids.cgi: Remove accidently commited commented code snipped.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Correctly use "enabled" for checked checkboxes.
Stefan Schantl [Tue, 23 Mar 2021 16:38:26 +0000 (17:38 +0100)] 
ids.cgi: Correctly use "enabled" for checked checkboxes.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Read-in providers settings file when neccessary.
Stefan Schantl [Tue, 23 Mar 2021 16:37:33 +0000 (17:37 +0100)] 
ids.cgi: Read-in providers settings file when neccessary.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add code to add/edit a ruleset provider.
Stefan Schantl [Tue, 23 Mar 2021 15:20:52 +0000 (16:20 +0100)] 
ids.cgi: Add code to add/edit a ruleset provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoUpdate language files.
Stefan Schantl [Tue, 23 Mar 2021 15:20:17 +0000 (16:20 +0100)] 
Update language files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Introduce providers_settings_file.
Stefan Schantl [Tue, 23 Mar 2021 13:58:09 +0000 (14:58 +0100)] 
ids-functions.pl: Introduce providers_settings_file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Rework rulesetsettings section.
Stefan Schantl [Tue, 23 Mar 2021 13:56:11 +0000 (14:56 +0100)] 
ids.cgi: Rework rulesetsettings section.

* The page and section now supports multiple ruleset providers at once.
* Adding / Editing a ruleset provider has been moved to a own sub-page.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoruleset-sources: Fix website details for emergingthreats provider.
Stefan Schantl [Tue, 23 Mar 2021 11:39:13 +0000 (12:39 +0100)] 
ruleset-sources: Fix website details for emergingthreats provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Move configuration of ruleset autoupdate intervall to IDS main
Stefan Schantl [Mon, 22 Mar 2021 15:27:33 +0000 (16:27 +0100)] 
ids.cgi: Move configuration of ruleset autoupdate intervall to IDS main
section.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Stop showing ruleset date on customize rulest sub-page.
Stefan Schantl [Mon, 22 Mar 2021 13:42:42 +0000 (14:42 +0100)] 
ids.cgi: Stop showing ruleset date on customize rulest sub-page.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add "Back" button to customize ruleset sub-page.
Stefan Schantl [Mon, 22 Mar 2021 10:48:58 +0000 (11:48 +0100)] 
ids.cgi: Add "Back" button to customize ruleset sub-page.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Move / Splitt main page and customize ruleset subpage.
Stefan Schantl [Sun, 21 Mar 2021 20:41:42 +0000 (21:41 +0100)] 
ids.cgi: Move / Splitt main page and customize ruleset subpage.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Only read-in ruleset if neccessary.
Stefan Schantl [Sun, 21 Mar 2021 16:22:29 +0000 (17:22 +0100)] 
ids.cgi: Only read-in ruleset if neccessary.

This process takes some time, especially on huge rulesets.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Add button to customize the ruleset.
Stefan Schantl [Sun, 21 Mar 2021 16:17:05 +0000 (17:17 +0100)] 
ids.cgi: Add button to customize the ruleset.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Introduce and use get_provider_name() function.
Stefan Schantl [Sat, 20 Mar 2021 17:07:57 +0000 (18:07 +0100)] 
ids.cgi: Introduce and use get_provider_name() function.

This function is used to grab the name of a provider by the given
handle.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Move the section to customize the IDS ruleset to a function.
Stefan Schantl [Sat, 20 Mar 2021 15:58:11 +0000 (16:58 +0100)] 
ids.cgi: Move the section to customize the IDS ruleset to a function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Remove unused rulesetsources hashes.
Stefan Schantl [Sat, 20 Mar 2021 15:54:37 +0000 (16:54 +0100)] 
ids.cgi: Remove unused rulesetsources hashes.

They have been superseeded by the new ruleset sources file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Require ruleset-sources file for provider details.
Stefan Schantl [Sat, 20 Mar 2021 14:57:51 +0000 (15:57 +0100)] 
ids-functions.pl: Require ruleset-sources file for provider details.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids.cgi: Make CGI work with new ruleset-sources file.
Stefan Schantl [Fri, 19 Mar 2021 20:28:00 +0000 (21:28 +0100)] 
ids.cgi: Make CGI work with new ruleset-sources file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Add get_ruleset_providers() function.
Stefan Schantl [Fri, 19 Mar 2021 20:27:23 +0000 (21:27 +0100)] 
ids-functions.pl: Add get_ruleset_providers() function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoids-functions.pl: Make downloader work with new ruleset-sources file
Stefan Schantl [Fri, 19 Mar 2021 20:26:44 +0000 (21:26 +0100)] 
ids-functions.pl: Make downloader work with new ruleset-sources file
format.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoruleset-sources: Rework file format and data.
Stefan Schantl [Fri, 19 Mar 2021 20:24:36 +0000 (21:24 +0100)] 
ruleset-sources: Rework file format and data.

The file now contains a lot more of data and easily can be extended
to provide more and new providers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
Stefan Schantl [Sun, 19 Dec 2021 12:19:03 +0000 (13:19 +0100)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

4 years agoCore Update 163: Ship updated CA certificates
Peter Müller [Sun, 19 Dec 2021 10:40:17 +0000 (11:40 +0100)] 
Core Update 163: Ship updated CA certificates

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
4 years agoupdate ca-certificates CA bundle
Peter Müller [Sat, 18 Dec 2021 13:01:09 +0000 (14:01 +0100)] 
update ca-certificates CA bundle

Update the CA certificates list to what Mozilla NSS ships currently.

The original file can be retrieved from:
https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
4 years agoTor: update to 0.4.6.9
Peter Müller [Sat, 18 Dec 2021 16:23:58 +0000 (17:23 +0100)] 
Tor: update to 0.4.6.9

Full changelog as per https://gitweb.torproject.org/tor.git/plain/ChangeLog:

Changes in version 0.4.6.9 - 2021-12-15
  This version fixes several bugs from earlier versions of Tor. One important
  piece is the removal of DNS timeout metric from the overload general signal.
  See below for more details.

  o Major bugfixes (relay, overload):
    - Don't make Tor DNS timeout trigger an overload general state.
      These timeouts are different from DNS server timeout. They have to
      be seen as timeout related to UX and not because of a network
      problem. Fixes bug 40527; bugfix on 0.4.6.1-alpha.

  o Minor feature (reproducible build):
    - The repository can now build reproducible tarballs which adds the
      build command "make dist-reprod" for that purpose. Closes
      ticket 26299.

  o Minor features (compilation):
    - Give an error message if trying to build with a version of
      LibreSSL known not to work with Tor. (There's an incompatibility
      with LibreSSL versions 3.2.1 through 3.4.0 inclusive because of
      their incompatibility with OpenSSL 1.1.1's TLSv1.3 APIs.) Closes
      ticket 40511.

  o Minor features (fallbackdir):
    - Regenerate fallback directories generated on December 15, 2021.

  o Minor features (geoip data):
    - Update the geoip files to match the IPFire Location Database, as
      retrieved on 2021/12/15.

  o Minor bugfixes (compilation):
    - Fix our configuration logic to detect whether we had OpenSSL 3:
      previously, our logic was reversed. This has no other effect than
      to change whether we suppress deprecated API warnings. Fixes bug
      40429; bugfix on 0.3.5.13.

  o Minor bugfixes (relay):
    - Reject IPv6-only DirPorts. Our reachability self-test forces
      DirPorts to be IPv4, but our configuration parser allowed them to
      be IPv6-only, which led to an assertion failure. Fixes bug 40494;
      bugfix on 0.4.5.1-alpha.

  o Documentation (man, relay):
    - Missing "OverloadStatistics" in tor.1 manpage. Fixes bug 40504;
      bugfix on 0.4.6.1-alpha.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
4 years agoMerge branch 'next' into temp-c163-development
Peter Müller [Fri, 17 Dec 2021 10:30:41 +0000 (11:30 +0100)] 
Merge branch 'next' into temp-c163-development

4 years agosuricata: Do not load rules for dnp3 and modbus. v2.27-core162
Stefan Schantl [Thu, 16 Dec 2021 19:23:36 +0000 (20:23 +0100)] 
suricata: Do not load rules for dnp3 and modbus.

The parsers for those are disabled in the suricata config so
the rules are not needed, on the contrary they massively will spam
warnings when launching suricate because of the disabled parsers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agosuricata: Do not load rules for dnp3 and modbus.
Stefan Schantl [Thu, 16 Dec 2021 19:04:41 +0000 (20:04 +0100)] 
suricata: Do not load rules for dnp3 and modbus.

The parsers for those are disabled in the suricata config so
the rules are not needed, on the contrary they massively will spam
warnings when launching suricate because of the disabled parsers.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
4 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
Stefan Schantl [Thu, 16 Dec 2021 19:00:18 +0000 (20:00 +0100)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

4 years agoCore Update 163: Ship backup.pl
Peter Müller [Tue, 14 Dec 2021 13:40:58 +0000 (14:40 +0100)] 
Core Update 163: Ship backup.pl

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
4 years agobackup: Fork ISO job into the background in CGI script
Michael Tremer [Thu, 2 Dec 2021 12:37:15 +0000 (12:37 +0000)] 
backup: Fork ISO job into the background in CGI script

In order to be able to run the ISO command on command line it is helpful
that the script does not go into background halfway through the process.

We should rather start it as a background job straight from the CGI
script.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
4 years agobackup: Create tarball in one pass
Michael Tremer [Thu, 2 Dec 2021 12:37:14 +0000 (12:37 +0000)] 
backup: Create tarball in one pass

This patch is changing the behaviour of the backup script so that it
creates one tarball and compresses it in one go.

This will save storing the original tarball on disk before compressing
it which on my test system requires significant disk space.

This patch also solves a bug where the backup file included with the ISO
image could not be extracted because it was not gzip-compressed when it
was expected to be.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
4 years agobackup: Use filename as specified on console
Michael Tremer [Thu, 2 Dec 2021 12:37:13 +0000 (12:37 +0000)] 
backup: Use filename as specified on console

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
4 years agoCore Update 163: Ship libloc
Peter Müller [Tue, 14 Dec 2021 09:46:25 +0000 (10:46 +0100)] 
Core Update 163: Ship libloc

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
4 years agolibloc: Update to 0.9.9
Peter Müller [Mon, 13 Dec 2021 19:09:13 +0000 (20:09 +0100)] 
libloc: Update to 0.9.9

Please refer to https://lists.ipfire.org/pipermail/location/2021-November/000483.html
for this versions' release announcement.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
4 years agoCore Update 163: Ship and restart Unbound
Peter Müller [Mon, 13 Dec 2021 11:54:19 +0000 (12:54 +0100)] 
Core Update 163: Ship and restart Unbound

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
4 years agounbound: Update to 1.14.0
Matthias Fischer [Sat, 11 Dec 2021 07:38:17 +0000 (08:38 +0100)] 
unbound: Update to 1.14.0

For details see:
https://nlnetlabs.nl/projects/unbound/download/#unbound-1-14-0

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
4 years agoMerge branch 'next' into temp-c163-development
Peter Müller [Mon, 13 Dec 2021 11:51:26 +0000 (12:51 +0100)] 
Merge branch 'next' into temp-c163-development

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
4 years agosuricata: Disable sid 2210059.
Stefan Schantl [Wed, 8 Dec 2021 17:18:05 +0000 (18:18 +0100)] 
suricata: Disable sid 2210059.

This rule emits a massive logspam and temporary will be disabled until
a better solution is found.

Fixes #12738.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agosuricata: Cleanup default loaded rules file.
Stefan Schantl [Wed, 8 Dec 2021 17:10:31 +0000 (18:10 +0100)] 
suricata: Cleanup default loaded rules file.

There are no such rules file available and therefore cannot be loaded.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agosuricata: Move default loaded rulefiles to own included file.
Stefan Schantl [Wed, 8 Dec 2021 17:10:30 +0000 (18:10 +0100)] 
suricata: Move default loaded rulefiles to own included file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agopcengines-apu-firmware: Update to version 4.15.0.1
Adolf Belka [Mon, 6 Dec 2021 17:01:32 +0000 (18:01 +0100)] 
pcengines-apu-firmware: Update to version 4.15.0.1

- Update from 4.14.0.4 to 4.15.0.1
- Update of rootfile
- Changelog
    v4.15.0.1
        rebased with official coreboot repository commit 6973a3e7
    v4.14.0.6
        rebased with official coreboot repository commit d06c0917
        Re-added GPIO bindings to fix LED and button functionality
    v4.14.0.5
        rebased with official coreboot repository commit d4c55353
        Updated CPU declarations in ACPI to comply with newer ACPI standard
        Removed GPIO bindings to fix conflict with OS drivers

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agomanualpages: Complete the list of user manual pages
Jon Murphy [Sat, 4 Dec 2021 23:46:20 +0000 (00:46 +0100)] 
manualpages: Complete the list of user manual pages

Jon Murphy gathered all the links and made the updated file
available on the mailing list:
https://lists.ipfire.org/pipermail/development/2021-October/011383.html
https://lists.ipfire.org/pipermail/development/2021-December/011737.html

With kind permission from him, this patch contains the completed list.
The list was successfully checked with "./make.sh check-manualpages".

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Reported-by: Jon Murphy <jcmurphy26@gmail.com>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoCore Update 163: Ship pango, harfbuzz and fribidi
Peter Müller [Thu, 9 Dec 2021 20:08:54 +0000 (21:08 +0100)] 
Core Update 163: Ship pango, harfbuzz and fribidi

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>