Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Externals 13.07.2015 - #2158

Merged
semenko merged 27 commits into
EFForg:masterfrom
numismatika:externals
Nov 30, 2015
Merged

semenko merged 27 commits into
EFForg:masterfrom
numismatika:externals

Conversation

@numismatika

Copy link
Copy Markdown
Contributor

This adds a couple of Subdomains to ad- and tracking networks as well as adds rules for new ones.

@jsha

jsha commented Aug 12, 2015

Copy link
Copy Markdown
Member

Considering this blocked on the redirect to HTTP. @numismatika, can you run the fetch test on this branch and make sure everything succeeds?

git diff master --name-only | xargs ./fetch-test.sh 

@jsha

jsha commented Aug 13, 2015

Copy link
Copy Markdown
Member

@numismatika: I saw your comments on IRC but I think you're not currently logged in. I'm not sure what's going wrong with the command I suggested. But the goal is to pass each XML file modified in this branch into fetch-test.sh. So you can also do it manually:

./fetch-test.sh file1 file2 etc

@mnordhoff

Copy link
Copy Markdown
Contributor

At the moment, it ought to be:

./fetch-test.sh src/chrome/content/rules/Adility.xml src/chrome/content/rules/Adobetag.com.xml src/chrome/content/rules/Adrolays.xml src/chrome/content/rules/BoomAds.xml src/chrome/content/rules/Criteo.xml src/chrome/content/rules/Exponential.com.xml src/chrome/content/rules/I12.de.xml src/chrome/content/rules/IQ-Media-Marketing.xml src/chrome/content/rules/KrxD.net.xml src/chrome/content/rules/Moat.xml src/chrome/content/rules/Moat_ads.com.xml src/chrome/content/rules/Nugg.ad.xml src/chrome/content/rules/Nurago.xml src/chrome/content/rules/Outbrain.xml src/chrome/content/rules/RevSci.net.xml src/chrome/content/rules/SevenOneMedia.xml src/chrome/content/rules/Teads.tv.xml src/chrome/content/rules/Urbanartcloud.com.xml src/chrome/content/rules/Xplosion_interactive.xml

I got that with:

git diff 8a48495^.. --name-only | xargs

Your diff command also included extraneous changes made in master, but that could be an artifact of my setup.

@mnordhoff

Copy link
Copy Markdown
Contributor

Correction: Moat_ads.xml was deleted, so it should be left out.

./fetch-test.sh src/chrome/content/rules/Adility.xml src/chrome/content/rules/Adobetag.com.xml src/chrome/content/rules/Adrolays.xml src/chrome/content/rules/BoomAds.xml src/chrome/content/rules/Criteo.xml src/chrome/content/rules/Exponential.com.xml src/chrome/content/rules/I12.de.xml src/chrome/content/rules/IQ-Media-Marketing.xml src/chrome/content/rules/KrxD.net.xml src/chrome/content/rules/Moat.xml src/chrome/content/rules/Nugg.ad.xml src/chrome/content/rules/Nurago.xml src/chrome/content/rules/Outbrain.xml src/chrome/content/rules/RevSci.net.xml src/chrome/content/rules/SevenOneMedia.xml src/chrome/content/rules/Teads.tv.xml src/chrome/content/rules/Urbanartcloud.com.xml src/chrome/content/rules/Xplosion_interactive.xml

@numismatika

Copy link
Copy Markdown
Contributor Author

i don't want to turn this into a python support topic, but pip install -r requirements ends up with some weird python issues, pip3 works but python3 can't execute the test scripts.
It will take some more significant effort to get this testing done. I'm sorry

@numismatika

Copy link
Copy Markdown
Contributor Author

I removed Nugg.ad for now to avoid merge conflicts.
Of course gwp is still a valid target for a tls-rewrite.

@jsha

jsha commented Aug 27, 2015

Copy link
Copy Markdown
Member

I pulled this branch and ran fetch-test.sh, and got just one error:

ERROR src/chrome/content/rules/Criteo.xml: Fetch error: http://labs.criteo.com/ => https://labs.criteo.com/: (7, 'Failed to connect to labs.criteo.com port 443: Connection refused')

@numismatika

Copy link
Copy Markdown
Contributor Author

@jsha i removed the subdomain from the Criteo rule now.
The host doesn't resolve to an ip.

@numismatika

Copy link
Copy Markdown
Contributor Author

@semenko Is it still small enough to be merged?

@numismatika

Copy link
Copy Markdown
Contributor Author

So i rebased the stuff on top of the current master.
The merge conflict on revsci.net should be gone now

Numismatika added 15 commits November 30, 2015 14:43
- removed wildcards
- added v4 subdomain
- add log,vrp & vrt subdomains
- add cdn & ups subdomain
- add static, widget & widget.us subdomain
- convert the rules to current style
- add d & rtt subdomain
- add beadon-dub-nopii subdomain
- add r, sync & t subdomain
- add assets subdomain
- fix ruleset style
Numismatika added 9 commits November 30, 2015 14:47
- remove whitespace
- remove labs subdomain
- add pix01 & pq-direct subdomains
- add more domains
- add mathid & mathid-origin subdomains
- added more subdomains
Numismatika added 3 commits November 30, 2015 15:24
- remove redundant securecookie comment
- add gwp,mtm,si,71, 71iv & asv subdomains
- add im2 subdomain & sascdn domains
- remove redundant securecookie comments
- remove redundant SAS-CDN file
@numismatika

Copy link
Copy Markdown
Contributor Author

rebased again to avoid merge conflict

@semenko

semenko commented Nov 30, 2015

Copy link
Copy Markdown
Contributor

Great, thanks!

semenko added a commit that referenced this pull request Nov 30, 2015
@semenko
semenko merged commit 5c7ead4 into EFForg:master Nov 30, 2015
@numismatika
numismatika deleted the externals branch November 30, 2015 16:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants