Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/en_US/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

@cschanaj cschanaj Sep 10, 2020 •

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find this question in the FAQ is misleading on how HTTPS Everywhere works. It is also inconsistent with the terminology we use. I believe this question would be better rephrased to avoid confusion.

HTTPS Everywhere use a collection of peer-reviewed rulesets to upgrade insecure HTTP connections to HTTPS. We also use the terminology "Add a rule for this site" on the extension user interface, our users "Enable"/ "Disable" rules with checkbox as needed.

Would something like Why use bundled rulesets to upgrade insecure connections to HTTPS? better?

P.S. I am not a native English speaker, so please forgive me if I am asking a weird question.

@pipboy96 pipboy96 Sep 10, 2020 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest "Why not just redirect all websites by default?" "Why not redirect every possible website?". The simplest wording possible is often the best one.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can change the wording, just have to coordinate a small effort to get the translation. I can schedule that into the next round of documentation updates. Wanted to focus on this renaming portion first. I will note this in the documentation items that need to be done.

Thank you both so much for reviewing with great care and compassion.

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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/es/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/rules/coverage.checker.config
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion test/rules/http.checker.config
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
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 "<target\s+host=\s*\"$REGEX_ESCAPED_HOST\"\s*/>" src/chrome/content/rules/*.xml | wc -l`
if [ $REPEATS -gt 1 ]; then
echo $host
fi
done > $TMPFILE

cp --force $TMPFILE test/validations/special/duplicate-whitelist.txt
cp --force $TMPFILE test/validations/special/duplicate-allowlist.txt
6 changes: 3 additions & 3 deletions test/validations/special/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/*')
Expand Down Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
File renamed without changes.