Commit Graph

6098 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Stefan Schantl
c5486ccb97 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>
2018-08-22 10:37:44 +02:00
Michael Tremer
0ff9099443 core124: Ship updated backup include/exclude files
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-21 15:06:22 +01:00
Michael Tremer
f868ccb763 backup: Add root's SSH keys and settings
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-21 15:05:40 +01:00
Michael Tremer
9b0618c09f backup: Add custom squid configuration files
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-21 15:05:13 +01:00
Michael Tremer
7486e30eeb backup: Order incldue/exclude alphabetically
Nothing has been added or removed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-21 11:32:04 +01:00
Arne Fitzenreiter
3b81e38a08 gcc: x86_64 add libspp to rootfile
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-08-20 17:38:31 +02:00
Stefan Schantl
d9711d91ef ids-functions.pl: Display error if oinkmaster cannot be executed
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-18 10:01:14 +02:00
Stefan Schantl
88daf7eb3a ids-functions.pl: Log correct error message if download fails
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-17 08:49:06 +02:00
Stefan Schantl
04b5c77a45 ruleset-sources: Move to suricata optimized ruleset when using emerginthreads.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-08-17 07:36:54 +02:00
Michael Tremer
c6b97a0681 core124: Ship updated pciutils
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 18:55:49 +01:00
Peter Müller
70e4a5b276 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>
2018-08-16 18:55:13 +01:00
Michael Tremer
c708276290 core124: Ship updated ids.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 18:54:41 +01:00
Michael Tremer
8098a76b52 core124: Ship updated bind
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 13:05:47 +01:00
Michael Tremer
1233d81f21 core124: Don't re-generate the initrd
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 13:02:56 +01:00
Michael Tremer
4c01f489f6 core124: Re-install bootloader during update
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 13:02:37 +01:00
Michael Tremer
de0566323f core124: Ship EFI changes
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 13:01:42 +01:00
Michael Tremer
046ef135e6 Merge remote-tracking branch 'origin/efi' into next 2018-08-16 12:49:13 +01:00
Michael Tremer
d5461580a5 core124: Ship update localnet init script
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 12:47:55 +01:00
Michael Tremer
264f34546f Start Core Update 124
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 12:47:06 +01:00
Arne Fitzenreiter
b211357dae core123: ship updated unbound initskript
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-08-15 13:30:07 +02:00
Arne Fitzenreiter
f3d23ae0ff core123: ship updated logs.cgi/ids.dat
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-08-15 12:19:29 +02:00
Michael Tremer
06966f3613 core123: Ship updated backup.pl
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 20:39:17 +01:00
Matthias Fischer
84578512f5 Fixes for 'backup.pl' (Bug #11816)
Hi,

Fixes #11816
(https://bugzilla.ipfire.org/show_bug.cgi?id=11816 and
https://bugzilla.ipfire.org/attachment.cgi?id=608):

"[root@ipfire ~]# backupctrl exclude
...
tar: The following options were used after any non-optional arguments in
archive create or update mode.  These options are positional and affect
only arguments that follow them.  Please, rearrange them properly.
tar: --exclude-from '/var/ipfire/backup/exclude.user' has no effect
tar: Exiting with failure status due to previous errors"

Please test - I got no errors anymore.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 20:38:47 +01:00
Michael Tremer
3045fd1b58 core123: Ship openssl-compat, too
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 20:37:54 +01:00
Arne Fitzenreiter
2eed2aaa50 core123: Ship updated openssl
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-08-14 20:29:03 +02:00
Michael Tremer
d6d070a07a Merge remote-tracking branch 'ms/aws-cli' into next 2018-08-14 19:14:58 +01:00
Michael Tremer
a9e6119972 openssl: Update to 1.1.0i and 1.0.2p
Changes between 1.1.0h and 1.1.0i [14 Aug 2018]

  *) Client DoS due to large DH parameter

     During key agreement in a TLS handshake using a DH(E) based ciphersuite a
     malicious server can send a very large prime value to the client. This will
     cause the client to spend an unreasonably long period of time generating a
     key for this prime resulting in a hang until the client has finished. This
     could be exploited in a Denial Of Service attack.

     This issue was reported to OpenSSL on 5th June 2018 by Guido Vranken
     (CVE-2018-0732)
     [Guido Vranken]

  *) Cache timing vulnerability in RSA Key Generation

     The OpenSSL RSA Key generation algorithm has been shown to be vulnerable to
     a cache timing side channel attack. An attacker with sufficient access to
     mount cache timing attacks during the RSA key generation process could
     recover the private key.

     This issue was reported to OpenSSL on 4th April 2018 by Alejandro Cabrera
     Aldaya, Billy Brumley, Cesar Pereida Garcia and Luis Manuel Alvarez Tapia.
     (CVE-2018-0737)
     [Billy Brumley]

  *) Make EVP_PKEY_asn1_new() a bit stricter about its input.  A NULL pem_str
     parameter is no longer accepted, as it leads to a corrupt table.  NULL
     pem_str is reserved for alias entries only.
     [Richard Levitte]

  *) Revert blinding in ECDSA sign and instead make problematic addition
     length-invariant. Switch even to fixed-length Montgomery multiplication.
     [Andy Polyakov]

  *) Change generating and checking of primes so that the error rate of not
     being prime depends on the intended use based on the size of the input.
     For larger primes this will result in more rounds of Miller-Rabin.
     The maximal error rate for primes with more than 1080 bits is lowered
     to 2^-128.
     [Kurt Roeckx, Annie Yousar]

  *) Increase the number of Miller-Rabin rounds for DSA key generating to 64.
     [Kurt Roeckx]

  *) Add blinding to ECDSA and DSA signatures to protect against side channel
     attacks discovered by Keegan Ryan (NCC Group).
     [Matt Caswell]

  *) When unlocking a pass phrase protected PEM file or PKCS#8 container, we
     now allow empty (zero character) pass phrases.
     [Richard Levitte]

  *) Certificate time validation (X509_cmp_time) enforces stricter
     compliance with RFC 5280. Fractional seconds and timezone offsets
     are no longer allowed.
     [Emilia Käsper]

  *) Fixed a text canonicalisation bug in CMS

     Where a CMS detached signature is used with text content the text goes
     through a canonicalisation process first prior to signing or verifying a
     signature. This process strips trailing space at the end of lines, converts
     line terminators to CRLF and removes additional trailing line terminators
     at the end of a file. A bug in the canonicalisation process meant that
     some characters, such as form-feed, were incorrectly treated as whitespace
     and removed. This is contrary to the specification (RFC5485). This fix
     could mean that detached text data signed with an earlier version of
     OpenSSL 1.1.0 may fail to verify using the fixed version, or text data
     signed with a fixed OpenSSL may fail to verify with an earlier version of
     OpenSSL 1.1.0. A workaround is to only verify the canonicalised text data
     and use the "-binary" flag (for the "cms" command line application) or set
     the SMIME_BINARY/PKCS7_BINARY/CMS_BINARY flags (if using CMS_verify()).
     [Matt Caswell]

 Changes between 1.0.2o and 1.0.2p [14 Aug 2018]

  *) Client DoS due to large DH parameter

     During key agreement in a TLS handshake using a DH(E) based ciphersuite a
     malicious server can send a very large prime value to the client. This will
     cause the client to spend an unreasonably long period of time generating a
     key for this prime resulting in a hang until the client has finished. This
     could be exploited in a Denial Of Service attack.

     This issue was reported to OpenSSL on 5th June 2018 by Guido Vranken
     (CVE-2018-0732)
     [Guido Vranken]

  *) Cache timing vulnerability in RSA Key Generation

     The OpenSSL RSA Key generation algorithm has been shown to be vulnerable to
     a cache timing side channel attack. An attacker with sufficient access to
     mount cache timing attacks during the RSA key generation process could
     recover the private key.

     This issue was reported to OpenSSL on 4th April 2018 by Alejandro Cabrera
     Aldaya, Billy Brumley, Cesar Pereida Garcia and Luis Manuel Alvarez Tapia.
     (CVE-2018-0737)
     [Billy Brumley]

  *) Make EVP_PKEY_asn1_new() a bit stricter about its input.  A NULL pem_str
     parameter is no longer accepted, as it leads to a corrupt table.  NULL
     pem_str is reserved for alias entries only.
     [Richard Levitte]

  *) Revert blinding in ECDSA sign and instead make problematic addition
     length-invariant. Switch even to fixed-length Montgomery multiplication.
     [Andy Polyakov]

  *) Change generating and checking of primes so that the error rate of not
     being prime depends on the intended use based on the size of the input.
     For larger primes this will result in more rounds of Miller-Rabin.
     The maximal error rate for primes with more than 1080 bits is lowered
     to 2^-128.
     [Kurt Roeckx, Annie Yousar]

  *) Increase the number of Miller-Rabin rounds for DSA key generating to 64.
     [Kurt Roeckx]

  *) Add blinding to ECDSA and DSA signatures to protect against side channel
     attacks discovered by Keegan Ryan (NCC Group).
     [Matt Caswell]

  *) When unlocking a pass phrase protected PEM file or PKCS#8 container, we
     now allow empty (zero character) pass phrases.
     [Richard Levitte]

  *) Certificate time validation (X509_cmp_time) enforces stricter
     compliance with RFC 5280. Fractional seconds and timezone offsets
     are no longer allowed.
     [Emilia Käsper]

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 19:14:38 +01:00
Michael Tremer
2a3dde52f7 python3-s3transfer: Fix rootfile
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 15:13:24 +01:00
Michael Tremer
faa5472a2e python3-pyasn1: New package as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 15:00:28 +01:00
Michael Tremer
d45d524725 python3-rsa: New package as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 14:44:30 +01:00
Michael Tremer
953f6f7332 python3-s3transfer: New package as required by aws-cli
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 14:38:11 +01:00