Skip to content

refactor: optimize sanitization and validation functions #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dll-as wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −19
Open

refactor: optimize sanitization and validation functions #1191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions src/renderer/lib/inputSanitizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@ const isIPv6 = (address: string) => /^[0-9a-fA-F:]+$/.test(address);
const VALID_COUNTRIES = countries.map((c) => c.value);

export const sanitizeProfileName = (name: string): string => {
name = name.trim();
name = name.replace(/[^a-zA-Z0-9-_ ]/g, '');
name = name.replace(/@/g, '');
name = name.replace(/[?&]/g, '');
if (name.length > 10) {
name = name.slice(0, 10);
}
return name;
const sanitized = name
.trim()
.replace(/[^a-zA-Z0-9-_ ]/g, '')
.replace(/[@?&]/g, '')
.substring(0, 10);

return sanitized;
};

export const validEndpoint = (value: string) => {
Expand Down Expand Up @@ -91,19 +90,26 @@ export const validateTestUrl = (url: string): string => {
if (!url || typeof url !== 'string') {
return defaultSettings.testUrl;
}
url = url.trim();
if (url === '') {

const trimmedUrl = url.trim();
if (!trimmedUrl) return defaultSettings.testUrl;

try {
let testUrl = trimmedUrl;

if (!testUrl.startsWith('http://') && !testUrl.startsWith('https://')) {
testUrl = 'https://' + testUrl;
}

if (!testUrl.endsWith('/cdn-cgi/trace')) {
testUrl = testUrl.replace(/\/+$/, '') + '/cdn-cgi/trace';
}

new URL(testUrl);
return testUrl;
} catch {
return defaultSettings.testUrl;
}
if (!url.startsWith('http://') && !url.startsWith('https://')) {
url = 'https://' + url;
}
if (!url.endsWith('/cdn-cgi/trace')) {
url = url.replace(/\/$/, '');
url += '/cdn-cgi/trace';
}
url = url.replace(/\/$/, '');
return url;
};

export const determineIpType = (endpoint: string, ipType: string): '' | 'v4' | 'v6' => {
Expand Down