Commit Graph

2907 Commits

Author SHA1 Message Date
Michael Tremer
d68e150e86 proxy: Drop web browser check
This is neither reliable nor up to date and is therefore removed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:54:56 +01:00
Michael Tremer
a1018d86ae proxy: Set authentication TTL for NTLM authentication also
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:49:18 +01:00
Michael Tremer
6df2d52887 proxy: Use correct authentication cache TTL for AD
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:48:32 +01:00
Michael Tremer
fa286b1330 proxy: Use entered setting for auth children for AD
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:46:20 +01:00
Michael Tremer
5c2a76f7b3 proxy: Use correct realm for AD authentication
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:44:19 +01:00
Michael Tremer
dc637f087f proxy: Remove AUTH_IPCACHE_TTL
This is potentially dangerous to set larger than zero.

Authentication is perfomed on basis of IP addresses which is
not a good idea at all.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:39:36 +01:00
Michael Tremer
ea72700a3b proxy: Drop NTLM authentication
This is the authentication againt NT 4.0 style domain controllers.

squid has dropped support for this in the 4.5 release and nobody
should be using these old domain controllers any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:28:46 +01:00
Michael Tremer
eedca6e36c squid: Run as many redirectors as we have CPU cores
This makes sure that we use the optimal ratio of memory and
CPU usage.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Tested-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Tested-by: Matthias Fischer <matthias.fischer@ipfire.org>
2019-01-08 03:33:37 +01:00
Daniel Weismüller
1a3323f2e6 BUG 11786 - squid: Remove setting for filter processes the number of Squid processes
I added a function to determine the number of cores.
Now the number of squid processes will be equal to the number of logical cores.
Further I removed the possibility of changing the number
of squid processes in the proxy.cgi

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: root <root@ipfire.test>
2019-01-08 02:02:05 +01:00
Matthias Fischer
d01b31914a snort: Update to 2.9.12
For details see:

Release notes:
https://snort.org/downloads/snort/release_notes_2.9.12.txt

Changelog:
https://snort.org/downloads/snort/changelog_2.9.12.txt

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-05 15:42:34 +00:00
Matthias Fischer
0a12cd7039 dnsforward.cgi: fix for language string
Hi,

In https://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff;h=1a26564e95b5694337e51860544e7775d35055f3
the language string 'dnsforward forward_server' => 'DNS-Server', was deleted and replaced
by 'dnsforward forward_servers' => 'DNS-Server',

IMHO this leads to an empty string in 'dnsforward.cgi', line 223:

...
<td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
...

I changed this line...

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-03 14:58:26 +00:00
Erik Kapfer
e6f7f8e7ba database_attribute: Deliver/create index.txt.attr
Fixes #11904

Since OpenSSL-1.1.0x the database attribute file for IPSec and OpenVPN wasn´t created while initial PKI generation.
OpenVPN delivered an error message but IPSec did crashed within the first attempt.
This problem persists also after X509 deletion and new generation.

index.txt.attr will now be delivered by the system but also deleted and recreated while setting up a new x509.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-03 14:52:53 +00:00
Stefan Schantl
7b6f8596ed Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata 2018-12-28 07:36:59 +01:00
Stefan Schantl
74cc8f5a3d ids-functions.pl: Introduce function write_modify_sids_file()
This function is used to write the corresponding file which
tells oinkmaster to alter the whole ruleset and finally
switches suricata into an IPS or IDS.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-25 18:49:57 +01:00
Stefan Schantl
b02e30fd81 ids.cgi: Move variable declaration to ids-functions.pl
Also move some functions from the cgi file to the library file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-25 18:26:21 +01:00
Stefan Schantl
53817b89c0 ids.cgi: Hack to use the correct language string for red network zone.
This hack is needed because "red" is used as "internet" in the language files
and "red1" contains the correct "red" translations.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-24 13:19:06 +01:00
Stefan Schantl
99b372b51d ids.cgi: Colourize network zones
Colourize the network with the proper colour.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-24 13:18:14 +01:00
Stefan Schantl
01d02eb63b ids.cgi: Change RUN_MODE to MONITOR_TRAFFIC_ONLY
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-24 10:04:55 +01:00
Stefan Schantl
ea5c8eeb83 ids.cgi: Seperate IPS and ruleset settings
Now each of both have their own corresponding configuration areas.
The taken settings will be saved in "/var/ipfire/suricata/settings" for
all IDS/IPS related settings and in "/var/ipfire/suricata/rules-settings" for
ruleset related settings.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-24 08:26:39 +01:00
Stefan Schantl
ebdd0f9a90 ids.cgi: Prevent from starting suricata without ruleset or selected network zone
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-20 13:18:48 +01:00
Stefan Schantl
0a1bba1a1d ids.cgi: Access ruleset by its own name
This improves accessing the single rules of a rule category.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-20 11:55:13 +01:00
Michael Tremer
cb8a25e5ec DNS Forwarding: Let UI accept hostnames, too
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-12-19 20:47:41 +01:00
Michael Tremer
1a26564e95 DNS Forwarding: Allow passing multiple name servers (separated by comma)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-12-19 20:42:46 +01:00
Stefan Schantl
8353c3fd36 ids.cgi: Allways use the whitelist
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-18 15:19:30 +01:00
Stefan Schantl
a13ddf04d9 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-12-12 09:27:59 +01:00
Michael Tremer
1ee8c6732f Update maintainers
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-27 10:24:29 +00:00
Michael Tremer
9bdc8f854c credits.cgi: Remove old dev section
I do not know why I forgot this. Now it is how it was intended
in the first place.

This commit removes all email addresses because people keep
emailing me for private support. Use the forum guys!

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-27 10:20:09 +00:00
Michael Tremer
4b4b29b314 Update list of contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-26 16:01:29 +00:00
Michael Tremer
f9e4f4dcdf Update list of contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-08 16:42:37 +00:00
Peter Müller
0c451a4a32 fix downloading Snort rules if behind upstream proxy
Currently, the wget call only uses proxy information for HTTP.
Since rulesets are downloaded via HTTPS now, the same information
also needs to be applied for HTTPS.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-01 10:30:08 +00:00
Michael Tremer
02776a0dc2 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-10-29 10:51:44 +00:00
Arne Fitzenreiter
ca9c45b3f2 graphs: add NVMe disks
Add NVMe disks to media and hardwaregraphs.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-10-28 17:56:37 +01:00
Arne Fitzenreiter
d823d5f072 hostapd: add switch to disable neigborhood scan
this may violate regulatory rules because 40Mhz channels should disabled
if there are other networks but nearly every commercial router ignore this.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-10-27 16:47:12 +02:00
Michael Tremer
bb44410b95 pakfire: Remove option to enable/disable checks for updates
This does not change anything

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-10-24 11:21:12 +01:00
Michael Tremer
f887bf5fbe hostapd: Add support for 802.11ac
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-10-18 14:50:41 +01:00
Michael Tremer
f9b7bc9259 Update list of contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-10-18 14:29:23 +01:00
Stefan Schantl
2d475a3c6c Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata 2018-09-26 14:49:34 +02:00
Stefan Schantl
eadad5fda6 ids.cgi: Add support for autoupdate of the IDS ruleset
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-09-26 14:43:09 +02:00
Stefan Schantl
dae534f2ca ids.cgi: Only write oinkmaster-modify-sids.conf if neccessary.
Only write to the file if the runmode of the IDS has been changed.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-09-26 13:02:28 +02:00
Michael Tremer
a6c190818a backup: Fix deleting backup files
Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-09-20 14:21:41 +01:00
Michael Tremer
614764e58a backup: Sanitise content of ADDON variable
References: #11830

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-09-13 15:03:59 +01:00
Michael Tremer
7f6257e0a4 backup: Sanitise FILE parameter
This parameter was passed to some shell commands without any
sanitisation which allowed an attacker who was authenticated to
the web UI to download arbitrary files from some directories
and delete any file from the filesystem.

References: #11830

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-09-13 15:03:59 +01:00
Stefan Schantl
5508f18c01 logs.cgi/log.dat: Fix pattern to display oinkmaster related messages
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-09-11 12:28:28 +02:00
Stefan Schantl
43ab7d9c30 ids.cgi: Set state of used rulefile to on if it contains rules
Only set the state of a used rulefile to "on" if it is present in
the %idsrules hash. This happens if it contains at least one rule.

This prevents from showing a rulefile in the ruleset section if, it
does not exist anymore or does not contains any rules at all.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2018-09-11 12:00:31 +02:00
Stefan Schantl
b7e2974394 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>
2018-09-11 11:58:11 +02:00
Peter Müller
b67e79a4f1 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>
2018-09-10 16:30:09 +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
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