lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 02:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interfaces: Diagnostics: Packet Capture - support mac addresses in "Host Address" field. closes https://github.com/opnsense/core/issues/6159

Browse Source
This commit is contained in:
Ad Schellevis 2023-01-02 17:46:38 +01:00
parent e5d6acd2eb
commit 720ffdc561
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/packetcapture.xml
View File

@ -35,13 +35,13 @@
<label>Host Address</label>
<type>text</type>
<help>
This value is either the Source or Destination IP address or subnet in CIDR notation.
This value is either the Source or Destination IP/MAC address or subnet in CIDR notation.
The packet capture will look for this address in either field.
Matching can be negated by preceding the value with "not".
Multiple IP addresses or CIDR subnets may be specified as boolean expression.
If you leave this field blank, all packets on the specified interface will be captured.
Example: not 10.0.0.0/24 not and not 11.0.0.1
Example: not 10.0.0.0/24 not and not 11.0.0.1 or 00:0a:01:02:03:04
</help>
</field>
<field>

10
src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php
View File

@ -62,6 +62,16 @@ class Util
return !empty(filter_var($address, FILTER_VALIDATE_IP));
}
/**
* is provided address a mac address.
* @param string $network address
* @return boolean
*/
public static function isMACAddress($address)
{
return !empty(filter_var($address, FILTER_VALIDATE_MAC));
}
/**
* is provided network valid
* @param string $network network

2
src/opnsense/mvc/app/models/OPNsense/Diagnostics/FieldTypes/HostField.php
View File

@ -51,7 +51,7 @@ class HostField extends BaseField
$parts = preg_split('/ /', $data, -1, PREG_SPLIT_NO_EMPTY);
$tokens = [];
foreach ($parts as $part) {
if (Util::isIpAddress($part) || Util::isSubnet($part)) {
if (Util::isIpAddress($part) || Util::isSubnet($part) || Util::isMACAddress($part)) {
$tokens[] = 'net';
} elseif (in_array(strtolower($part), ['and', 'or', 'not'])) {
$tokens[] = strtolower($part);

2
src/opnsense/scripts/interfaces/capture.py
View File

@ -140,6 +140,8 @@ if __name__ == '__main__':
tokens.append(token)
elif token.find('/') > -1:
tokens.append('net %s' % token)
elif token.count(':') == 5 and sum([len(x) == 2 for x in token.split(':')]) == 6:
tokens.append('ether host %s' % token)
else:
tokens.append('host %s' % token)
filters.append('( %s )' % ' '.join(tokens))