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

Return to a step back when wildcard is present in the key (not in the value)

Browse Source
This commit is contained in:
ilyaigpetrov 2021-01-15 16:54:10 +00:00
parent 796681ae5a
commit 7dae51db8c
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,20 +298,19 @@
self.included = [];
self.excluded = [];
for(const host of Object.keys(self.exceptions)) {
const ifProxy = self.exceptions[host]?.ifProxy || false;
const ifWild = self.exceptions[host]?.ifWild || false;
const ifProxy = self.exceptions[host] || false;
if (ifProxy) {
self.included.push([host, ifWild]);
self.included.push(host);
} else {
self.excluded.push([host, ifWild]);
self.excluded.push(host);
}
}
['included', 'excluded'].forEach((who) => {
self[who] = self[who]
.map( ([domain, ifWild]) => [domain.split('').reverse(), ifWild] )
.map( (domain) => domain.split('').reverse() )
.sort()
.map( ([rDomain, ifWild]) => [rDomain.reverse().join(''), ifWild] );
.map( (rDomain) => rDomain.reverse().join('') );
});
if (self.included.length && !self.filteredCustomsString) {
@ -392,7 +391,7 @@
if (pacMods.ifProxyMoreDomains) {
finalExceptions = pacMods.moreDomains.reduce((acc, tld) => {
acc[tld] = { ifProxy: true, ifWild: true };
acc['*.' + tld] = true;
return acc;
}, finalExceptions);
@ -408,7 +407,7 @@
/******/ /* EXCEPTIONS START */
/******/ const dotHost = '.' + host;
/******/ const isHostInDomain = (domain) => dotHost.endsWith('.' + domain);
/******/ const domainReducer = (maxWeight, [domain, { ifProxy, ifWild }]) => {
/******/ const domainReducer = (maxWeight, [domain, ifProxy]) => {
/******/
/******/ if (!isHostInDomain(domain)) {
/******/ return maxWeight;

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

@ -62,9 +62,6 @@ export default function getExcEditor(theState) {
};
*/
const unWild = (inputExpr) => inputExpr.replace(/^\*\./g, '');
return class ExcEditor extends Component {
modsToOpts(pacMods) {
@ -88,7 +85,6 @@ export default function getExcEditor(theState) {
const pacMods = props.apis.pacKitchen.getPacMods();
this.state = {
trimmedInputValueOrSpace,
inputHostname: unWild(trimmedInputValueOrSpace),
sortedListOfOptions: this.modsToOpts(pacMods),
hostToIfHidden: {},
};
@ -114,7 +110,7 @@ export default function getExcEditor(theState) {
isHostValid(host) {
const ValidHostnameRegex = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/;
const ValidHostnameRegex = /^(?:\*\.)?(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/;
if(!ValidHostnameRegex.test(host)) {
this.props.funs.showErrors(new TypeError('Должно быть только доменное имя, без протокола, порта и пути. Попробуйте ещё раз.'));
return false;
@ -125,8 +121,7 @@ export default function getExcEditor(theState) {
handleRadioClick(event) {
const ifWild = this.state.trimmedInputValueOrSpace.startsWith('*.');
const host = this.state.inputHostname;
const host = this.state.trimmedInputValueOrSpace;
(() => { // `return` === `preventDefault`.
if(!this.isHostValid(host)) {
@ -152,7 +147,7 @@ export default function getExcEditor(theState) {
return false;
}
pacMods.exceptions[host] = { ifProxy: ifYesClicked, ifWild };
pacMods.exceptions[host] = ifYesClicked;
break;
default:
@ -217,7 +212,6 @@ export default function getExcEditor(theState) {
setInputValue(currentHost);
this.setState({
trimmedInputValueOrSpace: currentHost,
inputHostname: unWild(currentHost),
});
// Episode 2.
@ -300,7 +294,7 @@ export default function getExcEditor(theState) {
if ( acc !== undefined ) {
return acc;
}
return this.state.inputHostname === excHost ? (excState || {}).ifProxy : undefined;
return this.state.trimmedInputValueOrSpace === excHost ? excState : undefined;
}, undefined);
@ -329,7 +323,7 @@ export default function getExcEditor(theState) {
// 1. Option's value may be changed to hide it from the tooltip.
// 2. Space is used in matching so even an empty input (replaced with space) has tooltip with prompts.
const ifProxy = (excState || {}).ifProxy;
const ifProxy = excState;
return <option
value={ this.state.hostToIfHidden[excHost] ? '\n' : excHost + ' ' }
label={ ifProxy === true ? labelIfProxied : (ifProxy === false ? labelIfNotProxied : labelIfAuto) }/>