Skip to content

O
OpnSense
Commit 2e20c8d6 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

firewall: simplify and prettify alias pages #443

parent afc4a48e
Show whitespace changes
Inline Side-by-side
Showing with 245 additions and 277 deletions
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View file @ 2e20c8d6
...@@ -140,22 +140,10 @@ ...@@ -140,22 +140,10 @@
</Interfaces> </Interfaces>
<Firewall order="3" cssClass="glyphicon glyphicon-fire"> <Firewall order="3" cssClass="glyphicon glyphicon-fire">
<Aliases order="10" cssClass="fa fa-list-alt fa-fw"> <Aliases order="10" cssClass="fa fa-list-alt fa-fw">
<All order="100" url="/firewall_aliases.php?tab=all"> <View order="100" url="/firewall_aliases.php">
<Edit url="/firewall_aliases_edit.php?tab=all" visibility="hidden"/> <Edit url="/firewall_aliases_edit.php*" visibility="hidden"/>
<Network url="/firewall_aliases.php?tab=network" visibility="hidden"/> </View>
<NoneEdit url="/firewall_aliases_edit.php?id=*" visibility="hidden"/> <Import order="200" url="/firewall_aliases_import.php"/>
<None url="/firewall_aliases.php" visibility="hidden"/>
</All>
<IPs order="200" url="/firewall_aliases.php?tab=ip">
<Edit url="/firewall_aliases_edit.php?tab=ip" visibility="hidden"/>
</IPs>
<Ports order="300" url="/firewall_aliases.php?tab=port">
<Edit url="/firewall_aliases_edit.php?tab=port" visibility="hidden"/>
</Ports>
<URLs order="400" url="/firewall_aliases.php?tab=url">
<Edit url="/firewall_aliases_edit.php?tab=url" visibility="hidden"/>
</URLs>
<Import order="500" url="/firewall_aliases_import.php"/>
</Aliases> </Aliases>
<Rules order="20" url="/firewall_rules.php" cssClass="fa fa-check fa-fw"> <Rules order="20" url="/firewall_rules.php" cssClass="fa fa-check fa-fw">
<RulesEdit url="/firewall_rules_edit.php*" visibility="hidden"/> <RulesEdit url="/firewall_rules_edit.php*" visibility="hidden"/>
......
src/www/firewall_aliases.php
View file @ 2e20c8d6
...@@ -31,6 +31,25 @@ ...@@ -31,6 +31,25 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("filter.inc"); require_once("filter.inc");
function find_alias_type($type)
{
$types = array(
'host' => gettext('Host(s)'),
'network' => gettext('Network(s)'),
'port' => gettext('Port(s)'),
'url' => gettext('URL (IPs)'),
'url_ports' => gettext('URL (Ports)'),
'urltable' => gettext('URL Table (IPs)'),
'urltable_ports' => gettext('URL Table (Ports)'),
);
if (isset($types[$type])) {
return $types[$type];
}
return $type;
}
function find_alias_reference($section, $field, $origname, &$is_alias_referenced, &$referenced_by) { function find_alias_reference($section, $field, $origname, &$is_alias_referenced, &$referenced_by) {
global $config; global $config;
if(!$origname || $is_alias_referenced) if(!$origname || $is_alias_referenced)
...@@ -75,9 +94,6 @@ if (!isset($config['aliases']['alias'])) { ...@@ -75,9 +94,6 @@ if (!isset($config['aliases']['alias'])) {
} }
$a_aliases = &$config['aliases']['alias']; $a_aliases = &$config['aliases']['alias'];
// determine selected tab
$selected_tab = htmlspecialchars(($_REQUEST['tab'] == "" ? "ip" : preg_replace("/\W/","",$_REQUEST['tab'])));
if ($_SERVER['REQUEST_METHOD'] === 'POST') { if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (isset($_POST['apply'])) { if (isset($_POST['apply'])) {
/* reload all components that use aliases */ /* reload all components that use aliases */
...@@ -128,7 +144,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { ...@@ -128,7 +144,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
filter_configure(); filter_configure();
mark_subsystem_dirty('aliases'); mark_subsystem_dirty('aliases');
} }
header("Location: firewall_aliases.php?tab=" . $selected_tab); header('Location: firewall_aliases.php');
exit; exit;
} }
} }
...@@ -137,7 +153,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { ...@@ -137,7 +153,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
legacy_html_escape_form_data($a_aliases); legacy_html_escape_form_data($a_aliases);
$main_buttons = array( $main_buttons = array(
array('href'=>'firewall_aliases_edit.php?tab='.$selected_tab, 'label'=>gettext("Add a new alias")), array('href' => 'firewall_aliases_edit.php', 'label' => gettext('Add a new alias')),
); );
include("head.inc"); include("head.inc");
...@@ -186,37 +202,18 @@ $( document ).ready(function() { ...@@ -186,37 +202,18 @@ $( document ).ready(function() {
<table class="table table-striped"> <table class="table table-striped">
<tr> <tr>
<td><?=gettext("Name"); ?></td> <td><?=gettext("Name"); ?></td>
<td><?=gettext("Values"); ?></td> <td><?=gettext("Type"); ?></td>
<td><?=gettext("Description"); ?></td> <td><?=gettext("Description"); ?></td>
<td><?=gettext("Values"); ?></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<?php <?php
uasort($a_aliases, function($a, $b){ uasort($a_aliases, function($a, $b) {
return strnatcmp($a['name'], $b['name']); return strnatcmp($a['name'], $b['name']);
}); });
foreach ($a_aliases as $i=> $alias){ foreach ($a_aliases as $i=> $alias){
$show_alias = false; ?>
switch ($selected_tab){
case "all":
$show_alias= true;
break;
case "ip":
case "host":
case "network":
if (preg_match("/(host|network)/",$alias["type"]))
$show_alias= true;
break;
case "url":
if (preg_match("/(url)/i",$alias["type"]))
$show_alias= true;
break;
case "port":
if($alias["type"] == "port")
$show_alias= true;
break;
}
if ($show_alias ){
?>
<tr> <tr>
<td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';"> <td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
<?=$alias['name'];?> <?=$alias['name'];?>
...@@ -238,10 +235,13 @@ $( document ).ready(function() { ...@@ -238,10 +235,13 @@ $( document ).ready(function() {
} }
?> ?>
<td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';"> <td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
<?=$alias_values; ?> <?= find_alias_type($alias['type']) ?>
</td> </td>
<td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';"> <td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
<?=$alias['descr'];?> <?= $alias['descr'] ?>
</td>
<td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
<?= $alias_values ?>
</td> </td>
<td> <td>
<a href="firewall_aliases_edit.php?id=<?=$i;?>" title="<?=gettext("Edit alias"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a> <a href="firewall_aliases_edit.php?id=<?=$i;?>" title="<?=gettext("Edit alias"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
...@@ -249,17 +249,14 @@ $( document ).ready(function() { ...@@ -249,17 +249,14 @@ $( document ).ready(function() {
</td> </td>
</tr> </tr>
<?php <?php
} // if ($show_alias)
} // foreach } // foreach
?> ?>
</table> <tr>
<div class="container-fluid"> <td colspan="5">
<span class="text-danger">
<strong><?=gettext("Note:"); ?><br />
</strong></span>
</span>
<?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?> <?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?>
</div> </td>
</tr>
</table>
</form> </form>
</div> </div>
</section> </section>
......
src/www/firewall_aliases_edit.php
View file @ 2e20c8d6
...@@ -230,15 +230,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -230,15 +230,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} }
} }
if($pconfig['type'] == 'host') { header('Location: firewall_aliases.php');
header("Location: firewall_aliases.php?tab=ip");
} elseif (strpos($pconfig['type'],'url') !== false) {
header("Location: firewall_aliases.php?tab=url");
} else {
header("Location: firewall_aliases.php?tab=".$pconfig['type']);
}
exit; exit;
} }
} }
} }
...@@ -357,16 +350,12 @@ include("head.inc"); ...@@ -357,16 +350,12 @@ include("head.inc");
<div class="row"> <div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?> <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box tab-content">
<header class="content-box-head container-fluid">
<h3><?=gettext("Alias Edit");?></h3>
</header>
<div class="content-box-main">
<form action="firewall_aliases_edit.php" method="post" name="iform" id="iform"> <form action="firewall_aliases_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<tr> <tr>
<td colspan="2" align="right"> <td width="22%"><strong><?=gettext("Alias Edit");?></strong></td>
<td width="78%" align="right">
<small><?=gettext("full help"); ?> </small> <small><?=gettext("full help"); ?> </small>
<i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i> <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i>
</td> </td>
...@@ -522,10 +511,8 @@ include("head.inc"); ...@@ -522,10 +511,8 @@ include("head.inc");
</td> </td>
</tr> </tr>
</table> </table>
</div>
</form> </form>
</div> </div>
</div>
</section> </section>
</div> </div>
</div> </div>
......
src/www/firewall_aliases_import.php
View file @ 2e20c8d6
...@@ -153,15 +153,12 @@ include("head.inc"); ...@@ -153,15 +153,12 @@ include("head.inc");
<div class="row"> <div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?> <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box tab-content">
<header class="content-box-head container-fluid">
<h3><?=gettext("Alias Import");?></h3>
</header>
<div class="content-box-main">
<form action="firewall_aliases_import.php" method="post" name="iform"> <form action="firewall_aliases_import.php" method="post" name="iform">
<table class="table table-striped"> <table class="table table-striped">
<tr> <tr>
<td colspan="2" align="right"> <td width="22%"><strong><?=gettext("Alias Import");?></strong></td>
<td width="78%" align="right">
<small><?=gettext("full help"); ?> </small> <small><?=gettext("full help"); ?> </small>
<i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i> <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i>
</td> </td>
...@@ -208,13 +205,12 @@ include("head.inc"); ...@@ -208,13 +205,12 @@ include("head.inc");
<td> <td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" /> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>"
onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_aliases.php');?>'" /> onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? html_safe($_SERVER['HTTP_REFERER']) : '/firewall_aliases.php');?>'" />
</td> </td>
</tr> </tr>
</table> </table>
</form> </form>
</div> </div>
</div>
</section> </section>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023