mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-19 11:04:42 +00:00
VPN / IPSec / Tunnel settings - Change overview page to support pagination lowering load times on large setups, closes https://github.com/opnsense/core/issues/5279
o remove legacy page and references o bug fix delete phase 1 button (using wrong id)
This commit is contained in:
Ad Schellevis
parent
da936ef321
commit
ecb34928fb
1
plist
1
plist
@ -1831,7 +1831,6 @@
|
||||
/usr/local/www/system_usermanager_import_ldap.php
|
||||
/usr/local/www/system_usermanager_passwordmg.php
|
||||
/usr/local/www/system_usermanager_settings_ldapacpicker.php
|
||||
/usr/local/www/vpn_ipsec.php
|
||||
/usr/local/www/vpn_ipsec_keys.php
|
||||
/usr/local/www/vpn_ipsec_keys_edit.php
|
||||
/usr/local/www/vpn_ipsec_mobile.php
|
||||
|
||||
@ -541,7 +541,7 @@ function filter_core_rules_system($fw, $defaults)
|
||||
$fw->registerFilterRule(
|
||||
5,
|
||||
array('direction' => 'out', 'statetype' => 'keep', 'quick' => false, 'interface' => 'enc0',
|
||||
'#ref' => 'vpn_ipsec.php#enable',
|
||||
'#ref' => '/ui/ipsec/tunnels',
|
||||
'descr' => 'IPsec internal host to host'),
|
||||
$defaults['pass']
|
||||
);
|
||||
|
||||
@ -9,14 +9,16 @@
|
||||
<pattern>api/ipsec/legacy-subsystem/*</pattern>
|
||||
</patterns>
|
||||
</page-vpn-ipsec-keypairs>
|
||||
|
||||
<!-- ACLs for legacy code -->
|
||||
<page-vpn-ipsec>
|
||||
<name>VPN: IPsec</name>
|
||||
<patterns>
|
||||
<pattern>vpn_ipsec.php*</pattern>
|
||||
<pattern>ui/ipsec/tunnels</pattern>
|
||||
<pattern>api/ipsec/tunnel/*</pattern>
|
||||
<pattern>api/ipsec/legacy-subsystem/*</pattern>
|
||||
</patterns>
|
||||
</page-vpn-ipsec>
|
||||
|
||||
<!-- ACLs for legacy code -->
|
||||
<page-vpn-ipsec-editphase1>
|
||||
<name>VPN: IPsec: Edit Phase 1</name>
|
||||
<patterns>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<menu>
|
||||
<VPN>
|
||||
<IPsec cssClass="fa fa-lock fa-fw" order="10">
|
||||
<Tunnels order="10" VisibleName="Tunnel Settings" url="/vpn_ipsec.php">
|
||||
<Tunnels order="10" VisibleName="Tunnel Settings" url="/ui/ipsec/tunnels">
|
||||
<Phase1 url="/vpn_ipsec_phase1.php*" visibility="hidden"/>
|
||||
<Phase2 url="/vpn_ipsec_phase2.php*" visibility="hidden"/>
|
||||
</Tunnels>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
$(function () {
|
||||
function attach_legacy_actions() {
|
||||
$(".legacy_action").unbind('click').click(function(e){
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
if ($(this).data('scope') === 'phase1') {
|
||||
if ($(this).hasClass('command-add')) {
|
||||
window.location = '/vpn_ipsec_phase1.php';
|
||||
@ -80,8 +80,10 @@
|
||||
data_tags = 'data-row-id="' + row.id + '" data-scope="phase2" data-row-uniqid="' + row.uniqid + '"';
|
||||
}
|
||||
btns = btns + '<button type="button" class="btn btn-xs legacy_action btn-default command-edit bootgrid-tooltip" ' + data_tags + '><span class="fa fa-fw fa-pencil"></span></button> ' +
|
||||
'<button type="button" class="btn btn-xs btn-default legacy_action command-copy bootgrid-tooltip" ' + data_tags + '><span class="fa fa-fw fa-clone"></span></button>' +
|
||||
'<button type="button" class="btn btn-xs btn-default command-delete bootgrid-tooltip" ' + data_tags + '><span class="fa fa-fw fa-trash-o"></span></button>';
|
||||
'<button type="button" class="btn btn-xs btn-default legacy_action command-copy bootgrid-tooltip" ' + data_tags + '><span class="fa fa-fw fa-clone"></span></button>';
|
||||
|
||||
// delete buttons use standard mvc functionality, id should map to the unique id used by the delete endpoint
|
||||
btns = btns +'<button type="button" class="btn btn-xs btn-default command-delete bootgrid-tooltip" data-row-id="' + row.id + '" ><span class="fa fa-fw fa-trash-o"></span></button>';
|
||||
return btns;
|
||||
},
|
||||
"gateway": function (column, row) {
|
||||
@ -210,9 +212,10 @@
|
||||
<button data-action="add" type="button" title="{{ lang._('add phase 1 entry') }}" data-scope="phase1" class="btn btn-xs btn-primary legacy_action command-add">
|
||||
<span class="fa fa-fw fa-plus"></span>
|
||||
</button>
|
||||
{# multi select isn't supported on master/detail views
|
||||
<button data-action="deleteSelected" type="button" class="btn btn-xs btn-default">
|
||||
<span class="fa fa-fw fa-trash-o"></span>
|
||||
</button>
|
||||
</button> #}
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
|
||||
@ -1,625 +0,0 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* Copyright (C) 2014-2016 Deciso B.V.
|
||||
* Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>
|
||||
* Copyright (C) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
||||
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
require_once("guiconfig.inc");
|
||||
require_once("system.inc");
|
||||
require_once("filter.inc");
|
||||
require_once("interfaces.inc");
|
||||
require_once("plugins.inc.d/ipsec.inc");
|
||||
|
||||
/*
|
||||
* Return phase2 idinfo in text format
|
||||
*/
|
||||
function ipsec_idinfo_to_text(& $idinfo) {
|
||||
global $config;
|
||||
|
||||
switch ($idinfo['type']) {
|
||||
case "address":
|
||||
return $idinfo['address'];
|
||||
break; /* NOTREACHED */
|
||||
case "network":
|
||||
return $idinfo['address']."/".$idinfo['netbits'];
|
||||
break; /* NOTREACHED */
|
||||
case "mobile":
|
||||
return gettext("Mobile Client");
|
||||
break; /* NOTREACHED */
|
||||
case "none":
|
||||
return gettext("None");
|
||||
break; /* NOTREACHED */
|
||||
default:
|
||||
if (!empty($config['interfaces'][$idinfo['type']])) {
|
||||
return convert_friendly_interface_to_friendly_descr($idinfo['type']);
|
||||
} else {
|
||||
return strtoupper($idinfo['type']);
|
||||
}
|
||||
break; /* NOTREACHED */
|
||||
}
|
||||
}
|
||||
|
||||
$a_phase1 = &config_read_array('ipsec', 'phase1');
|
||||
$a_phase2 = &config_read_array('ipsec', 'phase2');
|
||||
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||
if (isset($_POST['apply'])) {
|
||||
ipsec_configure_do();
|
||||
filter_configure();
|
||||
$savemsg = get_std_save_message();
|
||||
clear_subsystem_dirty('ipsec');
|
||||
} elseif (isset($_POST['save'])) {
|
||||
if (!empty($_POST['enable'])) {
|
||||
$config['ipsec']['enable'] = true;
|
||||
} elseif (isset($config['ipsec']['enable'])) {
|
||||
unset($config['ipsec']['enable']);
|
||||
}
|
||||
write_config();
|
||||
ipsec_configure_do();
|
||||
filter_configure();
|
||||
clear_subsystem_dirty('ipsec');
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
exit;
|
||||
} elseif (!empty($_POST['act']) && $_POST['act'] == "delphase1" ) {
|
||||
$del_items = array();
|
||||
if (isset($_POST['id']) && isset($config['ipsec']['phase1'][$_POST['id']])){
|
||||
$del_items[] = $_POST['id'];
|
||||
} elseif (empty($_POST['id']) && isset($_POST['p1entry']) && count($_POST['p1entry'])) {
|
||||
$del_items = $_POST['p1entry'];
|
||||
}
|
||||
|
||||
foreach ($del_items as $p1entrydel) {
|
||||
/* remove static route if interface is not WAN */
|
||||
if ($a_phase1[$p1entrydel]['interface'] != 'wan') {
|
||||
/* XXX does this even apply? only use of system.inc at the top! */
|
||||
system_host_route($a_phase1[$p1entrydel]['remote-gateway'], $a_phase1[$p1entrydel]['remote-gateway'], true, false);
|
||||
}
|
||||
/* remove all phase2 entries that match the ikeid */
|
||||
$ikeid = $a_phase1[$p1entrydel]['ikeid'];
|
||||
foreach ($a_phase2 as $p2index => $ph2tmp) {
|
||||
if ($ph2tmp['ikeid'] == $ikeid) {
|
||||
unset($a_phase2[$p2index]);
|
||||
}
|
||||
}
|
||||
unset($config['ipsec']['phase1'][$p1entrydel]);
|
||||
}
|
||||
|
||||
write_config();
|
||||
mark_subsystem_dirty('ipsec');
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
exit;
|
||||
} elseif (!empty($_POST['act']) && $_POST['act'] == "delselected" ) {
|
||||
if (empty($_POST['id']) && isset($_POST['p2entry']) && count($_POST['p2entry'])) {
|
||||
foreach ($_POST['p2entry'] as $p2entrydel) {
|
||||
unset($config['ipsec']['phase2'][$p2entrydel]);
|
||||
}
|
||||
}
|
||||
if (empty($_POST['id']) && isset($_POST['p1entry']) && count($_POST['p1entry'])) {
|
||||
foreach ($_POST['p1entry'] as $p1entrydel) {
|
||||
$ikeid = $a_phase1[$p1entrydel]['ikeid'];
|
||||
foreach ($a_phase2 as $p2index => $ph2tmp) {
|
||||
if ($ph2tmp['ikeid'] == $ikeid) {
|
||||
unset($a_phase2[$p2index]);
|
||||
}
|
||||
}
|
||||
unset($config['ipsec']['phase1'][$p1entrydel]);
|
||||
}
|
||||
}
|
||||
write_config();
|
||||
mark_subsystem_dirty('ipsec');
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
exit;
|
||||
} elseif (!empty($_POST['act']) && $_POST['act'] == "delphase2" ) {
|
||||
if (isset($_POST['id']) && isset($config['ipsec']['phase2'][$_POST['id']])){
|
||||
unset($config['ipsec']['phase2'][$_POST['id']]);
|
||||
}
|
||||
write_config();
|
||||
mark_subsystem_dirty('ipsec');
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
exit;
|
||||
} elseif (!empty($_POST['act']) && $_POST['act'] == "move" ) {
|
||||
// move phase 2 records
|
||||
if (isset($_POST['p2entry']) && count($_POST['p2entry']) > 0) {
|
||||
// if rule not set/found, move to end
|
||||
if (!isset($_POST['id']) || !isset($a_phase2[$_POST['id']])) {
|
||||
$id = count($a_phase2);
|
||||
} else {
|
||||
$id = $_POST['id'];
|
||||
}
|
||||
$a_phase2 = legacy_move_config_list_items($a_phase2, $id, $_POST['p2entry']);
|
||||
}
|
||||
// move phase 1 records
|
||||
if (isset($_POST['p1entry']) && count($_POST['p1entry']) > 0) {
|
||||
// if rule not set/found, move to end
|
||||
if (!isset($_POST['id']) || !isset($a_phase1[$_POST['id']])) {
|
||||
$id = count($a_phase1);
|
||||
} else {
|
||||
$id = $_POST['id'];
|
||||
}
|
||||
$a_phase1 = legacy_move_config_list_items($a_phase1, $id, $_POST['p1entry']);
|
||||
}
|
||||
write_config();
|
||||
mark_subsystem_dirty('ipsec');
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
exit;
|
||||
} elseif (!empty($_POST['act']) && $_POST['act'] == "togglep1" && isset($a_phase1[$_POST['id']]) ) {
|
||||
// toggle phase 1 record
|
||||
if (isset($a_phase1[$_POST['id']]['disabled'])) {
|
||||
unset($a_phase1[$_POST['id']]['disabled']);
|
||||
} else {
|
||||
$a_phase1[$_POST['id']]['disabled'] = true;
|
||||
}
|
||||
write_config();
|
||||
mark_subsystem_dirty('ipsec');
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
exit;
|
||||
} elseif (!empty($_POST['act']) && $_POST['act'] == "togglep2" && isset($a_phase2[$_POST['id']]) ) {
|
||||
// toggle phase 2 record
|
||||
if (isset($a_phase2[$_POST['id']]['disabled'])) {
|
||||
unset($a_phase2[$_POST['id']]['disabled']);
|
||||
} else {
|
||||
$a_phase2[$_POST['id']]['disabled'] = true;
|
||||
}
|
||||
write_config();
|
||||
mark_subsystem_dirty('ipsec');
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
// form data
|
||||
legacy_html_escape_form_data($a_phase1);
|
||||
legacy_html_escape_form_data($a_phase2);
|
||||
|
||||
$service_hook = 'strongswan';
|
||||
|
||||
include("head.inc");
|
||||
|
||||
$dhgroups = array(
|
||||
0 => gettext('off'),
|
||||
1 => '1 (768 bits)',
|
||||
2 => '2 (1024 bits)',
|
||||
5 => '5 (1536 bits)',
|
||||
14 => '14 (2048 bits)',
|
||||
15 => '15 (3072 bits)',
|
||||
16 => '16 (4096 bits)',
|
||||
17 => '17 (6144 bits)',
|
||||
18 => '18 (8192 bits)',
|
||||
19 => '19 (NIST EC 256 bits)',
|
||||
20 => '20 (NIST EC 384 bits)',
|
||||
21 => '21 (NIST EC 521 bits)',
|
||||
22 => '22 (1024(sub 160) bits)',
|
||||
23 => '23 (2048(sub 224) bits)',
|
||||
24 => '24 (2048(sub 256) bits)',
|
||||
28 => '28 (Brainpool EC 256 bits)',
|
||||
29 => '29 (Brainpool EC 384 bits)',
|
||||
30 => '30 (Brainpool EC 512 bits)',
|
||||
31 => '31 (Elliptic Curve 25519)',
|
||||
);
|
||||
|
||||
$p2_protos = array(
|
||||
'esp' => 'ESP',
|
||||
'ah' => 'AH'
|
||||
);
|
||||
|
||||
$p1_ealgos = ipsec_p1_ealgos();
|
||||
$p2_ealgos = ipsec_p2_ealgos();
|
||||
$p1_authentication_methods = ipsec_p1_authentication_methods();
|
||||
$p2_halgos = ipsec_p2_halgos();
|
||||
|
||||
?>
|
||||
<body>
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
// link move/toggle buttons (phase 1 and phase 2)
|
||||
$(".act_move").click(function(event){
|
||||
event.preventDefault();
|
||||
$("#id").val($(this).data("id"));
|
||||
$("#action").val($(this).data("act"));
|
||||
$("#iform").submit();
|
||||
});
|
||||
|
||||
|
||||
// link delete phase 1 buttons
|
||||
$(".act_delete_p1").click(function(event){
|
||||
event.preventDefault();
|
||||
var id = $(this).data("id");
|
||||
// delete single
|
||||
BootstrapDialog.show({
|
||||
type:BootstrapDialog.TYPE_DANGER,
|
||||
title: "<?= gettext("IPSEC");?>",
|
||||
message: "<?=gettext("Do you really want to delete this phase1 and all associated phase2 entries?"); ?>",
|
||||
buttons: [{
|
||||
label: "<?= gettext("No");?>",
|
||||
action: function(dialogRef) {
|
||||
dialogRef.close();
|
||||
}}, {
|
||||
label: "<?= gettext("Yes");?>",
|
||||
action: function(dialogRef) {
|
||||
$("#id").val(id);
|
||||
$("#action").val("delphase1");
|
||||
$("#iform").submit()
|
||||
}
|
||||
}]
|
||||
});
|
||||
});
|
||||
|
||||
// link delete phase 2 buttons
|
||||
$(".act_delete_p2").click(function(event){
|
||||
event.preventDefault();
|
||||
var id = $(this).data("id");
|
||||
// delete single
|
||||
BootstrapDialog.show({
|
||||
type:BootstrapDialog.TYPE_DANGER,
|
||||
title: "<?= gettext("IPSEC");?>",
|
||||
message: "<?=gettext("Do you really want to delete this phase2 entry?"); ?>",
|
||||
buttons: [{
|
||||
label: "<?= gettext("No");?>",
|
||||
action: function(dialogRef) {
|
||||
dialogRef.close();
|
||||
}}, {
|
||||
label: "<?= gettext("Yes");?>",
|
||||
action: function(dialogRef) {
|
||||
$("#id").val(id);
|
||||
$("#action").val("delphase2");
|
||||
$("#iform").submit()
|
||||
}
|
||||
}]
|
||||
});
|
||||
});
|
||||
|
||||
$("#act_delete_selected").click(function(event){
|
||||
event.preventDefault();
|
||||
// delete selected
|
||||
BootstrapDialog.show({
|
||||
type:BootstrapDialog.TYPE_DANGER,
|
||||
title: "<?= gettext("IPSEC");?>",
|
||||
message: "<?=gettext("Do you really want to delete the selected entries?");?>",
|
||||
buttons: [{
|
||||
label: "<?= gettext("No");?>",
|
||||
action: function(dialogRef) {
|
||||
dialogRef.close();
|
||||
}}, {
|
||||
label: "<?= gettext("Yes");?>",
|
||||
action: function(dialogRef) {
|
||||
$("#id").val("");
|
||||
$("#action").val("delselected");
|
||||
$("#iform").submit()
|
||||
}
|
||||
}]
|
||||
});
|
||||
});
|
||||
|
||||
$("#collapse_p2").click(function(){
|
||||
$(".phase2_tr").toggleClass("hidden");
|
||||
});
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
<?php include("fbegin.inc"); ?>
|
||||
<style>
|
||||
tr.phase1_tr > td {
|
||||
font-weight: bolder;
|
||||
background-color: #FBFBFB;
|
||||
}
|
||||
tr.phase2_tr > td {
|
||||
font-weight: lighter;
|
||||
font-style: italic;
|
||||
padding-top: 1px !important;
|
||||
padding-bottom: 1px !important;
|
||||
}
|
||||
</style>
|
||||
<section class="page-content-main">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<?php
|
||||
if (isset($savemsg)) {
|
||||
print_info_box($savemsg);
|
||||
}
|
||||
if (is_subsystem_dirty('ipsec')) {
|
||||
print_info_box_apply(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
|
||||
}?>
|
||||
<section class="col-xs-12">
|
||||
<form method="post" name="iform" id="iform">
|
||||
<input type="hidden" id="id" name="id" value="" />
|
||||
<input type="hidden" id="action" name="act" value="" />
|
||||
<div class="tab-content content-box col-xs-12">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td><i class="fa fa-expand" id="collapse_p2" style="cursor: pointer;" data-toggle="tooltip" title="<?=gettext("collapse/expand phase 2s");?>"></i></td>
|
||||
<td class="hidden-xs"><?=gettext("Type"); ?></td>
|
||||
<td><?=gettext("Remote Gateway"); ?></td>
|
||||
<td class="hidden-xs"><?=gettext("Mode"); ?></td>
|
||||
<td class="hidden-xs"><?=gettext("Phase 1 Proposal"); ?></td>
|
||||
<td class="hidden-xs"><?=gettext("Authentication"); ?></td>
|
||||
<td><?=gettext("Description"); ?></td>
|
||||
<td class="text-nowrap"></td>
|
||||
</tr>
|
||||
<tr class="phase2_tr">
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td class="hidden-xs"></td>
|
||||
<td><?=gettext("Local Subnet"); ?></td>
|
||||
<td class="hidden-xs"><?=gettext("Remote Subnet"); ?></td>
|
||||
<td class="hidden-xs"><?=gettext("Phase 2 Proposal"); ?></td>
|
||||
<td class="hidden-xs"></td>
|
||||
<td></td>
|
||||
<td class="text-nowrap"></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
$i = 0;
|
||||
foreach ($a_phase1 as $ph1ent) :?>
|
||||
<tr class="phase1_tr">
|
||||
<td>
|
||||
<input type="checkbox" name="p1entry[]" value="<?=$i;?>"/>
|
||||
</td>
|
||||
<td>
|
||||
<button data-id="<?=$i; ?>" data-act="togglep1" type="submit"
|
||||
type="submit" class="act_move btn btn-<?= isset($ph1ent['disabled'])? "default":"success"?> btn-xs"
|
||||
title="<?=(isset($ph1ent['disabled'])) ? gettext("Enable phase 1 entry") : gettext("Disable phase 1 entry");?>" data-toggle="tooltip">
|
||||
<i class="fa fa-play fa-fw"></i>
|
||||
</button>
|
||||
</td>
|
||||
<td class="hidden-xs">
|
||||
<?=empty($ph1ent['protocol']) || $ph1ent['protocol'] == "inet" ? "IPv4" : "IPv6"; ?>
|
||||
<?php $ph1ent_type = array('ikev1' => 'IKE', 'ikev2' => 'IKEv2', 'ike' => 'auto'); ?>
|
||||
<?=!empty($ph1ent['iketype']) && isset($ph1ent_type[$ph1ent['iketype']]) ? $ph1ent_type[$ph1ent['iketype']] :"" ;?>
|
||||
</td>
|
||||
<td>
|
||||
<?php
|
||||
if (!empty($ph1ent['interface'])) {
|
||||
$iflabels = get_configured_interface_with_descr();
|
||||
|
||||
$carplist = get_configured_carp_interface_list();
|
||||
foreach ($carplist as $cif => $carpip) {
|
||||
$iflabels[$cif] = $carpip." (".get_vip_descr($carpip).")";
|
||||
}
|
||||
|
||||
$aliaslist = get_configured_ip_aliases_list();
|
||||
foreach ($aliaslist as $aliasip => $aliasif) {
|
||||
$iflabels[$aliasip] = $aliasip." (".get_vip_descr($aliasip).")";
|
||||
}
|
||||
$if = $iflabels[$ph1ent['interface']];
|
||||
} else {
|
||||
$if = "WAN";
|
||||
}?>
|
||||
<?=htmlspecialchars($if);?>
|
||||
<?=!isset($ph1ent['mobile'])?
|
||||
$ph1ent['remote-gateway']
|
||||
:
|
||||
"<strong>" . gettext("Mobile Client") . "</strong>";
|
||||
?>
|
||||
</td>
|
||||
<td class="hidden-xs">
|
||||
<?=htmlspecialchars($ph1ent['mode']);?>
|
||||
</td>
|
||||
<td class="hidden-xs">
|
||||
<?=$p1_ealgos[$ph1ent['encryption-algorithm']['name']]['name'];?>
|
||||
<?php
|
||||
if (!empty($ph1ent['encryption-algorithm']['keylen'])) {
|
||||
if ($ph1ent['encryption-algorithm']['keylen']=="auto") {
|
||||
echo " (" . gettext("auto") . ")";
|
||||
} else {
|
||||
echo " ({$ph1ent['encryption-algorithm']['keylen']} " . gettext("bits") . ")";
|
||||
}
|
||||
}?> +
|
||||
|
||||
<?=strtoupper($ph1ent['hash-algorithm']);?>
|
||||
<?php if (!empty($ph1ent['dhgroup'])): ?>
|
||||
+ <?=gettext("DH Group"); ?> <?= $ph1ent['dhgroup'] ?>
|
||||
<?php endif ?>
|
||||
</td>
|
||||
<td class="hidden-xs">
|
||||
<?= html_safe($p1_authentication_methods[$ph1ent['authentication_method']]['name']) ?>
|
||||
</td>
|
||||
<td>
|
||||
<?= $ph1ent['descr'] ?>
|
||||
</td>
|
||||
<td class="text-nowrap">
|
||||
<a href="vpn_ipsec_phase2.php?ikeid=<?=$ph1ent['ikeid']; ?><?= isset($ph1ent['mobile'])?"&mobile=true":"";?>" class="btn btn-primary btn-xs"
|
||||
title="<?=gettext("add phase 2 entry"); ?>" data-toggle="tooltip">
|
||||
<i class="fa fa-plus fa-fw"></i>
|
||||
</a>
|
||||
<button data-id="<?=$i; ?>" data-act="move" type="submit" class="act_move btn btn-default btn-xs"
|
||||
title="<?=gettext("Move selected entries before this");?>" data-toggle="tooltip">
|
||||
<i class="fa fa-arrow-left fa-fw"></i>
|
||||
</button>
|
||||
<a href="vpn_ipsec_phase1.php?p1index=<?=$i; ?>" class="btn btn-default btn-xs"
|
||||
title="<?= html_safe(gettext('Edit')) ?>" data-toggle="tooltip">
|
||||
<i class="fa fa-pencil fa-fw"></i>
|
||||
</a>
|
||||
<?php if (!isset($ph1ent['mobile'])): ?>
|
||||
<a href="vpn_ipsec_phase1.php?dup=<?=$i; ?>" class="btn btn-default btn-xs"
|
||||
title="<?= html_safe(gettext('Clone')) ?>" data-toggle="tooltip">
|
||||
<i class="fa fa-clone fa-fw"></i>
|
||||
</a>
|
||||
<?php endif ?>
|
||||
<button data-id="<?=$i; ?>" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip"
|
||||
type="submit" class="act_delete_p1 btn btn-default btn-xs">
|
||||
<i class="fa fa-trash fa-fw"></i>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
$phase2count=0;
|
||||
foreach ($a_phase2 as $ph2ent) {
|
||||
if ($ph2ent['ikeid'] != $ph1ent['ikeid']) {
|
||||
continue;
|
||||
}
|
||||
$phase2count++;
|
||||
}?>
|
||||
<?php
|
||||
$j = 0;
|
||||
foreach ($a_phase2 as $ph2index => $ph2ent) :
|
||||
if ($ph2ent['ikeid'] != $ph1ent['ikeid']) {
|
||||
continue;
|
||||
}?>
|
||||
<tr class="phase2_tr">
|
||||
<td>
|
||||
<input type="checkbox" name="p2entry[]" value="<?=$ph2index;?>"/>
|
||||
</td>
|
||||
<td>
|
||||
<button data-id="<?=$ph2index; ?>" data-act="togglep2" type="submit"
|
||||
title="<?=(isset($ph2ent['disabled'])) ? gettext("Enable phase 2 entry") : gettext("Disable phase 2 entry"); ?>" data-toggle="tooltip"
|
||||
class="act_move btn btn-<?= isset($ph2ent['disabled'])?"default":"success";?> btn-xs">
|
||||
<i class="fa fa-play fa-fw"></i>
|
||||
</button>
|
||||
</td>
|
||||
<td class="hidden-xs">
|
||||
<?=$p2_protos[$ph2ent['protocol']];?>
|
||||
<?=isset($ph2ent['mode']) ? array_search($ph2ent['mode'], array("IPv4 tunnel" => "tunnel", "IPv6 tunnel" => "tunnel6", "transport" => "transport", "Route-based" => "route-based")) : ""; ?>
|
||||
</td>
|
||||
<?php
|
||||
if (($ph2ent['mode'] == "tunnel") || ($ph2ent['mode'] == "tunnel6")) :?>
|
||||
<td>
|
||||
<?=ipsec_idinfo_to_text($ph2ent['localid']); ?>
|
||||
</td>
|
||||
<td>
|
||||
<?=ipsec_idinfo_to_text($ph2ent['remoteid']); ?>
|
||||
</td>
|
||||
<?php
|
||||
elseif ($ph2ent['mode'] == "route-based"):?>
|
||||
<td><?=$ph2ent['tunnel_local'];?></td>
|
||||
<td><?=$ph2ent['tunnel_remote'];?></td>
|
||||
<?php
|
||||
else :?>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<?php
|
||||
endif;?>
|
||||
<td class="hidden-xs">
|
||||
<?php
|
||||
if (!empty($ph2ent['encryption-algorithm-option'])) {
|
||||
foreach ($ph2ent['encryption-algorithm-option'] as $k => $ph2ea) {
|
||||
if ($k > 0) {
|
||||
echo ", ";
|
||||
}
|
||||
echo $p2_ealgos[$ph2ea['name']]['name'];
|
||||
if (!empty($ph2ea['keylen'])) {
|
||||
if ($ph2ea['keylen']=="auto") {
|
||||
echo " (" . gettext("auto") . ")";
|
||||
} else {
|
||||
echo " ({$ph2ea['keylen']} " . gettext("bits") . ")";
|
||||
}
|
||||
}
|
||||
}
|
||||
}?>
|
||||
+
|
||||
<?php
|
||||
if (!empty($ph2ent['hash-algorithm-option']) && is_array($ph2ent['hash-algorithm-option'])) {
|
||||
foreach ($ph2ent['hash-algorithm-option'] as $k => $ph2ha) {
|
||||
if ($k) {
|
||||
echo ", ";
|
||||
}
|
||||
echo $p2_halgos[$ph2ha];
|
||||
}
|
||||
}?>
|
||||
+
|
||||
<?=isset($ph2ent['pfsgroup']) ? $dhgroups[$ph2ent['pfsgroup']] : gettext("off"); ?>
|
||||
</td>
|
||||
<td class="hidden-xs">
|
||||
</td>
|
||||
<td class="hidden-xs">
|
||||
<?=$ph2ent['descr'];?>
|
||||
</td>
|
||||
<td class="text-nowrap">
|
||||
<button data-id="<?=$j; ?>" data-act="move" type="submit" class="act_move btn btn-default btn-xs"
|
||||
title="<?=gettext("Move selected entries before this");?>" data-toggle="tooltip">
|
||||
<i class="fa fa-arrow-left fa-fw"></i>
|
||||
</button>
|
||||
<a href="vpn_ipsec_phase2.php?p2index=<?=$ph2ent['uniqid']; ?>"
|
||||
title="<?= html_safe(gettext('Edit')) ?>" data-toggle="tooltip"
|
||||
class="btn btn-default btn-xs">
|
||||
<i class="fa fa-pencil fa-fw"></i>
|
||||
</a>
|
||||
<a href="vpn_ipsec_phase2.php?dup=<?=$ph2ent['uniqid']; ?>" class="btn btn-default btn-xs"
|
||||
title="<?= html_safe(gettext('Clone')) ?>" data-toggle="tooltip">
|
||||
<i class="fa fa-clone fa-fw"></i>
|
||||
</a>
|
||||
<button data-id="<?=$ph2index; ?>" type="submit" class="act_delete_p2 btn btn-default btn-xs"
|
||||
title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip">
|
||||
<i class="fa fa-trash fa-fw"></i>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
$j++;
|
||||
endforeach;
|
||||
$i++;
|
||||
endforeach;?>
|
||||
<tr>
|
||||
<td colspan="4" class="hidden-xs"></td>
|
||||
<td colspan="4"> </td>
|
||||
<td class="text-nowrap">
|
||||
<a href="vpn_ipsec_phase1.php" title="<?=gettext("add new phase 1 entry");?>" data-toggle="tooltip"
|
||||
class="btn btn-primary btn-xs">
|
||||
<i class="fa fa-plus fa-fw"></i>
|
||||
</a>
|
||||
<button
|
||||
type="submit"
|
||||
data-id="<?=$i;?>"
|
||||
data-act="move"
|
||||
title="<?=gettext("Move selected entries to end");?>"
|
||||
data-toggle="tooltip"
|
||||
class="act_move btn btn-default btn-xs">
|
||||
<i class="fa fa-arrow-down fa-fw"></i>
|
||||
</button>
|
||||
<button id="act_delete_selected" data-id=""
|
||||
type="submit"
|
||||
title="<?=gettext("delete selected entries");?>"
|
||||
data-toggle="tooltip"
|
||||
class="btn btn-default btn-xs">
|
||||
<i class="fa fa-trash fa-fw"></i>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan=9>
|
||||
<input name="enable" type="checkbox" id="enable" value="yes" <?=!empty($config['ipsec']['enable']) ? "checked=\"checked\"":"";?>/>
|
||||
<strong><?=gettext("Enable IPsec"); ?></strong>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan=9>
|
||||
<input type="submit" name="save" class="btn btn-primary" value="<?=html_safe(gettext('Save')); ?>" />
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<?php include("foot.inc");
|
||||
@ -484,7 +484,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
|
||||
write_config();
|
||||
mark_subsystem_dirty('ipsec');
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
header(url_safe('Location: /ui/ipsec/tunnels'));
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
@ -450,7 +450,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
write_config();
|
||||
mark_subsystem_dirty('ipsec');
|
||||
|
||||
header(url_safe('Location: /vpn_ipsec.php'));
|
||||
header(url_safe('Location: /ui/ipsec/tunnels'));
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user