WEBLIB.RE/vpnclient_ynh
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Clean PHP exceptions

Browse Source
This commit is contained in:
Julien VAUBOURG
2014-11-14 20:44:38 +01:00
parent 9ee92147e4
commit 1579b16afd
1 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
sources/controller.php
View File

@@ -55,60 +55,58 @@ dispatch_put('/settings', function() {
$ip6_net = empty($_POST['ip6_net']) ? 'none' : $_POST['ip6_net']; $ip6_net = empty($_POST['ip6_net']) ? 'none' : $_POST['ip6_net'];
$ip6_addr = 'none'; $ip6_addr = 'none';
if(empty($_POST['server_name']) || empty($_POST['server_port']) || empty($_POST['server_proto'])) { try {
flash('error', T_('The Server Address, the Server Port and the Protocol cannot be empty.')); if(empty($_POST['server_name']) || empty($_POST['server_port']) || empty($_POST['server_proto'])) {
goto redirect; throw new Exception(T_('The Server Address, the Server Port and the Protocol cannot be empty'));
} }
if(!preg_match('/^\d+$/', $_POST['server_port'])) { if(!preg_match('/^\d+$/', $_POST['server_port'])) {
flash('error', T_('The Server Port must be only composed of digits.')); throw new Exception(T_('The Server Port must be only composed of digits'));
goto redirect; }
}
if($_POST['server_proto'] != 'udp' && $_POST['server_proto'] != 'tcp') {
if($_POST['server_proto'] != 'udp' && $_POST['server_proto'] != 'tcp') { throw new Exception(T_('The Protocol must be "udp" or "tcp"'));
flash('error', T_('The Protocol must be "udp" or "tcp".')); }
goto redirect;
} if(($_FILES['crt_client']['error'] == UPLOAD_ERR_OK && $_FILES['crt_client_key']['error'] != UPLOAD_ERR_OK && (!$crt_client_key_exists || $_POST['crt_client_key_delete'] == 1))
|| ($_FILES['crt_client_key']['error'] == UPLOAD_ERR_OK && $_FILES['crt_client']['error'] != UPLOAD_ERR_OK && (!$crt_client_exists || $_POST['crt_client_delete'] == 1))) {
if(($_FILES['crt_client']['error'] == UPLOAD_ERR_OK && $_FILES['crt_client_key']['error'] != UPLOAD_ERR_OK && (!$crt_client_key_exists || $_POST['crt_client_key_delete'] == 1))
|| ($_FILES['crt_client_key']['error'] == UPLOAD_ERR_OK && $_FILES['crt_client']['error'] != UPLOAD_ERR_OK && (!$crt_client_exists || $_POST['crt_client_delete'] == 1))) { throw new Exception(T_('A Client Certificate is needed when you suggest a Key, or vice versa'));
}
flash('error', T_('A Client Certificate is needed when you suggest a Key (or vice versa).'));
goto redirect; if(empty($_POST['login_user']) xor empty($_POST['login_passphrase'])) {
} throw new Exception(T_('A Password is needed when you suggest a Username, or vice versa'));
}
if(empty($_POST['login_user']) xor empty($_POST['login_passphrase'])) {
flash('error', T_('A Password is needed when you suggest a Username (or vice versa).')); if($_FILES['crt_server_ca']['error'] != UPLOAD_ERR_OK && !$crt_server_ca_exists) {
goto redirect; throw new Exception(T_('You need a Server CA.'));
} }
if($_FILES['crt_server_ca']['error'] != UPLOAD_ERR_OK && !$crt_server_ca_exists) { if(($_FILES['crt_client_key']['error'] != UPLOAD_ERR_OK && (!$crt_client_key_exists || $_POST['crt_client_key_delete'] == 1)) && empty($_POST['login_user'])) {
flash('error', T_('You need a Server CA.')); throw new Exception(T_('You need either a Client Certificate, either a Username, or both'));
goto redirect; }
}
if($ip6_net != 'none') {
if(($_FILES['crt_client_key']['error'] != UPLOAD_ERR_OK && (!$crt_client_key_exists || $_POST['crt_client_key_delete'] == 1)) && empty($_POST['login_user'])) { $ip6_net = ipv6_expanded($ip6_net);
flash('error', T_('You need either a Client Certificate, either a Username (or both).'));
goto redirect; if(empty($ip6_net)) {
} throw new Exception(T_('The IPv6 Delegated Prefix format looks bad'));
}
if($ip6_net != 'none') {
$ip6_net = ipv6_expanded($ip6_net); $ip6_blocs = explode(':', $ip6_net);
$ip6_addr = "${ip6_blocs[0]}:${ip6_blocs[1]}:${ip6_blocs[2]}:${ip6_blocs[3]}:${ip6_blocs[4]}:${ip6_blocs[5]}:${ip6_blocs[6]}:1";
if(empty($ip6_net)) {
flash('error', T_('The IPv6 Delegated Prefix format looks bad.')); $ip6_net = ipv6_compressed($ip6_net);
goto redirect; $ip6_addr = ipv6_compressed($ip6_addr);
} }
$ip6_blocs = explode(':', $ip6_net); } catch(Exception $e) {
$ip6_addr = "${ip6_blocs[0]}:${ip6_blocs[1]}:${ip6_blocs[2]}:${ip6_blocs[3]}:${ip6_blocs[4]}:${ip6_blocs[5]}:${ip6_blocs[6]}:1"; flash('error', $e->getMessage().T_(' (configuration not updated).'));
goto redirect;
$ip6_net = ipv6_compressed($ip6_net);
$ip6_addr = ipv6_compressed($ip6_addr);
} }
stop_service(); stop_service();
moulinette_set('server_name', $_POST['server_name']); moulinette_set('server_name', $_POST['server_name']);
moulinette_set('server_port', $_POST['server_port']); moulinette_set('server_port', $_POST['server_port']);
moulinette_set('server_proto', $_POST['server_proto']); moulinette_set('server_proto', $_POST['server_proto']);
@@ -116,23 +114,23 @@ dispatch_put('/settings', function() {
moulinette_set('login_passphrase', $_POST['login_passphrase']); moulinette_set('login_passphrase', $_POST['login_passphrase']);
moulinette_set('ip6_net', $ip6_net); moulinette_set('ip6_net', $ip6_net);
moulinette_set('ip6_addr', $ip6_addr); moulinette_set('ip6_addr', $ip6_addr);
if($_FILES['crt_client']['error'] == UPLOAD_ERR_OK) { if($_FILES['crt_client']['error'] == UPLOAD_ERR_OK) {
move_uploaded_file($_FILES['crt_client']['tmp_name'], '/etc/openvpn/keys/user.crt'); move_uploaded_file($_FILES['crt_client']['tmp_name'], '/etc/openvpn/keys/user.crt');
} elseif($_POST['crt_client_delete'] == 1) { } elseif($_POST['crt_client_delete'] == 1) {
unlink('/etc/openvpn/keys/user.crt'); unlink('/etc/openvpn/keys/user.crt');
} }
if($_FILES['crt_client_key']['error'] == UPLOAD_ERR_OK) { if($_FILES['crt_client_key']['error'] == UPLOAD_ERR_OK) {
move_uploaded_file($_FILES['crt_client_key']['tmp_name'], '/etc/openvpn/keys/user.key'); move_uploaded_file($_FILES['crt_client_key']['tmp_name'], '/etc/openvpn/keys/user.key');
} elseif($_POST['crt_client_key_delete'] == 1) { } elseif($_POST['crt_client_key_delete'] == 1) {
unlink('/etc/openvpn/keys/user.key'); unlink('/etc/openvpn/keys/user.key');
} }
if($_FILES['crt_server_ca']['error'] == UPLOAD_ERR_OK) { if($_FILES['crt_server_ca']['error'] == UPLOAD_ERR_OK) {
move_uploaded_file($_FILES['crt_server_ca']['tmp_name'], '/etc/openvpn/keys/ca-server.crt'); move_uploaded_file($_FILES['crt_server_ca']['tmp_name'], '/etc/openvpn/keys/ca-server.crt');
} }
if(!empty($_POST['login_user'])) { if(!empty($_POST['login_user'])) {
file_put_contents('/etc/openvpn/keys/credentials', "${_POST['login_user']}\n${_POST['login_passphrase']}"); file_put_contents('/etc/openvpn/keys/credentials', "${_POST['login_user']}\n${_POST['login_passphrase']}");
} else { } else {