From 3914d1d4dd3ed3cc002b3bce6305f58c91586f2e Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Wed, 9 Sep 2020 13:29:10 -0700 Subject: [PATCH 1/5] Change naming convention of allow listing * For clarity and better inclusion --- docs/en_US/faq.md | 6 +- docs/es/faq.md | 4 +- test/.pytest_cache/README.md | 8 + test/.pytest_cache/v/cache/nodeids | 1 + test/rules/coverage.checker.config | 2 +- test/rules/http.checker.config | 2 +- test/selenium/.pytest_cache/README.md | 8 + .../selenium/.pytest_cache/v/cache/lastfailed | 6 + test/selenium/.pytest_cache/v/cache/nodeids | 1 + test/selenium/dummy-chromium.pem | 13 ++ ...anup.sh => duplicate-allowlist-cleanup.sh} | 4 +- ...-whitelist.txt => duplicate-allowlist.txt} | 0 test/validations/special/run.py | 6 +- .../dbconnect.py | 0 .../run.py | 8 +- utils/rewriter/package-lock.json | 170 ++++++++++++++++++ ...leanup.sh => ruleset-allowlist-cleanup.sh} | 4 +- ...et-whitelist.csv => ruleset-allowlist.csv} | 0 18 files changed, 225 insertions(+), 18 deletions(-) create mode 100644 test/.pytest_cache/README.md create mode 100644 test/.pytest_cache/v/cache/nodeids create mode 100644 test/selenium/.pytest_cache/README.md create mode 100644 test/selenium/.pytest_cache/v/cache/lastfailed create mode 100644 test/selenium/.pytest_cache/v/cache/nodeids create mode 100644 test/selenium/dummy-chromium.pem rename test/validations/special/{duplicate-whitelist-cleanup.sh => duplicate-allowlist-cleanup.sh} (73%) rename test/validations/special/{duplicate-whitelist.txt => duplicate-allowlist.txt} (100%) rename utils/{mk-client-whitelist => mk-client-allowlist}/dbconnect.py (100%) rename utils/{mk-client-whitelist => mk-client-allowlist}/run.py (84%) create mode 100644 utils/rewriter/package-lock.json rename utils/{ruleset-whitelist-cleanup.sh => ruleset-allowlist-cleanup.sh} (93%) rename utils/{ruleset-whitelist.csv => ruleset-allowlist.csv} (100%) diff --git a/docs/en_US/faq.md b/docs/en_US/faq.md index e9e993b1222b..1a805b5bcf53 100644 --- a/docs/en_US/faq.md +++ b/docs/en_US/faq.md @@ -12,9 +12,9 @@ here](https://www.eff.org/https-everywhere/development). network?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) * [Will there be a version of HTTPS Everywhere for IE, Safari, or some other browser?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) -* [Why use a whitelist of sites that support HTTPS? Why can't you try to use +* [Why use a allowlist of sites that support HTTPS? Why can't you try to use HTTPS for every last site, and only fall back to HTTP if it isn't - available?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) + available?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) * [How do I get rid of/move the HTTPS Everywhere button in the toolbar?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar) * [When does HTTPS Everywhere protect me? When does it not protect @@ -79,7 +79,7 @@ perform secure request rewriting in these browsers, feel free to let us know at https-everywhere at EFF.org (but note that modifying document.location or window.location in JavaScript is not secure). -### [Why use a whitelist of sites that support HTTPS? Why can't you try to use HTTPS for every last site, and only fall back to HTTP if it isn't available?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) +### [Why use a allowlist of sites that support HTTPS? Why can't you try to use HTTPS for every last site, and only fall back to HTTP if it isn't available?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) There are several problems with the idea of trying to automatically detect HTTPS on every site. There is no guarantee that sites are going to give the diff --git a/docs/es/faq.md b/docs/es/faq.md index c3074a1dd629..7592e873a2e7 100644 --- a/docs/es/faq.md +++ b/docs/es/faq.md @@ -15,7 +15,7 @@ recursos [enumerados aquí](https://www.eff.org/https-everywhere/development). * [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está - disponible?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) + disponible?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) * [¿Cómo puedo eliminar o mover el botón HTTPS Everywhere de la barra de herramientas?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar) * [¿Cuándo me protege HTTPS Everywhere? ¿Cuándo no me @@ -82,7 +82,7 @@ estos navegadores, no dude en hacérnoslo saber en https-everywhere en EFF.org (pero tenga en cuenta que modificar document.location o window.location en JavaScript no es seguro). -### [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) +### [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) Hay varios problemas con la idea de tratar de detectar automáticamente HTTPS en cada sitio. No hay ninguna garantía de que los sitios van a dar la misma diff --git a/test/.pytest_cache/README.md b/test/.pytest_cache/README.md new file mode 100644 index 000000000000..bb78ba07ee53 --- /dev/null +++ b/test/.pytest_cache/README.md @@ -0,0 +1,8 @@ +# pytest cache directory # + +This directory contains data from the pytest's cache plugin, +which provides the `--lf` and `--ff` options, as well as the `cache` fixture. + +**Do not** commit this to version control. + +See [the docs](https://docs.pytest.org/en/latest/cache.html) for more information. diff --git a/test/.pytest_cache/v/cache/nodeids b/test/.pytest_cache/v/cache/nodeids new file mode 100644 index 000000000000..0637a088a01e --- /dev/null +++ b/test/.pytest_cache/v/cache/nodeids @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/test/rules/coverage.checker.config b/test/rules/coverage.checker.config index 6f3b5bf20cd5..8b73bf7cff06 100644 --- a/test/rules/coverage.checker.config +++ b/test/rules/coverage.checker.config @@ -8,7 +8,7 @@ check_target_validity = true check_nonmatch_groups = true check_test_formatting = true include_default_off = false -skiplist = utils/ruleset-whitelist.csv +skiplist = utils/ruleset-allowlist.csv skipfield = 1 [certificates] diff --git a/test/rules/http.checker.config b/test/rules/http.checker.config index 1d1023b3e861..ecdd8e36d802 100644 --- a/test/rules/http.checker.config +++ b/test/rules/http.checker.config @@ -8,7 +8,7 @@ check_nonmatch_groups = false check_test_formatting = false auto_disable = false include_default_off = false -skiplist = utils/ruleset-whitelist.csv +skiplist = utils/ruleset-allowlist.csv skipfield = 2 [certificates] diff --git a/test/selenium/.pytest_cache/README.md b/test/selenium/.pytest_cache/README.md new file mode 100644 index 000000000000..bb78ba07ee53 --- /dev/null +++ b/test/selenium/.pytest_cache/README.md @@ -0,0 +1,8 @@ +# pytest cache directory # + +This directory contains data from the pytest's cache plugin, +which provides the `--lf` and `--ff` options, as well as the `cache` fixture. + +**Do not** commit this to version control. + +See [the docs](https://docs.pytest.org/en/latest/cache.html) for more information. diff --git a/test/selenium/.pytest_cache/v/cache/lastfailed b/test/selenium/.pytest_cache/v/cache/lastfailed new file mode 100644 index 000000000000..517917ed6ace --- /dev/null +++ b/test/selenium/.pytest_cache/v/cache/lastfailed @@ -0,0 +1,6 @@ +{ + "test_navigation.py": true, + "test_options.py": true, + "test_options.py::OptionsTest::test_options": true, + "test_popup.py": true +} \ No newline at end of file diff --git a/test/selenium/.pytest_cache/v/cache/nodeids b/test/selenium/.pytest_cache/v/cache/nodeids new file mode 100644 index 000000000000..0637a088a01e --- /dev/null +++ b/test/selenium/.pytest_cache/v/cache/nodeids @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/test/selenium/dummy-chromium.pem b/test/selenium/dummy-chromium.pem new file mode 100644 index 000000000000..918c85ca0a60 --- /dev/null +++ b/test/selenium/dummy-chromium.pem @@ -0,0 +1,13 @@ +-----BEGIN PRIVATE KEY----- +MIIB5QIBADANBgkqhkiG9w0BAQEFAASCAc8wggHLAgEAAmEA7brIN8QmkHir3fKz +zU7jdhaojpru/NwAqp5mbW4gGqOhEnxcYGoa48nDm5aXMBAlRQRh8OtmR6sMSizT +a6JsQwmOt0u29B9dG0m/22hGCwHoXcnZB+gO30kmfN3KyDzJAgMBAAECYQCKJ1AP +yHg44UfP9imzmLLrf4N5TGSyog/pF6Ci26rgkFMc8RSmG0OBOVHp63v1PIutUrOp +9Lhcmg7QR6RVtETbHbk9H4Yaqqqszn1D1FxdHyl46Q7MhAYXCMuFE1LYTHkCMQD+ +FmqGX2mf5yLlx+IWVxgZLzuL/jGurVg/UyaX1Kprq1RiBMNgtjFjSkGQOYggj78C +MQDvhNjUD3W62hVjwmjZINSy2WUYxds9WOzCTkL/FfBiuckLJTgjT5WK2DNoMWbV +VXcCMQDZK7Gq3jw6VuVF/r0oGRLY270Kn545TaICpgBzf2qWEl9SU/3mWHMICXzW +V8YZBqMCMA0YRz54xef8SlUU6OSODfLlPci38H+PIAqTesg1a9oJ7DrmwwXzMOrR +XSYiJUweiwIwej6E3/pugTS8OYIovSzB2Iph6c3knluUWOcwnYgM4pUnXJKFJxpI +a4aCS0OEUbLJ +-----END PRIVATE KEY----- diff --git a/test/validations/special/duplicate-whitelist-cleanup.sh b/test/validations/special/duplicate-allowlist-cleanup.sh similarity index 73% rename from test/validations/special/duplicate-whitelist-cleanup.sh rename to test/validations/special/duplicate-allowlist-cleanup.sh index 22dbb7081c74..50c5a905bdf0 100755 --- a/test/validations/special/duplicate-whitelist-cleanup.sh +++ b/test/validations/special/duplicate-allowlist-cleanup.sh @@ -3,7 +3,7 @@ TMPFILE=`mktemp /tmp/buffer.XXXXXXXX` trap 'rm "$TMPFILE"' EXIT -for host in `cat test/validations/special/duplicate-whitelist.txt`; do +for host in `cat test/validations/special/duplicate-allowlist.txt`; do REGEX_ESCAPED_HOST=`python3.6 -c "import re; print(re.escape('$host'))"` REPEATS=`egrep -l "" src/chrome/content/rules/*.xml | wc -l` if [ $REPEATS -gt 1 ]; then @@ -11,4 +11,4 @@ for host in `cat test/validations/special/duplicate-whitelist.txt`; do fi done > $TMPFILE -cp --force $TMPFILE test/validations/special/duplicate-whitelist.txt +cp --force $TMPFILE test/validations/special/duplicate-allowlist.txt diff --git a/test/validations/special/duplicate-whitelist.txt b/test/validations/special/duplicate-allowlist.txt similarity index 100% rename from test/validations/special/duplicate-whitelist.txt rename to test/validations/special/duplicate-allowlist.txt diff --git a/test/validations/special/run.py b/test/validations/special/run.py index e318a2655a52..1b7b44e7bd02 100755 --- a/test/validations/special/run.py +++ b/test/validations/special/run.py @@ -32,9 +32,9 @@ def fail(s): xpath_cookie_host_pattern = etree.XPath("/ruleset/securecookie/@host") xpath_cookie_name_pattern = etree.XPath("/ruleset/securecookie/@name") -# Load lists of ruleset names whitelisted for duplicate rules +# Load lists of ruleset names allowlisted for duplicate rules thispath = os.path.dirname(os.path.realpath(__file__)) -with open(thispath + '/duplicate-whitelist.txt') as duplicate_fh: +with open(thispath + '/duplicate-allowlist.txt') as duplicate_fh: duplicate_allowed_list = [x.rstrip('\n') for x in duplicate_fh.readlines()] filenames = glob.glob(thispath + '/../../../src/chrome/content/rules/*') @@ -188,7 +188,7 @@ def nomes_all(where=sys.argv[1:]): for host, count in host_counter.most_common(): if count > 1: if host in duplicate_allowed_list: - warn("Whitelisted hostname %s shows up in %d different rulesets." % (host, count)) + warn("Allowlisted hostname %s shows up in %d different rulesets." % (host, count)) else: failure = 1 fail("Hostname %s shows up in %d different rulesets." % (host, count)) diff --git a/utils/mk-client-whitelist/dbconnect.py b/utils/mk-client-allowlist/dbconnect.py similarity index 100% rename from utils/mk-client-whitelist/dbconnect.py rename to utils/mk-client-allowlist/dbconnect.py diff --git a/utils/mk-client-whitelist/run.py b/utils/mk-client-allowlist/run.py similarity index 84% rename from utils/mk-client-whitelist/run.py rename to utils/mk-client-allowlist/run.py index 43837d75e80a..7accccfc5614 100755 --- a/utils/mk-client-whitelist/run.py +++ b/utils/mk-client-allowlist/run.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3.6 -# Make a list of the current top 1,000 certs to whitelist from the +# Make a list of the current top 1,000 certs to allowlist from the # Decentralized SSL Observatory's client submissions, to live in -# https-everywhere/src/chrome/content/code/X509ChainWhitelist.js +# https-everywhere/src/chrome/content/code/X509ChainAllowlist.js import dbconnect import sys @@ -37,9 +37,9 @@ header = """ // These are SHA256 fingerprints for the most common chains observed by the // Decentralized SSL Observatory. These should not be resubmitted. -// This file is automatically generated by utils/mk_client_whitelist.py +// This file is automatically generated by utils/mk_client_allowlist.py -const X509ChainWhitelist = {""" +const X509ChainAllowlist = {""" print(header) for chain_fp in sorted([row[0] for row in results]): diff --git a/utils/rewriter/package-lock.json b/utils/rewriter/package-lock.json new file mode 100644 index 000000000000..0778b1fd65b8 --- /dev/null +++ b/utils/rewriter/package-lock.json @@ -0,0 +1,170 @@ +{ + "name": "https-everywhere-rewriter", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" + }, + "event-stream": { + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz", + "integrity": "sha1-A4u7LqnqkDhbJvvBhU0LU58qvqM=", + "requires": { + "duplexer": "~0.1.1", + "from": "~0", + "map-stream": "~0.0.3", + "pause-stream": "0.0.11", + "split": "0.2", + "stream-combiner": "~0.0.3", + "through": "~2.3.1" + } + }, + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", + "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "map-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", + "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "requires": { + "through": "~2.3" + } + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "readdirp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.0.1.tgz", + "integrity": "sha1-ZyqgxQE+eUKZa786OSv2mu+J1aU=", + "requires": { + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "split": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", + "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=", + "requires": { + "through": "2" + } + }, + "stream-combiner": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "requires": { + "duplexer": "~0.1.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + }, + "urijs": { + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz", + "integrity": "sha512-s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w==" + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "xmldom": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.17.tgz", + "integrity": "sha1-xd663AafCjln3fvAE5Wk18sNQoI=" + } + } +} diff --git a/utils/ruleset-whitelist-cleanup.sh b/utils/ruleset-allowlist-cleanup.sh similarity index 93% rename from utils/ruleset-whitelist-cleanup.sh rename to utils/ruleset-allowlist-cleanup.sh index a906236f5bed..1975665b41bf 100755 --- a/utils/ruleset-whitelist-cleanup.sh +++ b/utils/ruleset-allowlist-cleanup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Remove from ruleset whitelist the filenames of files that +# Remove from ruleset allowlist the filenames of files that # no longer exist or have no matching hash sums. # Change directory to git root; taken from ../test/test.sh @@ -14,7 +14,7 @@ fi # Run from ruleset folder to simplify sha256sum output cd src/chrome/content/rules -WLIST=../../../../utils/ruleset-whitelist.csv +WLIST=../../../../utils/ruleset-allowlist.csv DELIM="," (read; while IFS=$DELIM read listed_hash coverage_flag fetch_flag file; do diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-allowlist.csv similarity index 100% rename from utils/ruleset-whitelist.csv rename to utils/ruleset-allowlist.csv From 01c77f0076d0a670652ff33b8e187195fb2ce63d Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Wed, 9 Sep 2020 13:36:26 -0700 Subject: [PATCH 2/5] Remove cache files that snuck in --- test/.pytest_cache/README.md | 8 -------- test/.pytest_cache/v/cache/nodeids | 1 - test/selenium/.pytest_cache/README.md | 8 -------- test/selenium/.pytest_cache/v/cache/lastfailed | 6 ------ test/selenium/.pytest_cache/v/cache/nodeids | 1 - test/selenium/dummy-chromium.pem | 13 ------------- 6 files changed, 37 deletions(-) delete mode 100644 test/.pytest_cache/README.md delete mode 100644 test/.pytest_cache/v/cache/nodeids delete mode 100644 test/selenium/.pytest_cache/README.md delete mode 100644 test/selenium/.pytest_cache/v/cache/lastfailed delete mode 100644 test/selenium/.pytest_cache/v/cache/nodeids delete mode 100644 test/selenium/dummy-chromium.pem diff --git a/test/.pytest_cache/README.md b/test/.pytest_cache/README.md deleted file mode 100644 index bb78ba07ee53..000000000000 --- a/test/.pytest_cache/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# pytest cache directory # - -This directory contains data from the pytest's cache plugin, -which provides the `--lf` and `--ff` options, as well as the `cache` fixture. - -**Do not** commit this to version control. - -See [the docs](https://docs.pytest.org/en/latest/cache.html) for more information. diff --git a/test/.pytest_cache/v/cache/nodeids b/test/.pytest_cache/v/cache/nodeids deleted file mode 100644 index 0637a088a01e..000000000000 --- a/test/.pytest_cache/v/cache/nodeids +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/test/selenium/.pytest_cache/README.md b/test/selenium/.pytest_cache/README.md deleted file mode 100644 index bb78ba07ee53..000000000000 --- a/test/selenium/.pytest_cache/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# pytest cache directory # - -This directory contains data from the pytest's cache plugin, -which provides the `--lf` and `--ff` options, as well as the `cache` fixture. - -**Do not** commit this to version control. - -See [the docs](https://docs.pytest.org/en/latest/cache.html) for more information. diff --git a/test/selenium/.pytest_cache/v/cache/lastfailed b/test/selenium/.pytest_cache/v/cache/lastfailed deleted file mode 100644 index 517917ed6ace..000000000000 --- a/test/selenium/.pytest_cache/v/cache/lastfailed +++ /dev/null @@ -1,6 +0,0 @@ -{ - "test_navigation.py": true, - "test_options.py": true, - "test_options.py::OptionsTest::test_options": true, - "test_popup.py": true -} \ No newline at end of file diff --git a/test/selenium/.pytest_cache/v/cache/nodeids b/test/selenium/.pytest_cache/v/cache/nodeids deleted file mode 100644 index 0637a088a01e..000000000000 --- a/test/selenium/.pytest_cache/v/cache/nodeids +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/test/selenium/dummy-chromium.pem b/test/selenium/dummy-chromium.pem deleted file mode 100644 index 918c85ca0a60..000000000000 --- a/test/selenium/dummy-chromium.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIB5QIBADANBgkqhkiG9w0BAQEFAASCAc8wggHLAgEAAmEA7brIN8QmkHir3fKz -zU7jdhaojpru/NwAqp5mbW4gGqOhEnxcYGoa48nDm5aXMBAlRQRh8OtmR6sMSizT -a6JsQwmOt0u29B9dG0m/22hGCwHoXcnZB+gO30kmfN3KyDzJAgMBAAECYQCKJ1AP -yHg44UfP9imzmLLrf4N5TGSyog/pF6Ci26rgkFMc8RSmG0OBOVHp63v1PIutUrOp -9Lhcmg7QR6RVtETbHbk9H4Yaqqqszn1D1FxdHyl46Q7MhAYXCMuFE1LYTHkCMQD+ -FmqGX2mf5yLlx+IWVxgZLzuL/jGurVg/UyaX1Kprq1RiBMNgtjFjSkGQOYggj78C -MQDvhNjUD3W62hVjwmjZINSy2WUYxds9WOzCTkL/FfBiuckLJTgjT5WK2DNoMWbV -VXcCMQDZK7Gq3jw6VuVF/r0oGRLY270Kn545TaICpgBzf2qWEl9SU/3mWHMICXzW -V8YZBqMCMA0YRz54xef8SlUU6OSODfLlPci38H+PIAqTesg1a9oJ7DrmwwXzMOrR -XSYiJUweiwIwej6E3/pugTS8OYIovSzB2Iph6c3knluUWOcwnYgM4pUnXJKFJxpI -a4aCS0OEUbLJ ------END PRIVATE KEY----- From 98ae9d8656e315d380ea30cf627997a86f82eb22 Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Wed, 9 Sep 2020 13:58:31 -0700 Subject: [PATCH 3/5] Remove package.json generated file that also snuck in --- utils/rewriter/package-lock.json | 170 ------------------------------- 1 file changed, 170 deletions(-) delete mode 100644 utils/rewriter/package-lock.json diff --git a/utils/rewriter/package-lock.json b/utils/rewriter/package-lock.json deleted file mode 100644 index 0778b1fd65b8..000000000000 --- a/utils/rewriter/package-lock.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "name": "https-everywhere-rewriter", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" - }, - "event-stream": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz", - "integrity": "sha1-A4u7LqnqkDhbJvvBhU0LU58qvqM=", - "requires": { - "duplexer": "~0.1.1", - "from": "~0", - "map-stream": "~0.0.3", - "pause-stream": "0.0.11", - "split": "0.2", - "stream-combiner": "~0.0.3", - "through": "~2.3.1" - } - }, - "from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" - }, - "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "map-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", - "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=" - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "pause-stream": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", - "requires": { - "through": "~2.3" - } - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.0.1.tgz", - "integrity": "sha1-ZyqgxQE+eUKZa786OSv2mu+J1aU=", - "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "split": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", - "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=", - "requires": { - "through": "2" - } - }, - "stream-combiner": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", - "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", - "requires": { - "duplexer": "~0.1.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - }, - "urijs": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz", - "integrity": "sha512-s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w==" - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "xmldom": { - "version": "0.1.17", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.17.tgz", - "integrity": "sha1-xd663AafCjln3fvAE5Wk18sNQoI=" - } - } -} From 5bf96878a12755bb7c2322dc0109cdf0eefc50ee Mon Sep 17 00:00:00 2001 From: Alexis Date: Thu, 1 Oct 2020 17:19:14 -0700 Subject: [PATCH 4/5] Update docs/es/faq.md Co-authored by @andresbase --- docs/es/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/es/faq.md b/docs/es/faq.md index 7592e873a2e7..f96f4f537e74 100644 --- a/docs/es/faq.md +++ b/docs/es/faq.md @@ -12,7 +12,7 @@ recursos [enumerados aquí](https://www.eff.org/https-everywhere/development). inalámbrica?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) * [¿Habrá una versión de HTTPS Everywhere para IE, Safari o algún otro navegador?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) -* [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué +* [¿Por qué utilizar una lista de sitios aprobados que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) From ef08780ebd6ff36fb9567da3e51c267929188b1e Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Thu, 1 Oct 2020 17:36:32 -0700 Subject: [PATCH 5/5] Amend Spanish Translation --- docs/es/faq.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/es/faq.md b/docs/es/faq.md index 7592e873a2e7..bdd7547fc376 100644 --- a/docs/es/faq.md +++ b/docs/es/faq.md @@ -12,7 +12,7 @@ recursos [enumerados aquí](https://www.eff.org/https-everywhere/development). inalámbrica?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) * [¿Habrá una versión de HTTPS Everywhere para IE, Safari o algún otro navegador?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) -* [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué +* [¿Por qué utilizar una lista de sitios aprobados que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) @@ -82,7 +82,7 @@ estos navegadores, no dude en hacérnoslo saber en https-everywhere en EFF.org (pero tenga en cuenta que modificar document.location o window.location en JavaScript no es seguro). -### [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) +### [¿Por qué utilizar una lista de sitios aprobados que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) Hay varios problemas con la idea de tratar de detectar automáticamente HTTPS en cada sitio. No hay ninguna garantía de que los sitios van a dar la misma