From 8e1cfcf3bde531dc3ea9131ec4d0e2ea5bb64598 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 09:52:11 -0500 Subject: [PATCH 01/12] Update label syntax Adds support for custom icons and better (more consistent) links --- _includes/cardv2.html | 55 ++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 031f52ab..e7eb4b52 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -41,23 +41,44 @@ {{ include.description }} {% if include.labels %} {% assign labels = include.labels | split:"|" %} - {% for label in labels %} - {% assign label_data = label | split:":" %} - {% assign color = label_data[0] %} - {% assign text = label_data[1] %} - {% assign tooltip = label_data[2] | default: false %} - {% assign help_icon = '' %} - {{text}} {{ help_icon }} - {% else %} - > {{text}} - {% endif %} - - {% endfor %} + {% for label in labels %} + {% assign label_data = label | split:"::" %} + {% assign label_attr = include.label_data | split:"==" %} + {% for attr in label_attr %} + {% assign i = forloop.index %} + {% if label_attr[i] = "color" } + {% assign color = label_attr[i+1] %} + {% elsif label_attr[i] = "link" %} + {% assign link = label_attr[i+1] %} + {% elsif label_attr[i] = "text" %} + {% assign text = label_attr[i+1] %} + {% elsif label_attr[i] = "icon" %} + {% assign icon = label_attr[i+1] %} + {% elsif label_attr[i] = "tooltip" %} + {% assign tooltip = label_attr[i+1] %} + {% endif %} + {% endfor %} + {% if link %} + {{ text }} + {% else %}> {{ text }}{% endif %} + + {% else %} + {{text}} + {% else %} + > {% if icon %}{% endif %} {{text}} + {% endif %} + + {% endif %} + {% endfor %} {% endif %}

-- 2.47.2 From 602ea000571ccbd78b562162b2fba15e67895e06 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 10:02:55 -0500 Subject: [PATCH 02/12] Add default color --- _includes/cardv2.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index e7eb4b52..c2d1b6bb 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -60,7 +60,7 @@ {% endfor %} {% if link %} {{ text }} @@ -68,7 +68,7 @@ {% else %} Date: Wed, 13 May 2020 10:31:33 -0500 Subject: [PATCH 03/12] Fix the operators --- _includes/cardv2.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index c2d1b6bb..adfd75e3 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -43,20 +43,20 @@ {% assign labels = include.labels | split:"|" %} {% for label in labels %} {% assign label_data = label | split:"::" %} - {% assign label_attr = include.label_data | split:"==" %} + {% assign label_attr = label_data | split:"==" %} {% for attr in label_attr %} - {% assign i = forloop.index %} - {% if label_attr[i] = "color" } - {% assign color = label_attr[i+1] %} - {% elsif label_attr[i] = "link" %} - {% assign link = label_attr[i+1] %} - {% elsif label_attr[i] = "text" %} - {% assign text = label_attr[i+1] %} - {% elsif label_attr[i] = "icon" %} - {% assign icon = label_attr[i+1] %} - {% elsif label_attr[i] = "tooltip" %} - {% assign tooltip = label_attr[i+1] %} - {% endif %} + {% assign i = forloop.index %} + {% if label_attr == "color" } + {% assign color = label_attr[i] %} + {% elsif label_attr == "link" %} + {% assign link = label_attr[i] %} + {% elsif label_attr == "text" %} + {% assign text = label_attr[i] %} + {% elsif label_attr == "icon" %} + {% assign icon = label_attr[i] %} + {% elsif label_attr == "tooltip" %} + {% assign tooltip = label_attr[i] %} + {% endif %} {% endfor %} {% if link %} Date: Wed, 13 May 2020 10:36:48 -0500 Subject: [PATCH 04/12] fix variables --- _includes/cardv2.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index adfd75e3..65c3e33b 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -46,16 +46,16 @@ {% assign label_attr = label_data | split:"==" %} {% for attr in label_attr %} {% assign i = forloop.index %} - {% if label_attr == "color" } - {% assign color = label_attr[i] %} - {% elsif label_attr == "link" %} - {% assign link = label_attr[i] %} - {% elsif label_attr == "text" %} - {% assign text = label_attr[i] %} - {% elsif label_attr == "icon" %} - {% assign icon = label_attr[i] %} - {% elsif label_attr == "tooltip" %} - {% assign tooltip = label_attr[i] %} + {% if attr == "color" } + {% assign color = attr[i] %} + {% elsif attr == "link" %} + {% assign link = attr[i] %} + {% elsif attr == "text" %} + {% assign text = attr[i] %} + {% elsif attr == "icon" %} + {% assign icon = attr[i] %} + {% elsif attr == "tooltip" %} + {% assign tooltip = attr[i] %} {% endif %} {% endfor %} {% if link %} -- 2.47.2 From 29925d98e711917b54513e60e85c37c6f3855292 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 10:37:02 -0500 Subject: [PATCH 05/12] update label syntax --- _includes/sections/cloud-storage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index a03c7898..143391c8 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -9,7 +9,7 @@ title="Keybase KBFS" image="/assets/img/svg/3rd-party/keybase.svg" description='Keybase provides 250GB of E2EE cloud storage for free. Its protocol has also been indepedently audited (PDF). Keybase allows you to share files with any Keybase user, or social media user through the use of "identity proofs". They currently do not offer additional space above your quota.' - labels="warning:Warning:This software relies on a closed-source central server." + labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." website="https://book.keybase.io/docs/files" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" @@ -27,7 +27,7 @@ title="Nextcloud - Choose your hoster" image="/assets/img/svg/3rd-party/nextcloud.svg" description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." - labels="warning:Experimental E2EE:Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'." + labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" -- 2.47.2 From c518f558e54d053ce6d78721944c1a5e933b89ad Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 10:45:08 -0500 Subject: [PATCH 06/12] Fix all my bad loops and assignments --- _includes/cardv2.html | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 65c3e33b..3b88f05a 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -43,19 +43,18 @@ {% assign labels = include.labels | split:"|" %} {% for label in labels %} {% assign label_data = label | split:"::" %} - {% assign label_attr = label_data | split:"==" %} - {% for attr in label_attr %} - {% assign i = forloop.index %} - {% if attr == "color" } - {% assign color = attr[i] %} - {% elsif attr == "link" %} - {% assign link = attr[i] %} - {% elsif attr == "text" %} - {% assign text = attr[i] %} - {% elsif attr == "icon" %} - {% assign icon = attr[i] %} - {% elsif attr == "tooltip" %} - {% assign tooltip = attr[i] %} + {% for label_attr in label_data %} + {% assign attr = label_attr | split:"==" %} + {% if attr[0] == "color" } + {% assign color = attr[1] %} + {% elsif attr[0] == "link" %} + {% assign link = attr[1] %} + {% elsif attr[0] == "text" %} + {% assign text = attr[1] %} + {% elsif attr[0] == "icon" %} + {% assign icon = attr[1] %} + {% elsif attr[0] == "tooltip" %} + {% assign tooltip = attr[1] %} {% endif %} {% endfor %} {% if link %} -- 2.47.2 From 58cb1ec15db10b03e2ed17d19192a1f9c016b882 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 10:59:56 -0500 Subject: [PATCH 07/12] Move badge code to separate file --- _includes/badge.html | 20 ++++++++++++++++++++ _includes/cardv2.html | 29 ++++++++--------------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 _includes/badge.html diff --git a/_includes/badge.html b/_includes/badge.html new file mode 100644 index 00000000..ac2a8a7e --- /dev/null +++ b/_includes/badge.html @@ -0,0 +1,20 @@ +{% if include.link %} + {{ include.text }} +{% else %}> {{ include.text }}{% endif %} + +{% else %} + {{include.text}} + {% else %} + > {% if include.icon %}{% endif %} {{include.text}} + {% endif %} + +{% endif %} diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 3b88f05a..87066b83 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -45,7 +45,7 @@ {% assign label_data = label | split:"::" %} {% for label_attr in label_data %} {% assign attr = label_attr | split:"==" %} - {% if attr[0] == "color" } + {% if attr[0] == "color" %} {% assign color = attr[1] %} {% elsif attr[0] == "link" %} {% assign link = attr[1] %} @@ -57,26 +57,13 @@ {% assign tooltip = attr[1] %} {% endif %} {% endfor %} - {% if link %} - {{ text }} - {% else %}> {{ text }}{% endif %} - - {% else %} - {{text}} - {% else %} - > {% if icon %}{% endif %} {{text}} - {% endif %} - - {% endif %} + {% include badge.html + link=link + color=color + text=text + icon=icon + tooltip=tooltip + %} {% endfor %} {% endif %}

-- 2.47.2 From 535d45d7af8fed2bbd38a28cedc95d854eb21021 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 11:05:36 -0500 Subject: [PATCH 08/12] Update cloud-storage.html --- _includes/sections/cloud-storage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index 143391c8..ec9a2081 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -9,7 +9,7 @@ title="Keybase KBFS" image="/assets/img/svg/3rd-party/keybase.svg" description='Keybase provides 250GB of E2EE cloud storage for free. Its protocol has also been indepedently audited (PDF). Keybase allows you to share files with any Keybase user, or social media user through the use of "identity proofs". They currently do not offer additional space above your quota.' - labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." + labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." website="https://book.keybase.io/docs/files" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" @@ -47,6 +47,6 @@

Worth Mentioning

    -
  • Cryptomator - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
    • +
  • Cryptomator - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}
  • CryptPad - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.
-- 2.47.2 From 1e5bffb8fe9c58325dfa68b9651b4d629b1fed68 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 11:08:00 -0500 Subject: [PATCH 09/12] Reset variables --- _includes/cardv2.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 87066b83..9743f3dd 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -64,6 +64,11 @@ icon=icon tooltip=tooltip %} + {% assign color = "" %} + {% assign link = "" %} + {% assign text = "" %} + {% assign icon = "" %} + {% assign tooltip = "" %} {% endfor %} {% endif %}

-- 2.47.2 From 7c819c22c79319b33ce8be82065e458f009caac9 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 11:27:29 -0500 Subject: [PATCH 10/12] Update old-style badges --- _includes/cardv2.html | 10 +++++----- _includes/sections/file-sharing.html | 2 +- _includes/sections/instant-messenger.html | 10 +++++----- _includes/sections/live-operating-systems.html | 2 +- _includes/sections/mobile-operating-systems.html | 6 +++--- _includes/sections/operating-systems.html | 4 ++-- _includes/sections/router-firmware.html | 4 ++-- _includes/sections/search-engines.html | 2 +- _includes/sections/selfhosted-cloud.html | 2 +- _includes/sections/teamchat.html | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 9743f3dd..cd270fa5 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -64,11 +64,11 @@ icon=icon tooltip=tooltip %} - {% assign color = "" %} - {% assign link = "" %} - {% assign text = "" %} - {% assign icon = "" %} - {% assign tooltip = "" %} + {% assign color = nil %} + {% assign link = nil %} + {% assign text = nil %} + {% assign icon = nil %} + {% assign tooltip = nil %} {% endfor %} {% endif %}

diff --git a/_includes/sections/file-sharing.html b/_includes/sections/file-sharing.html index 30d7a6fb..671b2f5d 100644 --- a/_includes/sections/file-sharing.html +++ b/_includes/sections/file-sharing.html @@ -3,7 +3,7 @@ {% include cardv2.html title="Firefox Send" image="/assets/img/svg/3rd-party/firefox_send.svg" -labels="warning:Warning: IP addresses are retained in logs for 90 days." +labels="color==warning::link==https://send.firefox.com/legal::text==Warning::tooltip==IP addresses are retained in logs for 90 days." description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security." website="https://send.firefox.com/" privacy-policy="https://send.firefox.com/legal" diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 5b73f99b..1fa5a774 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -24,7 +24,7 @@ title="Signal" image="/assets/img/svg/3rd-party/signal.svg" description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been indepedently audited (PDF)' - labels="warning:Requires phone number:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP" + labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Requires phone number::tooltip==Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|text==VoIP" website="https://signal.org/" privacy-policy="https://signal.org/legal/" forum="https://forum.privacytools.io/t/discussion-signal/664" @@ -42,7 +42,7 @@ title="Keybase" image="/assets/img/svg/3rd-party/keybase.svg" description='Keybase provides a hosted team chat with E2EE. Its protocol has also been indepedently audited (PDF). Keybase can help you prove you own social media accounts though the use of cryptographic signing of "identity proofs".' - labels="warning:Warning:This software relies on a closed-source central server." + labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." website="https://keybase.io/" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" @@ -94,8 +94,8 @@ include cardv2.html title="Riot" image="/assets/img/svg/3rd-party/riotim.svg" - description='Riot.im is the reference client for the Matrix network. The Matrix open standard is an open-source standard for secure, decentralized, real-time communication.
' - labels="success:VoIP" + description='Riot.im is the reference client for the Matrix network. The Matrix open standard is an open-source standard for secure, decentralized, real-time communication.' + labels="text==VoIP" website="https://about.riot.im/" privacy-policy="https://riot.im/privacy" forum="https://forum.privacytools.io/t/discussion-riot-im/665/" @@ -166,7 +166,7 @@ title="Jami" image="/assets/img/svg/3rd-party/jami.svg" description="Encrypted instant messaging and video calling software. All communications are E2EE using TLS 1.3 and never stored elsewhere than on user's devices, even when TURN servers are used." - labels="warning:Warning:This software is partially centralized but can be self-hosted.|success:VoIP" + labels="color==warning::link==https://git.jami.net/savoirfairelinux/ring-project/issues/765::text==Warning::tooltip==This software is partially centralized but can be self-hosted.|text==VoIP" website="https://jami.net/" privacy-policy="https://jami.net/privacy-policy/" forum="https://forum.privacytools.io/t/discussion-jami/2116" diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index f17db2f5..f566b552 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -5,7 +5,7 @@ title="Tails" image="/assets/img/svg/3rd-party/tails.svg" description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.' badges="info:GNU/Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://tails.boum.org/" git="https://git-tails.immerda.ch/tails/" %} diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/mobile-operating-systems.html index 0db145ab..f17d7ab8 100644 --- a/_includes/sections/mobile-operating-systems.html +++ b/_includes/sections/mobile-operating-systems.html @@ -10,7 +10,7 @@ image="/assets/img/svg/3rd-party/grapheneos.svg" image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg" description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.' badges="info:AOSP" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://grapheneos.org/" github="https://github.com/GrapheneOS/" %} @@ -20,7 +20,7 @@ title="LineageOS" image="/assets/img/svg/3rd-party/lineageos.svg" description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.' badges="info:AOSP" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://www.lineageos.org/" privacy-policy="https://www.lineageos.org/legal/" github="https://github.com/LineageOS" @@ -31,7 +31,7 @@ title="Ubuntu Touch" image="/assets/img/svg/3rd-party/ubuntu.svg" description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." badges="info:GNU/Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://ubuntu-touch.io/" privacy-policy="https://ubports.com/privacy" github="https://github.com/ubports" diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 1fdb8c44..487a432f 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -9,7 +9,7 @@ title="Qubes OS" image="/assets/img/svg/3rd-party/qubes_os.svg" description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.' badges="info:Xen" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://www.qubes-os.org/" privacy-policy="https://www.qubes-os.org/privacy/" github="https://github.com/QubesOS" @@ -21,7 +21,7 @@ title="Fedora Workstation" image="/assets/img/svg/3rd-party/fedora.svg" description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.' badges="info:GNU/Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://getfedora.org/" privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy" git="https://src.fedoraproject.org/" diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index b6988966..cb19f6d5 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -6,7 +6,7 @@ image="/assets/img/svg/3rd-party/openwrt.svg" image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg" description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." badges="info:Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://openwrt.org/" git="https://git.openwrt.org/" %} @@ -17,7 +17,7 @@ image="/assets/img/svg/3rd-party/pfsense.svg" image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg" description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." badges="info:BSD" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://www.pfsense.org/" privacy-policy="https://www.pfsense.org/privacy.html" github="https://github.com/pfsense/" diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index ed90e59e..44d720ff 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -42,7 +42,7 @@ github="https://github.com/Qwant/" title="Startpage.com" image="/assets/img/svg/3rd-party/startpage.svg" description='Startpage.com is a search engine that provides Google search results with complete privacy protection. Startpage BV is a Netherlands-based company that has been dedicated to privacy-respecting search since 2006.' -labels="warning:Warning:Startpage.com was recently acquired by United States-based System1." +labels="color==warning::link==https://support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1::text==Warning::tooltip==Startpage.com was recently acquired by United States-based System1." website="https://www.startpage.com/" privacy-policy="https://www.startpage.com/en/privacy-policy/" forum="https://forum.privacytools.io/t/delisted-discussion-startpage/284" diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html index 15b6aff9..a8e02543 100644 --- a/_includes/sections/selfhosted-cloud.html +++ b/_includes/sections/selfhosted-cloud.html @@ -8,7 +8,7 @@ title="Nextcloud" image="/assets/img/svg/3rd-party/nextcloud.svg" description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." - labels="warning:Experimental E2EE:Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'." + labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index d96b280e..c0b31e45 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -13,7 +13,7 @@ title="Riot" image="/assets/img/svg/3rd-party/riotim.svg" description='Riot.im is the reference client for the Matrix network. The Matrix open standard is an open-source standard for secure, decentralized, real-time communication.
' - labels="success:VoIP" + labels="text==VoIP" website="https://about.riot.im/" privacy-policy="https://riot.im/privacy" forum="https://forum.privacytools.io/t/discussion-riot-im/665/" @@ -32,7 +32,7 @@ title="Rocket.chat" image="/assets/img/svg/3rd-party/rocketchat.svg" description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE." - labels="warning:Experimental E2EE:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes.|success:VoIP" + labels="color==warning::link==https://rocket.chat/docs/user-guides/end-to-end-encryption/::text==Experimental E2EE::tooltip==Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes.|text==VoIP" website="https://rocket.chat/" privacy-policy="https://rocket.chat/privacy" forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223" @@ -50,7 +50,7 @@ title="Keybase" image="/assets/img/svg/3rd-party/keybase.svg" description='Keybase provides a hosted team chat with E2EE. Its protocol has also been indepedently audited (PDF). Keybase can help you prove you own social media accounts through the use of cryptographic signing of "identity proofs".' - labels="warning:Warning:This software relies on a closed-source central server." + labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." website="https://keybase.io/" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" -- 2.47.2 From 4fc19d712891c96988479999a21f37c9d8af53ae Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 May 2020 12:31:30 -0500 Subject: [PATCH 11/12] Additional badge syntax --- _includes/badge.html | 2 +- _includes/sections/dns.html | 22 ++++++++-- _includes/sections/file-encryption.html | 17 ++++++-- pages/providers/dns.html | 54 +++++++++++++++++++++---- 4 files changed, 81 insertions(+), 14 deletions(-) diff --git a/_includes/badge.html b/_includes/badge.html index ac2a8a7e..f908ecf8 100644 --- a/_includes/badge.html +++ b/_includes/badge.html @@ -1,6 +1,6 @@ {% if include.link %} {{ include.text }} diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index d57dc50b..240d87b7 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -112,7 +112,12 @@ malicious domains - + {% include badge.html + link="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain" + color="warning" + icon="fas fa-exclamation-triangle" + tooltip="And some wildcard and IDN domains." + %} @@ -137,7 +142,13 @@ - Cloudflare + Cloudflare + {% include badge.html + link="https://codeberg.org/crimeflare/cloudflare-tor/" + color="warning" + icon="fas fa-exclamation-triangle" + tooltip="Cloudflare is one of the world's largest networks, and a problem considering anonymity and decentralization." + %} Anycast (based in @@ -355,7 +366,12 @@ - Quad9 + Quad9 + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + tooltip="Founders include the Global Cyber Alliance, composed of the City of London Police and Manhattan District Attorney's Office." + %} Anycast (based in diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html index 69c87798..ff9a1da2 100644 --- a/_includes/sections/file-encryption.html +++ b/_includes/sections/file-encryption.html @@ -55,10 +55,21 @@

Worth Mentioning

    -
  • Cryptomator - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
    • +
  • Cryptomator - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" + tooltip="Cryptomator's mobile apps are not open-source." + %}
  • Linux Unified Key Setup (LUKS) - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.
  • Tomb - A simple zsh script for making LUKS containers on the commandline.
  • Hat.sh - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.
    • -
  • Keka - A macOS-only, file archiver with the ability to encrypt files. -
    • +
  • Keka - A macOS-only, file archiver with the ability to encrypt files. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + link="https://github.com/aonez/Keka#so-where-is-the-source-code" + tooltip="This software is no longer open source." + %}
diff --git a/pages/providers/dns.html b/pages/providers/dns.html index db65a9d9..3c8718d9 100644 --- a/pages/providers/dns.html +++ b/pages/providers/dns.html @@ -13,10 +13,21 @@ breadcrumb: "DNS"
  • DNS-over-TLS (DoT) - A security protocol for encrypted DNS on a dedicated port 853. Some providers support port 443 which generally works everywhere while port 853 is often blocked by restrictive firewalls. DoT has two modes:
      • -
    • Oppurtunistic mode: the client attempts to form a DNS-over-TLS connection to the server on port 853 without performing certificate validation. If it fails, it will use unencrypted DNS.
      • +
    • Oppurtunistic mode: the client attempts to form a DNS-over-TLS connection to the server on port 853 without performing certificate validation. If it fails, it will use unencrypted DNS. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + tooltip="In other words automatic mode leaves your DNS traffic vulnerable to SSL strip and MITM attacks." + %}
    • Strict mode: the client connects to a specific hostname and performs certificate validation for it. If it fails, no DNS queries are made until it succeeds.
    -
  • DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443.
    • +
  • DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + link="https://tools.ietf.org/html/rfc8484#section-8.2" + tooltip="DoH contains metadata such as user-agent (which may include system information) that is sent to the DNS server." + %}
  • DNSCrypt - An older yet robust method of encrypting DNS.
@@ -25,9 +36,20 @@ breadcrumb: "DNS"
  • DoH / DoT
      -
    • Check DNSLeakTest.com.
      • +
    • Check DNSLeakTest.com. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + tooltip="Your DNS provider may not appear with their own name, so compare the responses to what you know or can find about your DNS provider. Just ensure you don't see your ISP or old unencrypted DNS provider." + %}
    • Check the website of your DNS provider. They may have a page for telling "you are using our DNS." Examples include AdGuard and Cloudflare.
      • -
    • If using Firefox's trusted recursive resolver (TRR), navigate to about:networking#dns. If the TRR column says "true" for some fields, you are using DoH.
      • +
    • If using Firefox's trusted recursive resolver (TRR), navigate to about:networking#dns. If the TRR column says "true" for some fields, you are using DoH. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + link="https://wiki.mozilla.org/Trusted_Recursive_Resolver" + tooltip="Some fields will say 'false' depending on the the value of network.trr.mode in about:config" + %}
  • dnscrypt-proxy - Check dnscrypt-proxy's wiki on how to verify that your DNS is encrypted.
    • @@ -40,7 +62,14 @@ breadcrumb: "DNS"
    • Encrypted DNS clients for desktop:
        -
      • Firefox comes with built-in DoH support with Cloudflare set as the default resolver, but can be configured to use any DoH resolver. Currently Mozilla is conducting studies before enabling DoH by default for all US-based Firefox users.
        • +
      • Firefox comes with built-in DoH support with Cloudflare set as the default resolver, but can be configured to use any DoH resolver. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + link="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/firefox/" + tooltip=""Cloudflare has agreed to collect only a limited amount of data about the DNS requests that are sent to the Cloudflare Resolver for Firefox via the Firefox browser."" + %} + Currently Mozilla is conducting studies before enabling DoH by default for all US-based Firefox users.
        • DNS over HTTPS can be enabled in Menu -> Preferences (about:preferences) -> Network Settings -> Enable DNS over HTTPS. Set "Use Provider" to "Custom", and enter your DoH provider's address.
        • Advanced users may enable it in about:config by setting network.trr.custom_uri and network.trr.uri as the address you find from the documentation of your DoH provider and network.trr.mode as 2. It may also be desirable to set network.security.esni.enabled to True in order to enable encrypted SNI and make sites supporting ESNI a bit more difficult to track.
          • @@ -49,9 +78,20 @@ breadcrumb: "DNS"
        • Encrypted DNS clients for mobile:
            -
          • Android 9 comes with a DoT client by default.
            • +
          • Android 9 comes with a DoT client by default. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + link="https://www.quad9.net/private-dns-quad9-android9/" + tooltip="...but with some caveats" + %}
              • -
            • We recommend selecting Private DNS provider hostname and entering the DoT address from documentation of your DoT provider to enable strict mode (see Terms above).
              • +
            • We recommend selecting Private DNS provider hostname and entering the DoT address from documentation of your DoT provider to enable strict mode (see Terms above). + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + tooltip="If you are on a network blocking access to port 853, Android will error about the network not having internet connectivity." + %}
          • DNSCloak - An open-source DNSCrypt and DoH client for iOS by the Center for the Cultivation of Technology gemeinnuetzige GmbH.
          • Nebulo - An open-source application for Android supporting DoH and DoT. It also supports caching DNS responses and locally logging DNS queries.
            • -- 2.47.2 From 6c28f65892bb5ba4b0cf9b4a589c3b7fb469ce16 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Sat, 16 May 2020 08:34:30 +0000 Subject: [PATCH 12/12] Changed some missing badges over to the new format --- _includes/sections/file-sharing.html | 77 ++++++++------- .../sections/live-operating-systems.html | 25 +++-- .../sections/mobile-operating-systems.html | 88 +++++++++++------ _includes/sections/operating-systems.html | 94 +++++++++++++------ _includes/sections/router-firmware.html | 73 +++++++++----- _includes/sections/voice-video-messenger.html | 23 +++-- 6 files changed, 246 insertions(+), 134 deletions(-) diff --git a/_includes/sections/file-sharing.html b/_includes/sections/file-sharing.html index 671b2f5d..619dedc3 100644 --- a/_includes/sections/file-sharing.html +++ b/_includes/sections/file-sharing.html @@ -1,52 +1,59 @@

            File Sharing

            {% include cardv2.html -title="Firefox Send" -image="/assets/img/svg/3rd-party/firefox_send.svg" -labels="color==warning::link==https://send.firefox.com/legal::text==Warning::tooltip==IP addresses are retained in logs for 90 days." -description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security." -website="https://send.firefox.com/" -privacy-policy="https://send.firefox.com/legal" -forum="https://forum.privacytools.io/t/discussion-firefox-send/755" -github="https://github.com/mozilla/send" -web="https://send.firefox.com/" -googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend" + title="Firefox Send" + image="/assets/img/svg/3rd-party/firefox_send.svg" + labels="color==warning::link==https://send.firefox.com/legal::text==Warning::tooltip==IP addresses are retained in logs for 90 days." + description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security." + website="https://send.firefox.com/" + privacy-policy="https://send.firefox.com/legal" + forum="https://forum.privacytools.io/t/discussion-firefox-send/755" + github="https://github.com/mozilla/send" + web="https://send.firefox.com/" + googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend" %} {% include cardv2.html -title="OnionShare" -image="/assets/img/svg/3rd-party/onionshare.svg" -website="https://onionshare.org/" -tor="http://lldan5gahapx5k7iafb3s4ikijc4ni7gx5iywdflkba5y2ezyg6sjgyd.onion/" -description="OnionShare is an open-source tool that lets you securely and anonymously share a file of any size. It works by starting a web server accessible as a Tor onion service, with an unguessable URL that you can share with the recipients to download or send files." -forum="https://forum.privacytools.io/t/discussion-onionshare/754" -github="https://github.com/micahflee/onionshare" -windows="https://onionshare.org/#downloads" -mac="https://onionshare.org/#downloads" -linux="https://onionshare.org/#downloads" -freebsd="https://www.freshports.org/www/onionshare/" -openbsd="http://openports.se/net/onionshare" + title="OnionShare" + image="/assets/img/svg/3rd-party/onionshare.svg" + website="https://onionshare.org/" + tor="http://lldan5gahapx5k7iafb3s4ikijc4ni7gx5iywdflkba5y2ezyg6sjgyd.onion/" + description="OnionShare is an open-source tool that lets you securely and anonymously share a file of any size. It works by starting a web server accessible as a Tor onion service, with an unguessable URL that you can share with the recipients to download or send files." + forum="https://forum.privacytools.io/t/discussion-onionshare/754" + github="https://github.com/micahflee/onionshare" + windows="https://onionshare.org/#downloads" + mac="https://onionshare.org/#downloads" + linux="https://onionshare.org/#downloads" + freebsd="https://www.freshports.org/www/onionshare/" + openbsd="http://openports.se/net/onionshare" %} {% include cardv2.html -title="Magic Wormhole" -image="/assets/img/png/3rd-party/magic_wormhole.png" -website="https://magic-wormhole.readthedocs.io" -description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\"" -forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756" -github="https://github.com/warner/magic-wormhole" -windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" -mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" -linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" -freebsd="https://www.freshports.org/net/py-magic-wormhole/" -openbsd="https://pypi.org/project/magic-wormhole/" -netbsd="https://pypi.org/project/magic-wormhole/" + title="Magic Wormhole" + image="/assets/img/png/3rd-party/magic_wormhole.png" + website="https://magic-wormhole.readthedocs.io" + description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\"" + forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756" + github="https://github.com/warner/magic-wormhole" + windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" + mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" + linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" + freebsd="https://www.freshports.org/net/py-magic-wormhole/" + openbsd="https://pypi.org/project/magic-wormhole/" + netbsd="https://pypi.org/project/magic-wormhole/" %}

            Worth Mentioning

              -
            • FramaDrop - Stores a file of any size for 24h. Data is end-to-end encrypted from your browser, powered by LuFi.
              • +
            • FramaDrop - Stores a file of any size for 24h. Data is end-to-end encrypted from your browser, powered by LuFi. + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + link="https://framasoft.org/en/cgu/" + tooltip="FramaDrop logs IP addresses and fingerprints the browser for an unclear amount of time." + %} +
            • croc - Easily and securely send arbitrary-sized files from one computer to another. Similar to Magic Wormhole but without dependencies.
            • FreedomBox - Designed to be your own inexpensive server at home. It runs free software and offers an increasing number of services ranging from a calendar or XMPP server, to a wiki, or VPN.
            diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index f566b552..af0a1014 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -1,13 +1,13 @@

            PC Live Operating Systems

            {% include cardv2.html -title="Tails" -image="/assets/img/svg/3rd-party/tails.svg" -description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.' -badges="info:GNU/Linux" -labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." -website="https://tails.boum.org/" -git="https://git-tails.immerda.ch/tails/" + title="Tails" + image="/assets/img/svg/3rd-party/tails.svg" + description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.' + badges="info:GNU/Linux" + labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + website="https://tails.boum.org/" + git="https://git-tails.immerda.ch/tails/" %}

            Worth Mentioning

            @@ -15,12 +15,19 @@ git="https://git-tails.immerda.ch/tails/"
            • Fedora Workstation - GNU/Linux + {% include badge.html + color="info" + text="GNU/Linux" + %} - Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.
              • +
            • Debian - GNU/Linux + {% include badge.html + color="info" + text="GNU/Linux" + %} - Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.
            diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/mobile-operating-systems.html index f17d7ab8..91ba166d 100644 --- a/_includes/sections/mobile-operating-systems.html +++ b/_includes/sections/mobile-operating-systems.html @@ -5,42 +5,76 @@
{% include cardv2.html -title="GrapheneOS" -image="/assets/img/svg/3rd-party/grapheneos.svg" -image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg" -description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.' -badges="info:AOSP" -labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." -website="https://grapheneos.org/" -github="https://github.com/GrapheneOS/" + title="GrapheneOS" + image="/assets/img/svg/3rd-party/grapheneos.svg" + image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg" + description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.' + badges="info:AOSP" + labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + website="https://grapheneos.org/" + github="https://github.com/GrapheneOS/" %} {% include cardv2.html -title="LineageOS" -image="/assets/img/svg/3rd-party/lineageos.svg" -description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.' -badges="info:AOSP" -labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." -website="https://www.lineageos.org/" -privacy-policy="https://www.lineageos.org/legal/" -github="https://github.com/LineageOS" + title="LineageOS" + image="/assets/img/svg/3rd-party/lineageos.svg" + description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.' + badges="info:AOSP" + labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + website="https://www.lineageos.org/" + privacy-policy="https://www.lineageos.org/legal/" + github="https://github.com/LineageOS" %} {% include cardv2.html -title="Ubuntu Touch" -image="/assets/img/svg/3rd-party/ubuntu.svg" -description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." -badges="info:GNU/Linux" -labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." -website="https://ubuntu-touch.io/" -privacy-policy="https://ubports.com/privacy" -github="https://github.com/ubports" + title="Ubuntu Touch" + image="/assets/img/svg/3rd-party/ubuntu.svg" + description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." + badges="info:GNU/Linux" + labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + website="https://ubuntu-touch.io/" + privacy-policy="https://ubports.com/privacy" + github="https://github.com/ubports" %}

Worth Mentioning

    -
  • Replicant AOSP - An open-source operating system based on Android, aiming to replace all proprietary components with free software.
    • -
  • OmniROM AOSP contrib - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.
    • -
  • MicroG Add-on Package contrib - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at Lineage for microG.
    • +
  • Replicant + {% include badge.html + color="info" + text="AOSP" + %} + - An open-source operating system based on Android, aiming to replace all proprietary components with free software. +
    • + +
  • + OmniROM + {% include badge.html + color="info" + text="AOSP" + %} + {% include badge.html + color="warning" + icon="far fa-question-circle" + text="contrib" + tooltip="This software may depend on or recommend non-free software." + %} + - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform. +
    • + +
  • + MicroG + {% include badge.html + color="info" + text="Add-on Package" + %} + {% include badge.html + color="warning" + icon="far fa-question-circle" + text="contrib" + tooltip="This software may depend on or recommend non-free software." + %} + - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at Lineage for microG. +
diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 487a432f..3f1209c7 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -7,44 +7,80 @@ {% include cardv2.html title="Qubes OS" image="/assets/img/svg/3rd-party/qubes_os.svg" -description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.' -badges="info:Xen" -labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." -website="https://www.qubes-os.org/" -privacy-policy="https://www.qubes-os.org/privacy/" -github="https://github.com/QubesOS" -tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/" + description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.' + badges="info:Xen" + labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + website="https://www.qubes-os.org/" + privacy-policy="https://www.qubes-os.org/privacy/" + github="https://github.com/QubesOS" + tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/" %} {% include cardv2.html -title="Fedora Workstation" -image="/assets/img/svg/3rd-party/fedora.svg" -description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.' -badges="info:GNU/Linux" -labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." -website="https://getfedora.org/" -privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy" -git="https://src.fedoraproject.org/" + title="Fedora Workstation" + image="/assets/img/svg/3rd-party/fedora.svg" + description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.' + badges="info:GNU/Linux" + labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + website="https://getfedora.org/" + privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy" + git="https://src.fedoraproject.org/" %} {% include cardv2.html -title="Debian" -image="/assets/img/svg/3rd-party/debian.svg" -description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.' -badges="info:GNU/Linux" -website="https://www.debian.org/" -privacy-policy="https://www.debian.org/legal/privacy" -tor="http://sejnfjrq6szgca7v.onion" -gitlab="https://salsa.debian.org/qa/debsources" + title="Debian" + image="/assets/img/svg/3rd-party/debian.svg" + description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.' + badges="info:GNU/Linux" + website="https://www.debian.org/" + privacy-policy="https://www.debian.org/legal/privacy" + tor="http://sejnfjrq6szgca7v.onion" + gitlab="https://salsa.debian.org/qa/debsources" %}

Worth Mentioning

    -
  • OpenBSD BSD - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
    • -
  • Arch Linux GNU/Linux contrib - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. Parabola is a - completely open source version of Arch Linux.
    • -
  • Trisquel GNU/Linux - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.
    • -
  • Whonix GNU/Linux - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" - and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.
    • +
  • OpenBSD + {% include badge.html + color="info" + text="BSD" + %} + - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography. +
    • + +
  • + Arch Linux + {% include badge.html + color="info" + text="GNU/Linux" + %} + {% include badge.html + color="warning" + icon="far fa-question-circle" + text="contrib" + tooltip="This software may depend on or recommend non-free software." + %} + - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. Parabola is a + completely open source version of Arch Linux. +
    • + +
  • + Trisquel + {% include badge.html + color="info" + text="GNU/Linux" + %} + - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed. +
    • + +
  • + Whonix + {% include badge.html + color="info" + text="GNU/Linux" + %} + - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" + and a Tor "Gateway". All communication are forced through the Tor network to accomplish this. +
diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index cb19f6d5..c2dbea93 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -1,41 +1,62 @@

Open Source Router Firmware

{% include cardv2.html -title="OpenWrt" -image="/assets/img/svg/3rd-party/openwrt.svg" -image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg" -description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." -badges="info:Linux" -labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." -website="https://openwrt.org/" -git="https://git.openwrt.org/" + title="OpenWrt" + image="/assets/img/svg/3rd-party/openwrt.svg" + image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg" + description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." + badges="info:Linux" + labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + website="https://openwrt.org/" + git="https://git.openwrt.org/" %} {% include cardv2.html -title="pfSense" -image="/assets/img/svg/3rd-party/pfsense.svg" -image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg" -description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." -badges="info:BSD" -labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." -website="https://www.pfsense.org/" -privacy-policy="https://www.pfsense.org/privacy.html" -github="https://github.com/pfsense/" + title="pfSense" + image="/assets/img/svg/3rd-party/pfsense.svg" + image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg" + description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." + badges="info:BSD" + labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + website="https://www.pfsense.org/" + privacy-policy="https://www.pfsense.org/privacy.html" + github="https://github.com/pfsense/" %} {% include cardv2.html -title="LibreCMC" -image="/assets/img/svg/3rd-party/librecmc.svg" -image-dark="/assets/img/svg/3rd-party/librecmc-dark.svg" -description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)." -badges="info:GNU/Linux" -website="https://librecmc.org" -git="https://gogs.librecmc.org/libreCMC/libreCMC" + title="LibreCMC" + image="/assets/img/svg/3rd-party/librecmc.svg" + image-dark="/assets/img/svg/3rd-party/librecmc-dark.svg" + description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)." + badges="info:GNU/Linux" + website="https://librecmc.org" + git="https://gogs.librecmc.org/libreCMC/libreCMC" %}

Worth Mentioning

    -
  • OpenBSD BSD - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
    • -
  • DD-WRT Linux contrib - A Linux-based open-source firmware compatible with several models of routers and access points.
    • +
  • + OpenBSD + {% include badge.html + color="info" + text="BSD" + %} + - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography. +
    • + +
  • + DD-WRT + {% include badge.html + color="info" + text="GNU/Linux" + %} + {% include badge.html + color="warning" + icon="far fa-question-circle" + text="contrib" + tooltip="This software may depend on or recommend non-free software." + %} + - A Linux-based open-source firmware compatible with several models of routers and access points. +
diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html index 4c6ec899..e39d9ffc 100644 --- a/_includes/sections/voice-video-messenger.html +++ b/_includes/sections/voice-video-messenger.html @@ -39,17 +39,24 @@ ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
  • Jitsi Meet - Jitsi Meet is a free and open-source multiplatform voice (VoIP), video conferencing, and instant messaging application. - Requires WebRTC - - - Multiparty meetings are not E2EE - + + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + text="Requires WebRTC" + tooltip="Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it." + %} + + {% include badge.html + color="warning" + icon="fas fa-exclamation-triangle" + link="https://jitsi.org/security" + text="Multiparty meetings are not E2EE" + %} + See also list of public Jitsi Meet instances.
-

Related Information

    -- 2.47.2