Commit Graph

1691 Commits

Author SHA1 Message Date
Stefan Schantl
06ff7e28d7 guardian.cgi: Accidently hardcoded some descriptions.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
7899718f04 guardian.cgi: Add dropdown to select the used loglevel.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
a67b3e2dc5 guardian.cgi: Remove code for options which have been dropped from guardian.
Guardian does not longer require the information for the red interface from
the configfile.

Guardian does not longer support a targetfile.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
26fcd31e1f guardian.cgi: Add options to enable/disable some built-in functions from guardian.
This commit allows to enable or disable the monitoring of the snort alertfile
and to switch off the blocking of SSH and HTTPD Brute-force attempts.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
d2fea55e09 guardian.cgi: Remove code for Blockinterfaces.
We don't need this code anymore because we dropped interface support
from guardian.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
1d5702a7c3 guardian.cgi: Connect subboxes with input elements to the main boxes.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
5f462919d9 guardian.cgi: Sort blocked IP addresses.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
8b8413e566 guardian.cgi: Add hyperlink to ipinfo page for blocked hosts.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
7f7285911c guardian.cgi: Autodetect the used interface for red.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Stefan Schantl
01dbccb11e guardian.cgi: New page to configure and interact with guardian.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:17:55 +02:00
Alf Høgemark
f00699e8bb Change case of the unit "bit" from "Bit" to "bit" in web UI
The correct case for "kilobit" is "kilobit", not "kiloBit".
And the same applies for Mbit, Gbit etc.
Reference is https://en.wikipedia.org/wiki/Kilobit

This commit changes the texts used in the web UI, so
that it correctly displays as "bit", "kbit", "Mbit" etc.

This fixes bugzilla item 10918.

Signed-off-by: Alf Høgemark <alf@i100.no>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-07-20 16:46:23 +01:00
Stefan Schantl
59232d7225 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2016-06-21 10:08:07 +02:00
Matthias Fischer
40ede5ecb0 log.dat: Fix identation for clamav
Fixes unneeded tabs in 'log.dat'.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-06-01 22:48:28 +01:00
Matthias Fischer
9b39654d9e log.dat: Added 'squid' and 'snort' plus translations
Added 'squid' and 'snort' to section dropdown in LOGS / SYSTEM LOGS,
added translations.

Added translation string for 'web proxy' in '30-network.menu'.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-06-01 22:16:12 +01:00
Matthias Fischer
9494c6112a log.dat: fix missing quotation marks for 'ddns'
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-06-01 22:16:10 +01:00
Matthias Fischer
3a376d999e snort 2.9.8.2: update snort download url
Update for
http://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=0aff7b81965c06756ff42482ef0aa3ccfa68bf8f

Update url is set to 'snortrules-snapshot-2982.tar.gz'

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-05-21 11:35:17 +02:00
Matthias Fischer
5a5e5f04a7 snort: Update to 2.9.8.2
Release notes:

2016-03-09 - Snort 2.9.8.2
[*] New additions
 *  Future-flow and DNS API exposed to lua detector.
 *  Double VLAN tagging support.
[*] Improvements
 *  Performance improvements to AppID.
 *  Stability improvements to file and ftp_telnet preprocessor.
 *  Fixed several issues with SDF and obfuscation.
 *  Resolved an issue of improper handling of malformed DNS host
    in AppID.
 *  HTTP PAF accepts all tokens between method and version strings
    in a request URI.
 *  Resolved snort build issue with "--disable-perfprofiling" configure
    option.
 *  Enhanced mime parsing by adding support for detecting files
    after unknown headers and no headers.
 *  Fixed issue with gzip decompression. If the server response specifies
    Content-Encoding as GZIP, but no Content-Length field for HTTP ver 1.0.
 *  End of Header(EOH) identification for HTTP response header spanning multiple
    packets.
 *  Improved packet reassembly for HTTP.
 *  Fixed Flash LZMA decompression issue.

For details see:
https://www.snort.org/downloads/snort/changelog_2.9.8.2.txt

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-05-21 11:35:11 +02:00
Michael Tremer
2f662bf058 optionsfw.cgi: Clean up code
Add translation to radio buttons. No functional changes.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-04-20 16:14:14 +01:00
Michael Tremer
8e7c5e65ad firewall: Fix connection tracking for PPTP
GRE connections were not correctly forwarded without the helper
being enabled. Choosing the wrong protocol here did not allow
us to load it properly.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-04-20 16:04:24 +01:00
Michael Tremer
0aff7b8196 {proxy,chpasswd}.cgi: Fix a remote code execution vulnerability
Handcrafted requests with shell commands could be sent to these
CGI files and gain shell access as unprivileged user.

References: #11087

Reported-by: Yann Cam <yann.cam@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-04-08 15:54:53 +01:00
Michael Tremer
f367d5b388 ipinfo.cgi: Remove XSS vulnerability
References: #11087

Reported-by: Yann Cam <yann.cam@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-04-08 15:54:53 +01:00
Michael Tremer
c97698a8f4 Merge remote-tracking branch 'meitelwein/web-gui-ipv6' into next 2016-01-23 00:39:24 +00:00
Michael Tremer
8a1a3bf393 Merge remote-tracking branch 'ms/iptables-conntrack' into next 2016-01-22 00:54:14 +00:00
Erik Kapfer
bcb30674e2 webaccess.cgi: Fixed language settings.
Fix for #10879. Added also use strict.

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-01-19 00:06:30 +00:00
Michael Eitelwein
43638be58b No code changes, fixed formatting by replacing spaces with tabs 2016-01-09 20:09:58 +01:00
Michael Eitelwein
1b5b6c91da Fixed detection of firewall chain when bridge is used for ipv6
Signed-off-by: Michael Eitelwein <michael@eitelwein.net>
2016-01-07 19:40:24 +01:00
Michael Eitelwein
a249e865bd Firewall chain was not extracted correctly when ipv6 uses bridge
Signed-off-by: Michael Eitelwein <michael@eitelwein.net>
2016-01-07 19:26:46 +01:00
Michael Eitelwein
f97c6774ef Fix regex to extract firewall chain for ipv6 in showrequestfrom*.dat
If bridged ipv6 is used, $iface is taken from PHYSIN
In the log line the order of fields is "... IN=XY OUT=XY PHYSIN=XY ..."

Signed-off-by: Michael Eitelwein <michael@eitelwein.net>
2016-01-07 15:24:13 +01:00
Michael Eitelwein
9877d28d9e Enable correct display of ipv6 entries in Firewall log pages of web UI.
3 main changes:
 - Fill $iface and $out from PHYSIN and PHYSOUT when looking at bridged packets, othwerwise fill from IN and OUT
 - Recognize ipv4 and ipv6 address style for $srcaddr and $dstaddr
 - Match color coding of tables to pie charts (see seperate patch sent earlier)

I am using the bridged ipv6 setup as proposed in the wiki. I do not think this breaks anything when not using ipv6. So it would be nice to include this even if ipv6 is not officially supported yet. It is quite useful when using the ipv6 setup.

Signed-off-by: Michael Eitelwein <michael@eitelwein.net>
---
2016-01-07 14:00:01 +01:00
Michael Tremer
b0a014b7f8 QoS: Improve saving enabled/disable state
It was reported that the QoS did not stop when
the user clicked the "stop" button. This patch
fixes that.

Fixes #10664

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Acked-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
2016-01-05 21:04:05 +00:00
Erik Kapfer
964700d414 openvpn: Update to version 2.3.7, added --verify-x509-name directive.
The tls-remote directive is deprecated and will be removed with
OpenVPN version 2.4 . Added instead --verify-x509-name HOST name
into ovpnmain.cgi.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-01-04 22:41:46 +00:00
Michael Tremer
ffeaaef618 connections.cgi: Fix page crash with IPsec connections with one subnet only
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-12-12 09:50:19 +00:00
Alexander Marx
1e656e8adc BUG10993: fix errormessage when editing static routes
When editing existing static routes and clicking on apply button, there
was an errormessage saying that this route is already in use.
Now the errormessage is only displayed if a new route has the same ip
than an existing one.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-12-10 16:37:22 +00:00
Michael Tremer
2b163f4497 Drop tripwire
This add-on is likely to be unused

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-12-04 22:18:27 +00:00
Michael Tremer
1574f25557 routing.cgi: Fix syntax error that caused an Internal Server Error
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-25 12:47:29 +00:00
Alexander Marx
70defeb036 BUG10964: When entering wrong data in dma setup, the fields are blanked
When entring wrong values in the fields and saving the site, there comes
an errormessage and all fields except mailserver and port are blanked.
Now the fileds are preserved and all data is displayed even after an
errormessage

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-10 18:38:56 +00:00
Alexander Marx
35a21a254d BUG10902: Add statusfile line when editing an ovpn n2n connection
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-09 17:36:10 +00:00
Alexander Marx
f770b72899 BUG10940: remove leading zeros in ip address
in firewallgroups (hosts) an error was created when using ip adresses
like 192.168.000.008. Now all leading zeros are deleted in
firewallgroups and in the firewall itself when using single ip addresses
as source or target.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-09 17:32:59 +00:00
Alexander Marx
4bfec109e7 BUG10965: only write auth.conf if username/password are set
auth.conf was always written, even if no username/password provided.
In this case only the ip or Hostname of the mailserver was written into
auth.conf. Now the file is only filled if username/password are filled.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Timo Eissler <timo.eissler@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-05 15:34:28 +00:00
Michael Tremer
2913185aa4 openvpn: The --up option only takes one single argument
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-05 11:44:57 +00:00
Michael Tremer
a4e9b9d8e0 openvpn: Apply static routes on client site as well
Fixes: #10968

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-05 11:44:04 +00:00
Matthias Fischer
b6f571fa88 snort: Update to 2.9.7.6
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:18:56 +00:00
Michael Tremer
b22d8aaf4a openvpn: Embed the certificate and key file into configuration
This will allow to import just the configuration file
into iOS and establish the VPN connection. Also works
with many other OpenVPN clients.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:10:47 +00:00
Michael Tremer
71af643cda openvpn: Add option to download a client package with PEM files
This patch adds the option to download a client package
that comes with a regular PEM and key file instead of a
PKCS12 file which is easier to use with clients that
don't support PKCS12 (like iOS) opposed to converting
the file manually.

This requires that the connection is created without
using a password for the certificate. Then the certificate
is already stored in an insecure way.

This patch also adds this to the Core Update 95 updater.

Fixes: #10966

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
CC: Alexander Marx <alexander.marx@ipfire.org>
2015-11-04 21:10:41 +00:00
Michael Tremer
3045d6abde openvpn: Apply static routes when N2N connection comes up
Fixes: #10968

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:10:27 +00:00
Matthias Fischer
93a08fe261 dma: Update to 0.10
Sorry, I borked the PATCH from yesterday...second try:

dma: Update to 0.10
Changes: dns.c, do not treat unreachable DNS server as permanent error
See: 1a1306df01 (diff-8e1267319329e5ee7e6a92fb2aa01c6b)

Deleted unnecessary blank lines in 'mail.cgi'

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:10:04 +00:00
Michael Tremer
6feea5f778 credits.cgi: Update credits
Promotes Alexander Marx to the group of Core Developers.

Also lots of reformatting of old HTML code.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-31 21:41:58 +00:00
Michael Tremer
a057a97655 dhcp rfc2136: dhcpd does not seem to support SHA-1
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-21 17:34:41 +01:00
Michael Tremer
364452506f Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next 2015-10-21 13:50:31 +01:00
Alexander Marx
6be114f03a BUG10941: fix single ip-addresses when no subnet given
Some functions when adding a new route where senseless.
Now the ip address is checked and in case of a missing / wrong
subnetmask an errormessage is raised. The ip address is preserved.
ELSE
we convert the subnetmask to cidr notation and calculate the network ip
correctly.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 19:19:51 +01:00