Skip to content

Commit

Permalink
update uBlockOrigin/uAssets#11152
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yuki2718
Yuki2718 committed Mar 9, 2022
1 parent 096c3e8 commit 94d3096
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ChineseFilter/sections/antiadblock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ linovelib.com#$#body[style] { overflow: auto !important; }
!+ PLATFORM(ios, ext_android_cb)
@@||pagead2.googlesyndication.com/pagead/js/adsbygoogle.js$domain=linovelib.com
! https://github.com/uBlockOrigin/uAssets/issues/11152
rjno1.com#%#//scriptlet('abort-on-stack-trace', 'document.styleSheets', 'inlineScript')
rjno1.com#%#//scriptlet('abort-on-stack-trace', 'setTimeout', '/google|inlineScript/')
rjno1.com#%#//scriptlet('abort-on-stack-trace', 'document.getElementById', 'inlineScript')
rjno1.com#%#//scriptlet('abort-on-stack-trace', 'document.getElementById', '/google|inlineScript/')
rjno1.com#$?#style:contains(@keyframes) { remove: true; }
!+ NOT_PLATFORM(ios, ext_android_cb)
||jspassport.ssl.qhimg.com^$script,redirect=noopjs,domain=rjno1.com
Expand Down

11 comments on commit 94d3096

@AdamWr
Copy link
Member

@AdamWr AdamWr commented on 94d3096 Mar 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Yuki2718 If I'm not wrong, inlineScript in abort-on-stack-trace it's not supported by AdGuard (I will open an issue about it in scriptlets repo - AdguardTeam/Scriptlets#201).
Also, extension (stable version) doesn't support abort-on-stack-trace yet.
Could you please check if these rules work:

rjno1.com#%#//scriptlet("abort-current-inline-script", "onload", "document.getElementById")
rjno1.com#%#//scriptlet("abort-current-inline-script", "setTimeout", "google")
rjno1.com#%#//scriptlet("abort-current-inline-script", "EventTarget.prototype.addEventListener", "event.target.tagName")

@Yuki2718
Copy link
Collaborator Author

@Yuki2718 Yuki2718 commented on 94d3096 Mar 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, extension (stable version) doesn't support abort-on-stack-trace yet.

Yes, this is why I couldn't test on Extension. Should have tested on dev build tho.

Could you please check if these rules work:

No, not working either on AG Ext or uBO. Of note Extra works fine. Oh, not - now Extra is also bypassed.

@AdamWr
Copy link
Member

@AdamWr AdamWr commented on 94d3096 Mar 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These rules seem to work fine on my end with AdGuard for Windows/extension for Chrome/Firefox.
Could you please make a screenshot with adblock notice?

@Yuki2718
Copy link
Collaborator Author

@Yuki2718 Yuki2718 commented on 94d3096 Mar 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry I forgot to enable Chinese filters and with Chinese filters enabled they work. So maybe !#if. And now working on uBO too, I had typo. Can't do anything right today. At least rjno1.com##+js(abort-on-stack-trace, setTimeout, /google|inlineScript/) seems to be needed for uBO.

@AdamWr
Copy link
Member

@AdamWr AdamWr commented on 94d3096 Mar 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, so I will add them for AdGuard only and leave abort-on-stack-trace for uBO.
Thank you for checking it.

@Yuki2718
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added 59fa0de

@AdamWr
Copy link
Member

@AdamWr AdamWr commented on 94d3096 Mar 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, you were faster :)

@Yuki2718
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rjno1.com#%#//scriptlet("abort-current-inline-script", "EventTarget.prototype.addEventListener", "event.target.tagName") is needed for uBO as well. The rest 2 may not, but no harm currently.

@Yuki2718
Copy link
Collaborator Author

@Yuki2718 Yuki2718 commented on 94d3096 Mar 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gorhill @gwarser Apparently acis in uBO can't abort inline on access to setTimeout in this case. Please take a look if you have time by adding

rjno1.com#@#+js(abort-on-stack-trace, setTimeout, /google|inlineScript/)
rjno1.com##+js(acis, setTimeout, google)

(As they change quickly, sent saved page to gwarser on Slack. saved page:

https://ln5.sync.com/dl/c453f3dd0/xe3bh8qu-3ykmts3u-szbdngtv-bxdx4jj8
https://ln5.sync.com/dl/abb7ca050/hxc2vrsv-bbrdedsn-qk33cpca-7zcxhp5y

)

@gorhill
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see inline scripts at these pages, only scripts pulled in as secondary resources.

@Yuki2718
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gorhill Possibly my links confused you? The site in question is https://www.rjno1.com/ and I see lots of inline-script as of now. The site is a serious circumventor chaning every few hours so I saved html and updloaded the files to ln5.sync.com (cloud storage).

Please sign in to comment.