anticensority/runet-censorship-bypass
1
1
Fork 0
mirror of https://github.com/anticensority/runet-censorship-bypass.git synced 2024-11-24 02:13:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty username case

Browse Source
This commit is contained in:
Ilya Ig. Petrov 2017-11-01 00:19:10 +05:00
parent 8f1ce3b6ea
commit 9b35c413cc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
View File

@ -268,7 +268,7 @@
proxyHostToCredsList[`${hostname}:${port}`] || []; proxyHostToCredsList[`${hostname}:${port}`] || [];
const tries = proxyHostToCredsList[`${hostname}:${port}`]; const tries = proxyHostToCredsList[`${hostname}:${port}`];
tries.push({ tries.push({
username, username: username || '',
password: password || '', password: password || '',
}); });

7
extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/ProxyEditor.js
View File

@ -408,6 +408,8 @@ export default function getProxyEditor(theState) {
creds, creds,
hostname, hostname,
port, port,
username,
password,
} = theState.utils.parseProxyScheme(proxyAsString); } = theState.utils.parseProxyScheme(proxyAsString);
const crededAddr = `${creds ? `${creds}@` : ''}${hostname}:${port}`; const crededAddr = `${creds ? `${creds}@` : ''}${hostname}:${port}`;
@ -417,11 +419,14 @@ export default function getProxyEditor(theState) {
`Неверный тип ${type}. Известные типы: ${knownTypes.join(', ')}.` `Неверный тип ${type}. Известные типы: ${knownTypes.join(', ')}.`
); );
} }
if (!(crededAddr && /^(?:[^@]+@)?[^:]+:\d+$/.test(crededAddr))) { if (!(crededAddr && /^(?:.+@)?[^:]+:\d+$/.test(crededAddr))) {
return new Error( return new Error(
`Адрес прокси "${crededAddr || ''}" не соответствует формату "<опц_логин>:<опц_пароль>@<домен_или_IP>:<порт_из_цифр>".` `Адрес прокси "${crededAddr || ''}" не соответствует формату "<опц_логин>:<опц_пароль>@<домен_или_IP>:<порт_из_цифр>".`
); );
} }
if (password && !username) {
return new Error('Вашему пользователю не хватает имени?');
}
const portInt = parseInt(port); const portInt = parseInt(port);
if (portInt < 0 || portInt > 65535) { if (portInt < 0 || portInt > 65535) {
return new Error( return new Error(