Skip to content

Commit 9601338

Browse files
martinthomasmartinthomas
authored
Merge pull request #2 from EFForg/master
Get up to date
2 parents 174decb + fa81324 commit 9601338

File tree

10,023 files changed

+67989
-48592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,023 files changed

+67989
-48592
lines changed

‎.build_exclusions‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ chrome/content/rules/validity-*
1010
chrome/content/rules/make-*
1111
*.xcf.gz
1212
.gitignore
13-
webextension/.gitignore
14-
chrome-resources/update-from-chrome-svn.sh
15-
webextension/chrome-resources/update-from-chrome-svn.sh
1613
.eslintrc.json
17-
webextension/.eslintrc.json
1814
.eslintignore
1915
node_modules
16+
package-lock.json
17+
test

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EditorConfig is awesome: http://EditorConfig.org
1+
# EditorConfig is awesome: https://EditorConfig.org
22

33
root = true
44

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,8 @@
44
[//]: # (Please help us by following this issue template.)
55
[//]: # (You can delete all blank lines and all lines starting)
66
[//]: # (with the comment marker, such as this one.)
7-
[//]: #
8-
[//]: # (Delete all but one of the following "Type" lines.)
9-
[//]: # (Leave in the line that best describes the issue you are reporting.)
107

11-
Type: ruleset issue
12-
Type: new ruleset
13-
Type: code issue
14-
Type: feature request
158
Type: other
169

17-
[//]: # (If you are reporting a ruleset/website problem, include the top-level)
18-
[//]: # (domain below. For example, if you want to report an issue about)
19-
[//]: # ("one.example.com" and "two.example.com", then the line below should)
20-
[//]: # (be:)
21-
[//]: #
22-
[//]: # (Domain: example.com)
23-
[//]: #
24-
[//]: # (Be sure to remove the parenthesis and comment marker. If you are only)
25-
[//]: # (reporting an issue about "one.example.com", then the line below should)
26-
[//]: # (be:)
27-
[//]: #
28-
[//]: # (Domain: one.example.com)
29-
[//]: #
30-
[//]: # (Only include one top-level domain. If you have more than one top-level)
31-
[//]: # (domain to report, such as both "example.com" and "example.org", open a)
32-
[//]: # (new issue for each top-level domain.)
33-
[//]: #
34-
[//]: # (If you are not reporting a ruleset/website problem, you can delete the)
35-
[//]: # ("Domain" line or leave it blank.)
36-
37-
Domain:
38-
3910
[//]: # (Include any other relevant information below. Thank you again for)
4011
[//]: # (helping to improve HTTPS Everywhere.)

‎.github/ISSUE_TEMPLATE/code-issue.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Code issue report
3+
about: Report an issue about our code
4+
---
5+
6+
[//]: # (Thank you for reporting an issue to HTTPS Everywhere.)
7+
[//]: # (We welcome input from users on improving this project.)
8+
[//]: #
9+
[//]: # (Please help us by following this issue template.)
10+
[//]: # (You can delete all blank lines and all lines starting)
11+
[//]: # (with the comment marker, such as this one.)
12+
13+
Type: code issue
14+
15+
[//]: # (Include any other relevant information below. Thank you again for)
16+
[//]: # (helping to improve HTTPS Everywhere.)

‎.github/ISSUE_TEMPLATE/feature-request.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Feature request
3+
about: Request a feature to help us improve HTTPS Everywhere
4+
---
5+
6+
[//]: # (Thank you for reporting an issue to HTTPS Everywhere.)
7+
[//]: # (We welcome input from users on improving this project.)
8+
[//]: #
9+
[//]: # (Please help us by following this issue template.)
10+
[//]: # (You can delete all blank lines and all lines starting)
11+
[//]: # (with the comment marker, such as this one.)
12+
13+
Type: feature request
14+
15+
[//]: # (Include any other relevant information below. Thank you again for)
16+
[//]: # (helping to improve HTTPS Everywhere.)

‎.github/ISSUE_TEMPLATE/new-ruleset.md‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
name: New ruleset
3+
about: Request/submit a new ruleset
4+
---
5+
6+
[//]: # (Thank you for reporting an issue to HTTPS Everywhere.)
7+
[//]: # (We welcome input from users on improving this project.)
8+
[//]: #
9+
[//]: # (Please help us by following this issue template.)
10+
[//]: # (You can delete all blank lines and all lines starting)
11+
[//]: # (with the comment marker, such as this one.)
12+
[//]: #
13+
[//]: # (Delete all but one of the following "Type" lines.)
14+
[//]: # (Leave in the line that best describes the issue you are reporting.)
15+
[//]: #
16+
[//]: # (If you are submitting a new ruleset, please check the list at)
17+
[//]: # (https://www.eff.org/https-everywhere/atlas/index.html and the open)
18+
[//]: # (issues and pull requests to make sure it doesn't already exist.)
19+
20+
Type: new ruleset
21+
22+
[//]: # (If you are reporting a ruleset/website problem, include the top-level)
23+
[//]: # (domain below. For example, if you want to report an issue about)
24+
[//]: # ("one.example.com" and "two.example.com", then the line below should)
25+
[//]: # (be:)
26+
[//]: #
27+
[//]: # (Domain: example.com)
28+
[//]: #
29+
[//]: # (Be sure to remove the parenthesis and comment marker. If you are only)
30+
[//]: # (reporting an issue about "one.example.com", then the line below should)
31+
[//]: # (be:)
32+
[//]: #
33+
[//]: # (Domain: one.example.com)
34+
[//]: #
35+
[//]: # (Only include one top-level domain. If you have more than one top-level)
36+
[//]: # (domain to report, such as both "example.com" and "example.org", open a)
37+
[//]: # (new issue for each top-level domain.)
38+
39+
Domain:
40+
41+
[//]: # (Include any other relevant information below. Thank you again for)
42+
[//]: # (helping to improve HTTPS Everywhere.)

‎.github/ISSUE_TEMPLATE/ruleset-issue.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Ruleset/website issue report
3+
about: Report a issue about a ruleset/website
4+
---
5+
6+
[//]: # (Thank you for reporting an issue to HTTPS Everywhere.)
7+
[//]: # (We welcome input from users on improving this project.)
8+
[//]: #
9+
[//]: # (Please help us by following this issue template.)
10+
[//]: # (You can delete all blank lines and all lines starting)
11+
[//]: # (with the comment marker, such as this one.)
12+
[//]: #
13+
14+
Type: ruleset/website issue
15+
16+
[//]: # (Uncomment and fill the domain bellow if you belive that yet another)
17+
[//]: # (domain should be added to the existing ruleset.)
18+
19+
[//]: # Domain:
20+
21+
[//]: # (Include any other relevant information below. Thank you again for)
22+
[//]: # (helping to improve HTTPS Everywhere.)

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ os: linux
33
dist: trusty
44
language: python
55
python: 3.6
6-
group: deprecated-2017Q4
6+
group: bionic
77
services:
88
- docker
99
matrix:
@@ -12,11 +12,11 @@ matrix:
1212
- env: TEST="lint"
1313
language: node_js
1414
node_js:
15-
- "node"
15+
- "lts/*"
1616
- env: TEST="unittests"
1717
language: node_js
18-
node_js: node
19-
- "node"
18+
node_js:
19+
- "lts/*"
2020
- env: TEST="validations"
2121
- env: TEST="fetch"
2222
- env: TEST="preloaded"

‎CODE_OF_CONDUCT.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This project is governed by [EFF's Public Projects Code of Conduct](https://www.eff.org/pages/eppcode).

‎CONTRIBUTING.md‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* [Welcome!](#welcome)
44
* [HTTPS Everywhere Source Code Layout](#https-everywhere-source-code-layout)
55
* [Submitting Changes](#submitting-changes)
6+
* [I Want To Fix My Site](#i-want-to-fix-my-site)
67
* [Contributing Rulesets](#contributing-rulesets)
78
* [General Info](#general-info)
89
* [New Rulesets](#new-rulesets)
@@ -47,6 +48,8 @@ If you get stuck we have two publicly-archived mailing lists: the https-everywhe
4748

4849
You can also find more information on about HTTPS Everywhere on our [FAQ](https://www.eff.org/https-everywhere/faq) page.
4950

51+
Also, please remember that this project is governed by [EFF's Public Projects Code of Conduct](https://www.eff.org/pages/eppcode).
52+
5053
Thanks again, and we look forward to your contributions!
5154

5255

@@ -68,6 +71,20 @@ To submit changes, open a pull request from our [GitHub repository](https://gith
6871

6972
HTTPS Everywhere is maintained by a limited set of staff and volunteers. Please be mindful that we may take a while before we're able to review your contributions.
7073

74+
## I Want To Fix My Site
75+
76+
**"I want to get an SSL certificate"**
77+
78+
To get an SSL certificate, as an option, you can go to [Let's Encrypt](https://letsencrypt.org/) and get a free certificate.
79+
80+
**"I have an SSL certificate, but it's not configured properly"**
81+
82+
Scan your site at the [Mozilla Observatory](https://observatory.mozilla.org/) and get results on what is wrong/insecure about your site, as well as tips and directions on how to fix those issues.
83+
84+
**"How do I get on the HSTS Preload list?"**
85+
86+
In order to do this, you must have an SSL certificate correctly installed and your site redirecting to HTTPS. As well as meet a few extra requirements for the [`HTTP Strict-Transport-Security`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security) header. To view "how close" your site is for HSTS preloading, scan your site [here](https://hstspreload.org/).
87+
7188
* * *
7289

7390
# Contributing Rulesets
@@ -326,7 +343,7 @@ In `utils` we have a tool called `hsts-prune` which removes `targets` from rules
326343

327344
> Let `included domain` denote either a `target`, or a parent of a `target`. Let `supported browsers` include the ESR, Dev, and Stable releases of Firefox, and the Stable release of Chromium. If `included domain` is a parent of the `target`, the `included domain` must be present in the HSTS preload list for all `supported browsers` with the relevant flag which denotes inclusion of subdomains set to `true`. If `included domain` is the `target` itself, it must be included the HSTS preload list for all `supported browsers`. Additionally, if the http endpoint of the `target` exists, it must issue a 3XX redirect to the https endpoint for that target. Additionally, the https endpoint for the `target` must deliver a `Strict-Transport-Security` header with the following directives present:
328345
>
329-
> - `max-age` >= 10886400
346+
> - `max-age` >= 31536000
330347
> - `includeSubDomains`
331348
> - `preload`
332349
>
@@ -372,13 +389,6 @@ We ask that if you want to delete your GitHub account, you either close your HTT
372389
* * *
373390

374391
# Contributing Translations
375-
376-
HTTPS Everywhere translations are handled through Transifex. The easiest way to help with translations is to [create a Transifex account](https://www.transifex.com/signup/) if you don't already have one. Then log into your account and click "Explore", then search for "Tor Project", and click on The Tor Project. Then choose the language you plan to translate into, click on the name of that language, and then click "Join team" and "Go" to accept joining the translation team for your language.
377-
378-
Then, in the Tor Project resources list, find and click the link for the file
379-
380-
HTTPS Everywhere - https-everywhere.dtd
381-
382-
and choose "Translate now" to enter the translation interface.
392+
We are reviewing our process around translations and currently discussing ways to improve. Translations are still processed under the same entity and those who have an account already, do not need to take action at this time. Thank you for your contributions.
383393

384394
* * *

0 commit comments

Comments
 (0)