houseassassin/vpnbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

singbox template: package_name -> ruleset

Browse Source
This commit is contained in:
mercury
2024-10-14 00:38:58 +04:00
parent 1d9d992361
commit 5eef9581c7
3 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/bot.php
+36 -18
View File
@@ -5072,25 +5072,38 @@ DNS-over-HTTPS with IP:
foreach ($route['rules'] as $k => $v) {
if (!empty($v['createruleset'])) {
foreach ($v['createruleset'] as $i => $r) {
foreach ($v['createruleset'] as $r) {
foreach ($r['rules'] as $l => $n) {
if (array_key_exists('domain_suffix', $n) && $n['domain_suffix'] == '~pac~') {
$r['rules'][$l]['domain_suffix'] = array_keys(array_filter($pac['includelist'] ?: []));
if (empty($r['rules'][$l]['domain_suffix'])) {
unset($r['rules'][$l]);
}
}
if (array_key_exists('domain_suffix', $n) && $n['domain_suffix'] == '~warp~') {
$r['rules'][$l]['domain_suffix'] = array_keys(array_filter($pac['warplist'] ?: []));
if (empty($r['rules'][$l]['domain_suffix'])) {
unset($r['rules'][$l]);
}
}
if (array_key_exists('domain_suffix', $n) && $n['domain_suffix'] == '~block~') {
$r['rules'][$l]['domain_suffix'] = array_keys(array_filter($pac['blocklist'] ?: []));
if (empty($r['rules'][$l]['domain_suffix'])) {
unset($r['rules'][$l]);
}
switch (true) {
case array_key_exists('domain_suffix', $n):
switch ($n['domain_suffix']) {
case '~pac~':
$t = 'includelist';
break;
case '~warp~':
$t = 'warplist';
break;
case '~block~':
$t = 'blocklist';
break;
}
$r['rules'][$l]['domain_suffix'] = array_keys(array_filter($pac[$t] ?: []));
if (empty($r['rules'][$l]['domain_suffix'])) {
unset($r['rules'][$l]);
}
break;
case array_key_exists('package_name', $n):
$r['rules'][$l]['package_name'] = array_keys(array_filter($pac['packagelist'] ?: []));
if (empty($r['rules'][$l]['package_name'])) {
unset($r['rules'][$l]);
}
break;
case array_key_exists('process_name', $n):
$r['rules'][$l]['process_name'] = array_keys(array_filter($pac['processlist'] ?: []));
if (empty($r['rules'][$l]['process_name'])) {
unset($r['rules'][$l]);
}
break;
}
}
if (!empty($_GET['r']) && $r['name'] == $_GET['r']) {
@@ -5121,6 +5134,11 @@ DNS-over-HTTPS with IP:
"download_detour" => "direct",
];
$route['rules'][$k]['rule_set'][] = $r['name'];
switch (true) {
case preg_match('#~(.+)~#', $route['rules'][$k]['outbound'], $m):
$route['rules'][$k]['outbound'] = $pac[$m[1]] ? 'direct' : 'proxy';
break;
}
}
unset($route['rules'][$k]['createruleset']);
if (empty($route['rules'][$k]['rule_set'])) {
config/sing.json
+22 -4
View File
@@ -111,14 +111,32 @@
"outbound": "dns-out"
},
{
"package_name": [
"createruleset": [
{
"name": "package",
"interval": "15s",
"rules": [
{
"package_name": "~package~"
}
]
}
],
"outbound": "proxy"
"outbound": "~app_outbound~"
},
{
"process_name": [
"createruleset": [
{
"name": "process",
"interval": "15s",
"rules": [
{
"process_name": "~process~"
}
]
}
],
"outbound": "proxy"
"outbound": "~process_outbound~"
},
{
"createruleset": [
version
+2
View File
@@ -1,3 +1,5 @@
14.10.2024 v1.68
- singbox template: package_name -> ruleset
13.10.2024 v1.67
- sslip.io -> nip.io
13.10.2024 v1.66