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

Parse credentialized (creded) proxies

Browse Source
This commit is contained in:
Ilya Ig. Petrov 2017-10-17 21:35:01 +05:00
parent e37a376c53
commit 7ac474a5e7
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ export default function getProxyEditor(theState) {
{ {
text-align: center; text-align: center;
} }
table.editor tr.proxyRow input[name="hostname"] { table.editor tr.proxyRow input[name="crededHostname"] {
padding: 0; padding: 0;
} }
@ -217,10 +217,10 @@ export default function getProxyEditor(theState) {
}, {}); }, {});
const type = that.state.selectedNewType; const type = that.state.selectedNewType;
const hostname = elements.newHostname; const crededHostname = elements.newHostname;
const port = elements.newPort; const port = elements.newPort;
const newValue = `${that.props.proxyStringRaw}; ${type} ${hostname}:${port}` const newValue = `${that.props.proxyStringRaw}; ${type} ${crededHostname}:${port}`
.trim().replace(/(\s*;\s*)+/, '; '); .trim().replace(/(\s*;\s*)+/, '; ');
that.props.setProxyStringRaw(true, newValue); that.props.setProxyStringRaw(true, newValue);
@ -324,7 +324,12 @@ export default function getProxyEditor(theState) {
{ {
splitBySemi(this.props.proxyStringRaw).map((proxyAsString, index) => { splitBySemi(this.props.proxyStringRaw).map((proxyAsString, index) => {
const [type, addr] = proxyAsString.trim().split(/\s+/); const [type, crededAddr] = proxyAsString.trim().split(/\s+/);
let [creds, addr] = crededAddr.split('@');
if (!addr) {
addr = creds;
creds = '';
}
const [hostname, port] = addr.split(':'); const [hostname, port] = addr.split(':');
return ( return (
<tr class={scopedCss.proxyRow}> <tr class={scopedCss.proxyRow}>
@ -335,7 +340,7 @@ export default function getProxyEditor(theState) {
>X</button> >X</button>
</td> </td>
<td>{type}</td> <td>{type}</td>
<td><input value={hostname} name="hostname" readonly/></td> <td><input value={`${creds && `${creds}@`}${hostname}`} name="crededHostname" readonly/></td>
<td>{port}</td> <td>{port}</td>
<td> <td>
<button type="button" disabled={props.ifInputsDisabled} <button type="button" disabled={props.ifInputsDisabled}
@ -390,7 +395,7 @@ export default function getProxyEditor(theState) {
const errors = splitBySemi(this.state.stashedExports) const errors = splitBySemi(this.state.stashedExports)
.map((proxyAsString) => { .map((proxyAsString) => {
const [rawType, addr, ...rest] = proxyAsString.split(/\s+/); const [rawType, crededAddr, ...rest] = proxyAsString.split(/\s+/);
if (rest && rest.length) { if (rest && rest.length) {
return new Error( return new Error(
`"${rest.join(', ')}" кажется мне лишним. Вы забыли ";"?` `"${rest.join(', ')}" кажется мне лишним. Вы забыли ";"?`
@ -402,11 +407,16 @@ export default function getProxyEditor(theState) {
`Неверный тип ${rawType}. Известные типы: ${knownTypes.join(', ')}.` `Неверный тип ${rawType}. Известные типы: ${knownTypes.join(', ')}.`
); );
} }
if (!(addr && /^[^:]+:\d+$/.test(addr))) { if (!(crededAddr && /^(?:[^@]+@)?[^:]+:\d+$/.test(crededAddr))) {
return new Error( return new Error(
`Адрес прокси "${addr || ''}" не соответствует формату "<домен_или_IP>:<порт_из_цифр>".` `Адрес прокси "${crededAddr || ''}" не соответствует формату "<опц_логин>:<опц_пароль>@<домен_или_IP>:<порт_из_цифр>".`
); );
} }
let [creds, addr] = crededAddr.split('@');
if (!addr) {
addr = creds;
creds = '';
}
const [hostname, rawPort] = addr.split(':'); const [hostname, rawPort] = addr.split(':');
const port = parseInt(rawPort); const port = parseInt(rawPort);
if (port < 0 || port > 65535) { if (port < 0 || port > 65535) {