Skip to content

Commit 895e535

Browse files
committed
Merge branch '4.0' into merge-4.0b
This is a big merge of 4.0 into master. I've merged the JS and related files manually. For the rules, I followed this procedure: git checkout -b merge-4.0b master git merge 4.0 rm src/chrome/content/rules/* cp ~/https-everywhere2/src/chrome/content/rules/* src/chrome/content/rules/ git add . git commit (where ~/https-everywhere2/ is checked out to master). In other words, this brings the merge history of master up to date with 4.0, but keeps the rules in master exactly the same. I've checked all the relevant divergences to see if there are any ruleset fixes in 4.0 that aren't yet cherry-picked into master. It appears there are not. In future all ruleset fixes should be made in 4.0 then merged into master, rather than made in master and cherry-picked into 4.0. This will make mergin much easier. Conflicts: README.md chromium/_locales/de/messages.json chromium/manifest.json src/Changelog src/chrome/content/about.xul src/chrome/content/code/HTTPS.js src/chrome/content/code/X509ChainWhitelist.js src/chrome/content/rules/00f.net.xml src/chrome/content/rules/01.org.xml src/chrome/content/rules/1WT.eu.xml src/chrome/content/rules/1xbet.com.xml src/chrome/content/rules/23andMe.com.xml src/chrome/content/rules/2mdn.net.xml src/chrome/content/rules/3_News.xml src/chrome/content/rules/4chan.xml src/chrome/content/rules/A2_Hosting.xml src/chrome/content/rules/ACM.org.xml src/chrome/content/rules/APM.com.xml src/chrome/content/rules/ARM.xml src/chrome/content/rules/ARRL.xml src/chrome/content/rules/ASUS.xml src/chrome/content/rules/ATech_Media.xml src/chrome/content/rules/Abine.xml src/chrome/content/rules/Abuse.ch.xml src/chrome/content/rules/ActBlue.xml src/chrome/content/rules/Active-Events.xml src/chrome/content/rules/Active.com.xml src/chrome/content/rules/ActiveState-Software.xml src/chrome/content/rules/Acxiom.xml src/chrome/content/rules/AdSafe.xml src/chrome/content/rules/Adafruit.xml src/chrome/content/rules/AdblockPlus.xml src/chrome/content/rules/AddToAny.xml src/chrome/content/rules/Adobe-mismatches.xml src/chrome/content/rules/Adobe.xml src/chrome/content/rules/Adobe_Connect.xml src/chrome/content/rules/AgileBits.xml src/chrome/content/rules/Alcatel-Lucent.com.xml src/chrome/content/rules/Alibaba.xml src/chrome/content/rules/Alipay.com.xml src/chrome/content/rules/Alzheimers_Association.xml src/chrome/content/rules/Amazon-Adsystem.com.xml src/chrome/content/rules/Amazon-Associates.xml src/chrome/content/rules/AmazonAWS.xml src/chrome/content/rules/American-Physical-Society.xml src/chrome/content/rules/American_Bar_Association.xml src/chrome/content/rules/Amnesty-International.xml src/chrome/content/rules/Ancestry.xml src/chrome/content/rules/Android.xml src/chrome/content/rules/AngelList.xml src/chrome/content/rules/Anti-Phishing_Working_Group.xml src/chrome/content/rules/Apache.xml src/chrome/content/rules/App.net.xml src/chrome/content/rules/Apple_Parts_Store.xml src/chrome/content/rules/Arch.xml src/chrome/content/rules/Archive.org_Way_Back_Machine.xml src/chrome/content/rules/Arizona-State-University.xml src/chrome/content/rules/Ars-Technica.xml src/chrome/content/rules/Artemis.net.xml src/chrome/content/rules/Artfiles_New_Media.xml src/chrome/content/rules/Ask_Ubuntu.com.xml src/chrome/content/rules/Associated_Press.xml src/chrome/content/rules/Asterisk.xml src/chrome/content/rules/Atlantic-Media.xml src/chrome/content/rules/Atlassian.net.xml src/chrome/content/rules/Atlassian.xml src/chrome/content/rules/Authorize.net.xml src/chrome/content/rules/Avast.com.xml src/chrome/content/rules/Awxcnx.xml src/chrome/content/rules/BBC.xml src/chrome/content/rules/BOF.nl.xml src/chrome/content/rules/BT-Group.xml src/chrome/content/rules/Baekdal.xml src/chrome/content/rules/Baidu.xml src/chrome/content/rules/BarnesandNoble.xml src/chrome/content/rules/Barracuda.com.xml src/chrome/content/rules/BayFiles.xml src/chrome/content/rules/Beanstalk_Data.xml src/chrome/content/rules/Best-Buy.xml src/chrome/content/rules/BigCommerce.xml src/chrome/content/rules/Big_Brother_Watch.xml src/chrome/content/rules/Billiger.de.xml src/chrome/content/rules/BitBucket.xml src/chrome/content/rules/BitCoin.xml src/chrome/content/rules/BitPay.xml src/chrome/content/rules/BitcoinWisdom.com.xml src/chrome/content/rules/Bitcoinity.org.xml src/chrome/content/rules/BlackVPN.xml src/chrome/content/rules/Black_Phone.ch.xml src/chrome/content/rules/Blackbaud.xml src/chrome/content/rules/Blockchain.info.xml src/chrome/content/rules/Bloomberg.xml src/chrome/content/rules/Blue_State_Digital.xml src/chrome/content/rules/Boing-Boing.xml src/chrome/content/rules/Boost.xml src/chrome/content/rules/BootstrapCDN.xml src/chrome/content/rules/Braintreepayments.com.xml src/chrome/content/rules/Brightcove.xml src/chrome/content/rules/Broadcom.xml src/chrome/content/rules/Buffer.xml src/chrome/content/rules/Burt-mismatches.xml src/chrome/content/rules/Burt.xml src/chrome/content/rules/BusinessWeek.com.xml src/chrome/content/rules/Bytemark.co.uk.xml src/chrome/content/rules/CBSI.com.xml src/chrome/content/rules/CBSIstatic.net.xml src/chrome/content/rules/CCC.xml src/chrome/content/rules/CD_Universe.xml src/chrome/content/rules/CERN.xml src/chrome/content/rules/CERT.xml src/chrome/content/rules/CPanel.xml src/chrome/content/rules/CSIRO.xml src/chrome/content/rules/Calibre.xml src/chrome/content/rules/Caltech-mismatches.xml src/chrome/content/rules/Caltech.xml src/chrome/content/rules/Calum.xml src/chrome/content/rules/Cam.ac.uk-problematic.xml src/chrome/content/rules/Camaya.net.xml src/chrome/content/rules/CanSecWest.xml src/chrome/content/rules/Canonical.xml src/chrome/content/rules/Cardiff-University.xml src/chrome/content/rules/Cargo.xml src/chrome/content/rules/Carnegie-Mellon-University.xml src/chrome/content/rules/Casale-Media.xml src/chrome/content/rules/Case_Western_Reserve_University.xml src/chrome/content/rules/Cato-Institute.xml src/chrome/content/rules/Celartem-mismatches.xml src/chrome/content/rules/Cell.xml src/chrome/content/rules/CentOS.org.xml src/chrome/content/rules/Center-for-American-Progress.xml src/chrome/content/rules/Chaos-Reigns.xml src/chrome/content/rules/Charity-Navigator.xml src/chrome/content/rules/Check_Point.xml src/chrome/content/rules/Chitika.xml src/chrome/content/rules/Chromium.org.xml src/chrome/content/rules/Chronicle.xml src/chrome/content/rules/Cisco.xml src/chrome/content/rules/ClickBank.xml src/chrome/content/rules/CloudFlare.xml src/chrome/content/rules/CloudForge-problematic.xml src/chrome/content/rules/CloudForge.xml src/chrome/content/rules/CloudSigma.xml src/chrome/content/rules/Cloudfront.xml src/chrome/content/rules/Cloudsecurityalliance.org.xml src/chrome/content/rules/Code.org.xml src/chrome/content/rules/CodePen.io.xml src/chrome/content/rules/Codeplex.xml src/chrome/content/rules/CoinURL.com.xml src/chrome/content/rules/Coinbase.xml src/chrome/content/rules/CollabNet.xml src/chrome/content/rules/Columbia_University.xml src/chrome/content/rules/Com.au.xml src/chrome/content/rules/ComScore.com.xml src/chrome/content/rules/Conformal-Systems.xml src/chrome/content/rules/ConsumerReports.xml src/chrome/content/rules/Content.ad.xml src/chrome/content/rules/Coreboot.xml src/chrome/content/rules/Corporate-ir.net.xml src/chrome/content/rules/Corsair.com.xml src/chrome/content/rules/Costco.xml src/chrome/content/rules/Council_on_Foreign_Relations.xml src/chrome/content/rules/CourageCampaign.xml src/chrome/content/rules/Coursera.xml src/chrome/content/rules/Coverity.com.xml src/chrome/content/rules/Createsend1.com.xml src/chrome/content/rules/CreativeCommons.xml src/chrome/content/rules/Cumulus_Networks.xml src/chrome/content/rules/Cupid.xml src/chrome/content/rules/Cupid_plc.com.xml src/chrome/content/rules/Cupid_plc_CDN.xml src/chrome/content/rules/CyanogenMod.org.xml src/chrome/content/rules/Cypherpunks.ca.xml src/chrome/content/rules/DBforums.xml src/chrome/content/rules/DD-WRT.xml src/chrome/content/rules/Dabs.xml src/chrome/content/rules/Daily-Express.xml src/chrome/content/rules/DailyDot.xml src/chrome/content/rules/DataTables.net.xml src/chrome/content/rules/DataXu.xml src/chrome/content/rules/Datamonitor_Healthcare.xml src/chrome/content/rules/Dealnews.com.xml src/chrome/content/rules/Debian-self-signed.xml src/chrome/content/rules/Debian.xml src/chrome/content/rules/Deposit-Files.xml src/chrome/content/rules/Derwesten.de.xml src/chrome/content/rules/DesignAddict.xml src/chrome/content/rules/Details.xml src/chrome/content/rules/DeusM.xml src/chrome/content/rules/Deutsche_Messe.xml src/chrome/content/rules/Diaspora.xml src/chrome/content/rules/Dice-problematic.xml src/chrome/content/rules/Dice.xml src/chrome/content/rules/DigiCert.xml src/chrome/content/rules/Digia.xml src/chrome/content/rules/Digital_Ocean.com.xml src/chrome/content/rules/Digital_Pacific.com.au.xml src/chrome/content/rules/Discovery-Communications.xml src/chrome/content/rules/Disney_International.com.xml src/chrome/content/rules/Domain-Offensive.xml src/chrome/content/rules/DoubleVerify.xml src/chrome/content/rules/Drawing_by_Numbers.org.xml src/chrome/content/rules/DreamHost.xml src/chrome/content/rules/Drupal.xml src/chrome/content/rules/Drweb.com.xml src/chrome/content/rules/Duke-University.xml src/chrome/content/rules/Duo-Security.xml src/chrome/content/rules/Dutch_Data_Protection_Authority.xml src/chrome/content/rules/Dynamite-Data-mismatches.xml src/chrome/content/rules/Dynamite-Data.xml src/chrome/content/rules/Dyne.org.xml src/chrome/content/rules/E-boks.dk.xml src/chrome/content/rules/EBay-mismatches.xml src/chrome/content/rules/EBay.xml src/chrome/content/rules/EDI7.lu.xml src/chrome/content/rules/EFF.xml src/chrome/content/rules/ELearnSecurity.com.xml src/chrome/content/rules/EPFL.xml src/chrome/content/rules/ETH_Zurich.xml src/chrome/content/rules/EUSecWest.xml src/chrome/content/rules/EVGA.xml src/chrome/content/rules/Earwolf_Podcast_Network.xml src/chrome/content/rules/EasyDNS.xml src/chrome/content/rules/Eater.xml src/chrome/content/rules/Eclipse.xml src/chrome/content/rules/EdgeCast-networks.xml src/chrome/content/rules/Edublogs.xml src/chrome/content/rules/Effective-Measure.xml src/chrome/content/rules/Elsevier.xml src/chrome/content/rules/Eniro.xml src/chrome/content/rules/Entrust.xml src/chrome/content/rules/Envato.com.xml src/chrome/content/rules/Erlang.xml src/chrome/content/rules/Eset.xml src/chrome/content/rules/EthicsPoint.com.xml src/chrome/content/rules/Etouches.xml src/chrome/content/rules/Europa.eu.xml src/chrome/content/rules/European_Space_Agency.xml src/chrome/content/rules/Eventbrite.xml src/chrome/content/rules/Evidon.xml src/chrome/content/rules/Experian.xml src/chrome/content/rules/Extreme_Tech.com.xml src/chrome/content/rules/F-Droid.xml src/chrome/content/rules/F-Secure.xml src/chrome/content/rules/FAZ-mismatches.xml src/chrome/content/rules/FSF.xml src/chrome/content/rules/FSFE.org.xml src/chrome/content/rules/Facebook.xml src/chrome/content/rules/Fast-Company.xml src/chrome/content/rules/Fasthosts.xml src/chrome/content/rules/Fastly.xml src/chrome/content/rules/Fastmail.xml src/chrome/content/rules/Fazekas.xml src/chrome/content/rules/Federal-Communications-Commission.xml src/chrome/content/rules/Fedora.xml src/chrome/content/rules/Fedora_Hosted.org.xml src/chrome/content/rules/FeedBurner.xml src/chrome/content/rules/FierceMarkets.xml src/chrome/content/rules/FierceWireless.xml src/chrome/content/rules/Fight-for-the-Future-mismatches.xml src/chrome/content/rules/Fight-for-the-Future.xml src/chrome/content/rules/Find-n-Save.xml src/chrome/content/rules/FindTheBest.xml src/chrome/content/rules/FireEye.xml src/chrome/content/rules/Flameeyes.xml src/chrome/content/rules/Flashrom.xml src/chrome/content/rules/Flashtalking.xml src/chrome/content/rules/Flickr.xml src/chrome/content/rules/Flightaware.xml src/chrome/content/rules/Flinto.com.xml src/chrome/content/rules/Flipboard.xml src/chrome/content/rules/Focus.de.xml src/chrome/content/rules/Forbes_Magazine.xml src/chrome/content/rules/Fox_News.xml src/chrome/content/rules/Frack.nl.xml src/chrome/content/rules/Frankie_Boyle.com.xml src/chrome/content/rules/FreeBSD.xml src/chrome/content/rules/FreeDesktop.xml src/chrome/content/rules/Free_Press.xml src/chrome/content/rules/FreedomPop.com.xml src/chrome/content/rules/Freenet.de.xml src/chrome/content/rules/Freescale.com.xml src/chrome/content/rules/Freshports.org.xml src/chrome/content/rules/Furaffinity.xml src/chrome/content/rules/Fused.xml src/chrome/content/rules/GENEVI.org.xml src/chrome/content/rules/GMO_Internet.xml src/chrome/content/rules/GNOME.xml src/chrome/content/rules/GNU.org.xml src/chrome/content/rules/GO.com.xml src/chrome/content/rules/GOV.UK.xml src/chrome/content/rules/GRC.com.xml src/chrome/content/rules/Gajim.xml src/chrome/content/rules/Gallup.xml src/chrome/content/rules/GameSpot.xml src/chrome/content/rules/GameTree.xml src/chrome/content/rules/Gamestar.de.xml src/chrome/content/rules/Gartner.com.xml src/chrome/content/rules/Geek_Tech_Labs.com.xml src/chrome/content/rules/Gentoo.xml src/chrome/content/rules/Geotrust.xml src/chrome/content/rules/GetDigital.de-falsemixed.xml src/chrome/content/rules/Getdigital.de.xml src/chrome/content/rules/Gfycat.com.xml src/chrome/content/rules/Ghostery.xml src/chrome/content/rules/GigaOM.xml src/chrome/content/rules/GigeNET.com.xml src/chrome/content/rules/Gitorious.xml src/chrome/content/rules/Gittip.com.xml src/chrome/content/rules/GlobalSign.xml src/chrome/content/rules/GnuPG.org-problematic.xml src/chrome/content/rules/GnuPG.org.xml src/chrome/content/rules/GnuTLS.org.xml src/chrome/content/rules/GoogleAPIs.xml src/chrome/content/rules/GoogleServices.xml src/chrome/content/rules/GovernoPortugues-mismatches.xml src/chrome/content/rules/Greenhouse.io.xml src/chrome/content/rules/Guardian.xml src/chrome/content/rules/GuideStar.xml src/chrome/content/rules/Guifi.xml src/chrome/content/rules/Guild-Wars-2.xml src/chrome/content/rules/Gumroad.com.xml src/chrome/content/rules/HITBSecConf.xml src/chrome/content/rules/HackerOne.com.xml src/chrome/content/rules/Hackpad.xml src/chrome/content/rules/Hak5.org.xml src/chrome/content/rules/Hands.com.xml src/chrome/content/rules/Harvard-University.xml src/chrome/content/rules/Haskell.org.xml src/chrome/content/rules/Hbz.xml src/chrome/content/rules/Heml.is.xml src/chrome/content/rules/Here.com.xml src/chrome/content/rules/Heteml.jp.xml src/chrome/content/rules/Hewlett-Packard.xml src/chrome/content/rules/HideMe.ru.xml src/chrome/content/rules/Hobsons-EMT.xml src/chrome/content/rules/Hola.xml src/chrome/content/rules/HootSuite-mismatches.xml src/chrome/content/rules/HostingCon.xml src/chrome/content/rules/Human_Rights_Watch.xml src/chrome/content/rules/HumbleBundle.xml src/chrome/content/rules/HypeMachine.xml src/chrome/content/rules/I2P.xml src/chrome/content/rules/ICQ.com.xml src/chrome/content/rules/ICharts.xml src/chrome/content/rules/IDC.xml src/chrome/content/rules/IEEE.xml src/chrome/content/rules/IET.xml src/chrome/content/rules/IETF.xml src/chrome/content/rules/IGN.xml src/chrome/content/rules/IModules.xml src/chrome/content/rules/INFOnline.xml src/chrome/content/rules/ISC.xml src/chrome/content/rules/ISPsystem.xml src/chrome/content/rules/ITPC.xml src/chrome/content/rules/IXsystems.xml src/chrome/content/rules/Iblocklist.com.xml src/chrome/content/rules/Igalia.xml src/chrome/content/rules/Ikea.com.xml src/chrome/content/rules/Ilya_Grigorik.xml src/chrome/content/rules/ImageShack.us.xml src/chrome/content/rules/Immunityinc.com.xml src/chrome/content/rules/ImperialViolet.org.xml src/chrome/content/rules/Incapsula.xml src/chrome/content/rules/Indiana-University.xml src/chrome/content/rules/Indiegogo.xml src/chrome/content/rules/Indymedia.xml src/chrome/content/rules/Infolinks.xml src/chrome/content/rules/Infomaniak-Network.xml src/chrome/content/rules/InoReader.xml src/chrome/content/rules/Instart_Logic.com.xml src/chrome/content/rules/Institute-of-Physics.xml src/chrome/content/rules/Intel.xml src/chrome/content/rules/InterContinental_Hotels_Group.xml src/chrome/content/rules/Intercom.io.xml src/chrome/content/rules/International-Association-for-Cryptologic-Research.xml src/chrome/content/rules/International-Business-Times.xml src/chrome/content/rules/Internet-Archive.xml src/chrome/content/rules/Internet-Society.xml src/chrome/content/rules/Internet2.xml src/chrome/content/rules/Internet_Defense_League.xml src/chrome/content/rules/Intevation-problematic.xml src/chrome/content/rules/Intevation.xml src/chrome/content/rules/Investis.com.xml src/chrome/content/rules/Issuu_Aps.xml src/chrome/content/rules/JAMA-Network.xml src/chrome/content/rules/JP-Politikens_Hus.xml src/chrome/content/rules/JanRain.xml src/chrome/content/rules/Jappix.xml src/chrome/content/rules/Java.net.xml src/chrome/content/rules/Jimdo.xml src/chrome/content/rules/Jitsi.xml src/chrome/content/rules/Jobvite.xml src/chrome/content/rules/Jolla.com.xml src/chrome/content/rules/Joomla.xml src/chrome/content/rules/Joyent.xml src/chrome/content/rules/JunoDownload.xml src/chrome/content/rules/JustGive.xml src/chrome/content/rules/JustGiving.xml src/chrome/content/rules/Justin.tv.xml src/chrome/content/rules/KDE.xml src/chrome/content/rules/Kali_Linux.org.xml src/chrome/content/rules/Kaltura.xml src/chrome/content/rules/Kapsi.fi.xml src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml src/chrome/content/rules/Kaspersky.com.xml src/chrome/content/rules/Katholieke-Universiteit-Leuven.xml src/chrome/content/rules/Kinfolk.com.xml src/chrome/content/rules/Kinja-problematic.xml src/chrome/content/rules/Kinja.xml src/chrome/content/rules/Kiva.org.xml src/chrome/content/rules/Kiwiirc.com.xml src/chrome/content/rules/KoreLogic-Security.xml src/chrome/content/rules/Krita.org.xml src/chrome/content/rules/Krux-Digital.xml src/chrome/content/rules/Kudelski_Security.xml src/chrome/content/rules/Kununu.xml src/chrome/content/rules/LFC-Hosting.xml src/chrome/content/rules/LINBIT.xml src/chrome/content/rules/LSE.ac.uk.xml src/chrome/content/rules/LTTng_Project.xml src/chrome/content/rules/La-Quadrature-du-Net.xml src/chrome/content/rules/Lakome.com.xml src/chrome/content/rules/Last.fm.xml src/chrome/content/rules/Le_Monde.fr.xml src/chrome/content/rules/Leo.org.xml src/chrome/content/rules/LibGuides.xml src/chrome/content/rules/LibSDL.org.xml src/chrome/content/rules/LibrePlanet.org.xml src/chrome/content/rules/Libsyn.xml src/chrome/content/rules/Ligatus.xml src/chrome/content/rules/Linaro.xml src/chrome/content/rules/Linerunner-mismatches.xml src/chrome/content/rules/Linerunner.xml src/chrome/content/rules/LinkedIn.xml src/chrome/content/rules/LinksAlpha.com.xml src/chrome/content/rules/Linksys.xml src/chrome/content/rules/Linphone.xml src/chrome/content/rules/Linux-sunxi.org.xml src/chrome/content/rules/LinuxFoundation.xml src/chrome/content/rules/LinuxQuestions.xml src/chrome/content/rules/Linux_Forums.xml src/chrome/content/rules/Lippincott_Williams_and_Wilkins.xml src/chrome/content/rules/LiteSpeed-Technologies-mismatches.xml src/chrome/content/rules/Livefyre.xml src/chrome/content/rules/LivingSocial.xml src/chrome/content/rules/Lohud.com.xml src/chrome/content/rules/LongTail.xml src/chrome/content/rules/MARC.info.xml src/chrome/content/rules/MIT.xml src/chrome/content/rules/MSDN.xml src/chrome/content/rules/MSI.com.xml src/chrome/content/rules/MSN.xml src/chrome/content/rules/MacWorld.com.xml src/chrome/content/rules/Mail.ru.xml src/chrome/content/rules/Mailvelope.xml src/chrome/content/rules/Makerbot.xml src/chrome/content/rules/MapBox.xml src/chrome/content/rules/Marchex.xml src/chrome/content/rules/Marketo.xml src/chrome/content/rules/Marvel.com.xml src/chrome/content/rules/Mastermind.xml src/chrome/content/rules/McAfee.xml src/chrome/content/rules/Media.net.xml src/chrome/content/rules/MediaWorks.xml src/chrome/content/rules/Mediacru.sh.xml src/chrome/content/rules/Meetup.xml src/chrome/content/rules/Mellanox.xml src/chrome/content/rules/Meltwater-News.xml src/chrome/content/rules/MetaCPAN.xml src/chrome/content/rules/Metasploit.xml src/chrome/content/rules/Microsoft.xml src/chrome/content/rules/Microsoft_Online_Services.xml src/chrome/content/rules/Mindshare-Technologies.xml src/chrome/content/rules/Mixi.xml src/chrome/content/rules/Mobile_Nations.xml src/chrome/content/rules/Mobypicture.xml src/chrome/content/rules/ModMyi.xml src/chrome/content/rules/Moevideo.xml src/chrome/content/rules/Mollom.xml src/chrome/content/rules/MongoDB.org.xml src/chrome/content/rules/Monotype-Imaging.xml src/chrome/content/rules/Mookie1.com.xml src/chrome/content/rules/Mozdev-mismatches.xml src/chrome/content/rules/Mozilla.xml src/chrome/content/rules/Msecnd.net.xml src/chrome/content/rules/Muckrock.xml src/chrome/content/rules/MyBuys.xml src/chrome/content/rules/MyFonts.com.xml src/chrome/content/rules/Mythic-Beasts.xml src/chrome/content/rules/NASA.gov.xml src/chrome/content/rules/NAVTEQ.xml src/chrome/content/rules/NEXTINpact.com.xml src/chrome/content/rules/NIC.ch.xml src/chrome/content/rules/NICTA.xml src/chrome/content/rules/NK_News.org.xml src/chrome/content/rules/NRC_Handelsblad.xml src/chrome/content/rules/NSS_Labs.xml src/chrome/content/rules/NTP.org.xml src/chrome/content/rules/NVidia.xml src/chrome/content/rules/Nandos.com.xml src/chrome/content/rules/National-Institutes-of-Health.xml src/chrome/content/rules/National_Geographic.xml src/chrome/content/rules/Nativo.net.xml src/chrome/content/rules/Naughty_Show_Reviews.com.xml src/chrome/content/rules/Ndr.de.xml src/chrome/content/rules/NearlyFreeSpeech.NET.xml src/chrome/content/rules/Net-security.org.xml src/chrome/content/rules/NetBSD.xml src/chrome/content/rules/NetDNA.xml src/chrome/content/rules/NetMarketShare.xml src/chrome/content/rules/Netflix.xml src/chrome/content/rules/Network-for-Good.xml src/chrome/content/rules/NetworkWorld.xml src/chrome/content/rules/New-Relic.xml src/chrome/content/rules/New-York-University.xml src/chrome/content/rules/New_Statesman.com.xml src/chrome/content/rules/New_Zealand_Herald.xml src/chrome/content/rules/NewsBlur.xml src/chrome/content/rules/NewsCred.com.xml src/chrome/content/rules/News_Distribution_Network.xml src/chrome/content/rules/News_Limited-problematic.xml src/chrome/content/rules/News_Limited.xml src/chrome/content/rules/Nginx.org.xml src/chrome/content/rules/Nic.cz.xml src/chrome/content/rules/No_Starch_Press.xml src/chrome/content/rules/Nodejitsu.com.xml src/chrome/content/rules/Nokia.xml src/chrome/content/rules/Norman.com.xml src/chrome/content/rules/North-American-Network-Operators-Group.xml src/chrome/content/rules/North-Carolina-State-University-problematic.xml src/chrome/content/rules/North-Carolina-State-University.xml src/chrome/content/rules/Northwestern_University.xml src/chrome/content/rules/NottinghamAC.xml src/chrome/content/rules/Npm_js.org.xml src/chrome/content/rules/Nuand.com.xml src/chrome/content/rules/Nugg.ad.xml src/chrome/content/rules/O2_online.de.xml src/chrome/content/rules/OAG.xml src/chrome/content/rules/OMICRON.xml src/chrome/content/rules/ON24.xml src/chrome/content/rules/OReilly-Media-mismatches.xml src/chrome/content/rules/OReilly-Media.xml src/chrome/content/rules/OSGeo.org.xml src/chrome/content/rules/Offensive-Security.com.xml src/chrome/content/rules/Ohio-State-University.xml src/chrome/content/rules/Onstream-Media.xml src/chrome/content/rules/Onswipe.xml src/chrome/content/rules/Ooyala.xml src/chrome/content/rules/Open-Clipart-Library.xml src/chrome/content/rules/Open-MPI.xml src/chrome/content/rules/OpenCores.xml src/chrome/content/rules/OpenHatch.org.xml src/chrome/content/rules/OpenMW.xml src/chrome/content/rules/OpenNet.net.xml src/chrome/content/rules/OpenSUSE.xml src/chrome/content/rules/OpenStack.xml src/chrome/content/rules/OpenTechFund.xml src/chrome/content/rules/OpenVPN.xml src/chrome/content/rules/OpenVZ.org.xml src/chrome/content/rules/OpenWRT.xml src/chrome/content/rules/OpenX.xml src/chrome/content/rules/Open_Rights_Group.xml src/chrome/content/rules/Open_Wireless_Movement.xml src/chrome/content/rules/Openswan.xml src/chrome/content/rules/Oracle-mismatches.xml src/chrome/content/rules/Orange.xml src/chrome/content/rules/Outbrain-mismatches.xml src/chrome/content/rules/Outbrain.xml src/chrome/content/rules/Outflux.net.xml src/chrome/content/rules/OverClockers.xml src/chrome/content/rules/Overclock.net.xml src/chrome/content/rules/Overclockers.com.xml src/chrome/content/rules/OwnCloud.xml src/chrome/content/rules/PBS.xml src/chrome/content/rules/PHP.xml src/chrome/content/rules/PPS.xml src/chrome/content/rules/Packagist.org.xml src/chrome/content/rules/Packt_Publishing.xml src/chrome/content/rules/Pale_Moon.org.xml src/chrome/content/rules/Parallels.xml src/chrome/content/rules/PassMark.com-falsemixed.xml src/chrome/content/rules/PassMark.com.xml src/chrome/content/rules/Payson.xml src/chrome/content/rules/Pcwelt.de.xml src/chrome/content/rules/Pennsylvania-State-University.xml src/chrome/content/rules/Perl.org.xml src/chrome/content/rules/PfSense.org.xml src/chrome/content/rules/PhpBB.xml src/chrome/content/rules/Phusion_Passenger.com.xml src/chrome/content/rules/PirateParty-mismatches.xml src/chrome/content/rules/PirateParty.xml src/chrome/content/rules/Piwik.org.xml src/chrome/content/rules/Planet_Minecraft.com.xml src/chrome/content/rules/PlayStation.xml src/chrome/content/rules/Plone.org.xml src/chrome/content/rules/Plurk.xml src/chrome/content/rules/PolarSSL.xml src/chrome/content/rules/PolicyMic.xml src/chrome/content/rules/Politiken.dk.xml src/chrome/content/rules/Polygon.xml src/chrome/content/rules/PornHub.xml src/chrome/content/rules/Porteus.xml src/chrome/content/rules/Postimg.org.xml src/chrome/content/rules/Postrelease.com.xml src/chrome/content/rules/PowerDNS.com.xml src/chrome/content/rules/Preisvergleich-Internet-Services.xml src/chrome/content/rules/Princeton.edu.xml src/chrome/content/rules/Privacy-International.xml src/chrome/content/rules/Privacy-SOS.xml src/chrome/content/rules/Project_Meshnet.xml src/chrome/content/rules/Proofpoint.xml src/chrome/content/rules/PropellerAds.xml src/chrome/content/rules/Prosidy.im.xml src/chrome/content/rules/Provide-Support.xml src/chrome/content/rules/PubMatic.xml src/chrome/content/rules/PublicCitizen.xml src/chrome/content/rules/Puppet_Labs.xml src/chrome/content/rules/Purdue_University.xml src/chrome/content/rules/Pusher.xml src/chrome/content/rules/Python.org.xml src/chrome/content/rules/QIP.xml src/chrome/content/rules/QQ.xml src/chrome/content/rules/QuakeNet.xml src/chrome/content/rules/Qualaris.com-falsemixed.xml src/chrome/content/rules/Qualys.xml src/chrome/content/rules/Qubes-OS.org.xml src/chrome/content/rules/RCFP.org.xml src/chrome/content/rules/RSA_Conference.xml src/chrome/content/rules/Rackspace.xml src/chrome/content/rules/Rally.org.xml src/chrome/content/rules/Rambler.xml src/chrome/content/rules/Reason.com.xml src/chrome/content/rules/Red_Bean_Software.xml src/chrome/content/rules/Red_Hat.xml src/chrome/content/rules/Reddit.xml src/chrome/content/rules/Reporters_Without_Borders.xml src/chrome/content/rules/RequestPolicy.xml src/chrome/content/rules/Responsys.xml src/chrome/content/rules/Richard-Dawkins-Foundation.xml src/chrome/content/rules/Richard_Dawkins_Foundation-problematic.xml src/chrome/content/rules/Right-Media.xml src/chrome/content/rules/RoboForm.com.xml src/chrome/content/rules/Rockstar-Games.xml src/chrome/content/rules/Rolling_Stone.com.xml src/chrome/content/rules/Rough_Trade_Gear.xml src/chrome/content/rules/Royal-Institution-of-Great-Britain-mismatches.xml src/chrome/content/rules/Rtbf.be.xml src/chrome/content/rules/Ruby-lang.org.xml src/chrome/content/rules/S-msn.com.xml src/chrome/content/rules/SANS.xml src/chrome/content/rules/SB-Nation.xml src/chrome/content/rules/SJ.se.xml src/chrome/content/rules/SKS-Keyservers.xml src/chrome/content/rules/STEG.xml src/chrome/content/rules/SUSE.xml src/chrome/content/rules/Sabayon.org.xml src/chrome/content/rules/SafariBooksOnline.xml src/chrome/content/rules/Safari_Flow.com.xml src/chrome/content/rules/Salon.xml src/chrome/content/rules/Samsung.xml src/chrome/content/rules/Sandia-National-Laboratories.xml src/chrome/content/rules/Santander.co.uk.xml src/chrome/content/rules/Sarava.org.xml src/chrome/content/rules/ScienceDaily.com.xml src/chrome/content/rules/Seafile.xml src/chrome/content/rules/SecureList.xml src/chrome/content/rules/Securepaynet.net.xml src/chrome/content/rules/Securi.xml src/chrome/content/rules/Security_in_a_Box.org.xml src/chrome/content/rules/Senate.gov.xml src/chrome/content/rules/ServerPilot.io.xml src/chrome/content/rules/Shacknews.xml src/chrome/content/rules/ShareThis.xml src/chrome/content/rules/Shodan.io.xml src/chrome/content/rules/Shopping.com.xml src/chrome/content/rules/Silent_Circle.xml src/chrome/content/rules/Silentcircle.org.xml src/chrome/content/rules/Silverpop.xml src/chrome/content/rules/Simons_Foundation.org.xml src/chrome/content/rules/Sina.xml src/chrome/content/rules/Sina_Weibo.xml src/chrome/content/rules/SingleHop.xml src/chrome/content/rules/Skeptic.org.uk.xml src/chrome/content/rules/Slashdot.xml src/chrome/content/rules/Slickdeals.xml src/chrome/content/rules/Smart-AdServer.xml src/chrome/content/rules/SmugMug.com.xml src/chrome/content/rules/Snort.xml src/chrome/content/rules/SockShare.com-problematic.xml src/chrome/content/rules/SockShare.xml src/chrome/content/rules/Solid-Run.com.xml src/chrome/content/rules/Sparkfun.xml src/chrome/content/rules/SpatialBuzz.com.xml src/chrome/content/rules/Spiceworks.xml src/chrome/content/rules/Splash_Data.com.xml src/chrome/content/rules/SpotXchange.com.xml src/chrome/content/rules/Spreadshirt.xml src/chrome/content/rules/Squarefree.com.xml src/chrome/content/rules/Squareup.com.xml src/chrome/content/rules/SquirrelMail.xml src/chrome/content/rules/Stand_Up_to_Cancer.xml src/chrome/content/rules/Stanford-University-problematic.xml src/chrome/content/rules/Stanford-University.xml src/chrome/content/rules/Starbucks.com.xml src/chrome/content/rules/State_of_Delaware.xml src/chrome/content/rules/StatusPage.io.xml src/chrome/content/rules/Steam.xml src/chrome/content/rules/Steamray.com.xml src/chrome/content/rules/Stony_Brook_University.xml src/chrome/content/rules/Stpeter.im.xml src/chrome/content/rules/Stripe.com.xml src/chrome/content/rules/StrongSwan.xml src/chrome/content/rules/Suddeutsche_Zeitung-problematic.xml src/chrome/content/rules/Suddeutsche_Zeitung_Tickets.xml src/chrome/content/rules/Sunset_ProHosting.xml src/chrome/content/rules/Swiftype.xml src/chrome/content/rules/Swisscom.ch.xml src/chrome/content/rules/Switch.ch.xml src/chrome/content/rules/THC.xml src/chrome/content/rules/TIBCO.com.xml src/chrome/content/rules/TIME.com.xml src/chrome/content/rules/TU-Dresden.de.xml src/chrome/content/rules/TVNZ.xml src/chrome/content/rules/Tactical_Tech.org.xml src/chrome/content/rules/Taobao.xml src/chrome/content/rules/Tapad.xml src/chrome/content/rules/Tapatalk.xml src/chrome/content/rules/Tape.tv.xml src/chrome/content/rules/Target.xml src/chrome/content/rules/TaxPayers_Alliance.xml src/chrome/content/rules/TechRepublic.xml src/chrome/content/rules/TechWeb.xml src/chrome/content/rules/Techdirt.xml src/chrome/content/rules/Technical_University_Munich.xml src/chrome/content/rules/TechnologyReview.xml src/chrome/content/rules/Texas-Instruments.xml src/chrome/content/rules/The-Business-Journals.xml src/chrome/content/rules/The-New-Yorker.xml src/chrome/content/rules/The-Next-Web.xml src/chrome/content/rules/The-Shmoo-Group.xml src/chrome/content/rules/TheDocumentFoundation.xml src/chrome/content/rules/ThePlatform.xml src/chrome/content/rules/The_Boston_Globe.xml src/chrome/content/rules/The_Daily_Beast.xml src/chrome/content/rules/The_Johns_Hopkins_University.xml src/chrome/content/rules/The_iPhone_Wiki.com.xml src/chrome/content/rules/Thehackernews.com.xml src/chrome/content/rules/Thomson-Reuters.xml src/chrome/content/rules/ThreatPost.xml src/chrome/content/rules/Threema.xml src/chrome/content/rules/Ticket_Factory.xml src/chrome/content/rules/Tictail.com.xml src/chrome/content/rules/Time_Inc.xml src/chrome/content/rules/ToSDR.org.xml src/chrome/content/rules/Top.de.xml src/chrome/content/rules/Toronto-Star.xml src/chrome/content/rules/Torproject.xml src/chrome/content/rules/TownNews.com.xml src/chrome/content/rules/Tox.im.xml src/chrome/content/rules/TracFone.com.xml src/chrome/content/rules/Traction-Digital.com.xml src/chrome/content/rules/TrafficJunky.xml src/chrome/content/rules/Transmission.xml src/chrome/content/rules/Travis_CI.xml src/chrome/content/rules/Tribler.xml src/chrome/content/rules/Trusted-Introducer.org.xml src/chrome/content/rules/Trusted-Shops.xml src/chrome/content/rules/Trusted_Computing_Group.xml src/chrome/content/rules/Tucows.xml src/chrome/content/rules/Tumblr.xml src/chrome/content/rules/Turn.com.xml src/chrome/content/rules/Turner.com.xml src/chrome/content/rules/Tweakers.net.xml src/chrome/content/rules/U-blox.com.xml src/chrome/content/rules/UBM.xml src/chrome/content/rules/UBS.xml src/chrome/content/rules/UCSD.edu-self-signed.xml src/chrome/content/rules/UN.org.xml src/chrome/content/rules/US-government.xml src/chrome/content/rules/USA.gov.xml src/chrome/content/rules/UTwente.nl.xml src/chrome/content/rules/UU.nl.xml src/chrome/content/rules/Uberspace.xml src/chrome/content/rules/Ubuntu.com-falsemixed.xml src/chrome/content/rules/Ubuntu.xml src/chrome/content/rules/Uni-Saarland.de.xml src/chrome/content/rules/UniStra.fr-falsemixed.xml src/chrome/content/rules/United-Internet.xml src/chrome/content/rules/University-of-Alaska-Anchorage.xml src/chrome/content/rules/University-of-California-Berkeley.xml src/chrome/content/rules/University-of-California-mismatches.xml src/chrome/content/rules/University-of-California.xml src/chrome/content/rules/University-of-Cambridge.xml src/chrome/content/rules/University-of-Chicago.xml src/chrome/content/rules/University-of-Colorado-at-Boulder.xml src/chrome/content/rules/University-of-Illinois-at-Urbana-Champaign.xml src/chrome/content/rules/University-of-Kansas.xml src/chrome/content/rules/University-of-Maryland.xml src/chrome/content/rules/University-of-Michigan.xml src/chrome/content/rules/University-of-Minnesota.xml src/chrome/content/rules/University-of-Oxford.xml src/chrome/content/rules/University-of-Pennsylvania.xml src/chrome/content/rules/University-of-Southern-California.xml src/chrome/content/rules/University-of-Strasbourg.xml src/chrome/content/rules/University-of-Texas-at-Austin-mismatches.xml src/chrome/content/rules/University-of-Texas-at-Austin.xml src/chrome/content/rules/University-of-Utah.xml src/chrome/content/rules/University-of-Virginia.xml src/chrome/content/rules/University-of-Washington.xml src/chrome/content/rules/University-of-Waterloo.xml src/chrome/content/rules/University_of_Arizona.xml src/chrome/content/rules/University_of_Bristol.xml src/chrome/content/rules/University_of_California_Santa_Cruz.xml src/chrome/content/rules/University_of_Erlangen-Nuremberg.xml src/chrome/content/rules/University_of_Kent.xml src/chrome/content/rules/University_of_Leeds.xml src/chrome/content/rules/University_of_Manchester.xml src/chrome/content/rules/University_of_Notre_Dame.xml src/chrome/content/rules/University_of_Oslo.xml src/chrome/content/rules/University_of_Potsdam.xml src/chrome/content/rules/University_of_Puerto_Rico.xml src/chrome/content/rules/University_of_Toronto-problematic.xml src/chrome/content/rules/University_of_Toronto.xml src/chrome/content/rules/University_of_Wisconsin-Madison.xml src/chrome/content/rules/Unknowncheats.me.xml src/chrome/content/rules/Unreal_Engine.xml src/chrome/content/rules/Upic.me.xml src/chrome/content/rules/Us-cert.gov.xml src/chrome/content/rules/Userfox.xml src/chrome/content/rules/VFEmail.net.xml src/chrome/content/rules/VMware.xml src/chrome/content/rules/Vagrantup.com.xml src/chrome/content/rules/Valve.xml src/chrome/content/rules/Variety.xml src/chrome/content/rules/Varnish-Cache.org.xml src/chrome/content/rules/Ve_Interactive.xml src/chrome/content/rules/Veracode.com.xml src/chrome/content/rules/Vice.xml src/chrome/content/rules/Victorias_Secret.xml src/chrome/content/rules/Vid.ly.xml src/chrome/content/rules/VideoLAN.xml src/chrome/content/rules/Virginia-Polytechnic-Institute-and-State-University.xml src/chrome/content/rules/VirusTotal.xml src/chrome/content/rules/Visa.xml src/chrome/content/rules/Visual_Revenue.xml src/chrome/content/rules/Voxer.xml src/chrome/content/rules/Vungle.xml src/chrome/content/rules/Walking_Men.xml src/chrome/content/rules/Walmart.com.xml src/chrome/content/rules/Walmart_images.com.xml src/chrome/content/rules/Warez-BB.org-problematic.xml src/chrome/content/rules/Washington-Post-Company.xml src/chrome/content/rules/We_Fight_Censorship.xml src/chrome/content/rules/Web.com.xml src/chrome/content/rules/WebSanity.xml src/chrome/content/rules/WebTrust.xml src/chrome/content/rules/Webkit.org.xml src/chrome/content/rules/Webnium.co.jp.xml src/chrome/content/rules/Webtranslateit.xml src/chrome/content/rules/Whatbox.ca.xml src/chrome/content/rules/Where.com.xml src/chrome/content/rules/Which.xml src/chrome/content/rules/WhisperSystems.xml src/chrome/content/rules/WhiteHat_Security.xml src/chrome/content/rules/WhosOn.com.xml src/chrome/content/rules/Wikimedia.xml src/chrome/content/rules/Wikivs.com.xml src/chrome/content/rules/WinZip.com.xml src/chrome/content/rules/Windows_Azure.xml src/chrome/content/rules/Wireshark.xml src/chrome/content/rules/Wolfram.com.xml src/chrome/content/rules/Wolfram_Alpha.xml src/chrome/content/rules/Wolfson-Microelectronics.xml src/chrome/content/rules/WordCamp.xml src/chrome/content/rules/WordPress.xml src/chrome/content/rules/Xbox.xml src/chrome/content/rules/Xtube.com.xml src/chrome/content/rules/YUI_Library.xml src/chrome/content/rules/Yahoo.com-falsemixed.xml src/chrome/content/rules/Yahoo.net.xml src/chrome/content/rules/Yahoo.xml src/chrome/content/rules/Yahoo_APIs.xml src/chrome/content/rules/Yandex.xml src/chrome/content/rules/Yieldlab.net.xml src/chrome/content/rules/Yimg.com.xml src/chrome/content/rules/Yocto_Project.org.xml src/chrome/content/rules/Yottaa.net.xml src/chrome/content/rules/YouTube.xml src/chrome/content/rules/Younited.com.xml src/chrome/content/rules/Your-Mailing-List-Provider.xml src/chrome/content/rules/Zataz.com-falsemixed.xml src/chrome/content/rules/Zataz.xml src/chrome/content/rules/Zen-Internet.xml src/chrome/content/rules/Zen_Internet-falsemixed.xml src/chrome/content/rules/Zend.xml src/chrome/content/rules/ZeniMax-Media.xml src/chrome/content/rules/Ziff-Davis-mismatches.xml src/chrome/content/rules/Ziff-Davis.xml src/chrome/content/rules/Zone-H.org.xml src/chrome/content/rules/Zoner.fi.xml src/chrome/content/rules/Zynga.xml src/chrome/content/rules/bitcasa.xml src/chrome/content/rules/cpaste.xml src/chrome/content/rules/cryptocoding.xml src/chrome/content/rules/kantonalbanken.xml src/chrome/content/rules/mathjax.xml src/chrome/content/rules/v2ex.xml src/chrome/content/ruleset-tests.js src/chrome/content/toolbar_button.js src/components/https-everywhere.js src/components/ssl-observatory.js src/defaults/preferences/preferences.js src/install.rdf
2 parents de56293 + d2cec86 commit 895e535

File tree

14 files changed

+1701
-474
lines changed

14 files changed

+1701
-474
lines changed

checkout

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit d324c102af704590bc209d128037e67fabbe7c24

chromium/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
"<all_urls>"
3939
],
4040
"update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml",
41-
"version": "2014.4.16"
41+
"version": "2014.11.25"
4242
}

makexpi.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ APP_NAME=https-everywhere
1717

1818
cd "`dirname $0`"
1919
RULESETS_SQLITE="$PWD/src/defaults/rulesets.sqlite"
20+
ANDROID_APP_ID=org.mozilla.firefox
2021

2122
[ -d pkg ] || mkdir pkg
2223

@@ -153,6 +154,7 @@ fi
153154

154155
cd src
155156

157+
156158
# Build the XPI!
157159
rm -f "../$XPI_NAME"
158160
#zip -q -X -9r "../$XPI_NAME" . "-x@../.build_exclusions"
@@ -167,6 +169,21 @@ else
167169
echo >&2 "Total included rules: `sqlite3 $RULESETS_SQLITE 'select count(*) from rulesets'`"
168170
echo >&2 "Rules disabled by default: `find chrome/content/rules -name "*.xml" | xargs grep -F default_off | wc -l`"
169171
echo >&2 "Created $XPI_NAME"
172+
173+
# Push to Android Firefox if device is connected
174+
# XXX on some systems, adb may require sudo...
175+
if type adb > /dev/null && adb devices > /dev/null 2>/dev/null ; then
176+
ADB_FOUND=`adb devices | tail -2 | head -1 | cut -f 1 | sed 's/ *$//g'`
177+
if [ "$ADB_FOUND" != "List of devices attached" ]; then
178+
echo Pushing "$XPI_NAME" to /sdcard/"$XPI_NAME"
179+
adb push "../$XPI_NAME" /sdcard/"$XPI_NAME"
180+
adb shell am start -a android.intent.action.VIEW \
181+
-c android.intent.category.DEFAULT \
182+
-d file:///mnt/sdcard/"$XPI_NAME" \
183+
-n $ANDROID_APP_ID/.App
184+
fi
185+
fi
186+
170187
if [ -n "$BRANCH" ]; then
171188
cd ../..
172189
cp $SUBDIR/$XPI_NAME pkg

src/Changelog

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
Institute of GB, Wall Street Journal
1717

1818
4.0.1 (2014-09-11)
19-
2019
* Significant new coverage: Reddit, Quora
2120
* Fixes include:
2221
Frontier Networks, Hotmail / Live, Microsoft, Mozilla, Ohio State, Rackspace, SJ.se, Timbo.se

src/chrome.manifest

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,15 @@ contract @eff.org/https-everywhere;1 {32c165b4-fe5e-4964-9250-603c410631b4}
4242

4343
category profile-after-change HTTPSEverywhere @eff.org/https-everywhere;1
4444

45-
overlay chrome://browser/content/browser.xul chrome://https-everywhere/content/toolbar_button.xul
46-
overlay chrome://navigator/content/navigator.xul chrome://https-everywhere/content/toolbar_button.xul
45+
# XUL gets included in every non-mobile build
46+
# Android has some non-XUL UI that is loaded from the
47+
# sessionstore-windows-restored observer in https-everywhere.js
48+
overlay chrome://browser/content/browser.xul chrome://https-everywhere/content/toolbar_button.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={3550f703-e582-4d05-9a08-453d09bdfdc6} application={a79fe89b-6662-4ff4-8e88-09950ad4dfde}
49+
overlay chrome://navigator/content/navigator.xul chrome://https-everywhere/content/toolbar_button.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={3550f703-e582-4d05-9a08-453d09bdfdc6} application={a79fe89b-6662-4ff4-8e88-09950ad4dfde}
4750

4851
style chrome://global/content/customizeToolbar.xul chrome://https-everywhere/skin/https-everywhere.css
49-
component {0f9ab521-986d-4ad8-9c1f-6934e195c15c} components/ssl-observatory.js
50-
contract @eff.org/ssl-observatory;1 {0f9ab521-986d-4ad8-9c1f-6934e195c15c}
5152

52-
category profile-after-change SSLObservatory @eff.org/ssl-observatory;1
53+
# Observatory does not yet have mobile-friendly UI
54+
component {0f9ab521-986d-4ad8-9c1f-6934e195c15c} components/ssl-observatory.js application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={3550f703-e582-4d05-9a08-453d09bdfdc6} application={a79fe89b-6662-4ff4-8e88-09950ad4dfde}
55+
contract @eff.org/ssl-observatory;1 {0f9ab521-986d-4ad8-9c1f-6934e195c15c} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={3550f703-e582-4d05-9a08-453d09bdfdc6} application={a79fe89b-6662-4ff4-8e88-09950ad4dfde}
56+
category profile-after-change SSLObservatory @eff.org/ssl-observatory;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={3550f703-e582-4d05-9a08-453d09bdfdc6} application={a79fe89b-6662-4ff4-8e88-09950ad4dfde}
Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
const CC = Components.classes;
2+
const CI = Components.interfaces;
3+
const CU = Components.utils;
4+
5+
var HTTPSEverywhere = CC["@eff.org/https-everywhere;1"]
6+
.getService(CI.nsISupports).wrappedJSObject;
7+
8+
CU.import("resource://gre/modules/Prompt.jsm");
9+
10+
var menuId;
11+
var urlbarId;
12+
var aWindow = getWindow();
13+
14+
15+
/*
16+
* Setup/Teardown for the UI
17+
*/
18+
19+
function loadIntoWindow() {
20+
if (!aWindow) {
21+
return;
22+
}
23+
var enabled = HTTPSEverywhere.prefs.getBoolPref("globalEnabled");
24+
addToggleItemToMenu(enabled);
25+
if (enabled) {
26+
urlbarId = aWindow.NativeWindow.pageactions.add(urlbarOptions);
27+
} else if (urlbarId) {
28+
aWindow.NativeWindow.pageactions.remove(urlbarId);
29+
}
30+
}
31+
32+
function unloadFromWindow() {
33+
if (!aWindow) {
34+
return;
35+
}
36+
aWindow.NativeWindow.menu.remove(menuId);
37+
aWindow.NativeWindow.pageactions.remove(urlbarId);
38+
}
39+
40+
41+
/*
42+
* Add a menu item to toggle HTTPS Everywhere
43+
*/
44+
45+
function addToggleItemToMenu(enabled) {
46+
if (menuId) { aWindow.NativeWindow.menu.remove(menuId); }
47+
var menuLabel = enabled ? "HTTPS Everywhere on" : "HTTPS Everywhere off";
48+
menuId = aWindow.NativeWindow.menu.add(menuLabel, null, function() {
49+
popupToggleMenu(aWindow, enabled);
50+
});
51+
}
52+
53+
function popupToggleMenu(aWindow, enabled) {
54+
var buttons = [
55+
{
56+
label: "Yes",
57+
callback: function() {
58+
toggleEnabledState();
59+
var msg = enabled ? "HTTPS Everywhere disabled!" : "HTTPS Everywhere enabled!";
60+
aWindow.NativeWindow.toast.show(msg, "short");
61+
return true;
62+
}
63+
}, {
64+
label: "No",
65+
callback: function() { return false; }
66+
}
67+
];
68+
var newState = enabled ? "off?" : "on?";
69+
aWindow.NativeWindow.doorhanger.show("Would you like to turn HTTPS Everywhere "+newState,
70+
"doorhanger-toggle", buttons);
71+
}
72+
73+
74+
/*
75+
* The HTTPS Everywhere icon in the URL bar shows a popup of rules that the
76+
* user can activate/deactivate. On long click, reset all rules to defaults.
77+
*/
78+
79+
var popupInfo = {
80+
rules: [],
81+
ruleItems: [],
82+
ruleStatus: [],
83+
alist: null,
84+
getApplicableList: function() {
85+
var browser = aWindow.BrowserApp.selectedBrowser;
86+
return HTTPSEverywhere.getApplicableListForBrowser(browser);
87+
},
88+
fill: function() {
89+
this.clear();
90+
this.alist = this.getApplicableList();
91+
HTTPSEverywhere.log(4,"applicable list active: "+JSON.stringify(this.alist.active));
92+
HTTPSEverywhere.log(4,"applicable list inactive: "+JSON.stringify(this.alist.inactive));
93+
for (var rule in this.alist.all) {
94+
if (this.alist.active.hasOwnProperty(rule)) {
95+
// active rules are checked and toggleable
96+
this.ruleItems.push({ label: rule, selected: true });
97+
this.ruleStatus.push(true);
98+
this.rules.push(this.alist.active[rule]);
99+
} else if (this.alist.moot.hasOwnProperty(rule)) {
100+
// moot rules are checked and toggleable too
101+
this.ruleItems.push({ label: rule, selected: true });
102+
this.ruleStatus.push(true);
103+
this.rules.push(this.alist.moot[rule]);
104+
} else if (this.alist.inactive.hasOwnProperty(rule)) {
105+
// inactive rules are unchecked and toggleable
106+
this.ruleItems.push({ label: rule });
107+
this.ruleStatus.push(false);
108+
this.rules.push(this.alist.inactive[rule]);
109+
} else if (this.alist.breaking.hasOwnProperty(rule)) {
110+
// breaking rules are get a unicode clockwise arrow next to them
111+
var ruleLabel = "\u21B7"+rule;
112+
var isSelected = this.alist.breaking[rule].active;
113+
this.ruleItems.push({ label: ruleLabel, selected: isSelected });
114+
this.ruleStatus.push(isSelected);
115+
this.rules.push(this.alist.breaking[rule]);
116+
}
117+
}
118+
},
119+
clear: function() {
120+
this.rules = [];
121+
this.ruleItems = [];
122+
this.ruleStatus = [];
123+
this.alist = {};
124+
}
125+
};
126+
127+
var urlbarOptions = {
128+
129+
title: "HTTPS Everywhere",
130+
131+
icon: "chrome://https-everywhere/skin/https-everywhere-128.png",
132+
133+
clickCallback: function() {
134+
popupInfo.fill();
135+
rulesPrompt.setMultiChoiceItems(popupInfo.ruleItems);
136+
rulesPrompt.show(function(data) {
137+
var db = data.button;
138+
if (db === -1) { return null; } // user didn't click the accept button
139+
if (popupInfo.rules.length !== db.length) {
140+
// Why does db sometimes have an extra entry that doesn't correspond
141+
// to any of the ruleItems? No idea, but let's log it.
142+
HTTPSEverywhere.log(5,"Got length mismatch between popupInfo.ruleItems and data.button");
143+
HTTPSEverywhere.log(4,"Applicable rules: "+JSON.stringify(popupInfo.rules));
144+
HTTPSEverywhere.log(4, "data.button: "+JSON.stringify(db));
145+
}
146+
for (var i=0; i<popupInfo.rules.length; i++) {
147+
if (popupInfo.ruleStatus[i] !== db[i]) {
148+
HTTPSEverywhere.log(4, "toggling: "+JSON.stringify(popupInfo.rules[i]));
149+
popupInfo.rules[i].toggle();
150+
}
151+
}
152+
reloadTab();
153+
return null;
154+
});
155+
},
156+
157+
longClickCallback: function() { popupResetDefaultsMenu(aWindow); }
158+
};
159+
160+
var rulesPrompt = new Prompt({
161+
window: aWindow,
162+
title: "Enable/disable rules",
163+
buttons: ["Apply changes"]
164+
});
165+
166+
function popupResetDefaultsMenu(aWindow) {
167+
var buttons = [
168+
{
169+
label: "Yes",
170+
callback: function() {
171+
resetToDefaults();
172+
var msg = "Default rules reset.";
173+
aWindow.NativeWindow.toast.show(msg, "short");
174+
return true;
175+
}
176+
}, {
177+
label: "No",
178+
callback: function() { return false; }
179+
}
180+
];
181+
aWindow.NativeWindow.doorhanger.show("Reset all HTTPS Everywhere rules to defaults?",
182+
"doorhanger-reset", buttons);
183+
}
184+
185+
186+
/*
187+
* Some useful utils
188+
*/
189+
190+
function reloadTab() {
191+
// There seems to be no API to do this directly?
192+
aWindow.BrowserApp.selectedTab.window.location.reload();
193+
}
194+
195+
function toggleEnabledState(){
196+
HTTPSEverywhere.toggleEnabledState();
197+
loadIntoWindow();
198+
reloadTab();
199+
}
200+
201+
function resetToDefaults() {
202+
HTTPSEverywhere.https_rules.resetRulesetsToDefaults();
203+
reloadTab();
204+
}
205+
206+
function getWindow() {
207+
return CC['@mozilla.org/appshell/window-mediator;1']
208+
.getService(CI.nsIWindowMediator)
209+
.getMostRecentWindow('navigator:browser');
210+
}
211+
212+
213+
/*
214+
* Here's the external API to this UI module
215+
*/
216+
217+
var AndroidUI = {
218+
init: function() {
219+
loadIntoWindow();
220+
},
221+
shutdown: function() {
222+
unloadFromWindow();
223+
}
224+
};
225+
226+
var EXPORTED_SYMBOLS = ["AndroidUI"];

src/chrome/content/code/ChannelReplacement.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,8 @@ ChannelReplacement.prototype = {
8181

8282
newChan.loadGroup = chan.loadGroup;
8383
newChan.notificationCallbacks = chan.notificationCallbacks;
84-
85-
// The following line has been commented out, because it appears to interfere with the Flash plugin.
86-
// For example, on https://www.youtube.com, if the LOAD_REPLACE flag is included in newChan's
87-
// loadFlag, the Flash plugin reports an error and video streaming does not take place.
88-
// By removing this flag, we allow Flash to see the "originalURI" attirubte of newChan,
89-
// which contains the HTTP (non-HTTPS) URL that Flash requested before HTTPS-Everywhere
90-
// redirected the channel.
91-
// XXX: May have unintended side effects. Needs more investigation.
92-
//
93-
// newChan.loadFlags = loadFlags | newChan.LOAD_REPLACE;
94-
95-
newChan.loadFlags = loadFlags;
96-
84+
newChan.loadFlags = loadFlags | newChan.LOAD_REPLACE;
85+
9786
if (!(newChan instanceof Ci.nsIHttpChannel))
9887
return this;
9988

0 commit comments

Comments
 (0)