From 4cd0f2e7355186bf49d5a864f091d982258852b2 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Sun, 25 Aug 2019 04:01:50 +0000 Subject: [PATCH 1/4] Make JavaScript work with LibreJS (#1213) --- _includes/footer.html | 17 ++++++++++++++--- _includes/scripts.html | 13 ------------- about/javascript/index.html | 27 +++++++++++++++++++++++++++ assets/js/main.js | 28 +++++++++++++++++++++------- 4 files changed, 62 insertions(+), 23 deletions(-) create mode 100644 about/javascript/index.html diff --git a/_includes/footer.html b/_includes/footer.html index 7472a098..1ca12dfc 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -71,8 +71,19 @@ + + + JavaScript Licenses + +

+ 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) +

+ diff --git a/_includes/scripts.html b/_includes/scripts.html index 08fffe2a..d55f2c76 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -11,17 +11,4 @@ - User privacy protection --> - diff --git a/about/javascript/index.html b/about/javascript/index.html new file mode 100644 index 00000000..1b77e49a --- /dev/null +++ b/about/javascript/index.html @@ -0,0 +1,27 @@ +

JavaScript Licenses

+ + + + + + + + + + + + + + + + + + + + + + + + + +
main.jsCC0-1.0-only
redirects.jsCC0-1.0-only
bootstrap.min.jsExpat
jquery-3.3.1.min.jsExpat
popper.min.jsExpat
sortable.min.jsExpat
diff --git a/assets/js/main.js b/assets/js/main.js index 6d68c8bc..f2925aad 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -1,13 +1,8 @@ -// Tooltips -$(function () { - $("[data-toggle='tooltip']").tooltip(); +$(function() { + $("[data-toggle='tooltip']").tooltip(); }); - -// // Navbar dropdowns -// - const navSections = document.querySelectorAll(".nav-details"); navSections.forEach(navSection => { @@ -31,3 +26,22 @@ function navSectionsClose(event) { navSection.open = !open; }); } + +// Matomo +var _paq = window._paq || []; +/* tracker methods like "setCustomDimension" should be called before "trackPageView" */ +_paq.push(["trackPageView"]); +_paq.push(["enableLinkTracking"]); +(function() { + var u = "https://stats.privacytools.io/"; + _paq.push(["setTrackerUrl", u + "matomo.php"]); + _paq.push(["setSiteId", "1"]); + var d = document, + g = d.createElement("script"), + s = d.getElementsByTagName("script")[0]; + g.type = "text/javascript"; + g.async = true; + g.defer = true; + g.src = u + "matomo.js"; + s.parentNode.insertBefore(g, s); +})(); From b28b103d4fca49be775ade45734a4d4491e249f4 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Mon, 26 Aug 2019 22:39:17 +0300 Subject: [PATCH 2/4] about:config: delete geo.enabled (#1217) Ref: https://github.com/privacytoolsIO/privacytools.io/issues/1212#issuecomment-524598044 --- _includes/sections/browser-tweaks.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index 277bbd57..fee1830a 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -52,9 +52,6 @@
dom.event.clipboardevents.enabled = false
Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.
-
geo.enabled = false
-
Disables geolocation.
-
media.eme.enabled = false

Disables playback of DRM-controlled HTML5 content, which, if enabled, automatically downloads the Widevine Content Decryption Module provided by Google Inc. Details

From 229b2058979796e397d684b45ef7ba9f1303d814 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Mon, 26 Aug 2019 23:20:34 +0300 Subject: [PATCH 3/4] dns: document enabling Firefox TRR (#1220) * dns: document enabling Firefox TRR * browser-tweaks: rm/note that TRR/DoH/ESNI have moved * dns: fix formatting * browser-tweaks: fix embarassing typo * browser-tweaks & dns: apply @nitrohorse's suggestions (and fix link) --- _includes/sections/browser-tweaks.html | 19 ++----------------- _includes/sections/dns.html | 11 +++++++++++ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index fee1830a..62b2ec4e 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -115,23 +115,8 @@
-
network.trr.mode = 2
-
- Use Trusted Recursive Resolver (DNS-over-HTTPS) first and if it fails, use the system resolver Source -
    -
  • 0 = disabled by default, may change in the future
  • -
  • 1 = use the faster resolver
  • -
  • 2 = use DoH first, fallback to system resolver
  • -
  • 3 = only use DoH. This may require network.trr.bootstrapAddress or using an IP address in network.trr.uri.
  • -
  • 5 = explicitly disable DoH
  • -
-
- -
network.trr.uri = CHANGEME
-
The address of your DNS-over-HTTPS provider, if you don't have one, check our encrypted DNS recommendations. It can also be changed in Settings, Network Settings, Enable DNS over HTTPS, Use Provider, Custom.
- -
network.security.esni.enabled = true
-
Hide the address which you are requesting SSL certificate for if the server supports it. This requires DoH/TRR to be enabled even on Android 9+ when Private DNS is enabled.
+
Looking for TRR, DoH or ESNI?
+
They have moved to our DNS page.
webgl.disabled = true
WebGL is a potential security risk. Source
diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index 219f170c..19c3e777 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -307,6 +307,10 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
  • 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.
    • +
        +
      • 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.esni.enabled to True in order to enable encrypted SNI and make sites supporting ESNI a bit more difficult to track.
      • +
  • Encrypted DNS clients for mobile: @@ -330,6 +334,13 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
  • Further reading: From 4cb3fc18ba0be180cc9cf822e0ea66d060663d75 Mon Sep 17 00:00:00 2001 From: Jonah Date: Mon, 26 Aug 2019 15:32:46 -0500 Subject: [PATCH 4/4] Add Gemfile.lock --- .gitignore | 2 - Gemfile.lock | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+), 2 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index af408d27..2d2eb810 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ _site/ -Gemfile -Gemfile.lock .sass-cache/ .DS_Store diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..5240d6f2 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,249 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.11.1) + colorator (1.1.0) + commonmarker (0.17.13) + ruby-enum (~> 0.5) + concurrent-ruby (1.1.5) + dnsruby (1.61.2) + addressable (~> 2.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + ethon (0.12.0) + ffi (>= 1.3.0) + eventmachine (1.2.7) + execjs (2.7.0) + faraday (0.15.4) + multipart-post (>= 1.2, < 3) + ffi (1.11.1) + forwardable-extended (2.6.0) + gemoji (3.0.0) + github-pages (197) + activesupport (= 4.2.10) + github-pages-health-check (= 1.16.1) + jekyll (= 3.7.4) + jekyll-avatar (= 0.6.0) + jekyll-coffeescript (= 1.1.1) + jekyll-commonmark-ghpages (= 0.1.5) + jekyll-default-layout (= 0.1.4) + jekyll-feed (= 0.11.0) + jekyll-gist (= 1.5.0) + jekyll-github-metadata (= 2.12.1) + jekyll-mentions (= 1.4.1) + jekyll-optional-front-matter (= 0.3.0) + jekyll-paginate (= 1.1.0) + jekyll-readme-index (= 0.2.0) + jekyll-redirect-from (= 0.14.0) + jekyll-relative-links (= 0.6.0) + jekyll-remote-theme (= 0.3.1) + jekyll-sass-converter (= 1.5.2) + jekyll-seo-tag (= 2.5.0) + jekyll-sitemap (= 1.2.0) + jekyll-swiss (= 0.4.0) + jekyll-theme-architect (= 0.1.1) + jekyll-theme-cayman (= 0.1.1) + jekyll-theme-dinky (= 0.1.1) + jekyll-theme-hacker (= 0.1.1) + jekyll-theme-leap-day (= 0.1.1) + jekyll-theme-merlot (= 0.1.1) + jekyll-theme-midnight (= 0.1.1) + jekyll-theme-minimal (= 0.1.1) + jekyll-theme-modernist (= 0.1.1) + jekyll-theme-primer (= 0.5.3) + jekyll-theme-slate (= 0.1.1) + jekyll-theme-tactile (= 0.1.1) + jekyll-theme-time-machine (= 0.1.1) + jekyll-titles-from-headings (= 0.5.1) + jemoji (= 0.10.2) + kramdown (= 1.17.0) + liquid (= 4.0.0) + listen (= 3.1.5) + mercenary (~> 0.3) + minima (= 2.5.0) + nokogiri (>= 1.8.5, < 2.0) + rouge (= 2.2.1) + terminal-table (~> 1.4) + github-pages-health-check (1.16.1) + addressable (~> 2.3) + dnsruby (~> 1.60) + octokit (~> 4.0) + public_suffix (~> 3.0) + typhoeus (~> 1.3) + html-pipeline (2.10.0) + activesupport (>= 2) + nokogiri (>= 1.4) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.7.4) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-avatar (0.6.0) + jekyll (~> 3.0) + jekyll-coffeescript (1.1.1) + coffee-script (~> 2.2) + coffee-script-source (~> 1.11.1) + jekyll-commonmark (1.3.1) + commonmarker (~> 0.14) + jekyll (>= 3.7, < 5.0) + jekyll-commonmark-ghpages (0.1.5) + commonmarker (~> 0.17.6) + jekyll-commonmark (~> 1) + rouge (~> 2) + jekyll-default-layout (0.1.4) + jekyll (~> 3.0) + jekyll-feed (0.11.0) + jekyll (~> 3.3) + jekyll-gist (1.5.0) + octokit (~> 4.2) + jekyll-github-metadata (2.12.1) + jekyll (~> 3.4) + octokit (~> 4.0, != 4.4.0) + jekyll-mentions (1.4.1) + html-pipeline (~> 2.3) + jekyll (~> 3.0) + jekyll-optional-front-matter (0.3.0) + jekyll (~> 3.0) + jekyll-paginate (1.1.0) + jekyll-readme-index (0.2.0) + jekyll (~> 3.0) + jekyll-redirect-from (0.14.0) + jekyll (~> 3.3) + jekyll-relative-links (0.6.0) + jekyll (~> 3.3) + jekyll-remote-theme (0.3.1) + jekyll (~> 3.5) + rubyzip (>= 1.2.1, < 3.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-seo-tag (2.5.0) + jekyll (~> 3.3) + jekyll-sitemap (1.2.0) + jekyll (~> 3.3) + jekyll-swiss (0.4.0) + jekyll-theme-architect (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-cayman (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-dinky (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-hacker (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-leap-day (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-merlot (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-midnight (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-minimal (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-modernist (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-primer (0.5.3) + jekyll (~> 3.5) + jekyll-github-metadata (~> 2.9) + jekyll-seo-tag (~> 2.0) + jekyll-theme-slate (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-tactile (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-time-machine (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-titles-from-headings (0.5.1) + jekyll (~> 3.3) + jekyll-watch (2.2.1) + listen (~> 3.0) + jemoji (0.10.2) + gemoji (~> 3.0) + html-pipeline (~> 2.2) + jekyll (~> 3.0) + kramdown (1.17.0) + liquid (4.0.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + mercenary (0.3.6) + mini_portile2 (2.4.0) + minima (2.5.0) + jekyll (~> 3.5) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + minitest (5.11.3) + multipart-post (2.0.0) + nokogiri (1.10.2) + mini_portile2 (~> 2.4.0) + octokit (4.13.0) + sawyer (~> 0.8.0, >= 0.5.3) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (3.1.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + rouge (2.2.1) + ruby-enum (0.7.2) + i18n + ruby_dep (1.5.0) + rubyzip (1.2.2) + safe_yaml (1.0.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + thread_safe (0.3.6) + typhoeus (1.3.1) + ethon (>= 0.9.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + unicode-display_width (1.5.0) + +PLATFORMS + ruby + +DEPENDENCIES + github-pages + tzinfo-data + +BUNDLED WITH + 2.0.2