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

Fix ITunes.com.xml HTTPS Mismatch#6871

Merged
gloomy-ghost merged 5 commits intoEFForg:masterfrom
weems:patch-1
Dec 10, 2016
Merged

Fix ITunes.com.xml HTTPS Mismatch#6871
gloomy-ghost merged 5 commits intoEFForg:masterfrom
weems:patch-1

Conversation

@weems
Copy link
Copy Markdown
Contributor

@weems weems commented Sep 14, 2016

Closing #6870

Michael Weems added 2 commits September 14, 2016 10:14
@Hainish Hainish added the top-1m label Sep 14, 2016
@jeremyn jeremyn closed this Sep 14, 2016
@jeremyn jeremyn reopened this Sep 14, 2016
@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Sep 14, 2016

@weems Thanks for the pull request.

@fuglede @J0WI I'm not sure why the test is giving this error:

ERROR src/chrome/content/rules/ITunes.com.xml: Fetch error: http://itunes.com/ => https://itunes.com/: Redirect for 'https://itunes.com/' missing Location

I can reproduce it locally with fetch-test.sh, but it works fine in Firefox and the response has a Location header. I haven't investigated the code though. Ideas?

@jeremyn jeremyn self-assigned this Sep 14, 2016
@J0WI
Copy link
Copy Markdown
Contributor

J0WI commented Sep 14, 2016

I can reproduce using curl., but I have no proper solution for it.

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Sep 14, 2016

I think I see it. This should look for the key Location, not location. Give me a little while to look into it more.

EDIT: never mind, it's already lowercasing the key in the previous line.

@weems
Copy link
Copy Markdown
Contributor Author

weems commented Sep 14, 2016

@jeremyn is this a error with the test or my changes?

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Sep 14, 2016

@weems The test.

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Sep 14, 2016

It's still the part of the code I linked above. The regex is bad:

(Pdb) self._headerRe
regex.Regex('(?P<name>\\S+?): (?P<value>.*?)\\r\\n', flags=regex.V0)
(Pdb) headerStr
'HTTP/1.1 301 Moved Permanently\nServer: Apache\nDate: Tue Jun  1 12:48:03 PDT 1999 PDT\nReferer: http://itunes.com/\nLocation: http://www.apple.com/itunes/?cid=OAS-US-DOMAINS-itunes.com\nContent-type: text/html\nContent-length: 311\n\n'
(Pdb) headers = self._headerRe.findall(headerStr)
(Pdb) headers
[]
(Pdb)

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Sep 14, 2016

By the way there are a lot of rules that have excluded URLs due to missing Location, see here. We really should fix it though.

@weems
Copy link
Copy Markdown
Contributor Author

weems commented Sep 14, 2016

@jeremyn so it's a problem with the code that checks the xml to make sure it will work?

@weems
Copy link
Copy Markdown
Contributor Author

weems commented Sep 14, 2016

@jeremyn ah.

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Sep 14, 2016

Pull request #6878 should fix the test problem.

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Sep 16, 2016

@weems The problem with the testing has been fixed by pull request #6878 so that's not a blocker anymore. Before we merge, please:

  • Clean up the comments by removing lines 3-4, 9-10, and 12-13 from your modified iTunes.com.xml in 232e702

Also, there are some other itunes.com subdomains that could be included either as targets or noted as bad, for example see here. Are you willing to add them as part of this issue? I won't require it because you're just trying to fix a simple issue, but it would be nice if you could add them. Either way is fine though.

spaces, comments cleaned up
@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Sep 17, 2016

Thanks, but you deleted the wrong lines from the top. Deleting lines 3-4 should have ended up with:

<!--
    For other Apple coverage, see Apple.xml.
        Mismatch-https://www.itunes.com has a certificate mismatch
-->

Also, are you going to pass on adding the new subdomains?

Finally, we like to squash-and-merge commits, which means rewriting commits in your name. Is that all right with you for this and other pull requests you submit?

@weems
Copy link
Copy Markdown
Contributor Author

weems commented Sep 21, 2016

@jeremyn Apologies, I am new, I will try to get sufficient changes in. Thanks

@gloomy-ghost
Copy link
Copy Markdown
Collaborator

Just a notice, closing is not a keyword which can close issues automatically after merging.

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Oct 14, 2016

@weems I'm checking in on this pull request. Do you need anything from me to move forward?

@weems
Copy link
Copy Markdown
Contributor Author

weems commented Oct 16, 2016

@jeremyn I'm going to get it in this week, sorry had some distractions this week.

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Nov 7, 2016

Hi @weems , I'm checking in again here. Do you want us to just make any remaining changes ourselves to your branch? I see you've enabled Allow edits from maintainers.

@weems
Copy link
Copy Markdown
Contributor Author

weems commented Nov 7, 2016

@jeremyn If you could, I'm still trying to learn the syntax here, maybe I can review for future commits. Thanks for tolerating this newbie :)

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Nov 18, 2016

@fuglede @gloomy-ghost @J0WI I've made changes on top of @weems 's pull request. Can one of you please review this? Please do a regular merge instead of squash-and-merge because we have multiple contributors.

@jeremyn jeremyn removed their assignment Nov 18, 2016
@gloomy-ghost
Copy link
Copy Markdown
Collaborator

gloomy-ghost commented Nov 18, 2016 via email

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Nov 18, 2016

@gloomy-ghost I can't find any tests for https://apps.itunes.com either. I don't want to include a target, or a even a failure comment, for a domain without any URLs that return a 200.

@gloomy-ghost
Copy link
Copy Markdown
Collaborator

gloomy-ghost commented Nov 18, 2016

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Nov 18, 2016

The URL you give in #6871 (comment) returns an HTTP 400.

@gloomy-ghost
Copy link
Copy Markdown
Collaborator

gloomy-ghost commented Nov 18, 2016 via email

@jeremyn
Copy link
Copy Markdown
Contributor

jeremyn commented Nov 18, 2016

https://apps.itunes.com/files/ios-music-app/ gives me an HTTP 503.

@gloomy-ghost
Copy link
Copy Markdown
Collaborator

gloomy-ghost commented Nov 18, 2016 via email

@weems
Copy link
Copy Markdown
Contributor Author

weems commented Nov 18, 2016

http://apps.itunes.com/files/ has some interesting information which may assist:"availableProjects: [itu-web-unsupported,atv-podcasts-app-custom,tvos-search-app,static-resources,ios-music-js-seed,itu-material-fix,ios-music-app-custom,itu-material-replace,atv-appstore-app-custom,itu-web-teacher,itu,tvos-books-app-custom,desktop-music-app-seed-custom,athena-ui,desktop-music-app-seed,desktop-music-app,itu-coursemanager,crossfire-ui,artistconnect,podcasts-connect,atv-search-app,tvos-whats-new-app,itu-universal-links,itu-web,atv-podcasts-app,atv-music-app-custom,atv-search-app-custom,appcontent,desktop-music-app-custom,atv-music-app-2.0-custom,finance-app-custom,tvos-books-app,ios-music-app-90seed,watchlist-app,ios-music-js-custom,tvos-whats-new-app-custom,ios-music-js,watchlist-app-custom,ios-music-js-seed-custom,ios-appstore-app,silverbullet-athena,atv-music-app-2.0,artistconnect-ui,atv-subscription-mgmt-app-custom,static-config,itu-sis-statics,atv-appstore-app,atv-music-app,atv-subscription-mgmt-app,tvos-search-app-custom,finance-app,atv-videos-app-custom,atv-videos-app,ios-music-app,foo]"

@gloomy-ghost
Copy link
Copy Markdown
Collaborator

Retest

@gloomy-ghost gloomy-ghost reopened this Dec 10, 2016
@gloomy-ghost gloomy-ghost merged commit 767bf2c into EFForg:master Dec 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants