Commit Graph

12446 Commits

Author SHA1 Message Date
Michael Tremer
505b886d0d core124: Apply changed sysctl.conf
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-09-09 17:48:14 +01:00
Peter Müller
d5fe332283 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>
2018-09-09 17:47:08 +01:00
Michael Tremer
65ae069c21 core124: Ship updated rng-tools
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-09-09 17:43:53 +01:00
Michael Tremer
fd0a0384f0 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
2018-09-09 17:42:17 +01:00
Stefan Schantl
6f3b3cd089 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>
2018-09-06 14:04:17 +02:00
Stefan Schantl
63d911cdc5 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>
2018-09-06 13:22:18 +02:00
Stefan Schantl
f5ddcad1cc 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>
2018-09-06 12:09:34 +02:00
Michael Tremer
3da2a66193 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>
2018-08-31 11:08:53 +01:00
Stefan Schantl
80bcd4dd1a 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>
2018-08-30 18:18:26 +02:00
Stefan Schantl
fd72c85eb8 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>
2018-08-30 15:12:29 +02:00
Stefan Schantl
762a33f17c 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>
2018-08-30 14:13:37 +02:00
Stefan Schantl
21cab141ec 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>
2018-08-29 12:37:44 +02:00
Stefan Schantl
d2e6bf6e5f 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>
2018-08-29 12:27:12 +02:00
Stefan Schantl
00512a5ac8 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>
2018-08-29 11:50:59 +02:00
Stefan Schantl
004b13b7e8 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>
2018-08-29 10:55:32 +02:00
Arne Fitzenreiter
fd313a1ae6 Merge branch 'master' into next 2018-08-29 07:44:59 +02:00
Arne Fitzenreiter
574a71177b kernel: fix dtb handling
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-08-28 12:39:08 +02:00
Stefan Schantl
be52c68a2d ids-functions.pl: Early abort downloadruleset() if no ruleset is configured
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-27 15:11:28 +02:00
Michael Tremer
aa61d769b7 core124: Ship latest pakfire changes
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-27 07:34:28 +01:00
Michael Tremer
06d55142e5 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>
2018-08-27 07:29:19 +01:00
Michael Tremer
e32591e7bf 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>
2018-08-27 07:23:03 +01:00
Stefan Schantl
e568796bb0 ids-functions.pl: Also check and fix the permissions of rulespath
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-25 15:48:58 +02:00
Stefan Schantl
4892f82ca1 suricata: Fix rootfile
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-25 15:22:53 +02:00
Arne Fitzenreiter
e5eedea01d Merge branch 'core123' of git.ipfire.org:/pub/git/ipfire-2.x into core123 2018-08-24 20:22:05 +02:00
Arne Fitzenreiter
1ce35de5cc intel-microcode: update to 20180807a
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-08-24 20:19:29 +02:00
Stefan Schantl
baeae34658 lfs/suricata: Move classification and reference config to /etc/suricata/rules
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-24 15:15:09 +02:00
Stefan Schantl
330759d88a 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>
2018-08-24 14:55:40 +02:00
Stefan Schantl
68123effb8 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>
2018-08-24 14:54:34 +02:00
Stefan Schantl
9074853d8d suricatactrl: Add reload command
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-24 14:27:01 +02:00
Stefan Schantl
335114b207 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>
2018-08-24 13:41:38 +02:00
Michael Tremer
973ffc2987 core124: Ship updated ntp package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-24 12:25:59 +01:00
Matthias Fischer
db5360ee9a 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>
2018-08-24 12:17:57 +01:00
Michael Tremer
b31d55a79d core124: Ship updated fwhosts.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-24 11:45:44 +01:00
Alexander Marx
2754623fa9 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>
2018-08-24 11:44:45 +01:00
Stefan Schantl
af5e823247 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>
2018-08-24 10:54:07 +02:00
Stefan Schantl
13d077fdf2 suricata.yaml: Fix include statement for homenet file
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-24 10:28:42 +02:00
Stefan Schantl
5f63067385 suricata: Fix initscript when using a single core machine
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-24 10:04:33 +02:00
Stefan Schantl
01ba4be48d 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>
2018-08-24 07:39:04 +02:00
Stefan Schantl
308ba5e74c 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>
2018-08-24 07:37:10 +02:00
Michael Tremer
aec1925bea IPsec: Show connected status for waiting connections that are active
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-23 17:34:50 +01:00
Michael Tremer
366b40c740 setup: Don't write any mount errors over the GUI
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-23 11:17:23 +01:00
Michael Tremer
95b87f39ac localnet: Set FQDN without using domainname command
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-23 10:18:59 +01:00
Stefan Schantl
cb52183c6a Fix merge conflicts during merge of next and the suricata branch 2018-08-23 10:34:17 +02:00
Stefan Schantl
7fe5bc8261 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-08-23 10:32:21 +02:00
Michael Tremer
702f0ba835 core124: Ship updated firewall.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-22 14:46:53 +01:00
Alexander Marx
d303638793 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>
2018-08-22 14:46:10 +01:00
Michael Tremer
7141cb1ee4 core124: Fix typo in rootfile
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-22 14:17:15 +01:00
Michael Tremer
8e11e1e869 core124: Ship updated AWS setup scripts
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-22 14:06:53 +01:00
Michael Tremer
84cd9b9162 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>
2018-08-22 14:05:43 +01:00
Michael Tremer
f3d59d2c94 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>
2018-08-22 14:02:43 +01:00