Skip to content

Commit

Permalink
deploy: update dist v1.9.62
Browse files Browse the repository at this point in the history
  • Loading branch information
Atlassian Bamboo committed Aug 4, 2023
1 parent 8d0ddfe commit 975ad11
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dist/build.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=1.9.61
version=1.9.62
2 changes: 1 addition & 1 deletion dist/redirects.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# AdGuard Scriptlets (Redirects Source)
# Version 1.9.61
# Version 1.9.62
#
- title: 1x1-transparent.gif
added: v1.0.4
Expand Down
4 changes: 2 additions & 2 deletions dist/scriptlets.corelibs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.9.61",
"version": "1.9.62",
"scriptlets": [
{
"names": [
Expand Down Expand Up @@ -418,7 +418,7 @@
"ubo-no-xhr-if.js",
"ubo-no-xhr-if"
],
"scriptlet": "function preventXHR(source,args){function hit(source){if(!0===source.verbose){try{var log=console.log.bind(console),trace=console.trace.bind(console),prefix=source.ruleText||\"\";if(source.domainName){var ruleStartIndex;source.ruleText.includes(\"#%#//\")?ruleStartIndex=source.ruleText.indexOf(\"#%#//\"):source.ruleText.includes(\"##+js\")&&(ruleStartIndex=source.ruleText.indexOf(\"##+js\"));var rulePart=source.ruleText.slice(ruleStartIndex);prefix=\"\".concat(source.domainName).concat(rulePart)}log(\"\".concat(prefix,\" trace start\")),trace&&trace(),log(\"\".concat(prefix,\" trace end\"))}catch(e){}\"function\"==typeof window.__debug&&window.__debug(source)}}function objectToString(obj){return obj&&\"object\"==typeof obj?function(obj){return 0===Object.keys(obj).length&&!obj.prototype}(obj)?\"{}\":Object.entries(obj).map((function(pair){var key=pair[0],value=pair[1],recordValueStr=value;return value instanceof Object&&(recordValueStr=\"{ \".concat(objectToString(value),\" }\")),\"\".concat(key,':\"').concat(recordValueStr,'\"')})).join(\" \"):String(obj)}function getXhrData(method,url,async,user,password){return{method:method,url:url,async:async,user:user,password:password}}function logMessage(source,message){var forced=arguments.length>2&&void 0!==arguments[2]&&arguments[2],convertMessageToString=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],name=source.name,verbose=source.verbose;if(forced||verbose){var nativeConsole=console.log;convertMessageToString?nativeConsole(\"\".concat(name,\": \").concat(message)):nativeConsole(\"\".concat(name,\":\"),message)}}function getNumberFromString(rawString){var num,parsedDelay=parseInt(rawString,10);return num=parsedDelay,(Number.isNaN||window.isNaN)(num)?null:parsedDelay}function nativeIsFinite(num){return(Number.isFinite||window.isFinite)(num)}var updatedArgs=args?[].concat(source).concat(args):[source];try{(function(source,propsToMatch,customResponseText){if(\"undefined\"!=typeof Proxy){var xhrData,nativeOpen=window.XMLHttpRequest.prototype.open,nativeSend=window.XMLHttpRequest.prototype.send,modifiedResponse=\"\",modifiedResponseText=\"\",openHandler={apply:function(target,thisArg,args){if(xhrData=getXhrData.apply(null,args),void 0===propsToMatch?(logMessage(source,\"xhr( \".concat(objectToString(xhrData),\" )\"),!0),hit(source)):function(source,propsToMatch,requestData){if(\"\"===propsToMatch||\"*\"===propsToMatch)return!0;var isMatched,PROPS_DIVIDER,PAIRS_MARKER,isRequestProp,propsObj,data,parsedData=(PROPS_DIVIDER=\" \",PAIRS_MARKER=\":\",isRequestProp=function(prop){return[\"url\",\"method\",\"headers\",\"body\",\"credentials\",\"cache\",\"redirect\",\"referrer\",\"referrerPolicy\",\"integrity\",\"keepalive\",\"signal\",\"mode\"].includes(prop)},propsObj={},propsToMatch.split(PROPS_DIVIDER).forEach((function(prop){var dividerInd=prop.indexOf(PAIRS_MARKER),key=prop.slice(0,dividerInd);if(isRequestProp(key)){var value=prop.slice(dividerInd+1);propsObj[key]=value}else propsObj.url=prop})),propsObj);if(data=parsedData,Object.values(data).every((function(value){return function(input){var isValid,FORWARD_SLASH=\"/\",str=function(str){return str.replace(/[.*+?^${}()|[\\]\\\\]/g,\"\\\\$&\")}(input);input[0]===FORWARD_SLASH&&input[input.length-1]===FORWARD_SLASH&&(str=input.slice(1,-1));try{isValid=new RegExp(str),isValid=!0}catch(e){isValid=!1}return isValid}(value)}))){var matchData=function(data){var matchData={};return Object.keys(data).forEach((function(key){matchData[key]=function(){var input=arguments.length>0&&void 0!==arguments[0]?arguments[0]:\"\",FORWARD_SLASH=\"/\";if(\"\"===input)return new RegExp(\".?\");var regExpStr,flagsStr,delimiterIndex=input.lastIndexOf(FORWARD_SLASH),flagsPart=input.substring(delimiterIndex+1),regExpPart=input.substring(0,delimiterIndex+1),isValidRegExpFlag=function(flag){if(!flag)return!1;try{return new RegExp(\"\",flag),!0}catch(ex){return!1}},flags=(flagsStr=flagsPart,(regExpStr=regExpPart).startsWith(FORWARD_SLASH)&&regExpStr.endsWith(FORWARD_SLASH)&&!regExpStr.endsWith(\"\\\\/\")&&isValidRegExpFlag(flagsStr)?flagsStr:\"\");if(input.startsWith(FORWARD_SLASH)&&input.endsWith(FORWARD_SLASH)||flags)return new RegExp((flags?regExpPart:input).slice(1,-1),flags);var escaped=input.replace(/\\\\'/g,\"'\").replace(/\\\\\"/g,'\"').replace(/[.*+?^${}()|[\\]\\\\]/g,\"\\\\$&\");return new RegExp(escaped)}(data[key])})),matchData}(parsedData);isMatched=Object.keys(matchData).every((function(matchKey){var matchValue=matchData[matchKey],dataValue=requestData[matchKey];return Object.prototype.hasOwnProperty.call(requestData,matchKey)&&\"string\"==typeof dataValue&&(null==matchValue?void 0:matchValue.test(dataValue))}))}else logMessage(source,\"Invalid parameter: \".concat(propsToMatch)),isMatched=!1;return isMatched}(source,propsToMatch,xhrData)&&(thisArg.shouldBePrevented=!0),thisArg.shouldBePrevented){thisArg.collectedHeaders=[];var setRequestHeaderHandler={apply:function(target,thisArg,args){return thisArg.collectedHeaders.push(args),Reflect.apply(target,thisArg,args)}};thisArg.setRequestHeader=new Proxy(thisArg.setRequestHeader,setRequestHeaderHandler)}return Reflect.apply(target,thisArg,args)}},sendHandler={apply:function(target,thisArg,args){if(!thisArg.shouldBePrevented)return Reflect.apply(target,thisArg,args);if(\"blob\"===thisArg.responseType&&(modifiedResponse=new Blob),\"arraybuffer\"===thisArg.responseType&&(modifiedResponse=new ArrayBuffer),customResponseText){var randomText=function(customResponseText){var customResponse=customResponseText;if(\"true\"===customResponse)return Math.random().toString(36).slice(-10);if(customResponse=customResponse.replace(\"length:\",\"\"),!/^\\d+-\\d+$/.test(customResponse))return null;var min,max,rangeMin=getNumberFromString(customResponse.split(\"-\")[0]),rangeMax=getNumberFromString(customResponse.split(\"-\")[1]);if(!nativeIsFinite(rangeMin)||!nativeIsFinite(rangeMax))return null;if(rangeMin>rangeMax){var temp=rangeMin;rangeMin=rangeMax,rangeMax=temp}return rangeMax>5e5?null:function(length){for(var result=\"\",characters=\"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+=~\",charactersLength=characters.length,i=0;i<length;i+=1)result+=characters.charAt(Math.floor(Math.random()*charactersLength));return result}((min=rangeMin,max=rangeMax,min=Math.ceil(min),max=Math.floor(max),Math.floor(Math.random()*(max-min+1)+min)))}(customResponseText);randomText?modifiedResponseText=randomText:logMessage(source,\"Invalid randomize parameter: '\".concat(customResponseText,\"'\"))}var forgedRequest=new XMLHttpRequest;forgedRequest.addEventListener(\"readystatechange\",(function(){if(4===forgedRequest.readyState){var readyState=forgedRequest.readyState,responseURL=forgedRequest.responseURL,responseXML=forgedRequest.responseXML,statusText=forgedRequest.statusText;Object.defineProperties(thisArg,{readyState:{value:readyState,writable:!1},statusText:{value:statusText,writable:!1},responseURL:{value:responseURL||xhrData.url,writable:!1},responseXML:{value:responseXML,writable:!1},status:{value:200,writable:!1},response:{value:modifiedResponse,writable:!1},responseText:{value:modifiedResponseText,writable:!1}}),setTimeout((function(){var stateEvent=new Event(\"readystatechange\");thisArg.dispatchEvent(stateEvent);var loadEvent=new Event(\"load\");thisArg.dispatchEvent(loadEvent);var loadEndEvent=new Event(\"loadend\");thisArg.dispatchEvent(loadEndEvent)}),1),hit(source)}})),nativeOpen.apply(forgedRequest,[xhrData.method,xhrData.url]),thisArg.collectedHeaders.forEach((function(header){var name=header[0],value=header[1];forgedRequest.setRequestHeader(name,value)}));try{nativeSend.call(forgedRequest,args)}catch(_unused){return Reflect.apply(target,thisArg,args)}}},getHeaderHandler={apply:function(target,thisArg,args){if(!thisArg.collectedHeaders.length)return null;var searchHeaderName=args[0].toLowerCase(),matchedHeader=thisArg.collectedHeaders.find((function(header){return header[0].toLowerCase()===searchHeaderName}));return matchedHeader?matchedHeader[1]:null}},getAllHeadersHandler={apply:function(target,thisArg){return thisArg.collectedHeaders.length?thisArg.collectedHeaders.map((function(header){var headerName=header[0],headerValue=header[1];return\"\".concat(headerName.toLowerCase(),\": \").concat(headerValue)})).join(\"\\r\\n\"):\"\"}};XMLHttpRequest.prototype.open=new Proxy(XMLHttpRequest.prototype.open,openHandler),XMLHttpRequest.prototype.send=new Proxy(XMLHttpRequest.prototype.send,sendHandler),XMLHttpRequest.prototype.getResponseHeader=new Proxy(XMLHttpRequest.prototype.getResponseHeader,getHeaderHandler),XMLHttpRequest.prototype.getAllResponseHeaders=new Proxy(XMLHttpRequest.prototype.getAllResponseHeaders,getAllHeadersHandler)}}).apply(this,updatedArgs)}catch(e){console.log(e)}}"
"scriptlet": "function preventXHR(source,args){function hit(source){if(!0===source.verbose){try{var log=console.log.bind(console),trace=console.trace.bind(console),prefix=source.ruleText||\"\";if(source.domainName){var ruleStartIndex;source.ruleText.includes(\"#%#//\")?ruleStartIndex=source.ruleText.indexOf(\"#%#//\"):source.ruleText.includes(\"##+js\")&&(ruleStartIndex=source.ruleText.indexOf(\"##+js\"));var rulePart=source.ruleText.slice(ruleStartIndex);prefix=\"\".concat(source.domainName).concat(rulePart)}log(\"\".concat(prefix,\" trace start\")),trace&&trace(),log(\"\".concat(prefix,\" trace end\"))}catch(e){}\"function\"==typeof window.__debug&&window.__debug(source)}}function objectToString(obj){return obj&&\"object\"==typeof obj?function(obj){return 0===Object.keys(obj).length&&!obj.prototype}(obj)?\"{}\":Object.entries(obj).map((function(pair){var key=pair[0],value=pair[1],recordValueStr=value;return value instanceof Object&&(recordValueStr=\"{ \".concat(objectToString(value),\" }\")),\"\".concat(key,':\"').concat(recordValueStr,'\"')})).join(\" \"):String(obj)}function getXhrData(method,url,async,user,password){return{method:method,url:url,async:async,user:user,password:password}}function logMessage(source,message){var forced=arguments.length>2&&void 0!==arguments[2]&&arguments[2],convertMessageToString=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],name=source.name,verbose=source.verbose;if(forced||verbose){var nativeConsole=console.log;convertMessageToString?nativeConsole(\"\".concat(name,\": \").concat(message)):nativeConsole(\"\".concat(name,\":\"),message)}}function getNumberFromString(rawString){var num,parsedDelay=parseInt(rawString,10);return num=parsedDelay,(Number.isNaN||window.isNaN)(num)?null:parsedDelay}function nativeIsFinite(num){return(Number.isFinite||window.isFinite)(num)}var updatedArgs=args?[].concat(source).concat(args):[source];try{(function(source,propsToMatch,customResponseText){if(\"undefined\"!=typeof Proxy){var xhrData,nativeOpen=window.XMLHttpRequest.prototype.open,nativeSend=window.XMLHttpRequest.prototype.send,nativeGetResponseHeader=window.XMLHttpRequest.prototype.getResponseHeader,nativeGetAllResponseHeaders=window.XMLHttpRequest.prototype.getAllResponseHeaders,modifiedResponse=\"\",modifiedResponseText=\"\",openHandler={apply:function(target,thisArg,args){if(xhrData=getXhrData.apply(null,args),void 0===propsToMatch?(logMessage(source,\"xhr( \".concat(objectToString(xhrData),\" )\"),!0),hit(source)):function(source,propsToMatch,requestData){if(\"\"===propsToMatch||\"*\"===propsToMatch)return!0;var isMatched,PROPS_DIVIDER,PAIRS_MARKER,isRequestProp,propsObj,data,parsedData=(PROPS_DIVIDER=\" \",PAIRS_MARKER=\":\",isRequestProp=function(prop){return[\"url\",\"method\",\"headers\",\"body\",\"credentials\",\"cache\",\"redirect\",\"referrer\",\"referrerPolicy\",\"integrity\",\"keepalive\",\"signal\",\"mode\"].includes(prop)},propsObj={},propsToMatch.split(PROPS_DIVIDER).forEach((function(prop){var dividerInd=prop.indexOf(PAIRS_MARKER),key=prop.slice(0,dividerInd);if(isRequestProp(key)){var value=prop.slice(dividerInd+1);propsObj[key]=value}else propsObj.url=prop})),propsObj);if(data=parsedData,Object.values(data).every((function(value){return function(input){var isValid,FORWARD_SLASH=\"/\",str=function(str){return str.replace(/[.*+?^${}()|[\\]\\\\]/g,\"\\\\$&\")}(input);input[0]===FORWARD_SLASH&&input[input.length-1]===FORWARD_SLASH&&(str=input.slice(1,-1));try{isValid=new RegExp(str),isValid=!0}catch(e){isValid=!1}return isValid}(value)}))){var matchData=function(data){var matchData={};return Object.keys(data).forEach((function(key){matchData[key]=function(){var input=arguments.length>0&&void 0!==arguments[0]?arguments[0]:\"\",FORWARD_SLASH=\"/\";if(\"\"===input)return new RegExp(\".?\");var regExpStr,flagsStr,delimiterIndex=input.lastIndexOf(FORWARD_SLASH),flagsPart=input.substring(delimiterIndex+1),regExpPart=input.substring(0,delimiterIndex+1),isValidRegExpFlag=function(flag){if(!flag)return!1;try{return new RegExp(\"\",flag),!0}catch(ex){return!1}},flags=(flagsStr=flagsPart,(regExpStr=regExpPart).startsWith(FORWARD_SLASH)&&regExpStr.endsWith(FORWARD_SLASH)&&!regExpStr.endsWith(\"\\\\/\")&&isValidRegExpFlag(flagsStr)?flagsStr:\"\");if(input.startsWith(FORWARD_SLASH)&&input.endsWith(FORWARD_SLASH)||flags)return new RegExp((flags?regExpPart:input).slice(1,-1),flags);var escaped=input.replace(/\\\\'/g,\"'\").replace(/\\\\\"/g,'\"').replace(/[.*+?^${}()|[\\]\\\\]/g,\"\\\\$&\");return new RegExp(escaped)}(data[key])})),matchData}(parsedData);isMatched=Object.keys(matchData).every((function(matchKey){var matchValue=matchData[matchKey],dataValue=requestData[matchKey];return Object.prototype.hasOwnProperty.call(requestData,matchKey)&&\"string\"==typeof dataValue&&(null==matchValue?void 0:matchValue.test(dataValue))}))}else logMessage(source,\"Invalid parameter: \".concat(propsToMatch)),isMatched=!1;return isMatched}(source,propsToMatch,xhrData)&&(thisArg.shouldBePrevented=!0,thisArg.xhrData=xhrData),thisArg.shouldBePrevented){thisArg.collectedHeaders=[];var setRequestHeaderHandler={apply:function(target,thisArg,args){return thisArg.collectedHeaders.push(args),Reflect.apply(target,thisArg,args)}};thisArg.setRequestHeader=new Proxy(thisArg.setRequestHeader,setRequestHeaderHandler)}return Reflect.apply(target,thisArg,args)}},sendHandler={apply:function(target,thisArg,args){if(!thisArg.shouldBePrevented)return Reflect.apply(target,thisArg,args);if(\"blob\"===thisArg.responseType&&(modifiedResponse=new Blob),\"arraybuffer\"===thisArg.responseType&&(modifiedResponse=new ArrayBuffer),customResponseText){var randomText=function(customResponseText){var customResponse=customResponseText;if(\"true\"===customResponse)return Math.random().toString(36).slice(-10);if(customResponse=customResponse.replace(\"length:\",\"\"),!/^\\d+-\\d+$/.test(customResponse))return null;var min,max,rangeMin=getNumberFromString(customResponse.split(\"-\")[0]),rangeMax=getNumberFromString(customResponse.split(\"-\")[1]);if(!nativeIsFinite(rangeMin)||!nativeIsFinite(rangeMax))return null;if(rangeMin>rangeMax){var temp=rangeMin;rangeMin=rangeMax,rangeMax=temp}return rangeMax>5e5?null:function(length){for(var result=\"\",characters=\"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+=~\",charactersLength=characters.length,i=0;i<length;i+=1)result+=characters.charAt(Math.floor(Math.random()*charactersLength));return result}((min=rangeMin,max=rangeMax,min=Math.ceil(min),max=Math.floor(max),Math.floor(Math.random()*(max-min+1)+min)))}(customResponseText);randomText?modifiedResponseText=randomText:logMessage(source,\"Invalid randomize parameter: '\".concat(customResponseText,\"'\"))}var forgedRequest=new XMLHttpRequest;forgedRequest.addEventListener(\"readystatechange\",(function(){if(4===forgedRequest.readyState){var readyState=forgedRequest.readyState,responseURL=forgedRequest.responseURL,responseXML=forgedRequest.responseXML,statusText=forgedRequest.statusText;Object.defineProperties(thisArg,{readyState:{value:readyState,writable:!1},statusText:{value:statusText,writable:!1},responseURL:{value:responseURL||thisArg.xhrData.url,writable:!1},responseXML:{value:responseXML,writable:!1},status:{value:200,writable:!1},response:{value:modifiedResponse,writable:!1},responseText:{value:modifiedResponseText,writable:!1}}),setTimeout((function(){var stateEvent=new Event(\"readystatechange\");thisArg.dispatchEvent(stateEvent);var loadEvent=new Event(\"load\");thisArg.dispatchEvent(loadEvent);var loadEndEvent=new Event(\"loadend\");thisArg.dispatchEvent(loadEndEvent)}),1),hit(source)}})),nativeOpen.apply(forgedRequest,[thisArg.xhrData.method,thisArg.xhrData.url]),thisArg.collectedHeaders.forEach((function(header){var name=header[0],value=header[1];forgedRequest.setRequestHeader(name,value)}));try{nativeSend.call(forgedRequest,args)}catch(_unused){return Reflect.apply(target,thisArg,args)}}},getHeaderHandler={apply:function(target,thisArg,args){if(!thisArg.shouldBePrevented)return nativeGetResponseHeader.apply(thisArg,args);if(!thisArg.collectedHeaders.length)return null;var searchHeaderName=args[0].toLowerCase(),matchedHeader=thisArg.collectedHeaders.find((function(header){return header[0].toLowerCase()===searchHeaderName}));return matchedHeader?matchedHeader[1]:null}},getAllHeadersHandler={apply:function(target,thisArg){return thisArg.shouldBePrevented?thisArg.collectedHeaders.length?thisArg.collectedHeaders.map((function(header){var headerName=header[0],headerValue=header[1];return\"\".concat(headerName.toLowerCase(),\": \").concat(headerValue)})).join(\"\\r\\n\"):\"\":nativeGetAllResponseHeaders.call(thisArg)}};XMLHttpRequest.prototype.open=new Proxy(XMLHttpRequest.prototype.open,openHandler),XMLHttpRequest.prototype.send=new Proxy(XMLHttpRequest.prototype.send,sendHandler),XMLHttpRequest.prototype.getResponseHeader=new Proxy(XMLHttpRequest.prototype.getResponseHeader,getHeaderHandler),XMLHttpRequest.prototype.getAllResponseHeaders=new Proxy(XMLHttpRequest.prototype.getAllResponseHeaders,getAllHeadersHandler)}}).apply(this,updatedArgs)}catch(e){console.log(e)}}"
},
{
"names": [
Expand Down
Loading

0 comments on commit 975ad11

Please sign in to comment.