yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-11-10 17:49:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: stash regex

Browse Source
This commit is contained in:
tokumeikoi 2022-01-11 23:39:17 +08:00
parent 90f9c181a0
commit 1f25edaaa4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Client/Protocols/Stash.php
View File

@ -56,17 +56,18 @@ class Stash
$isFilter = false; $isFilter = false;
foreach ($config['proxy-groups'][$k]['proxies'] as $src) { foreach ($config['proxy-groups'][$k]['proxies'] as $src) {
foreach ($proxies as $dst) { foreach ($proxies as $dst) {
if ($this->isMatch($src, $dst)) { if (!$this->isRegex($src)) continue;
$isFilter = true; $isFilter = true;
$config['proxy-groups'][$k]['proxies'] = array_diff($config['proxy-groups'][$k]['proxies'], [$src]); $config['proxy-groups'][$k]['proxies'] = array_values(array_diff($config['proxy-groups'][$k]['proxies'], [$src]));
if ($this->isMatch($src, $dst)) {
array_push($config['proxy-groups'][$k]['proxies'], $dst); array_push($config['proxy-groups'][$k]['proxies'], $dst);
} }
} }
if ($isFilter) continue;
} }
if (!$isFilter) { if ($isFilter) continue;
$config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies); $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
} }
}
// Force the current subscription domain to be a direct rule // Force the current subscription domain to be a direct rule
$subsDomain = $_SERVER['SERVER_NAME']; $subsDomain = $_SERVER['SERVER_NAME'];
$subsDomainRule = "DOMAIN,{$subsDomain},DIRECT"; $subsDomainRule = "DOMAIN,{$subsDomain},DIRECT";