lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 09:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ifgroups: simplify group maintenance for https://github.com/opnsense/core/issues/3780 (#3977)

Browse Source 
It doesn't really seem to make sense to try to link groups on different places, if they're only usable for pf which is always reloaded when new interfaces are connected.
The new ifgroup_setup() synchonizes attached interfaces for all configured groups, only rename and delete are still being served from the management pages (to avoid dropping static groups like openvpn).
This commit is contained in:
Ad Schellevis 2020-03-13 08:24:37 +01:00 committed by GitHub
parent 858116e0fc
commit e738e3ca05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 68 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/etc/inc/filter.inc
View File

@ -147,6 +147,67 @@ function filter_delete_states_for_down_gateways()
}
}
/**
* sync interface groups, but leave the ones not managed by us intact.
*/
function ifgroup_setup()
{
global $config;
$all_ifgroups = array();
$all_ifs = array();
$interface_details = legacy_interfaces_details();
if (isset($config['ifgroups']['ifgroupentry'])) {
foreach ($config['ifgroups']['ifgroupentry'] as $group) {
$all_ifgroups[$group['ifname']] = array();
foreach (explode(" ", $group['members']) as $member) {
if (!empty($config['interfaces'][$member])) {
$if = $config['interfaces'][$member]['if'];
if (!isset($all_ifs[$if])) {
$all_ifs[$if] = array();
}
$all_ifs[$if][] = $group['ifname'];
$all_ifgroups[$group['ifname']][] = $if;
}
}
}
}
foreach ($interface_details as $intf => $details) {
$thisifgroups = !empty($details['groups']) ? $details['groups'] : array();
foreach ($thisifgroups as $ifgroup) {
if (isset($all_ifgroups[$ifgroup]) && !in_array($intf, $all_ifgroups[$ifgroup])) {
// detach
mwexecf('/sbin/ifconfig %s -group %s', array($intf, $ifgroup));
}
}
if (!empty($all_ifs[$intf])) {
foreach ($all_ifs[$intf] as $ifgroup) {
if (!in_array($ifgroup, $thisifgroups)) {
// attach
mwexecf('/sbin/ifconfig %s group %s', array($intf, $ifgroup));
}
}
}
}
}
/**
* XXX: replace with check on interfaces section (see pf_interfaces)
*/
function is_interface_group($if)
{
global $config;
if (isset($config['ifgroups']['ifgroupentry'])) {
foreach ($config['ifgroups']['ifgroupentry'] as $groupentry) {
if ($groupentry['ifname'] === $if) {
return true;
}
}
}
return false;
}
function filter_configure_sync($verbose = false, $flush_states = false, $load_aliases = true)
{
global $config;
@ -160,6 +221,12 @@ function filter_configure_sync($verbose = false, $flush_states = false, $load_al
/* Use filter lock to not allow concurrent filter reloads during this run. */
$filterlck = lock('filter', LOCK_EX);
ifgroup_setup();
if ($verbose) {
echo '.';
flush();
}
// initialize fw plugin object
$fw = filter_core_get_initialized_plugin_system();
filter_core_bootstrap($fw);

51
src/etc/inc/interfaces.inc
View File

@ -962,8 +962,6 @@ function interfaces_configure($verbose = false)
plugins_configure('ipsec_prepare', $verbose);
plugins_configure('openvpn_prepare', $verbose);
plugins_configure('vxlan_prepare', $verbose);
interfaces_group_setup();
}
function interface_vip_bring_down($vip)
@ -2561,11 +2559,6 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
interface_bridge_add_member($bridgetmp, $realif);
}
}
$grouptmp = link_interface_to_group($interface);
if (!empty($grouptmp)) {
array_walk($grouptmp, 'interface_group_add_member');
}
}
if ($verbose) {
@ -3447,50 +3440,6 @@ function DHCP_Config_File_Substitutions($wancfg, $wanif, $dhclientconf)
return $dhclientconf;
}
function interfaces_group_setup()
{
global $config;
if (!isset($config['ifgroups']['ifgroupentry'])) {
return;
}
foreach ($config['ifgroups']['ifgroupentry'] as $groupar) {
interface_group_setup($groupar);
}
}
function interface_group_setup(&$groupname)
{
if (!is_array($groupname)) {
return;
}
$members = explode(' ', $groupname['members']);
foreach ($members as $ifs) {
interface_group_add_member($ifs, $groupname['ifname']);
}
}
function is_interface_group($if)
{
global $config;
if (isset($config['ifgroups']['ifgroupentry'])) {
foreach ($config['ifgroups']['ifgroupentry'] as $groupentry) {
if ($groupentry['ifname'] === $if) {
return true;
}
}
}
return false;
}
function interface_group_add_member($interface, $groupname)
{
mwexecf('/sbin/ifconfig %s group %s', array(get_real_interface($interface), $groupname));
}
/* convert fxp0 -> wan, etc. */
function convert_real_interface_to_friendly_interface_name($interface = 'wan')

9
src/etc/inc/plugins.inc.d/pf.inc
View File

@ -42,15 +42,6 @@ function pf_services()
'nocheck' => true,
'name' => 'pf',
);
$services[] = array(
'description' => gettext('Interface groups'),
'nocheck' => true,
'php' => array(
'start' => array('interfaces_group_setup'),
'restart' => array('interfaces_group_setup'),
),
'name' => 'ifgroups',
);
}
return $services;

6
src/etc/rc.newwanip
View File

@ -99,12 +99,6 @@ if (!empty($gif)) {
array_walk($gif, 'interface_gif_configure');
}
$grouptmp = link_interface_to_group($interface);
if (!empty($grouptmp)) {
array_walk($grouptmp, 'interface_group_add_member');
}
unset($bridgetmp);
$bridgetmp = link_interface_to_bridge($interface);
if (!empty($bridgetmp)) {
interface_bridge_add_member($bridgetmp, $interface_real);

5
src/etc/rc.newwanipv6
View File

@ -109,11 +109,6 @@ if (is_ipaddr($ip)) {
interfaces_vips_configure(false, $interface);
$grouptmp = link_interface_to_group($interface);
if (!empty($grouptmp)) {
array_walk($grouptmp, 'interface_group_add_member');
}
if (count(link_interface_to_track6($interface, true))) {
plugins_configure('dhcp', false, array('inet6'));
}

11
src/www/interfaces_groups_edit.php
View File

@ -113,28 +113,19 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
}
}
mark_subsystem_dirty('filter');
}
$old_ifname = isset($id) ? $a_ifgroups[$id]['ifname'] : $pconfig['ifname'];
// remove group members
foreach (explode(" ", $a_ifgroups[$id]['members']) as $old_member) {
if (!in_array($old_member, $pconfig['members']) || $old_ifname != $pconfig['ifname']) {
mwexecf('/sbin/ifconfig %s -group %s', array(get_real_interface($old_member), $a_ifgroups[$id]['ifname']));
}
}
// update item
$a_ifgroups[$id] = $ifgroupentry;
} else {
mark_subsystem_dirty('filter');
// add new item
$a_ifgroups[] = $ifgroupentry;
}
mark_subsystem_dirty('filter');
usort($a_ifgroups, function($a, $b) {
return strnatcmp($a['ifname'], $b['ifname']);
});
filter_rules_sort();
write_config();
interface_group_setup($ifgroupentry);
header(url_safe('Location: /interfaces_groups.php'));
exit;
}