adam/guacamole-client
1
0 Fork 0
Code Issues Pull Requests 1 Packages Releases Wiki Activity

GUACAMOLE-820: Match IP address filters against IP addresses anywhere in object properties.

Browse Source
This commit is contained in:
Michael Jumper committed 2020-06-18 14:06:19 -07:00
1 parent cbe2c5dbf2
commit 85a7a58bd3
1 file changed
+16 -8
Download Patch File Download Diff File Expand all files Collapse all files
guacamole/src/main/webapp/app/list/types/FilterPattern.js
+16 -8
View File
@@ -124,10 +124,14 @@ angular.module('list').factory('FilterPattern', ['$injector',
// For each defined getter
for (var i=0; i < getters.length; i++) {
// Test value against IPv4 network
var value = IPv4Network.parse(String(getters[i](object)));
if (value && network.contains(value))
return true;
// Test each possible IPv4 address within the string against
// the given IPv4 network
var addresses = String(getters[i](object)).split(/[^0-9.]+/);
for (var j=0; j < addresses.length; j++) {
var value = IPv4Network.parse(addresses[j]);
if (value && network.contains(value))
return true;
}
}
@@ -154,10 +158,14 @@ angular.module('list').factory('FilterPattern', ['$injector',
// For each defined getter
for (var i=0; i < getters.length; i++) {
// Test value against IPv6 network
var value = IPv6Network.parse(String(getters[i](object)));
if (value && network.contains(value))
return true;
// Test each possible IPv6 address within the string against
// the given IPv6 network
var addresses = String(getters[i](object)).split(/[^0-9A-Fa-f:]+/);
for (var j=0; j < addresses.length; j++) {
var value = IPv6Network.parse(addresses[j]);
if (value && network.contains(value))
return true;
}
}