]> git.ipfire.org Git - people/ummeegge/ipfire-2.x.git/log
people/ummeegge/ipfire-2.x.git
6 years agoids.cgi: Introduce whitelisting of IP-addresses
Stefan Schantl [Tue, 11 Sep 2018 08:21:00 +0000 (10:21 +0200)] 
ids.cgi: Introduce whitelisting of IP-addresses

If an IP-address has been added to the whitelist, any traffic from
this host will not longer inspected by suricata.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agoupdate disclaimer in LFS files
Peter Müller [Mon, 10 Sep 2018 17:52:21 +0000 (19:52 +0200)] 
update disclaimer in LFS files

Most of these files still used old dates and/or domain names for contact
mail addresses. This is now replaced by an up-to-date copyright line.

Just some housekeeping... :-)

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agocore124: Ship CA certificates
Michael Tremer [Mon, 10 Sep 2018 17:23:27 +0000 (18:23 +0100)] 
core124: Ship CA certificates

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agoupdate ca-certificates CA bundle
Peter Müller [Mon, 10 Sep 2018 16:25:40 +0000 (18:25 +0200)] 
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@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agouse custom SSH client configuration in LFS file
Peter Müller [Mon, 10 Sep 2018 14:29:09 +0000 (16:29 +0200)] 
use custom SSH client configuration in LFS file

Include OpenSSH client configuration file during build.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agoadd hardened SSH client configuration
Peter Müller [Mon, 10 Sep 2018 14:29:08 +0000 (16:29 +0200)] 
add hardened SSH client configuration

Introduce a custom OpenSSH client configuration file for IPFire.
Some people use it as a jumping host, so applying hardening options
system-wide improves security.

Cryptography setup is the same as for OpenSSH server configuration.

The second version of this patch re-adds some non-AEAD cipher suites
which are needed for connecting to older RHEL systems.

Partially fixes #11751

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agocore124: Ship updated unbound configuration and restart daemon
Michael Tremer [Mon, 10 Sep 2018 15:35:25 +0000 (16:35 +0100)] 
core124: Ship updated unbound configuration and restart daemon

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agoUnbound: Use aggressive NSEC
Peter Müller [Mon, 10 Sep 2018 14:21:26 +0000 (16:21 +0200)] 
Unbound: Use aggressive NSEC

This avoids some needless lookups to destination domains
with a very high NXDOMAIN rate and reduces load on upstream
servers.

See https://nlnetlabs.nl/documentation/unbound/unbound.conf/
for further details.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agoUnbound: Use caps for IDs
Peter Müller [Mon, 10 Sep 2018 14:21:25 +0000 (16:21 +0200)] 
Unbound: Use caps for IDs

Attempt to detect DNS spoofing attacks by inserting 0x20-encoded
random bits into upstream queries. Upstream documentation claims
it to be an experimental implementation, it did not cause any trouble
on productive systems here.

See https://nlnetlabs.nl/documentation/unbound/unbound.conf/ for
further details.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agoUnbound: Enable DNS cache poisoning mitigation
Peter Müller [Mon, 10 Sep 2018 14:21:24 +0000 (16:21 +0200)] 
Unbound: Enable DNS cache poisoning mitigation

By default, Unbound neither keeps track of the number of unwanted
replies nor initiates countermeasures if they become too large (DNS
cache poisoning).

This sets the maximum number of tolerated unwanted replies to
1M, causing the cache to be flushed afterwards. (Upstream documentation
recommends 10M as a threshold, but this turned out to be ineffective
against attacks in the wild.)

See https://nlnetlabs.nl/documentation/unbound/unbound.conf/ for
details. This version of the patch uses 1M as threshold instead of
5M and supersedes the first and second version.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agocore124: Ship updated redirect page template
Michael Tremer [Mon, 10 Sep 2018 15:30:52 +0000 (16:30 +0100)] 
core124: Ship updated redirect page template

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agoembed background image in redirect template
Peter Müller [Mon, 10 Sep 2018 14:15:44 +0000 (16:15 +0200)] 
embed background image in redirect template

Embed the IPFire background image into the redirect template
directly via CSS instead of loading it from somewhere else.
This is necessary because of Content Security Policy (CSP).

This patch inserts the base64 encoded image during build so
nothing needs to be updated twice in case background image
changes.

It supersedes first to fourth version of this patch and has
been successfully tested during a clean build.

Fixes #11650

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agocore124: Rebuild initrd
Michael Tremer [Sun, 9 Sep 2018 17:27:56 +0000 (18:27 +0100)] 
core124: Rebuild initrd

This script was missing in the last update and therefore
no microcodes were included.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agocore124: Apply changed sysctl.conf
Michael Tremer [Sun, 9 Sep 2018 16:48:14 +0000 (17:48 +0100)] 
core124: Apply changed sysctl.conf

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agodo not expose kernel address spaces even to privileged users
Peter Müller [Thu, 16 Aug 2018 15:29:58 +0000 (17:29 +0200)] 
do not expose kernel address spaces even to privileged users

Change this setting from 1 to 2 so kernel addresses are not
displayed even if a user has CAPS_SYSLOG privileges.

See also:
- https://lwn.net/Articles/420403/
- https://tails.boum.org/contribute/design/kernel_hardening/

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agocore124: Ship updated rng-tools
Michael Tremer [Sun, 9 Sep 2018 16:43:53 +0000 (17:43 +0100)] 
core124: Ship updated rng-tools

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agorng-tools: Update to 6.4
Michael Tremer [Sun, 9 Sep 2018 16:42:17 +0000 (17:42 +0100)] 
rng-tools: Update to 6.4

Also add a patch that keeps RDRAND enabled on i586

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Fixes: #11853
6 years agologs.cgi/ids.dat: Dont display/export empty events.
Stefan Schantl [Thu, 6 Sep 2018 11:28:20 +0000 (13:28 +0200)] 
logs.cgi/ids.dat: Dont display/export empty events.

Check if the current processed event has at least datetime and a title.
Otherwise skip it.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agologs.cgi/ids.dat: Ease list of reported events
Stefan Schantl [Thu, 6 Sep 2018 11:22:18 +0000 (13:22 +0200)] 
logs.cgi/ids.dat: Ease list of reported events

Just ease the strict layout by adding a simple line break.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agologs.cgi/ids.dat: Adjust code to show suricata events
Stefan Schantl [Thu, 6 Sep 2018 10:09:34 +0000 (12:09 +0200)] 
logs.cgi/ids.dat: Adjust code to show suricata events

As default show the events generated by suricata and if
for a certain selected date no suricata log is available
try to fall-back to read the events from the old snort
alert files (if available).

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agoaws: Don't update the system on first boot
Michael Tremer [Fri, 31 Aug 2018 10:08:53 +0000 (11:08 +0100)] 
aws: Don't update the system on first boot

This will violate AWS policy and therefore had to be removed.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
6 years agoids.cgi: Hide rules config section if no rules a present
Stefan Schantl [Thu, 30 Aug 2018 16:18:26 +0000 (18:18 +0200)] 
ids.cgi: Hide rules config section if no rules a present

Do not show the rules config section anymore if there is not
ruleset available.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agoEnable threshold file in suricata.yaml
Stefan Schantl [Thu, 30 Aug 2018 13:12:29 +0000 (15:12 +0200)] 
Enable threshold file in suricata.yaml

Enable and specify the path to the threshold-file in the suricata.yaml,
otherwise the programm is trying to read it from a build-in default
location and prints the following error message:

Error opening file: "/etc/suricata//threshold.config": No such file or directory

Fixes #11837.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agosuricata: Add files to be backuped
Stefan Schantl [Thu, 30 Aug 2018 12:13:37 +0000 (14:13 +0200)] 
suricata: Add files to be backuped

Now all oinkmaster related config files and suricata
related yaml files in "/var/ipfire/suricata/" will be
included into the backups.

Also the entire ruleset is part of the backup, so after a
backup has been restored, the IDS can be used in the same way
as before.

Fixes #11835.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agosuricata: Rule files are now located in /var/lib/suricata
Stefan Schantl [Wed, 29 Aug 2018 10:34:08 +0000 (12:34 +0200)] 
suricata: Rule files are now located in /var/lib/suricata

Place the rulefiles from now in "/var/lib/suricata".

Fixes #11834

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agosuricata: Do not ship an example configuration file
Stefan Schantl [Wed, 29 Aug 2018 10:27:12 +0000 (12:27 +0200)] 
suricata: Do not ship an example configuration file

Stop shipping a full example configuration file for suricata.

Fixes #11836.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agoids.cgi: Create file for used rulefiles on first execution if not present
Stefan Schantl [Wed, 29 Aug 2018 09:50:59 +0000 (11:50 +0200)] 
ids.cgi: Create file for used rulefiles on first execution if not present

Create this file on first execution of the script if it does not exist yet.
This will allow suricata to imediately be started. Otherwise the ruleset has
to be downloaded and configured before this file has been created and suricata
could be launched.

Fixes #11833.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agoids.cgi: Fix get_memory_usage()
Stefan Schantl [Wed, 29 Aug 2018 08:55:32 +0000 (10:55 +0200)] 
ids.cgi: Fix get_memory_usage()

Change the get_memory_usage() function to grab and return the
memory usage of the entire process, containing all sub-processes and
threads.

Fixes #11821

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
6 years agoMerge branch 'master' into next
Arne Fitzenreiter [Wed, 29 Aug 2018 05:43:06 +0000 (07:43 +0200)] 
Merge branch 'master' into next

6 years agokernel: fix dtb handling
Arne Fitzenreiter [Tue, 28 Aug 2018 10:39:08 +0000 (12:39 +0200)] 
kernel: fix dtb handling

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
7 years agoids-functions.pl: Early abort downloadruleset() if no ruleset is configured
Stefan Schantl [Mon, 27 Aug 2018 13:11:28 +0000 (15:11 +0200)] 
ids-functions.pl: Early abort downloadruleset() if no ruleset is configured

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agocore124: Ship latest pakfire changes
Michael Tremer [Mon, 27 Aug 2018 06:34:28 +0000 (07:34 +0100)] 
core124: Ship latest pakfire changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agopakfire: Remove any reference to counter.py
Michael Tremer [Mon, 27 Aug 2018 06:29:19 +0000 (07:29 +0100)] 
pakfire: Remove any reference to counter.py

The concept has been retired a very log time ago
and the web service only responds with 200 what ever
it is being sent.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agopakfire: Remove mirror health check
Michael Tremer [Mon, 27 Aug 2018 06:23:03 +0000 (07:23 +0100)] 
pakfire: Remove mirror health check

This is not really necessary because pakfire will automatically
failover to the next mirror anyways and that a mirror responds
to an ICMP echo request doesn't necessarily mean that it can
deliver the requested file.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoids-functions.pl: Also check and fix the permissions of rulespath
Stefan Schantl [Sat, 25 Aug 2018 13:48:58 +0000 (15:48 +0200)] 
ids-functions.pl: Also check and fix the permissions of rulespath

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agosuricata: Fix rootfile
Stefan Schantl [Sat, 25 Aug 2018 13:22:53 +0000 (15:22 +0200)] 
suricata: Fix rootfile

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoMerge branch 'core123' of git.ipfire.org:/pub/git/ipfire-2.x into core123
Arne Fitzenreiter [Fri, 24 Aug 2018 18:22:05 +0000 (20:22 +0200)] 
Merge branch 'core123' of git.ipfire.org:/pub/git/ipfire-2.x into core123

7 years agointel-microcode: update to 20180807a
Arne Fitzenreiter [Fri, 24 Aug 2018 18:19:29 +0000 (20:19 +0200)] 
intel-microcode: update to 20180807a

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
7 years agolfs/suricata: Move classification and reference config to /etc/suricata/rules
Stefan Schantl [Fri, 24 Aug 2018 13:15:09 +0000 (15:15 +0200)] 
lfs/suricata: Move classification and reference config to /etc/suricata/rules

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoids-functions.pl: Add priviate function _check_rulesdir_permissions()
Stefan Schantl [Fri, 24 Aug 2018 12:55:40 +0000 (14:55 +0200)] 
ids-functions.pl: Add priviate function _check_rulesdir_permissions()

This function checks if all files located in /etc/suricata/rules are
writable by the effective user and group (nobody:nobody) and if not
calls suricatactl to fix it.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agosuricatactrl: Add fix-rules-dir command
Stefan Schantl [Fri, 24 Aug 2018 12:54:34 +0000 (14:54 +0200)] 
suricatactrl: Add fix-rules-dir command

This command is used to set the ownership and permissions
back to nobody:nobdoy which is used by the WUI to write the
ruleset.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agosuricatactrl: Add reload command
Stefan Schantl [Fri, 24 Aug 2018 12:26:24 +0000 (14:26 +0200)] 
suricatactrl: Add reload command

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agosuricata.yaml: Start moving to IPFire specific configuration
Stefan Schantl [Fri, 24 Aug 2018 09:11:15 +0000 (11:11 +0200)] 
suricata.yaml: Start moving to IPFire specific configuration

Remove a lot of stuff and options which are deactivated during compiling,
unsupported by the plattform or not used in IPFire.

Add an advice to the full documented suricata-example.yaml file which also
is shipped by IPFire.

More work needs to be done.

See #11808

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agocore124: Ship updated ntp package
Michael Tremer [Fri, 24 Aug 2018 11:25:59 +0000 (12:25 +0100)] 
core124: Ship updated ntp package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agontp: Update to 4.2.8p12
Matthias Fischer [Thu, 23 Aug 2018 19:07:04 +0000 (21:07 +0200)] 
ntp: Update to 4.2.8p12

For details see:
http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agocore124: Ship updated fwhosts.cgi
Michael Tremer [Fri, 24 Aug 2018 10:45:44 +0000 (11:45 +0100)] 
core124: Ship updated fwhosts.cgi

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoBUG11825: firewall: Renaming a network/host group doesn't update rules
Alexander Marx [Fri, 24 Aug 2018 08:06:30 +0000 (10:06 +0200)] 
BUG11825: firewall: Renaming a network/host group doesn't update rules

Code only changed field 6 of hash (target group) and not field 4 (source group).
Also if using geoip it was only field 4 of hash (source group) and not field 6 of hash (target group)
Added new code that changes both fields to reflect the change in the firewallrules immediately.

fixes: #11825

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agosuricata.yaml: Adjust classification and reference config location
Stefan Schantl [Fri, 24 Aug 2018 08:54:07 +0000 (10:54 +0200)] 
suricata.yaml: Adjust classification and reference config location

Both files are included in the various rulesets, therefore use them
from the rules folder.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agosuricata.yaml: Fix include statement for homenet file
Stefan Schantl [Fri, 24 Aug 2018 08:28:42 +0000 (10:28 +0200)] 
suricata.yaml: Fix include statement for homenet file

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agosuricata: Fix initscript when using a single core machine
Stefan Schantl [Fri, 24 Aug 2018 08:04:33 +0000 (10:04 +0200)] 
suricata: Fix initscript when using a single core machine

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoids.cgi: Create oinkmaster related files at first call
Stefan Schantl [Fri, 24 Aug 2018 05:39:04 +0000 (07:39 +0200)] 
ids.cgi: Create oinkmaster related files at first call

With this commit, the CGI file will create the oinkmaster related
files during first run if they does not exist.

Fixes #11822.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoids-functions.pl: Add function to create empty files
Stefan Schantl [Fri, 24 Aug 2018 05:37:10 +0000 (07:37 +0200)] 
ids-functions.pl: Add function to create empty files

This generic function can be used to create any kind of emtpy files -
it just requires the full path and filename to work.

If the specified file exists at calltime, the function will abort
to prevent from overwriting existing files and content.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoIPsec: Show connected status for waiting connections that are active
Michael Tremer [Thu, 23 Aug 2018 16:34:50 +0000 (17:34 +0100)] 
IPsec: Show connected status for waiting connections that are active

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agosetup: Don't write any mount errors over the GUI
Michael Tremer [Thu, 23 Aug 2018 10:17:23 +0000 (11:17 +0100)] 
setup: Don't write any mount errors over the GUI

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agolocalnet: Set FQDN without using domainname command
Michael Tremer [Wed, 22 Aug 2018 12:36:23 +0000 (13:36 +0100)] 
localnet: Set FQDN without using domainname command

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoFix merge conflicts during merge of next and the suricata branch
Stefan Schantl [Thu, 23 Aug 2018 08:34:17 +0000 (10:34 +0200)] 
Fix merge conflicts during merge of next and the suricata branch

7 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Stefan Schantl [Thu, 23 Aug 2018 08:32:21 +0000 (10:32 +0200)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

7 years agocore124: Ship updated firewall.cgi
Michael Tremer [Wed, 22 Aug 2018 13:46:53 +0000 (14:46 +0100)] 
core124: Ship updated firewall.cgi

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoBUG11805: Firewall rule with source orange and target firewall-interface-orange not...
Alexander Marx [Wed, 22 Aug 2018 09:23:16 +0000 (11:23 +0200)] 
BUG11805: Firewall rule with source orange and target firewall-interface-orange not possible

Now its possible to create a rule with orange source and target orange interface of the firewall.

Fixes: #11805
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agocore124: Fix typo in rootfile
Michael Tremer [Wed, 22 Aug 2018 13:17:15 +0000 (14:17 +0100)] 
core124: Fix typo in rootfile

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agocore124: Ship updated AWS setup scripts
Michael Tremer [Wed, 22 Aug 2018 13:06:53 +0000 (14:06 +0100)] 
core124: Ship updated AWS setup scripts

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoDrop the network-trigger script
Michael Tremer [Wed, 22 Aug 2018 13:05:43 +0000 (14:05 +0100)] 
Drop the network-trigger script

This is done at boot time and doesn't normally need to be done again.

On AWS or in the setup, renaming any network interfaces is being
handled automatically.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agofirstsetup: There is no need to restart udev here
Michael Tremer [Wed, 22 Aug 2018 13:02:43 +0000 (14:02 +0100)] 
firstsetup: There is no need to restart udev here

All network interfaces are renamed accordingly in setup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoaws: Let udev rename all network interfaces
Michael Tremer [Wed, 22 Aug 2018 13:00:39 +0000 (14:00 +0100)] 
aws: Let udev rename all network interfaces

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agooinkmaster: Ship IPFire specific config file
Stefan Schantl [Wed, 22 Aug 2018 08:37:44 +0000 (10:37 +0200)] 
oinkmaster: Ship IPFire specific config file

Ship an IPFire specific configuration file for oinkmaster.

This allows oinkmaster to do all the great rule modifications which
have been introduced by the new ids.cgi file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoids.cgi: Rework handling of enabled/disabled sids
Stefan Schantl [Wed, 22 Aug 2018 06:39:57 +0000 (08:39 +0200)] 
ids.cgi: Rework handling of enabled/disabled sids

Now the enabled or disabled sids are stored in a single
hash instead of two arrays, which easily can be modified.

When saving the ruleset, the new read_enabled_disabled_sids() function
will be used to read-in the current (old) saved enabled or disabled sids
and add them to the new hash structure.

After adding or modifiying sids to the hash, the entries will be written
to the corresponding files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoids.cgi: Add function to read the enabled/disabled sid files
Stefan Schantl [Wed, 22 Aug 2018 06:38:16 +0000 (08:38 +0200)] 
ids.cgi: Add function to read the enabled/disabled sid files

This function is used to read-in the files for enabled or disabled sid
files and stores the sid and their state into a temporary hash which will
be returned by the function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agonano: Update to 2.9.8
Matthias Fischer [Tue, 21 Aug 2018 16:27:02 +0000 (18:27 +0200)] 
nano: Update to 2.9.8

For details see:
https://www.nano-editor.org/news.php

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoids.cgi: Fix check if the IDS is running
Stefan Schantl [Tue, 21 Aug 2018 17:18:01 +0000 (19:18 +0200)] 
ids.cgi: Fix check if the IDS is running

The correct function name is ids_is_running()!

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agocore124: Ship updated backup include/exclude files
Michael Tremer [Tue, 21 Aug 2018 14:06:22 +0000 (15:06 +0100)] 
core124: Ship updated backup include/exclude files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agobackup: Add root's SSH keys and settings
Michael Tremer [Tue, 21 Aug 2018 14:05:40 +0000 (15:05 +0100)] 
backup: Add root's SSH keys and settings

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agobackup: Add custom squid configuration files
Michael Tremer [Tue, 21 Aug 2018 14:05:13 +0000 (15:05 +0100)] 
backup: Add custom squid configuration files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agobackup: Order incldue/exclude alphabetically
Michael Tremer [Tue, 21 Aug 2018 10:32:04 +0000 (11:32 +0100)] 
backup: Order incldue/exclude alphabetically

Nothing has been added or removed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agogcc: x86_64 add libspp to rootfile
Arne Fitzenreiter [Mon, 20 Aug 2018 14:22:20 +0000 (16:22 +0200)] 
gcc: x86_64 add libspp to rootfile

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
7 years agocore123: ship libssp (was missing on x86_64)
Arne Fitzenreiter [Mon, 20 Aug 2018 14:23:49 +0000 (16:23 +0200)] 
core123: ship libssp (was missing on x86_64)

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
7 years agogcc: x86_64 add libspp to rootfile
Arne Fitzenreiter [Mon, 20 Aug 2018 14:22:20 +0000 (16:22 +0200)] 
gcc: x86_64 add libspp to rootfile

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
7 years agoids.cgi: Add backend code to handle switch between IDS and IPS mode
Stefan Schantl [Sat, 18 Aug 2018 12:48:30 +0000 (14:48 +0200)] 
ids.cgi: Add backend code to handle switch between IDS and IPS mode

This commit adds the required backend code to allow switching
between IDS and IPS mode of suricata.

Technically the behaviour of suricata is specified by the rules -
each of them can contain the action "alert" or "drop" (There are
more actions supported but these two are currently the important one)

When running in IDS mode, the ruleset does not need to be touched,
because the default action is "alert". When switching to IPS mode,
the CGI writes a single line to "oinkmaster-modify-sids.conf" which
is included by oinkmaster and modify the action for each single rule
from alert to drop.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoids.cgi: Allow to switch between IDS/IPS mode
Stefan Schantl [Sat, 18 Aug 2018 08:16:12 +0000 (10:16 +0200)] 
ids.cgi: Allow to switch between IDS/IPS mode

Add the option to select the runmode for suricata, wheater it
should run in intrusion detection mode or intrusion prevention mode.

If the option has not configured yet, it defaults to IPS mode.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoids-functions.pl: Display error if oinkmaster cannot be executed
Stefan Schantl [Sat, 18 Aug 2018 08:01:14 +0000 (10:01 +0200)] 
ids-functions.pl: Display error if oinkmaster cannot be executed

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agocore123: ship xtables-addons.
Arne Fitzenreiter [Fri, 17 Aug 2018 18:30:17 +0000 (20:30 +0200)] 
core123: ship xtables-addons.

xtables are build for installed iptables version so we need
to ship it even if it was not updated.
Also clean /lib/xtables because some modules are renamed.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
7 years agoids-functions.pl: Log correct error message if download fails
Stefan Schantl [Fri, 17 Aug 2018 06:49:06 +0000 (08:49 +0200)] 
ids-functions.pl: Log correct error message if download fails

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agosuricata: Fix detection of enabled IDS on zone in initscript
Stefan Schantl [Fri, 17 Aug 2018 06:45:47 +0000 (08:45 +0200)] 
suricata: Fix detection of enabled IDS on zone in initscript

I accidently commited the wrong file in the previous commit.
This is the fixed and working version.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agosuricata: Give 644 permissions to the suricata pidfile
Stefan Schantl [Fri, 17 Aug 2018 06:24:19 +0000 (08:24 +0200)] 
suricata: Give 644 permissions to the suricata pidfile

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agoruleset-sources: Move to suricata optimized ruleset when using emerginthreads.
Stefan Schantl [Fri, 17 Aug 2018 05:36:54 +0000 (07:36 +0200)] 
ruleset-sources: Move to suricata optimized ruleset when using emerginthreads.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agocore123: ship openssl sse2 version on i586
Arne Fitzenreiter [Fri, 17 Aug 2018 05:06:45 +0000 (07:06 +0200)] 
core123: ship openssl sse2 version on i586

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
7 years agobind: Update to 9.11.4-P1
Matthias Fischer [Thu, 16 Aug 2018 18:56:03 +0000 (20:56 +0200)] 
bind: Update to 9.11.4-P1

Fixes CVE-2018-5740 and CVE-2018-5738.

For details see:
http://ftp.isc.org/isc/bind9/9.11.4-P1/RELEASE-NOTES-bind-9.11.4-P1.html

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agocore124: Ship updated pciutils
Michael Tremer [Thu, 16 Aug 2018 17:55:49 +0000 (18:55 +0100)] 
core124: Ship updated pciutils

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agopciutils: update to 3.5.6
Peter Müller [Thu, 16 Aug 2018 15:10:58 +0000 (17:10 +0200)] 
pciutils: update to 3.5.6

The third version of this patch superseds the first and
second one which were broken due to bugs in the MUAs GPG
implementation.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agocore124: Ship updated ids.cgi
Michael Tremer [Thu, 16 Aug 2018 17:54:41 +0000 (18:54 +0100)] 
core124: Ship updated ids.cgi

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agodownload ET IDS rules via HTTPS
Peter Müller [Thu, 16 Aug 2018 15:09:41 +0000 (17:09 +0200)] 
download ET IDS rules via HTTPS

The Emerging Threats ruleset server supports HTTPS. It should
be used for downloading the ruleset in IPFire, too.

This also needs to be applied on the upcoming ids.cgi file for Suricata
which I will do in a second patch.

The third version of this patch superseds the first and
second one which were broken due to bugs in the MUAs GPG
implementation.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoPostfix: update to 3.3.1
Peter Müller [Thu, 16 Aug 2018 15:08:04 +0000 (17:08 +0200)] 
Postfix: update to 3.3.1

This updates Postfix to recent 3.3.x series, which contains
some new features. Release announcement available at
http://www.postfix.org/announcements/postfix-3.3.1.html

The third version of this patch superseds the first and
second one which were broken due to bugs in the MUAs GPG
implementation.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agosuricata: Add code to create iptables rules to the initscript
Stefan Schantl [Thu, 16 Aug 2018 16:51:13 +0000 (18:51 +0200)] 
suricata: Add code to create iptables rules to the initscript

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agofirewall: Add chains for IPS (suricata)
Stefan Schantl [Thu, 16 Aug 2018 16:50:39 +0000 (18:50 +0200)] 
firewall: Add chains for IPS (suricata)

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
7 years agocore124: Ship updated bind
Michael Tremer [Thu, 16 Aug 2018 12:05:47 +0000 (13:05 +0100)] 
core124: Ship updated bind

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agobind: Update to 9.11.4
Matthias Fischer [Sun, 22 Jul 2018 15:11:53 +0000 (17:11 +0200)] 
bind: Update to 9.11.4

For details see:
http://ftp.isc.org/isc/bind9/9.11.4/RELEASE-NOTES-bind-9.11.4.html

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agocore124: Don't re-generate the initrd
Michael Tremer [Thu, 16 Aug 2018 12:02:56 +0000 (13:02 +0100)] 
core124: Don't re-generate the initrd

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agocore124: Re-install bootloader during update
Michael Tremer [Thu, 16 Aug 2018 12:02:37 +0000 (13:02 +0100)] 
core124: Re-install bootloader during update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agocore124: Ship EFI changes
Michael Tremer [Thu, 16 Aug 2018 12:01:01 +0000 (13:01 +0100)] 
core124: Ship EFI changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 years agoMerge remote-tracking branch 'origin/efi' into next
Michael Tremer [Thu, 16 Aug 2018 11:49:13 +0000 (12:49 +0100)] 
Merge remote-tracking branch 'origin/efi' into next

7 years agocore124: Ship update localnet init script
Michael Tremer [Thu, 16 Aug 2018 11:47:55 +0000 (12:47 +0100)] 
core124: Ship update localnet init script

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>