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..bdd7547fc376 100644 --- a/docs/es/faq.md +++ b/docs/es/faq.md @@ -12,10 +12,10 @@ 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-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 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 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/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/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