Commit Graph

109 Commits

Author SHA1 Message Date
Michael Tremer
661cd276b6 Merge remote-tracking branch 'ummeegge/openvpn' into next
Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-11 18:47:11 +02:00
Michael Tremer
b2e75449a9 Revert "OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design."
This reverts commit c2b5d12b34.

Conflicts:
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-11 18:34:34 +02:00
Erik Kapfer
49abe7afb1 OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.
Added HMAC algorithm selection menu for N2N and RW.
Added cipher selection menu for N2N connections.
Added DH key selection also for existing installations incl. DH key upload possibility.
Adjusted the ovpn main WUI design to IPSec WUI.
Extend key lenght for CA, cert and control channel with faktor 2.
Some code and typo cleanup.
Bugfixes for #10317, #10149, #10462, #10463
V.2 New changes:
Integrated changes in langs and ovpnmain.cgi until 20.03.2014 2.15-Beta3.
ovpn.cnf have now default bits of 2048 instead of 1024.
ovpn.cnf default_md works now with sha256 instead of md5.
Bugfix: By new installation the auth directive for RWs is faded out #10462 Comment 15.
Added error message if the crl should be displayed but no crl is present.
v.3 New changes #10462 Comment 20:
Updated to core version 77.
Deleted manual name award in DH key upload section, name will be given automatically now.
Added sha512WithRSAEncryption instead of sha1WithRSAEncryption for "Root Certificate".
Added tls-auth support for Roadwarriors.
Added crypto engine support for N2N and Roadwarriors.
2014-05-11 09:24:04 +02:00
Erik Kapfer
c2b5d12b34 OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.
Added HMAC algorithm selection menu for N2N and RW.
Added cipher selection menu for N2N connections.
Added DH key selection also for existing installations incl. DH key upload possibility.
Adjusted the ovpn main WUI design to IPSec WUI.
Extend key lenght for CA, cert and control channel with faktor 2.
Some code and typo cleanup.
Bugfixes for #10317, #10149, #10462, #10463
V.2 New changes:
Integrated changes in langs and ovpnmain.cgi until 20.03.2014 2.15-Beta3.
ovpn.cnf have now default bits of 2048 instead of 1024.
ovpn.cnf default_md works now with sha256 instead of md5.
Bugfix: By new installation the auth directive for RWs is faded out #10462 Comment 15.
Added error message if the crl should be displayed but no crl is present.
2014-04-13 07:14:25 +02:00
Michael Tremer
dd29d563a6 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.ru
	doc/language_issues.tr
	doc/language_missings
2014-03-20 23:14:13 +01:00
Alexander Marx
03b08c08f0 VPN Checksubnets: Buttons are now Language Strings 2014-03-13 15:27:01 +01:00
Alexander Marx
4d81e0f381 VPN Checksubnets: Now the remote subnets (OpenVPN/IPSec) are checked. If they are defined elsewhere, there's a warningmessage displayed 2014-03-13 15:09:01 +01:00
Alexander Marx
b3c53248d9 Firewall: When delting an OpenVPN or IPSec connection, the rules are only colored yellow and the firewallrules are reloaded automatically 2014-03-13 13:53:39 +01:00
Erik Kapfer
4c962356a0 OpenVPN: Added auth and cipher menu, changed design, fixed bugs.
Added --auth directive with a flip menu for N2N and RW.
Added cipher menu for N2N.
Added new cipher and digest algorithm.
Adapted OpenVPN WUI design to IPSec design.
Changed key lenght for certificates with factor 2.
Added DH menu to WUI, with DH upload possibility and separated DH generation possibility.
Several Bugfixes, reference can be found under Bug #10463.
Also Fixes for #10317 and #10149.
2014-02-27 10:01:57 +01:00
Alf Høgemark
f8aa06792f cgi-bin: Add title attribute to input type image where missing
Almost all of <input type="image"... has both an alt and a
title attribute, but some are missing title, and when the icon
is not very clear, it makes it harder to understand what the icon
does. By adding title, the browser displays text when mouse pointer
is over the icon.

Also add missing quotes for alt and title attributes where needed.
2014-02-19 18:31:02 +01:00
Alf Høgemark
153cf6406c cgi-bin: Use readonly="readonly" attribute on html input elements
The proper way to mark readonly is to use readonly="readonly", not
readonly="true", like it was done some places.
2014-02-18 18:48:57 +01:00
Michael Tremer
5ee7500e59 Merge remote-tracking branch 'alfh/feature_htmlcleanup' into next
Conflicts:
	html/cgi-bin/logs.cgi/firewalllogip.dat
	html/cgi-bin/logs.cgi/firewalllogport.dat
	html/cgi-bin/media.cgi
2014-02-17 16:33:38 +01:00
Alf Høgemark
631b67b7cd cgi-bin: HTML cleanup, add quotes for attribute values 2014-02-15 16:54:38 +01:00
Alf Høgemark
973f711ad1 ovpnmain.cgi: htmlcleanup, change html tags from uppercase to lowercase 2014-02-15 15:46:27 +01:00
Alf Høgemark
1560bc6e1f ovpnmain.cgi: Use language string keys already defined 2014-02-15 15:23:46 +01:00
Alexander Marx
8084656823 openvpn: Wrong subnet calculation bug fix.
Fixes #10466.
2014-02-02 14:38:24 +01:00
Erik Kapfer
48cc0e123a openvpn: Since port must be < 1024 we can drop the conflict check.
All the potentially conflicting ports are smaller than < 1024
and can therefore never be used any way.
2014-01-20 20:22:03 +01:00
Michael Tremer
e11f536252 OpenVPN: Fix daemon stuck in WAIT state.
When the client is in the WAIT state, it is usally connected
to the server.
2014-01-12 15:40:50 +01:00
Erik Kapfer
8c252e6aa8 OpenVPN: Check if port is smaller than 1024.
Bug #10459.
2014-01-11 12:38:53 +01:00
Alexander Marx
3932f02ba3 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout 2014-01-09 16:23:39 +01:00
Alexander Marx
f7edf97ae7 Layout changes ovpnmain.cgi 2014-01-09 14:59:46 +01:00
Michael Tremer
9063a04e94 Merge branch 'master' into fifteen
Conflicts:
	config/backup/backup.pl
2014-01-09 13:31:25 +01:00
Alexander Marx
4d5247bdd0 fix ccd config name for openvpn 2.3 2014-01-09 11:47:44 +01:00
Alexander Marx
99bfa85c89 fifteen-theme: made ovpnmain.cgi tables themeable
Conflicts:
	html/cgi-bin/ovpnmain.cgi
2014-01-08 15:04:42 +01:00
Stefan Schantl
e602416f94 Fix inpossible download of hostcert on french language.
The french tranlsation string for download host certificate contains a single quote
character which breaks the used HTML code. As a result of this it wasn't possibe to
download the host certificate via the WUI with selected french language.

Fixes #10405.
2014-01-07 21:13:56 +01:00
Michael Tremer
ce7c5249bf openvpn: Support Camellia cipher. 2014-01-06 22:11:47 +01:00
Michael Tremer
b7d9509c3a openvpn: Use AES-256-CBC as default cipher.
Applies to new installations, only.
2014-01-04 17:20:15 +01:00
Arne Fitzenreiter
ba263fbbb9 Merge remote-tracking branch 'origin/next' into fifteen 2013-12-30 13:45:10 +01:00
Michael Tremer
1d0a260a8b openvpn: Move verify script out of configuration directory. 2013-12-29 21:13:55 +01:00
Alexander Marx
6d8eb5dec7 Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall 2013-10-24 09:24:12 +02:00
Michael Tremer
2ac39db92e Merge remote-tracking branch 'amarx/firewall' into fifteen 2013-08-28 11:33:20 +02:00
Michael Tremer
8e6a8fd5d3 ovpnmain.cgi: Don't fail if files are not existant.
N2N connections could not be deleted if they have never been
started.
2013-08-19 17:40:57 +02:00
Michael Tremer
86228a56ef ovpnmain.cgi: Fix remote IP address validation. 2013-08-19 17:33:23 +02:00
Alexander Marx
1ca546126e Forward Firewall: deleted configfile "nat" in ovpnmain.cgi for portfw check. File "nat" no longer exists. Now the portfw rules are in file "config" 2013-08-09 14:15:33 +02:00
Alexander Marx
eff2dbf833 Forward Firewall: changed sort-order to Sort::Naturally. This Perl Module will be available since core 68. 2013-08-09 14:13:11 +02:00
Alexander Marx
139a1ab947 Forward Firewall: removed devel-tags 2013-08-09 14:13:11 +02:00
Alexander Marx
6945e46310 Forward Firewall: rewrote portcheck routine in ovpnmain so that checks for portforwardingports are made against /var/ipfire/forward/nat instead of /var/ipfire/portfw/config 2013-08-09 14:13:11 +02:00
Stefan Schantl
c125d8a2b4 ovpnmain.cgi: Allow to keep the Remote field empty for N2N connections.
* It's now possible to keep the Remote Host/IP field empty.
* Cleaned up code.

Fixes #10392.
2013-07-20 10:57:45 +02:00
Stefan Schantl
92b87e17f1 ovpnmain.cgi: Set mtu-disc to off if not configured.
Fixes #10391.
2013-07-17 21:01:14 +02:00
Stefan Schantl
f48074bacb ovpnmain.cgi: Add check for a valid N2N network.
Fixes #10390.
2013-07-17 19:58:20 +02:00
Alexander Marx
b376fae45c OpenVPN: Bugfix 10352: When opening advanced server options all fields are disabled under IE10 2013-04-29 12:57:01 +02:00
Alexander Marx
ab4cf06cff OpenVPN: Bugfix 10357, now when chaning an VPN N2N or editing an old one the ports are checked. 2013-04-28 05:47:50 +02:00
Stefan Schantl
75559f73dc Merge branch 'ovpn-client-pkg-download' into core67-merge 2013-03-03 13:37:15 +01:00
Alexander Marx
81da1b01e9 ovpnmain.cgi: Change check for pushed dhcp domains.
The Domainname is now checked against validdomainname instead of validfqdn,
so there's no need of a dotted domainname anymore.

Fixes #10262.
2013-03-03 13:23:49 +01:00
Alexander Marx
96096995ed ovpnmain.cgi: Fix downloading of client packages.
It was only possible to download the client packages if the OpenVPN server is running - which is very confusing.

Fixes #10300.
2013-03-01 19:25:15 +01:00
Arne Fitzenreiter
b34fdcae83 proxy: allow access to IPFire itself if nets are blocked.
This fixes missing pictures on blocking pages.
fixes #10138
2013-02-14 19:33:37 +01:00
Bernhard Bittner
f0ccae1819 ovpnmain.cgi: Fix typo. 2013-01-09 15:22:21 +01:00
Alexander Marx
b643120c01 OpenVPN CCD: Fix ccd filename when certificate has spaces in name. Now the filename gets an underscore to provide full functionality of openvpn. 2013-01-07 12:31:03 +01:00
Stefan Schantl
4f6e3ae3b8 ovpnmain.cgi: Fix client package creation.
Fix print aguments to fit with operation systems which uses \r\n on textfiles.

Fixes #10269.
2012-12-17 21:54:33 +01:00
Alexander Marx
82c809c752 OpenVPN ccd: fixed typos in ccd-files 2012-11-29 21:31:32 +01:00