safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-820: Merge match IP address filters anywhere in object properties.

Browse Source
This commit is contained in:
Virtually Nick
2020-06-19 07:23:00 -04:00
committed by GitHub
parent 95f00f8779 85a7a58bd3
commit 6d89c1a308
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
guacamole/src/main/webapp/app/list/types/FilterPattern.js
View File

@@ -124,10 +124,14 @@ angular.module('list').factory('FilterPattern', ['$injector',
// For each defined getter // For each defined getter
for (var i=0; i < getters.length; i++) { for (var i=0; i < getters.length; i++) {
// Test value against IPv4 network // Test each possible IPv4 address within the string against
var value = IPv4Network.parse(String(getters[i](object))); // 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)) if (value && network.contains(value))
return true; return true;
}
} }
@@ -154,10 +158,14 @@ angular.module('list').factory('FilterPattern', ['$injector',
// For each defined getter // For each defined getter
for (var i=0; i < getters.length; i++) { for (var i=0; i < getters.length; i++) {
// Test value against IPv6 network // Test each possible IPv6 address within the string against
var value = IPv6Network.parse(String(getters[i](object))); // 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)) if (value && network.contains(value))
return true; return true;
}
} }