From 8a012af662255fa36c3aa89591078cdc353988fb Mon Sep 17 00:00:00 2001
From: Fire Demon <firedemon@creature.cafe>
Date: Wed, 12 Aug 2020 22:53:24 -0500
Subject: [Privacy] Make authorized fetch and allowlist mode a hard requirement
 for Monsterfork

---
 app/controllers/application_controller.rb | 4 ++--
 app/helpers/domain_control_helper.rb      | 2 +-
 app/services/concerns/payloadable.rb      | 2 +-
 config/initializers/2_whitelist_mode.rb   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9608f1cf9..908bd1bdb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -49,11 +49,11 @@ class ApplicationController < ActionController::Base
   end
 
   def authorized_fetch_mode?
-    ENV['AUTHORIZED_FETCH'] == 'true' || Rails.configuration.x.whitelist_mode
+    true
   end
 
   def public_fetch_mode?
-    !authorized_fetch_mode?
+    false
   end
 
   def store_current_location
diff --git a/app/helpers/domain_control_helper.rb b/app/helpers/domain_control_helper.rb
index ac60cad29..4ce205504 100644
--- a/app/helpers/domain_control_helper.rb
+++ b/app/helpers/domain_control_helper.rb
@@ -20,6 +20,6 @@ module DomainControlHelper
   end
 
   def whitelist_mode?
-    Rails.configuration.x.whitelist_mode
+    true
   end
 end
diff --git a/app/services/concerns/payloadable.rb b/app/services/concerns/payloadable.rb
index 3e45570c3..ba94539c8 100644
--- a/app/services/concerns/payloadable.rb
+++ b/app/services/concerns/payloadable.rb
@@ -15,6 +15,6 @@ module Payloadable
   end
 
   def signing_enabled?
-    ENV['AUTHORIZED_FETCH'] != 'true' && !Rails.configuration.x.whitelist_mode
+    true
   end
 end
diff --git a/config/initializers/2_whitelist_mode.rb b/config/initializers/2_whitelist_mode.rb
index 1cc6a8e72..3ac6d7a09 100644
--- a/config/initializers/2_whitelist_mode.rb
+++ b/config/initializers/2_whitelist_mode.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Rails.application.configure do
-  config.x.whitelist_mode = (ENV['LIMITED_FEDERATION_MODE'] || ENV['WHITELIST_MODE']) == 'true'
+  config.x.whitelist_mode = true
 end
-- 
cgit