Commit Graph

2250 Commits

Author SHA1 Message Date
Arne Fitzenreiter
5653e55107 perl-scripts: suppress smartmatch experimental warning
smartmatch was introduced with perl 5.10 and was marked
as experimental in 5.14

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-08-16 12:21:26 +02:00
Michael Tremer
c8ee8f37d4 Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-06-21 01:39:42 +01:00
Peter Müller
0dd16f4047 vpnmain.cgi: Fix writing ESP settings for PFS ciphers
The changes introduced due to #12091 caused IPsec ESP
to be invalid if PFS ciphers were selected. Code has
to read "!$pfs" instead of just "$pfs", as it should trigger
for ciphers _without_ Perfect Forward Secrecy.

Fixes #12099

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Cc: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-06-17 16:14:27 +01:00
Arne Fitzenreiter
faec909e1a vpnmain.cgi: remove wrongh "shift-space"
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-06-15 17:38:47 +02:00
Michael Tremer
171512b7a7 Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-06-05 12:46:37 +01:00
Stefan Schantl
81bae51f61 ids-functions.pl: Rework function write_modify_sids_file().
Directly implement the logic to determine the used ruleset and if
IDS or IPS mode should be used into the function instead of pass those
details as arguments.

This helps to prevent from doing this stuff at several places again and again.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-06-05 12:41:49 +01:00
Tim FitzGeorge
a5ba473c15 suricata: correct rule actions in IPS mode
In IPS mode rule actions need to be have the action 'drop' for the
protection to work, however this is not appropriate for all rules.
Modify the generator for oinkmaster-modify-sids.conf to leave
rules with the action 'alert' here this is appropriate.  Also add
a script to be run on update to correct existing downloaded rules.

Fixes #12086

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Tested-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-06-05 12:39:57 +01:00
Michael Tremer
745915d82c vpnmain.cgi: Fix wrong cipher suite generation when PFS is disabled
Fixes: #12091
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-06-05 05:07:27 +01:00
Bernhard Bitsch
e4f9ea3c16 dhcp.cgi: Save fixed leases immediately after addition of a new lease
This changes the behaviour of the script to immediately save the added
lease to file but still remain in edit mode to make changes.

If the user does not make any changes, the lease is immediately saved
and there is no second click required to write it to file.

This a more natural flow that is expected by almost all users of this
feature.

Fixes: #12050
Signed-off-by: Bernhard Bitsch <bbitsch@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-06-05 00:30:19 +01:00
Erik Kapfer
d2de0a00ce ovpnmain.cgi: Fixed line break for LZO option
It is better readable if everything is in one line.

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-06-02 22:49:17 +01:00
Erik Kapfer
ac2fdbb15e tor.cgi: Disable debugging output
Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-27 15:46:45 +01:00
Arne Fitzenreiter
29abc2d07c vulnerabilities.cgi: again change colours
red - vulnerable
blue - mitigated
green - not affected

because we not really trust the mitigations so they shound not green.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-05-25 07:39:38 +02:00
Arne Fitzenreiter
e896a9bd3d vulnerabilities.cgi fix string handling
remove lf at the end for correct matching
and not strip "Mitigated:" if it was not full working and still
vulnerable.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-05-25 06:54:35 +02:00
Michael Tremer
413f84e988 vulnerabilities.cgi: Regard mitigations that only mitigate something still as vulnerable
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-25 06:51:53 +02:00
Michael Tremer
a96bcf413a vulnerabilities.cgi: Simplify regexes
We can do the split in one.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-25 06:51:06 +02:00
Arne Fitzenreiter
984a6cabe4 vulnerablities: change to logic colours
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-05-22 12:34:03 +02:00
Arne Fitzenreiter
b23db9b97b vulnerablities.cgi: add colours for vuln,smt and unknown output.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-05-22 10:30:08 +02:00
Michael Tremer
1cbcd044af SMT: Show status on vulnerabilities.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 21:54:05 +01:00
Michael Tremer
f238e25172 vulnerabilities.cgi: Disable debugging output
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 21:39:03 +01:00
Michael Tremer
6f626b9ba0 Add the new vulnerabilities CGI file to the System menu
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 21:38:20 +01:00
Michael Tremer
65871d1a0c Add new CGI file to show CPU vulnerability status
This is supposed to help users to have an idea about
the status of the used hardware.

Additionally, it allows users to enable/disable SMT.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 21:17:17 +01:00
Michael Tremer
23b26ce5e3 zoneconf: Reindent with tabs
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:56:13 +01:00
Florian Bührle
7478903fb1 Added reboot notice
Added a reboot notice and made table rows more distinguishable by
alternating their background color. This improves usability.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:54:22 +01:00
Florian Bührle
0ec8e31ade zoneconf: Switch rows/columns
This change is necessary because the table can grow larger than the main
container if a user has many NICs on their machine.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:53:50 +01:00
Michael Tremer
145343d56e Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:52:42 +01:00
Erik Kapfer
1338977702 ovpn_reorganize_encryption: Integrate LZO from global to advanced section
Fixes: #11819

- Since the Voracle vulnerability, LZO is better placed under advanced section cause under specific circumstances it is exploitable.
- Warning/hint has been added in the option defaults description.

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:51:26 +01:00
Erik Kapfer
0c4ffc6919 ovpn_reorganize_encryption: Added tls-auth into global section
- Since HMAC selection is already in global section, it makes sense to keep the encryption togehter.
- Given tls-auth better understandable name.

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:50:21 +01:00
Erik Kapfer
86308adb25 ovpn_reorganize_encryption: Integrate HMAC selection to global section
Fixes: #12009 and #11824

- Since HMACs will be used in any configuration it is better placed in the global menu.
- Adapted global section to advanced and marked sections with a headline for better overview.
- Deleted old headline in advanced section cause it is not needed anymore.
- Added check if settings do not includes 'DAUTH', if possible SHA512 will be used and written to settings file.
    Old configurations with SHA1 will be untouched.

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:49:30 +01:00
Oliver Fuhrer
bf2a1c524b BUG 11696: VPN Subnets missing from wpad.dat
This patch fixes the behavior in 11696 and adds IPSEC and OpenVPN n2n subnets to wpad.dat so they don't pass through the proxy.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:38:17 +01:00
Erik Kapfer
830dfc978c suricata: Fixed logs.dat regex for suricata
Fixes: #12084

Since the Suricata regex did not match the messages output, Suricata was not displayed in the "System Logs" section in the WUI.

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-05-20 07:12:42 +02:00
Michael Tremer
3c6423cd40 Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-18 09:25:54 +01:00
Alexander Marx
c96146d01e BUG11505: Captive Portal: no way to remove an uploaded logo
added a delete button

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-17 23:36:32 +01:00
Michael Tremer
6b2801d62e URL Filter: Drop Safe Search feature
This is not working for quite some time now because all search
engines have moved over to HTTPS. Therefore we no longer can
manipulate the URL query string.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-11 04:16:39 +01:00
Florian Bührle
a6695868d0 zoneconf: Fix bug that resultet from last fix
Fix bug that prevents users from assigning NIC to RED if RED is in PPP
mode
2019-05-11 14:38:39 +02:00
Florian Bührle
f60b61e04d zoneconf: Fix bug in NIC assignment; Change visibility of unused zones
Fix a bug that allows users to add multiple NICs to non-bridged zones.
This fix includes a new error message.

Unused zones are now invisible instead of grey.
2019-05-11 13:28:12 +02:00
Michael Tremer
88e64c23c1 routing: Fix potential authenticated XSS in input processing
An authenticated Stored XSS (Cross-site Scripting) exists in the
(https://192.168.0.241:444/cgi-bin/routing.cgi) Routing Table Entries
via the "Remark" text box  or "remark" parameter. This is due to a
lack of user input validation in "Remark" text box  or "remark"
parameter. It allows an authenticated WebGUI user with privileges
for the affected page to execute Stored Cross-site Scripting in
the Routing Table Entries (/cgi-bin/routing.cgi), which helps
attacker to redirect the victim to a attacker's phishing page.

The Stored XSS get prompted on the victims page whenever victim
tries to access the Routing Table Entries configuraiton page.

An attacker get access to the victim's session by performing
the CSRF and gather the cookie and session id's or possibly can
change the victims configuration using this Stored XSS.

This attack can possibly spoof the victim's informations.

Fixes: #12072
Reported-by: Dharmesh Baskaran <dharmesh201093@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-10 09:04:54 +01:00
Michael Tremer
1d6bc7a0dc zoneconf: Remove red warning
This is a bit shouty and there are various places where we do not
warn about this problem, so this patch makes it more consistent.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-09 17:16:35 +02:00
Michael Tremer
03fd68552d zoneconf: Move "None" option to the top
This is a more natural order of the options to me

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-09 17:11:24 +02:00
Michael Tremer
462bc3d159 captive: Fix potential authenticated XSS in title processing
An authenticated Stored XSS (Cross-site Scripting) exists in the
(https://localhost:444/cgi-bin/captive.cgi) Captive Portal via the
"Title of Login Page" text box or "TITLE" parameter. This is due to
a lack of user input validation in "Title of Login Page" text box
or "TITLE" parameter. It allows an authenticated WebGUI user with
privileges for the affected page to execute Stored Cross-site
Scripting in the Captive Portal page (/cgi-bin/captive.cgi), which
helps attacker to redirect the victim to a attacker's page.

The Stored XSS get prompted on the victims page whenever victim
tries to access the Captive Portal page.

An attacker get access to the victim's session by performing the
CSRF and gather the cookie and session id's or possibly can
change the victims configuration using this Stored XSS.

This attack can possibly spoof the victim's informations.

Fixes: #12071
Reported-by: Dharmesh Baskaran <dharmesh201093@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-09 13:16:52 +01:00
Florian Bührle
1dcf513a41 webif: Add a GUI for configuring VLAN interfaces
This patch adds a new CGI file which allows users to edit the
VLAN configuration as well as configuring zones as bridges.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-08 12:15:27 +01:00
Stefan Schantl
d2b54a312f guardian: Remove snort related options.
IPFire has moved to suricata as IDS/IPS system, therefore all snort related
options has become obsolete.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-05-08 19:20:08 +02:00
Michael Tremer
b38710a1cd firewall: Allow SNAT rules with RED interface
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-07 23:45:17 +01:00
Arne Fitzenreiter
20c7552e0d Merge branch 'master' into next
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-04-26 19:39:55 +02:00
Michael Tremer
1f35114d7b hostap: Fix wiring of checkboxes for client isolation
The checkboxes were swapped which lead to client isolation
being enabled when the UI said disabled and vice-versa.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-26 07:42:48 +02:00
Michael Tremer
c721714036 hostap: Translate configuration settings
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-24 11:31:28 +01:00
Michael Tremer
5cf4aba470 hostap: Fix wiring of checkboxes for client isolation
The checkboxes were swapped which lead to client isolation
being enabled when the UI said disabled and vice-versa.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-24 11:24:33 +01:00
Michael Tremer
49ef32d164 hostap: Remove deprecated directive
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-24 11:08:36 +01:00
Michael Tremer
dc850cb32f hostap: Enable 80MHz bandwidth by default (when using ACS)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-24 10:43:50 +01:00
Michael Tremer
37a83c83cd hostap: Enable option to force clients to use 802.11w
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-24 10:39:25 +01:00
Michael Tremer
ea10f1a0b5 hostap: Allow to use Automatic Channel Selection (ACS)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-24 10:12:29 +01:00