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

Fix #24

Browse Source
This commit is contained in:
Julien Vaubourg
2015-09-29 00:17:23 +02:00
parent 5b0cc0cc2f
commit 8bcce7defe
4 changed files with 322 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
sources/controller.php
View File

@@ -64,6 +64,33 @@ function ipv6_compressed($ip) {
return $output[0];
}
function readAutoConf($file) {
$json = file_get_contents($file);
$config = json_decode($json, true);
if(!empty($config['crt_server_ca'])) {
$config['crt_server_ca'] = str_replace('|', "\n", $config['crt_server_ca']);
}
if(!empty($config['crt_client'])) {
$config['crt_client'] = str_replace('|', "\n", $config['crt_client']);
}
if(!empty($config['crt_client_key'])) {
$config['crt_client_key'] = str_replace('|', "\n", $config['crt_client_key']);
}
if(!empty($config['crt_client_ta'])) {
$config['crt_client_ta'] = str_replace('|', "\n", $config['crt_client_ta']);
}
if(!empty($config['openvpn_add'])) {
$config['openvpn_add'] = str_replace('|', "\n", $config['openvpn_add']);
}
return $config;
}
dispatch('/', function() {
$ip6_net = ynh_setting_get('ip6_net');
$ip6_net = ($ip6_net == 'none') ? '' : $ip6_net;
@@ -89,47 +116,56 @@ dispatch('/', function() {
});
dispatch_put('/settings', function() {
$service_enabled = isset($_POST['service_enabled']) ? 1 : 0;
if($service_enabled == 1) {
$crt_client_exists = file_exists('/etc/openvpn/keys/user.crt');
$crt_client_key_exists = file_exists('/etc/openvpn/keys/user.key');
$crt_server_ca_exists = file_exists('/etc/openvpn/keys/ca-server.crt');
$service_enabled = isset($_POST['service_enabled']) ? 1 : 0;
$ip6_net = empty($_POST['ip6_net']) ? 'none' : $_POST['ip6_net'];
$config = $_POST;
$autoconf = false;
if($_FILES['cubefile']['error'] == UPLOAD_ERR_OK) {
$config = readAutoConf($_FILES['cubefile']['tmp_name']);
$autoconf = true;
}
$ip6_net = empty($config['ip6_net']) ? 'none' : $config['ip6_net'];
$ip6_addr = 'none';
if($service_enabled == 1) {
try {
if(empty($_POST['server_name']) || empty($_POST['server_port']) || empty($_POST['server_proto'])) {
if(empty($config['server_name']) || empty($config['server_port']) || empty($config['server_proto'])) {
throw new Exception(_('The Server Address, the Server Port and the Protocol cannot be empty'));
}
if(!preg_match('/^\d+$/', $_POST['server_port'])) {
if(!preg_match('/^\d+$/', $config['server_port'])) {
throw new Exception(_('The Server Port must be only composed of digits'));
}
if($_POST['server_proto'] != 'udp' && $_POST['server_proto'] != 'tcp') {
if($config['server_proto'] != 'udp' && $config['server_proto'] != 'tcp') {
throw new Exception(_('The Protocol must be "udp" or "tcp"'));
}
if(empty($_POST['dns0']) || empty($_POST['dns1'])) {
if(empty($config['dns0']) || empty($config['dns1'])) {
throw new Exception(_('You need to define two DNS resolver addresses'));
}
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(empty($config['login_user']) xor empty($config['login_passphrase'])) {
throw new Exception(_('A Password is needed when you suggest a Username, or vice versa'));
}
if((!$autoconf && (($_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))))
|| ($autoconf && (empty($config['crt_client']) xor empty($config['crt_client_key'])))) {
throw new Exception(_('A Client Certificate is needed when you suggest a Key, or vice versa'));
}
if(empty($_POST['login_user']) xor empty($_POST['login_passphrase'])) {
throw new Exception(_('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) {
if((!$autoconf && $_FILES['crt_server_ca']['error'] != UPLOAD_ERR_OK && !$crt_server_ca_exists) || ($autoconf && empty($config['crt_server_ca']))) {
throw new Exception(_('You need a Server CA.'));
}
if(($_FILES['crt_client_key']['error'] != UPLOAD_ERR_OK && (!$crt_client_key_exists || $_POST['crt_client_key_delete'] == 1)) && empty($_POST['login_user'])) {
if(((!$autoconf && $_FILES['crt_client_key']['error'] != UPLOAD_ERR_OK && (!$crt_client_key_exists || $_POST['crt_client_key_delete'] == 1)) || ($autoconf && empty($config['crt_client_key']))) && empty($config['login_user'])) {
throw new Exception(_('You need either a Client Certificate, either a Username, or both'));
}
@@ -158,16 +194,60 @@ dispatch_put('/settings', function() {
ynh_setting_set('service_enabled', $service_enabled);
if($service_enabled == 1) {
ynh_setting_set('server_name', $_POST['server_name']);
ynh_setting_set('server_port', $_POST['server_port']);
ynh_setting_set('server_proto', $_POST['server_proto']);
ynh_setting_set('dns0', $_POST['dns0']);
ynh_setting_set('dns1', $_POST['dns1']);
ynh_setting_set('login_user', $_POST['login_user']);
ynh_setting_set('login_passphrase', $_POST['login_passphrase']);
ynh_setting_set('server_name', $config['server_name']);
ynh_setting_set('server_port', $config['server_port']);
ynh_setting_set('server_proto', $config['server_proto']);
ynh_setting_set('dns0', $config['dns0']);
ynh_setting_set('dns1', $config['dns1']);
ynh_setting_set('login_user', $config['login_user']);
ynh_setting_set('login_passphrase', $config['login_passphrase']);
ynh_setting_set('ip6_net', $ip6_net);
ynh_setting_set('ip6_addr', $ip6_addr);
if($autoconf) {
if(!empty($config['openvpn_add'])) {
copy('/etc/openvpn/client.conf.tpl.restore', '/etc/openvpn/client.conf.tpl');
$raw_openvpn = file_get_contents('/etc/openvpn/client.conf.tpl');
$raw_openvpn .= "\n# Custom\n".$config['openvpn_add'];
file_put_contents('/etc/openvpn/client.conf.tpl', $raw_openvpn);
}
if(empty($config['crt_client'])) {
if(file_exists('/etc/openvpn/keys/user.crt')) {
unlink('/etc/openvpn/keys/user.crt');
}
} else {
file_put_contents('/etc/openvpn/keys/user.crt', $config['crt_client']);
}
if(empty($config['crt_client_key'])) {
if(file_exists('/etc/openvpn/keys/user.key')) {
unlink('/etc/openvpn/keys/user.key');
}
} else {
file_put_contents('/etc/openvpn/keys/user.key', $config['crt_client_key']);
}
if(empty($config['crt_client_ta'])) {
if(file_exists('/etc/openvpn/keys/user_ta.key')) {
unlink('/etc/openvpn/keys/user_ta.key');
}
} else {
file_put_contents('/etc/openvpn/keys/user_ta.key', $config['crt_client_ta']);
}
if(empty($config['crt_server_ca'])) {
if(file_exists('/etc/openvpn/keys/ca-server.crt')) {
unlink('/etc/openvpn/keys/ca-server.crt');
}
} else {
file_put_contents('/etc/openvpn/keys/ca-server.crt', $config['crt_server_ca']);
}
} else {
file_put_contents('/etc/openvpn/client.conf.tpl', $_POST['raw_openvpn']);
if($_FILES['crt_client']['error'] == UPLOAD_ERR_OK) {
@@ -191,9 +271,10 @@ dispatch_put('/settings', function() {
if($_FILES['crt_server_ca']['error'] == UPLOAD_ERR_OK) {
move_uploaded_file($_FILES['crt_server_ca']['tmp_name'], '/etc/openvpn/keys/ca-server.crt');
}
}
if(!empty($_POST['login_user'])) {
file_put_contents('/etc/openvpn/keys/credentials', "${_POST['login_user']}\n${_POST['login_passphrase']}");
if(!empty($config['login_user'])) {
file_put_contents('/etc/openvpn/keys/credentials', "${config['login_user']}\n${config['login_passphrase']}");
} else {
file_put_contents('/etc/openvpn/keys/credentials', '');
}

9
sources/public/css/style.css
View File

@@ -96,3 +96,12 @@ textarea#raw_openvpn {
height: 300px;
border: 1px solid #D9534F;
}
ul.nav {
margin-top: 30px;
margin-bottom: 20px;
}
ul.nav a {
outline: none;
}

13
sources/public/js/custom.js
View File

@@ -16,11 +16,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
function tabsClick() {
var tab = $(this).parent().attr('data-tab');
$('.nav').find('li.active').removeClass('active');
$(this).parent().addClass('active');
$('.tabs').hide();
$('.tab' + tab).show();
return false;
}
$(document).ready(function() {
$('.btn-group').button();
$('[data-toggle="tooltip"]').tooltip();
$('.switch').bootstrapToggle();
$('.nav-tabs a').click(tabsClick);
$('.fileinput').click(function() {
if(!$(this).hasClass('btn-danger')) {

40
sources/views/settings.html.php
View File

@@ -55,7 +55,13 @@
</div>
</div>
<div class="panel panel-default enabled" <?= $service_enabled == 0 ? 'style="display: none"' : '' ?>>
<ul class="nav nav-tabs nav-justified enabled" <?= $service_enabled == 0 ? 'style="display: none"' : '' ?>>
<li role="presentation" data-tab="manualconfig" class="active"><a href="#"><?= _("Manual") ?></a></li>
<li role="presentation" data-tab="autoconfig"><a href="#"><?= _("Automatic") ?></a></li>
</ul>
<div class="tabs tabmanualconfig enabled" <?= $service_enabled == 0 ? 'style="display: none"' : '' ?>>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><?= _("VPN") ?></h3>
</div>
@@ -98,7 +104,7 @@
<div class="form-group" id="raw_openvpn_btnpanel">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-9">
<span class="glyphicon glyphicon-cog"></span> <a href="#" id="raw_openvpn_btn" data-toggle="tooltip" data-title="<?= _('Edit the raw configuration only if you know what you do!') ?>"><?= _('Advanced') ?></a>
<span class="glyphicon glyphicon-cog"></span> <a href="javascript:" id="raw_openvpn_btn" data-toggle="tooltip" data-title="<?= _('Edit the raw configuration only if you know what you do!') ?>"><?= _('Advanced') ?></a>
</div>
</div>
@@ -112,13 +118,13 @@
</div>
<?php if(!$crt_client_key_exists && empty($login_user)): ?>
<div class="alert alert-dismissible alert-warning fade in enabled" <?= $service_enabled == 0 ? 'style="display: none"' : '' ?> style="margin: 2px 0px 17px" role="alert">
<div class="alert alert-dismissible alert-warning fade in" style="margin: 2px 0px 17px" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<strong><?= _('Notice') ?>:</strong> <?= _("You need to upload a Client Certificate, or define a Username (or both) for starting your VPN Client.") ?>
</div>
<?php endif; ?>
<div class="panel panel-default enabled" <?= $service_enabled == 0 ? 'style="display: none"' : '' ?>>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><?= _("Authentication") ?></h3>
</div>
@@ -171,13 +177,13 @@
</div>
<div class="form-group">
<label for="crt_client_ta" class="col-sm-3 control-label" data-toggle="tooltip" data-title="<?= _('ta.key') ?>"><?= $crt_client_ta_exists ? _('Update Shared-Secret') : _('Upload Shared-Secret') ?></label>
<label for="crt_client_ta" class="col-sm-3 control-label"><?= $crt_client_ta_exists ? _('Update Shared-Secret') : _('Upload Shared-Secret') ?></label>
<div class="input-group col-sm-9" style="padding: 0 15px">
<?php if($crt_client_ta_exists): ?>
<a class="btn btn-danger input-group-addon deletefile" id="crt_client_ta_deletebtn" data-toggle="tooltip" data-title="<?= _('Delete this certificate') ?>"><span class="glyphicon glyphicon-remove"></span></a>
<input id="crt_client_ta_delete" name="crt_client_ta_delete" type="checkbox" value="1" style="display: none" />
<?php endif; ?>
<input type="text" class="form-control fileinput" id="crt_client_ta_choosertxt" data-toggle="tooltip" data-title="<?= _('Make sure your browser is able to read the key file before uploading') ?>" placeholder="-----BEGIN PRIVATE KEY-----" readonly="readonly" />
<input type="text" class="form-control fileinput" id="crt_client_ta_choosertxt" data-toggle="tooltip" data-title="<?= _('Make sure your browser is able to read the key file before uploading') ?>" placeholder="ta.key" readonly="readonly" />
<input id="crt_client_ta" name="crt_client_ta" type="file" style="display: none" />
<a class="btn input-group-addon fileinput" id="crt_client_ta_chooserbtn" data-toggle="tooltip" data-title="<?= _('Browse') ?> (<?= _('make sure your browser is able to read the key file before uploading') ?>)"><span class="glyphicon glyphicon-search"></span></a>
</div>
@@ -199,7 +205,7 @@
</div>
</div>
<div class="panel panel-default enabled" <?= $service_enabled == 0 ? 'style="display: none"' : '' ?>>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><?= _("DNS") ?></h3>
</div>
@@ -220,6 +226,26 @@
</div>
</div>
</div>
</div>
<div class="tabs tabautoconfig enabled" <?= $service_enabled == 0 ? 'style="display: none"' : '' ?>>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><?= _("Auto Configuration") ?></h3>
</div>
<div style="padding: 14px 14px 0 10px">
<div class="form-group">
<label for="cubefile" class="col-sm-3 control-label"><?= _('Upload Config') ?></label>
<div class="input-group col-sm-9" style="padding: 0 15px">
<input type="text" class="form-control fileinput" id="cubefile_choosertxt" placeholder="config.cube" readonly="readonly" />
<input id="cubefile" name="cubefile" type="file" style="display: none" />
<a class="btn input-group-addon fileinput" id="cubefile_chooserbtn" data-toggle="tooltip" data-title="<?= _('Browse') ?>"><span class="glyphicon glyphicon-search"></span></a>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<div style="text-align: center">