Commit Graph

1671 Commits

Author SHA1 Message Date
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
Alexander Marx
8b7417c50b BUG10806: fix wrong customhostgroupcheck
The function to check for valid hostgroup entries not only
checked the target hostgroup but also the source hostgroup if any.
This lead to the error.
Now the check only affects target hostgroups because it does not matter if a sourcegroup contains mac addresses.

 Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 19:18:59 +01:00
Stefan Schantl
953ff6edb3 firewalllogcountry.dat: Do not show 'Details' button for unkonw location.
The CGI offers the posibility to get more details for a certain locations
by clicking on a button.

This feature cannot be used for the category "unknown". To prevent users
from beeing confused about non show-able details, I added some code to hide
this button for this category.

Fixes #10726.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 18:53:58 +01:00
Stefan Schantl
609b862fe7 pppsetup.cgi: Fix site layout when no TYPE is specified
There was an issue with false generated HTML code, in case
of an empty or unset $pppsettings{'TYPE'} variable which results
in a missplaced website footer.

This patch moves the code for closeing the table and the call of the
closebox() function to the correct place to prevent this display issue.

Fixes #10565.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 18:51:31 +01:00
Larsen
2158e11ba9 IPSec VPN: Add "required" marker for "organization name"
IPSec VPN: Add "required" marker for "organization name"

Fixes https://bugzilla.ipfire.org/show_bug.cgi?id=10846

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-15 15:44:56 +01:00
Stefan Schantl
a9a28430b5 tor.cgi: Fix missing country flag icons.
The CGI now is using the GeoIP::get_flag_icon function provided by the
geoip-functions.pl, which takes care of the changed flag icons shipped
by core update 90.

Fixes #10919.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Tested-by: Jan Paul Tuecking <jan.paul.tuecking@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-15 15:42:44 +01:00
Michael Tremer
c6fba315ec connections.cgi: Support multiple subnets for IPsec
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-28 14:24:44 +01:00
Michael Tremer
b1881251d6 Merge remote-tracking branch 'ms/ipsec-subnets' into next 2015-09-28 14:21:18 +01:00
Lars Schuhmacher
624615ee07 vpnmain.cgi - Replace spaces with tab characters and fix indentation
Replaced spaces with tab characters. Fixed indentation.

This is based on http://patchwork.ipfire.org/patch/88/ so that patch must be applied before.

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-28 14:05:06 +01:00
Lars Schuhmacher
ed1d0fbdbe IPsec: Remove GUI option for "Roadwarrior virtual IP"
This setting stems from IPCop (and probably Openswan) and causes a problem.

Fixes bug #10496.

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-28 14:04:40 +01:00
Lars Schuhmacher
e3edceeb7a Mark required input fields with a star
Mark required input fields with a star as nowadays this is
the de-facto default. Before, it was the other way around and
optional fields were marked.

Signed-off-by: Lars Schumacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-21 16:40:41 +01:00
Michael Tremer
f6529a04a3 IPsec: Add option to force using MOBIKE
Some peers that are behind a NAT router that fails
to properly forward IKE packets on UDP port 500 cannot
establish an IPsec connection. MOBIKE tries to solve that
by sending these packets to UDP port 4500 instead.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-10 13:35:24 +01:00
Alexander Marx
afd6e1931d dma: change field order of mail.cgi and fix required fields
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-26 16:22:35 +01:00
Alexander Marx
2799b3d9e9 dma: fix typo in mail.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-26 12:36:47 +01:00
Michael Tremer
8792caad90 ipsec: Support using multiple subnets per tunnel
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-25 21:52:11 +01:00
Alexander Marx
1986cc88a1 dma: add loggingoption to weblog for mail
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-25 13:57:03 +01:00
Alexander Marx
9c7b90207e Add web UI for the system MTA
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-21 09:46:26 +01:00
Michael Tremer
6b86307cac firewall options: Fix translation and spelling of new ALG section
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-20 23:05:40 +01:00
Alexander Marx
63fd135400 BUG10844 add new options to firewalloptions for conntrack
simple changes, so far no languagefile changes because of simple
protocol names. should be clear in all languages.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-20 23:02:53 +01:00
Michael Tremer
e353470a8c dhcp.cgi: Count up key when skippingh search entries
This caused a bug that when the user wanted to edit one
of the static leases and clicked on the edit icon that
an other entry opened up for editing.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-06-17 14:02:05 +02:00
Michael Tremer
a1468f66f0 dhcp.cgi: Never save the search query
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-06-17 14:01:40 +02:00