Commit Graph

2222 Commits

Author SHA1 Message Date
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
Michael Tremer
e967871e8f Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-20 14:21:46 +01:00
Alexander Koch
cdc82a993a squid / WPAD: Add Wiki-Link for required further adjustments to GUI
This patch adds a notice with a link to the Wiki-page https://wiki.ipfire.org/configuration/network/proxy/extend/wpad to the new WebGUI-Setion to make the user aware of the fact, that WPAD will only work correctly if he makes further adjustments:

- Add DHCP-Options for WPAD via DHCP
- Add HOST-Entries to DNS and Apache-vhost or haproxy-frontend/backend or firewall-redirect for WPAD via DNS

These additional options depend on the users environment and can not be shipped by default as they might break the users setups.

Note: The translations are only done for "en" and "de" yet!

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-20 14:16:00 +01:00
Alexander Koch
ce1c170b0c squid / WPAD: Add GUI for exception-files for generation of proxy.pac
This patch adds the missing Web-GUI for the WPAD-Exceptions to proxy.cgi

Note: The translations are only done for "en" and "de" yet!

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-20 14:15:51 +01:00
Alexander Koch
ddc5602ac6 squid / WPAD: Add exception-files for generation of proxy.pac
This patch extends the script /srv/web/ipfire/cgi-bin/proxy.cgi by additional code for reading exceptions for URL's and IP's/Subnets from two new files:

- /var/ipfire/proxy/advanced/acls/dst_noproxy_url.acl
- /var/ipfire/proxy/advanced/acls/dst_noproxy_ip.acl

as described in: https://wiki.ipfire.org/configuration/network/proxy/extend/add_distri

These can be used to define additional URL's, IP's and Subnets that should be retrieved "DIRECT" and not via the proxy. The files have to be created by the user, as the WPAD-Feature is not enabled by default anyway. If the files are not present or their size is 0, nothing is done. I'll revise the wiki-page, after the patch is merged and the core update is released.

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-20 14:15:10 +01:00
Michael Tremer
9e65aa9ed6 Revert "hostapd: Always enable 80 MHz channel width for 802.11ac"
This reverts commit c31c8078cf.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-17 19:15:44 +01:00
Michael Tremer
0851afba33 remote.cgi: Move SSH Agent Forwarding to the top
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-11 23:24:54 +01:00
Michael Tremer
316d14c43a Update list of contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-11 23:00:25 +01:00
Peter Müller
c3c2ae4475 add option for selective PTR generation on hosts.cgi
In some cases, it might be useful to create an additional
host (i.e. for round robin loadbalancing) without assigning
another PTR to the IP address specified.

This patch introduces the ability to check or uncheck
PTR generation for each host individually.

Partially fixes #12030

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-11 22:58:03 +01:00
Stefan Schantl
0d34a479c8 ids.cgi: Display oinkcode section after page load when neccessary.
Fixes #12048.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-11 10:28:19 +01:00
Michael Tremer
d51d3c5b93 IPS logging: Fix date comparison for last entry
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-12 17:36:54 +01:00
Michael Tremer
2eb0c326da IPS logging: There is no distinguation between suricata & snort required
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-12 17:33:39 +01:00
Michael Tremer
19c066b602 IPS logging: Fix reading date
The CGI script only compares mm/dd and does not care about the year.

Suricata, however, logs the year as well which has to be ignored here.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-12 17:32:02 +01:00
Peter Müller
e918b62ae2 allow SSH agent forwarding to be configured via WebUI
Fixes #11931

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-04-08 21:15:35 +01:00
Michael Tremer
ab79dc43bf vpnmain.cgi: Set MTU to a default when editing an old connection
This field is required and therefore we need to initialize it
for old connections. Right now, the CGI throws an error message
when editing an existing connection without the MTU being filled
in.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-04 11:53:11 +01:00
Arne Fitzenreiter
c955ae653a Merge remote-tracking branch 'ms/dfs' into next 2019-03-30 16:55:35 +01:00
Michael Tremer
b6c60092db openvpn: Remove subnet check for static pools
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-22 15:24:03 +00:00
Michael Tremer
ceaf0ef008 dnsforward.cgi: Add DNSSEC option to legend
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-18 17:26:16 +00:00
Michael Tremer
08ded6035f dnsforward.cgi: Check DISABLE_DNSSEC checkbox when editing
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-18 15:36:04 +00:00
Michael Tremer
c31c8078cf hostapd: Always enable 80 MHz channel width for 802.11ac
This is mandatory to support by all hardware and works well.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-16 12:36:03 +00:00
Michael Tremer
70a7c454af hostapd: Automatically disassociate any clients with high error rates
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-16 12:36:03 +00:00
Peter Müller
5b4464a944 hostapd: make client isolation configurable via WebUI
hostapd supports client-isolation, but this feature could
not be configured via the WebUI so far. Since it might be
desired in public wireless networks, or even private ones,
it makes sense to provide a radio button to let the user
decide on.

Fixes #11974.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-16 12:34:06 +00:00
Stefan Schantl
7bf5b0f221 logs.cgi/ids.dat: Fixup processing dates from logfiles which contains a year
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-16 12:27:55 +00:00
Michael Tremer
3bc001dbf9 Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-14 13:20:56 +00:00
Michael Tremer
01604708c3 Merge remote-tracking branch 'stevee/next-suricata' into next 2019-03-14 13:19:35 +00:00
Michael Tremer
beac548962 Update list of contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-11 15:58:45 +00:00
Michael Tremer
56947acb12 Merge remote-tracking branch 'ms/dns-forwarding' into next 2019-03-11 15:57:15 +00:00
Michael Tremer
8288c0394b Merge remote-tracking branch 'ms/dhcp' into next 2019-03-11 09:53:56 +00:00
Peter Müller
04f9321955 Tor WebUI: drop relay bandwith options < 1 MBit/s
Tor requires at least 1 MBit/s in order to participate.

Fixes #12001

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-11 09:52:54 +00:00