Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-07 03:56:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: change vless validation logic

Browse Source
This commit is contained in:
divocat
2025-10-05 18:13:19 +03:00
parent c5e19a0f2d
commit 341f260fcf
6 changed files with 418 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
fe-app-podkop/src/validators/tests/validateVlessUrl.test.js Normal file
View File

@@ -0,0 +1,100 @@
import { describe, it, expect } from 'vitest';
import { validateVlessUrl } from '../validateVlessUrl';
const validUrls = [
// TCP
[
'tcp + none',
'vless://94792286-7bbe-4f33-8b36-18d1bbf70723@127.0.0.1:34520?type=tcp&encryption=none&security=none#vless-tcp-none',
],
[
'tcp + reality',
'vless://e95163dc-905e-480a-afe5-20b146288679@127.0.0.1:16399?type=tcp&encryption=none&security=reality&pbk=tqhSkeDR6jsqC-BYCnZWBrdL33g705ba8tV5-ZboWTM&fp=chrome&sni=google.com&sid=f6&spx=%2F#vless-tcp-reality',
],
[
'tcp + tls',
'vless://2e9e8288-060e-4da2-8b9f-a1c81826feb7@127.0.0.1:19316?type=tcp&encryption=none&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#vless-tcp-tls',
],
// mKCP
[
'mKCP + none',
'vless://72e201d7-7841-4a32-b266-4aa3eb776d51@127.0.0.1:17270?type=kcp&encryption=none&headerType=none&seed=AirziWi4ng&security=none#vless-mKCP',
],
// WebSocket
[
'ws + none',
'vless://d86daef7-565b-4ecd-a9ee-bac847ad38e6@127.0.0.1:12928?type=ws&encryption=none&path=%2Fwspath&host=google.com&security=none#vless-websocket-none',
],
[
'ws + tls',
'vless://fe0f0941-09a9-4e46-bc69-e00190d7bb9c@127.0.0.1:10156?type=ws&encryption=none&path=%2Fwspath&host=google.com&security=tls&fp=chrome&sni=google.com#vless-websocket-tls',
],
// gRPC
[
'grpc + none',
'vless://974b39e3-f7bf-42b9-933c-16699c635e77@127.0.0.1:15633?type=grpc&encryption=none&serviceName=TunService&security=none#vless-gRPC-none',
],
[
'grpc + reality',
'vless://651e7eca-5152-46f1-baf2-d502e0af7b27@127.0.0.1:28535?type=grpc&encryption=none&serviceName=TunService&security=reality&pbk=nhZ7NiKfcqESa5ZeBFfsq9o18W-OWOAHLln9UmuVXSk&fp=chrome&sni=google.com&sid=11cbaeaa&spx=%2F#vless-gRPC-reality',
],
// HTTPUpgrade
[
'httpupgrade + none',
'vless://2b98f144-847f-42f7-8798-e1a32d27bdc7@127.0.0.1:47154?type=httpupgrade&encryption=none&path=%2Fhttpupgradepath&host=google.com&security=none#vless-httpupgrade-none',
],
[
'httpupgrade + tls',
'vless://76dbd0ff-1a35-4f0c-a9ba-3c5890b7dea6@127.0.0.1:50639?type=httpupgrade&encryption=none&path=%2Fhttpupgradepath&host=google.com&security=tls&sni=google.com#vless-httpupgrade-tls',
],
// XHTTP
[
'xhttp + none',
'vless://c2841505-ec32-4b8d-b6dd-3e19d648c321@127.0.0.1:45507?type=xhttp&encryption=none&path=%2Fxhttppath&host=xhttp&mode=auto&security=none#vless-xhttp',
],
];
const invalidUrls = [
['No prefix', 'uuid@host:443?type=tcp&security=tls'],
['No uuid', 'vless://@127.0.0.1:443?type=tcp&security=tls'],
['No host', 'vless://uuid@:443?type=tcp&security=tls'],
['No port', 'vless://uuid@127.0.0.1?type=tcp&security=tls'],
['Invalid port', 'vless://uuid@127.0.0.1:abc?type=tcp&security=tls'],
['Missing type', 'vless://uuid@127.0.0.1:443?security=tls'],
['Missing security', 'vless://uuid@127.0.0.1:443?type=tcp'],
[
'reality without pbk',
'vless://uuid@127.0.0.1:443?type=tcp&security=reality&fp=chrome',
],
[
'reality without fp',
'vless://uuid@127.0.0.1:443?type=tcp&security=reality&pbk=abc',
],
[
'tcp + reality + unexpected spaces',
'vless://e95163dc-905e-480a-afe5-20b146288679@127.0.0.1:16399?type=tcp&encryption=none&security=reality&pbk=tqhSkeDR6jsqC-BYCnZWBrdL33g705ba8tV5-ZboWTM&fp=chrome&sni= google.com&sid=f6&spx=%2F#vless-tcp-reality',
],
];
describe('validateVlessUrl', () => {
describe.each(validUrls)('Valid URL: %s', (_desc, url) => {
it(`returns valid=true for "${url}"`, () => {
const res = validateVlessUrl(url);
expect(res.valid).toBe(true);
});
});
describe.each(invalidUrls)('Invalid URL: %s', (_desc, url) => {
it(`returns valid=false for "${url}"`, () => {
const res = validateVlessUrl(url);
expect(res.valid).toBe(false);
});
});
it('detects invalid port range', () => {
const res = validateVlessUrl(
'vless://uuid@127.0.0.1:99999?type=tcp&security=tls',
);
expect(res.valid).toBe(false);
});
});

7
fe-app-podkop/src/validators/validateShadowsocksUrl.ts
View File

@@ -10,6 +10,13 @@ export function validateShadowsocksUrl(url: string): ValidationResult {
} }
try { try {
if (!url || /\s/.test(url)) {
return {
valid: false,
message: 'Invalid Shadowsocks URL: must not contain spaces',
};
}
const mainPart = url.includes('?') ? url.split('?')[0] : url.split('#')[0]; const mainPart = url.includes('?') ? url.split('?')[0] : url.split('#')[0];
const encryptedPart = mainPart.split('/')[2]?.split('@')[0]; const encryptedPart = mainPart.split('/')[2]?.split('@')[0];

7
fe-app-podkop/src/validators/validateTrojanUrl.ts
View File

@@ -9,6 +9,13 @@ export function validateTrojanUrl(url: string): ValidationResult {
}; };
} }
if (!url || /\s/.test(url)) {
return {
valid: false,
message: 'Invalid Trojan URL: must not contain spaces',
};
}
try { try {
const parsedUrl = new URL(url); const parsedUrl = new URL(url);

68
fe-app-podkop/src/validators/validateVlessUrl.ts
View File

@@ -2,62 +2,68 @@ import { ValidationResult } from './types';
// TODO refactor current validation and add tests // TODO refactor current validation and add tests
export function validateVlessUrl(url: string): ValidationResult { export function validateVlessUrl(url: string): ValidationResult {
if (!url.startsWith('vless://')) { try {
const parsedUrl = new URL(url);
if (!url || /\s/.test(url)) {
return {
valid: false,
message: 'Invalid VLESS URL: must not contain spaces',
};
}
if (parsedUrl.protocol !== 'vless:') {
return { return {
valid: false, valid: false,
message: 'Invalid VLESS URL: must start with vless://', message: 'Invalid VLESS URL: must start with vless://',
}; };
} }
try { if (!parsedUrl.username) {
const uuid = url.split('/')[2]?.split('@')[0];
if (!uuid) {
return { valid: false, message: 'Invalid VLESS URL: missing UUID' }; return { valid: false, message: 'Invalid VLESS URL: missing UUID' };
} }
const serverPart = url.split('@')[1]; if (!parsedUrl.hostname) {
if (!serverPart) {
return {
valid: false,
message: 'Invalid VLESS URL: missing server address',
};
}
const [server, portAndRest] = serverPart.split(':');
if (!server) {
return { valid: false, message: 'Invalid VLESS URL: missing server' }; return { valid: false, message: 'Invalid VLESS URL: missing server' };
} }
const port = portAndRest ? portAndRest.split(/[/?#]/)[0] : null; if (!parsedUrl.port) {
if (!port) {
return { valid: false, message: 'Invalid VLESS URL: missing port' }; return { valid: false, message: 'Invalid VLESS URL: missing port' };
} }
const portNum = parseInt(port, 10); if (
isNaN(+parsedUrl.port) ||
if (isNaN(portNum) || portNum < 1 || portNum > 65535) { +parsedUrl.port < 1 ||
+parsedUrl.port > 65535
) {
return { return {
valid: false, valid: false,
message: 'Invalid port number. Must be between 1 and 65535', message:
'Invalid VLESS URL: invalid port number. Must be between 1 and 65535',
}; };
} }
const queryString = url.split('?')[1]; if (!parsedUrl.search) {
if (!queryString) {
return { return {
valid: false, valid: false,
message: 'Invalid VLESS URL: missing query parameters', message: 'Invalid VLESS URL: missing query parameters',
}; };
} }
const params = new URLSearchParams(queryString.split('#')[0]); const params = new URLSearchParams(parsedUrl.search);
const type = params.get('type'); const type = params.get('type');
const validTypes = ['tcp', 'raw', 'udp', 'grpc', 'http', 'ws']; const validTypes = [
'tcp',
'raw',
'udp',
'grpc',
'http',
'httpupgrade',
'xhttp',
'ws',
'kcp',
];
if (!type || !validTypes.includes(type)) { if (!type || !validTypes.includes(type)) {
return { return {
@@ -94,9 +100,9 @@ export function validateVlessUrl(url: string): ValidationResult {
}; };
} }
} }
return { valid: true, message: 'Valid' };
} catch (_e) { } catch (_e) {
return { valid: false, message: 'Invalid VLESS URL: parsing failed' }; return { valid: false, message: 'Invalid VLESS URL: parsing failed' };
} }
return { valid: true, message: 'Valid' };
} }

17
luci-app-podkop/htdocs/luci-static/resources/view/podkop/configSection.js
View File

@@ -128,18 +128,25 @@ function createConfigSection(section) {
} }
try { try {
const activeConfig = value const activeConfigs = value
.split('\n') .split('\n')
.map((line) => line.trim()) .map((line) => line.trim())
.find((line) => line && !line.startsWith('//')); .filter((line) => !line.startsWith('//'))
.filter(Boolean);
if (!activeConfig) { if (!activeConfigs.length) {
return _( return _(
'No active configuration found. At least one non-commented line is required.', 'No active configuration found. One configuration is required.',
); );
} }
const validation = main.validateProxyUrl(activeConfig); if (activeConfigs.length > 1) {
return _(
'Multiply active configurations found. Please leave one configuration.',
);
}
const validation = main.validateProxyUrl(activeConfigs[0]);
if (validation.valid) { if (validation.valid) {
return true; return true;

63
luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js
View File

@@ -128,6 +128,12 @@ function validateShadowsocksUrl(url) {
}; };
} }
try { try {
if (!url || /\s/.test(url)) {
return {
valid: false,
message: "Invalid Shadowsocks URL: must not contain spaces"
};
}
const mainPart = url.includes("?") ? url.split("?")[0] : url.split("#")[0]; const mainPart = url.includes("?") ? url.split("?")[0] : url.split("#")[0];
const encryptedPart = mainPart.split("/")[2]?.split("@")[0]; const encryptedPart = mainPart.split("/")[2]?.split("@")[0];
if (!encryptedPart) { if (!encryptedPart) {
@@ -185,49 +191,54 @@ function validateShadowsocksUrl(url) {
// src/validators/validateVlessUrl.ts // src/validators/validateVlessUrl.ts
function validateVlessUrl(url) { function validateVlessUrl(url) {
if (!url.startsWith("vless://")) { try {
const parsedUrl = new URL(url);
if (!url || /\s/.test(url)) {
return {
valid: false,
message: "Invalid VLESS URL: must not contain spaces"
};
}
if (parsedUrl.protocol !== "vless:") {
return { return {
valid: false, valid: false,
message: "Invalid VLESS URL: must start with vless://" message: "Invalid VLESS URL: must start with vless://"
}; };
} }
try { if (!parsedUrl.username) {
const uuid = url.split("/")[2]?.split("@")[0];
if (!uuid) {
return { valid: false, message: "Invalid VLESS URL: missing UUID" }; return { valid: false, message: "Invalid VLESS URL: missing UUID" };
} }
const serverPart = url.split("@")[1]; if (!parsedUrl.hostname) {
if (!serverPart) {
return {
valid: false,
message: "Invalid VLESS URL: missing server address"
};
}
const [server, portAndRest] = serverPart.split(":");
if (!server) {
return { valid: false, message: "Invalid VLESS URL: missing server" }; return { valid: false, message: "Invalid VLESS URL: missing server" };
} }
const port = portAndRest ? portAndRest.split(/[/?#]/)[0] : null; if (!parsedUrl.port) {
if (!port) {
return { valid: false, message: "Invalid VLESS URL: missing port" }; return { valid: false, message: "Invalid VLESS URL: missing port" };
} }
const portNum = parseInt(port, 10); if (isNaN(+parsedUrl.port) || +parsedUrl.port < 1 || +parsedUrl.port > 65535) {
if (isNaN(portNum) || portNum < 1 || portNum > 65535) {
return { return {
valid: false, valid: false,
message: "Invalid port number. Must be between 1 and 65535" message: "Invalid VLESS URL: invalid port number. Must be between 1 and 65535"
}; };
} }
const queryString = url.split("?")[1]; if (!parsedUrl.search) {
if (!queryString) {
return { return {
valid: false, valid: false,
message: "Invalid VLESS URL: missing query parameters" message: "Invalid VLESS URL: missing query parameters"
}; };
} }
const params = new URLSearchParams(queryString.split("#")[0]); const params = new URLSearchParams(parsedUrl.search);
const type = params.get("type"); const type = params.get("type");
const validTypes = ["tcp", "raw", "udp", "grpc", "http", "ws"]; const validTypes = [
"tcp",
"raw",
"udp",
"grpc",
"http",
"httpupgrade",
"xhttp",
"ws",
"kcp"
];
if (!type || !validTypes.includes(type)) { if (!type || !validTypes.includes(type)) {
return { return {
valid: false, valid: false,
@@ -256,10 +267,10 @@ function validateVlessUrl(url) {
}; };
} }
} }
return { valid: true, message: "Valid" };
} catch (_e) { } catch (_e) {
return { valid: false, message: "Invalid VLESS URL: parsing failed" }; return { valid: false, message: "Invalid VLESS URL: parsing failed" };
} }
return { valid: true, message: "Valid" };
} }
// src/validators/validateOutboundJson.ts // src/validators/validateOutboundJson.ts
@@ -286,6 +297,12 @@ function validateTrojanUrl(url) {
message: "Invalid Trojan URL: must start with trojan://" message: "Invalid Trojan URL: must start with trojan://"
}; };
} }
if (!url || /\s/.test(url)) {
return {
valid: false,
message: "Invalid Trojan URL: must not contain spaces"
};
}
try { try {
const parsedUrl = new URL(url); const parsedUrl = new URL(url);
if (!parsedUrl.username || !parsedUrl.hostname || !parsedUrl.port) { if (!parsedUrl.username || !parsedUrl.hostname || !parsedUrl.port) {