Local-GitHub-Proxy/Sub-Store
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git synced 2025-08-11 12:59:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #289 from makaspacex/master

Browse Source 
修复IP-CIDR的option错误
This commit is contained in:
xream 2024-02-28 22:19:11 +08:00 committed by GitHub
commit 56626dabc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/core/rule-utils/parsers.js
View File

@ -9,7 +9,7 @@ const RULE_TYPES_MAPPING = [
[/^(IN|SRC)-PORT$/, 'IN-PORT'], [/^(IN|SRC)-PORT$/, 'IN-PORT'],
[/^PROTOCOL$/, 'PROTOCOL'], [/^PROTOCOL$/, 'PROTOCOL'],
[/^IP-CIDR$/i, 'IP-CIDR'], [/^IP-CIDR$/i, 'IP-CIDR'],
[/^(IP-CIDR6|ip6-cidr|IP6-CIDR)$/], [/^(IP-CIDR6|ip6-cidr|IP6-CIDR)$/, 'IP-CIDR6'],
]; ];
function AllRuleParser() { function AllRuleParser() {
@ -40,7 +40,7 @@ function AllRuleParser() {
rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR' ||
rule.type === 'IP-CIDR6' rule.type === 'IP-CIDR6'
) { ) {
rule.options = params.slice(2); rule.options = params.slice(2).join(",");
} }
result.push(rule); result.push(rule);
} }

4
backend/src/core/rule-utils/producers.js
View File

@ -31,7 +31,7 @@ function SurgeRuleSet() {
const func = (rule) => { const func = (rule) => {
let output = `${rule.type},${rule.content}`; let output = `${rule.type},${rule.content}`;
if (rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6') { if (rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6') {
output += rule.options ? `,${rule.options[0]}` : ''; output += rule.options ? `,${rule.options}` : '';
} }
return output; return output;
}; };
@ -63,7 +63,7 @@ function ClashRuleProvider() {
rule.content rule.content
}`; }`;
if (rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6') { if (rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6') {
output += rule.options ? `,${rule.options[0]}` : ''; output += rule.options ? `,${rule.options}` : '';
} }
return output; return output;
}), }),