Commit Graph

133 Commits

Author SHA1 Message Date
Michael Tremer
9d9c825b4e Merge branch 'cr_fix' of https://github.com/hadfl/ipfire-2.x into next 2014-07-19 11:34:50 +02:00
Alexander Marx
5b942f7f3b OpenVPN: change sortorder of client status and control. Now every network is sorted and displayed in a group 2014-07-14 11:48:36 +02:00
Alexander Marx
c8b51e28bf Openvpn: Change sortorder of client status and control
Now every NET is sorted and second instance is the NAME of the VPN.
2014-07-10 08:08:01 +02:00
Dominik Hassler
66298ef2de - remove cr for n2n server and client config 2014-07-09 23:32:58 +02:00
Michael Tremer
d6c50a8591 Merge remote-tracking branch 'amarx/10538' into next 2014-07-05 22:42:32 +02:00
Alexander Marx
ceb78c46f3 ovpnmain.cgi: Sortorder clientstatus and control - Type, Name 2014-06-16 11:48:18 +02:00
Erik Kapfer
525839f74f openvpn: Clean up DH download code. 2014-06-12 17:36:57 +02:00
Erik Kapfer
ad09461a43 openvpn:Deleted download possibility for DH param and fixed some typos.
* Deleted DH-parameter download possibility in CA/key chart section.
* Fixed some typos in CA/key section.
2014-06-12 16:17:02 +02:00
Erik Kapfer
fd5ccb2dd5 openvpn: Renamed CA chart, added ta.key to chart.
* Added keys to CA chart and renamed CA specifics infos to
CA and key infos.
* Added ta.key to CA/key chart listing.
2014-06-12 09:11:52 +02:00
Erik Kapfer
c8f503560f openvpn: Changed chart string for DH parameter and code cleanup.
* Added PKCS infos for DH parameter string in the chart.
* Deleted some redundant '<td>'s and indent some code in chart section.
2014-06-12 08:37:07 +02:00
Erik Kapfer
a0ad10ca68 openvpn: Deleted double entry.
* 'my $authactive;' was two times defined, but only one time needed.
2014-06-12 08:27:43 +02:00
Erik Kapfer
f7fb5bc5c9 openvpn: Added DH parameter to CA chart.
Added also a 'Default' mark in N2N cipher menu for AES-256-CBC.

(cherry picked from commit c16d97c617)
2014-05-28 20:24:28 +02:00
Erik Kapfer
92bed25016 openvpn: Fixed some typos
(cherry picked from commit b585282abf)
2014-05-28 20:24:10 +02:00
Erik Kapfer
4be45949e9 openvpn: Changed directioning and added additional generation for ta.key.
Deleted the direction parameter 0 and 1 in ta.key directive for
compatibility purposes.
Added the ta.key generation also in PKI build process.
Replaced the ta.key to /certs instead of /ca and adapted the
apropriate paths.
2014-05-18 09:35:26 +02:00
Erik Kapfer
53ce51761f openvpn: Drop unused code from cgi file.
Deleted the following unused functions:

* checkportfw
* checkportoverlap
* checkportinc
* disallowreserved
2014-05-17 21:50:19 +02:00
Erik Kapfer
754066e6c3 openvpn: Deleted double entries for TLSAUTH and DAUTH.
Also drop remaining if clauses for Engines.
2014-05-17 21:32:55 +02:00
Alf Høgemark
1638682beb 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-05-14 21:56:42 +02:00
Alf Høgemark
a9fb14d051 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-05-14 21:55:28 +02:00
Alf Høgemark
040b8b0c5e ovpnmain.cgi: Use language string keys already defined 2014-05-14 21:54:27 +02:00
Alf Høgemark
bc2b3e9483 vpnmain.cgi: htmlcleanup, change html tags from uppercase to lowercase 2014-05-14 21:51:50 +02:00
Alexander Marx
d9fe569366 openvpn: Wrong subnet calculation bug fix.
Fixes #10466.
2014-05-14 21:47:23 +02:00
Michael Tremer
ed4b4c19b9 Re-apply: OpenVPN: Fix daemon stuck in WAIT state.
When the client is in the WAIT state, it is usally connected
to the server.

Conflicts:
	html/cgi-bin/index.cgi
	html/cgi-bin/ovpnmain.cgi
2014-05-14 21:46:22 +02:00
Michael Tremer
a50dadc229 openvpn: Remove RC2 as a cipher option. 2014-05-14 21:28:45 +02:00
Erik Kapfer
f527e53f54 ovpn_fixes: Fixed some typos and strcture.
Fixes #10462#c21.

Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-14 21:26:42 +02:00
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