diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 27850d1b..ee30fb33 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -13,14 +13,49 @@ Please read this before contributing. We're trying to keep it simple and promote the best tools, not all of them. ## Software Criteria - +### Main - Easy to use. Could your mother use that tool or service? Usability is most important. - Cross-platform / Accessible. - Privacy respecting. - Open Source / free software is preferred but not required. +- Must list source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md) (if applicable) +- Prioritize Products without Vendor Lock-in (decentralized/self-hostable) or data interoperability. There can be exceptions if no software is available that meet the criteria. +Note: This criteria applies to all of privacytools.io +### Proividers +- Prioritize Products by privacy respecting nationality. + +### VPN +- Prioritize Products by privacy respecting nationality. +- Cannot be based in USA or UK. +- Must be acessable via free software (i.e OpenVPN, WireGuard) +- Use Encryption +- Accept Cryptocurrency +- No logging policy + +### Email +- Outside of USA +- Support SMTP SSL +- Accessable Using Free Software (i.e IMAP) + +### Hardware +- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable) +- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when avalible. +- Cannot lock users to a particular platform. + +### Software +- Must be able to download over encrypted network (can be a mirror) +- Must be free software + +### Encryption +- Only verifiable encryption is to be trusted + +### OSes +- Must state if recommends, depends on, or offers non-free software (contrib) +- No Tracking Policy (opt-in analytics is ok) + ## Images - Provider logos are 200px x 70px ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png)) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index e3ecf696..3bd5313b 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,3 @@ +liberapay: privacytools.io patreon: privacytools custom: https://www.privacytools.io/donate/ diff --git a/.github/ISSUE_TEMPLATE/3_Discussion.md b/.github/ISSUE_TEMPLATE/3_Discussion.md index 506b96e2..dc53ae9e 100644 --- a/.github/ISSUE_TEMPLATE/3_Discussion.md +++ b/.github/ISSUE_TEMPLATE/3_Discussion.md @@ -1,3 +1,8 @@ + + --- name: "💬 Discussion" about: Discuss the website or any mentioned software in general. diff --git a/.github/ISSUE_TEMPLATE/6_Translation_Issues.md b/.github/ISSUE_TEMPLATE/6_Translation_Issues.md new file mode 100644 index 00000000..95843a0a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/6_Translation_Issues.md @@ -0,0 +1,21 @@ +--- +name: "🇦🇶 Translation Issue" +about: Report any issue with a translated site. +title: "🇦🇶 Translated Site Issue | " +labels: 🌐 website issue, 🇦🇶 translations +--- + +## Site Affected + +**Domain:** + + +- [ ] This site is listed as a translated version of the site in the privacytools.io navbar. + +## Description + + diff --git a/.well-known/matrix/client b/.well-known/matrix/client index 20a0718d..ee6d0a59 100644 --- a/.well-known/matrix/client +++ b/.well-known/matrix/client @@ -3,6 +3,6 @@ "base_url": "https://chat.privacytools.io" }, "m.identity_server": { - "base_url": "https://vector.im" + "base_url": "https://chat.privacytools.io" } } diff --git a/.well-known/security.txt b/.well-known/security.txt index b4cc04d6..6e804b30 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -2,3 +2,4 @@ Contact: admin@privacytools.io Encryption: https://www.jonaharagon.com/keys/ Preferred-Languages: en Canonical: https://www.privacytools.io/.well-known/security.txt +Policy: https://github.com/privacytoolsIO/privacytools.io/security/policy diff --git a/README.md b/README.md index a1c77d14..d93cbf6a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![privacytools](https://privacytools.io/assets/img/layout/logo.png)](https://www.privacytools.io/) +[![privacytools](./assets/img/layout/logo.png)](https://www.privacytools.io/) _Encryption Against Global Mass Surveillance._ @@ -31,6 +31,7 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri # Community Translations - [繁体中文 / Chinese](https://privacytools.twngo.xyz/) - [GitHub](https://github.com/twngo/privacytools-zh) - [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es) +- [Polski / Polish](https://pl.privacytools.io) - [Gitea](https://git.privacytools.io/pl-privacytoolsIO/pl.privacytools.io) - [Deutsch / German](https://privacytools.it-sec.rocks/) - [GitHub](https://github.com/Anon215/privacytools.it-sec.rocks) - [Français / French](https://privacytools.dreads-unlock.fr/) - [GitLab](https://gitlab.com/Booteille/privacytools) - [Italiano / Italian](https://privacytools-it.github.io/) - [GitHub](https://github.com/privacytools-it/privacytools-it.github.io) diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..1d363102 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,35 @@ +# Security Policies and Procedures + +This document outlines security procedures and policies for the `privacytools.io` repository/code and all services hosted by privacytools.io, such as Mastodon, Matrix, Riot, et cetera. + +## Reporting a Bug + +We take all security bugs related to our code and our infrastructure very seriously. Thank you for improving the security of our projects and services. We appreciate your efforts and responsible disclosure, and will make every effort to acknowledge your contributions. + +Report any security bugs by emailing the services administrator at [admin@privacytools.io](mailto:admin@privacytools.io). + +The administrative team will acknowledge your message within 48 hours, and will provide a detailed response within 72 hours detailing the next steps for handling your report. After our initial reply we will make every effort to keep you informed of the progress towards a fix and announcement, and we may ask for additional information or guidance. + +Please report any security bugs in third-party projects to the person or team maintaining that project. + +The following are out of scope and should **not** be attacked/performed: + +* Excessive Automated Scans +* Denial of Service Attacks +* Social Engineering Attacks +* Reports against infrastructure outside our control +* User or admin accounts not owned by the tester + +## Disclosure Policy + +When we receive a security report, that report will be assigned to an administrative team member. That person will coordinate the fix, release, and announcement process, involving the following steps: + +1. Confirm the problem and determine affected services. +2. Audit infrastructure and/or code to find any potential similar problems. +3. Prepare fixes for all releases currently in production, which will be implemented as quickly as possible. + +Additionally, if user data was directly affected or compromised, we will inform affected users to the best of our ability via email and/or a website notification with more information about the incident. + +## Comments on this Policy + +Please open a Pull Request or Issue if you would like to discuss any changes to this policy. diff --git a/_includes/card.html b/_includes/card.html index e6040222..dbc353c4 100644 --- a/_includes/card.html +++ b/_includes/card.html @@ -56,7 +56,7 @@ {% if include.tor %} Tor {% endif %} - + {% if include.git %} Git {% endif %} diff --git a/_includes/cardv2.html b/_includes/cardv2.html index f96dc6e8..86f6e3f0 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -7,42 +7,47 @@ {{include.title}} {{include.description}}

- Website - {% if include.forum %} - Forum - {% endif %} - {% if include.tor %} - Tor - {% endif %} +
+
+ Website + {% if include.forum %} + Forum + {% endif %} + {% if include.tor %} + Tor + {% endif %} +
-
- {% if include.windows %}{% endif %} - {% if include.mac %}{% endif %} - {% if include.linux %}{% endif %} - {% if include.bsd %}{% endif %} +
+ {% if include.windows %}{% endif %} + {% if include.mac %}{% endif %} + {% if include.linux %}{% endif %} + {% if include.bsd %}{% endif %} - {% if include.firefox %}{% endif %} - {% if include.chrome %}{% endif %} - {% if include.safari %}{% endif %} - {% if include.opera %}{% endif %} - {% if include.edge %}{% endif %} + {% if include.firefox %}{% endif %} + {% if include.chrome %}{% endif %} + {% if include.safari %}{% endif %} + {% if include.opera %}{% endif %} + {% if include.edge %}{% endif %} - {% if include.android %}{% endif %} - {% if include.ios %}{% endif %} - {% if include.fire %}{% endif %} + {% if include.android %}{% endif %} + {% if include.ios %}{% endif %} + {% if include.fire %}{% endif %} - {% if include.web %}{% endif %} + {% if include.web %}{% endif %} - {{include.icon1}} - {{include.icon2}} - {{include.icon3}} + {{include.icon1}} + {{include.icon2}} + {{include.icon3}} - {% if include.github %}{% endif %} - {% if include.gitlab %}{% endif %} - {% if include.git %}{% endif %} + {% if include.github %}{% endif %} + {% if include.gitlab %}{% endif %} + {% if include.git %}{% endif %} + {% if include.source %}{% endif %} +
-
\ No newline at end of file +
diff --git a/_includes/footer.html b/_includes/footer.html index ba4c9a92..7472a098 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -7,36 +7,36 @@
@@ -72,7 +72,7 @@

No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt. View our privacy policy.

-

Tor v3: privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion (Learn More)

+

Tor v3: privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion (Learn More)

diff --git a/_includes/nav.html b/_includes/nav.html index 18e6c3d4..bb50d012 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -16,9 +16,12 @@
Avoid US & UK services Cloud Storage + Social Networks + Social News Aggregators DNS Email Hosting + Pastebins Search Engines Social Networks VPN @@ -41,6 +44,7 @@ Software
+ Calendar/Contacts Sync Tools Digital Notebook Email Alternatives Email Clients @@ -80,6 +84,7 @@
繁體中文 Español + Polski Português Deutsch Italiano diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index 95edd4e0..d061eacb 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -8,8 +8,7 @@ {% include cardv2.html title="Privacy Badger: Stop Tracking" image="/assets/img/addons/privacy-badger.png" -description="Privacy Badger is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse. warning " +description="Privacy Badger is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse." website="https://www.eff.org/privacybadger" forum="https://forum.privacytools.io/t/discussion-privacy-badger/265" github="https://github.com/EFForg/privacybadger" @@ -83,6 +82,18 @@ opera="" safari="" %} +{% include cardv2.html +title="Snowflake" +image="/assets/img/addons/snowflake.png" +description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead." +website="https://snowflake.torproject.org" +forum="https://forum.privacytools.io/t/discussion-snowflake/1146" +github="https://gitweb.torproject.org/pluggable-transports/snowflake.git" +firefox="" +chrome="" +%} + +

For Experts Only