Skip to content
Permalink
Browse files

Add whitelist mode (#11291)

  • Loading branch information...
Gargron committed Jul 30, 2019
1 parent 85b7b56 commit 24552b5160a5090e7d6056fb69a209aa48fe4fce
Showing with 302 additions and 53 deletions.
  1. +5 −0 app/controllers/about_controller.rb
  2. +2 −0 app/controllers/activitypub/base_controller.rb
  3. +1 −1 app/controllers/activitypub/inboxes_controller.rb
  4. +40 −0 app/controllers/admin/domain_allows_controller.rb
  5. +25 −3 app/controllers/admin/instances_controller.rb
  6. +9 −0 app/controllers/api/base_controller.rb
  7. +2 −0 app/controllers/api/v1/accounts_controller.rb
  8. +2 −0 app/controllers/api/v1/apps_controller.rb
  9. +2 −1 app/controllers/api/v1/instances/activity_controller.rb
  10. +2 −1 app/controllers/api/v1/instances/peers_controller.rb
  11. +1 −0 app/controllers/api/v1/instances_controller.rb
  12. +3 −1 app/controllers/application_controller.rb
  13. +1 −0 app/controllers/concerns/account_owned_concern.rb
  14. +3 −2 app/controllers/directories_controller.rb
  15. +1 −1 app/controllers/home_controller.rb
  16. +1 −0 app/controllers/media_controller.rb
  17. +2 −0 app/controllers/media_proxy_controller.rb
  18. +3 −2 app/controllers/public_timelines_controller.rb
  19. +1 −0 app/controllers/remote_interaction_controller.rb
  20. +1 −0 app/controllers/tags_controller.rb
  21. +9 −1 app/helpers/domain_control_helper.rb
  22. +33 −0 app/models/domain_allow.rb
  23. +2 −1 app/models/instance.rb
  24. +4 −0 app/models/instance_filter.rb
  25. +11 −0 app/policies/domain_allow_policy.rb
  26. +1 −1 app/services/concerns/payloadable.rb
  27. +11 −0 app/services/unallow_domain_service.rb
  28. +14 −0 app/views/admin/domain_allows/new.html.haml
  29. +22 −13 app/views/admin/instances/index.html.haml
  30. +3 −1 app/views/admin/instances/show.html.haml
  31. +15 −13 app/views/admin/settings/edit.html.haml
  32. +1 −1 app/views/auth/registrations/new.html.haml
  33. +6 −3 app/views/layouts/public.html.haml
  34. +5 −0 config/initializers/2_whitelist_mode.rb
  35. +7 −0 config/locales/en.yml
  36. +2 −0 config/locales/simple_form.en.yml
  37. +1 −1 config/navigation.rb
  38. +1 −0 config/routes.rb
  39. +9 −0 db/migrate/20190705002136_create_domain_allows.rb
  40. +8 −1 db/schema.rb
  41. +19 −3 lib/mastodon/domains_cli.rb
  42. +3 −0 spec/fabricators/domain_allow_fabricator.rb
  43. +5 −0 spec/models/domain_allow_spec.rb
  44. +3 −2 streaming/index.js
@@ -3,6 +3,7 @@
class AboutController < ApplicationController
layout 'public'

before_action :require_open_federation!, only: [:show, :more]
before_action :set_body_classes, only: :show
before_action :set_instance_presenter
before_action :set_expires_in
@@ -19,6 +20,10 @@ def terms; end

private

def require_open_federation!
not_found if whitelist_mode?
end

def new_user
User.new.tap do |user|
user.build_account
@@ -1,6 +1,8 @@
# frozen_string_literal: true

class ActivityPub::BaseController < Api::BaseController
skip_before_action :require_authenticated_user!

private

def set_cache_headers
@@ -1,6 +1,6 @@
# frozen_string_literal: true

class ActivityPub::InboxesController < Api::BaseController
class ActivityPub::InboxesController < ActivityPub::BaseController
include SignatureVerification
include JsonLdHelper
include AccountOwnedConcern
@@ -0,0 +1,40 @@
# frozen_string_literal: true

class Admin::DomainAllowsController < Admin::BaseController
before_action :set_domain_allow, only: [:destroy]

def new
authorize :domain_allow, :create?

@domain_allow = DomainAllow.new(domain: params[:_domain])
end

def create
authorize :domain_allow, :create?

@domain_allow = DomainAllow.new(resource_params)

if @domain_allow.save
log_action :create, @domain_allow
redirect_to admin_instances_path, notice: I18n.t('admin.domain_allows.created_msg')
else
render :new
end
end

def destroy
authorize @domain_allow, :destroy?
UnallowDomainService.new.call(@domain_allow)
redirect_to admin_instances_path, notice: I18n.t('admin.domain_allows.destroyed_msg')
end

private

def set_domain_allow
@domain_allow = DomainAllow.find(params[:id])
end

def resource_params
params.require(:domain_allow).permit(:domain)
end
end
@@ -2,6 +2,10 @@

module Admin
class InstancesController < BaseController
before_action :set_domain_block, only: :show
before_action :set_domain_allow, only: :show
before_action :set_instance, only: :show

def index
authorize :instance, :index?

@@ -11,20 +15,38 @@ def index
def show
authorize :instance, :show?

@instance = Instance.new(Account.by_domain_accounts.find_by(domain: params[:id]) || DomainBlock.find_by!(domain: params[:id]))
@following_count = Follow.where(account: Account.where(domain: params[:id])).count
@followers_count = Follow.where(target_account: Account.where(domain: params[:id])).count
@reports_count = Report.where(target_account: Account.where(domain: params[:id])).count
@blocks_count = Block.where(target_account: Account.where(domain: params[:id])).count
@available = DeliveryFailureTracker.available?(Account.select(:shared_inbox_url).where(domain: params[:id]).first&.shared_inbox_url)
@media_storage = MediaAttachment.where(account: Account.where(domain: params[:id])).sum(:file_file_size)
@domain_block = DomainBlock.rule_for(params[:id])
end

private

def set_domain_block
@domain_block = DomainBlock.rule_for(params[:id])
end

def set_domain_allow
@domain_allow = DomainAllow.rule_for(params[:id])
end

def set_instance
resource = Account.by_domain_accounts.find_by(domain: params[:id])
resource ||= @domain_block
resource ||= @domain_allow

if resource
@instance = Instance.new(resource)
else
not_found
end
end

def filtered_instances
InstanceFilter.new(filter_params).results
InstanceFilter.new(whitelist_mode? ? { allowed: true } : filter_params).results
end

def paginated_instances
@@ -9,6 +9,7 @@ class Api::BaseController < ApplicationController
skip_before_action :store_current_location
skip_before_action :require_functional!

before_action :require_authenticated_user!, if: :disallow_unauthenticated_api_access?
before_action :set_cache_headers

protect_from_forgery with: :null_session
@@ -69,6 +70,10 @@ def current_user
nil
end

def require_authenticated_user!
render json: { error: 'This API requires an authenticated user' }, status: 401 unless current_user
end

def require_user!
if !current_user
render json: { error: 'This method requires an authenticated user' }, status: 422
@@ -94,4 +99,8 @@ def authorize_if_got_token!(*scopes)
def set_cache_headers
response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
end

def disallow_unauthenticated_api_access?
authorized_fetch_mode?
end
end
@@ -12,6 +12,8 @@ class Api::V1::AccountsController < Api::BaseController
before_action :check_account_suspension, only: [:show]
before_action :check_enabled_registrations, only: [:create]

skip_before_action :require_authenticated_user!, only: :create

respond_to :json

def show
@@ -1,6 +1,8 @@
# frozen_string_literal: true

class Api::V1::AppsController < Api::BaseController
skip_before_action :require_authenticated_user!

def create
@app = Doorkeeper::Application.create!(application_options)
render json: @app, serializer: REST::ApplicationSerializer
@@ -2,6 +2,7 @@

class Api::V1::Instances::ActivityController < Api::BaseController
before_action :require_enabled_api!

skip_before_action :set_cache_headers

respond_to :json
@@ -33,6 +34,6 @@ def activity
end

def require_enabled_api!
head 404 unless Setting.activity_api_enabled
head 404 unless Setting.activity_api_enabled && !whitelist_mode?
end
end
@@ -2,6 +2,7 @@

class Api::V1::Instances::PeersController < Api::BaseController
before_action :require_enabled_api!

skip_before_action :set_cache_headers

respond_to :json
@@ -14,6 +15,6 @@ def index
private

def require_enabled_api!
head 404 unless Setting.peers_api_enabled
head 404 unless Setting.peers_api_enabled && !whitelist_mode?
end
end
@@ -2,6 +2,7 @@

class Api::V1::InstancesController < Api::BaseController
respond_to :json

skip_before_action :set_cache_headers

def show
@@ -11,12 +11,14 @@ class ApplicationController < ActionController::Base
include UserTrackingConcern
include SessionTrackingConcern
include CacheConcern
include DomainControlHelper

helper_method :current_account
helper_method :current_session
helper_method :current_theme
helper_method :single_user_mode?
helper_method :use_seamless_external_login?
helper_method :whitelist_mode?

rescue_from ActionController::RoutingError, with: :not_found
rescue_from ActiveRecord::RecordNotFound, with: :not_found
@@ -38,7 +40,7 @@ def https_enabled?
end

def authorized_fetch_mode?
ENV['AUTHORIZED_FETCH'] == 'true'
ENV['AUTHORIZED_FETCH'] == 'true' || Rails.configuration.x.whitelist_mode
end

def public_fetch_mode?
@@ -4,6 +4,7 @@ module AccountOwnedConcern
extend ActiveSupport::Concern

included do
before_action :authenticate_user!, if: -> { whitelist_mode? && request.format != :json }
before_action :set_account, if: :account_required?
before_action :check_account_approval, if: :account_required?
before_action :check_account_suspension, if: :account_required?
@@ -3,7 +3,8 @@
class DirectoriesController < ApplicationController
layout 'public'

before_action :check_enabled
before_action :authenticate_user!, if: :whitelist_mode?
before_action :require_enabled!
before_action :set_instance_presenter
before_action :set_tag, only: :show
before_action :set_tags
@@ -19,7 +20,7 @@ def show

private

def check_enabled
def require_enabled!
return not_found unless Setting.profile_directory
end

@@ -55,7 +55,7 @@ def initial_state_params
end

def default_redirect_path
if request.path.start_with?('/web')
if request.path.start_with?('/web') || whitelist_mode?
new_user_session_path
elsif single_user_mode?
short_account_path(Account.local.without_suspended.where('id > 0').first)
@@ -5,6 +5,7 @@ class MediaController < ApplicationController

skip_before_action :store_current_location

before_action :authenticate_user!, if: :whitelist_mode?
before_action :set_media_attachment
before_action :verify_permitted_status!
before_action :check_playable, only: :player
@@ -5,6 +5,8 @@ class MediaProxyController < ApplicationController

skip_before_action :store_current_location

before_action :authenticate_user!, if: :whitelist_mode?

def show
RedisLock.acquire(lock_options) do |lock|
if lock.acquired?
@@ -3,7 +3,8 @@
class PublicTimelinesController < ApplicationController
layout 'public'

before_action :check_enabled
before_action :authenticate_user!, if: :whitelist_mode?
before_action :require_enabled!
before_action :set_body_classes
before_action :set_instance_presenter

@@ -16,7 +17,7 @@ def show

private

def check_enabled
def require_enabled!
not_found unless Setting.timeline_preview
end

@@ -5,6 +5,7 @@ class RemoteInteractionController < ApplicationController

layout 'modal'

before_action :authenticate_user!, if: :whitelist_mode?
before_action :set_interaction_type
before_action :set_status
before_action :set_body_classes
@@ -8,6 +8,7 @@ class TagsController < ApplicationController
layout 'public'

before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
before_action :authenticate_user!, if: :whitelist_mode?
before_action :set_tag
before_action :set_body_classes
before_action :set_instance_presenter
@@ -12,6 +12,14 @@ def domain_not_allowed?(uri_or_domain)
end
end

DomainBlock.blocked?(domain)
if whitelist_mode?
!DomainAllow.allowed?(domain)
else
DomainBlock.blocked?(domain)
end
end

def whitelist_mode?
Rails.configuration.x.whitelist_mode
end
end
@@ -0,0 +1,33 @@
# frozen_string_literal: true

# == Schema Information
#
# Table name: domain_allows
#
# id :bigint(8) not null, primary key
# domain :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null
#

class DomainAllow < ApplicationRecord
include DomainNormalizable

validates :domain, presence: true, uniqueness: true

scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }

class << self
def allowed?(domain)
!rule_for(domain).nil?
end

def rule_for(domain)
return if domain.blank?

uri = Addressable::URI.new.tap { |u| u.host = domain.gsub(/[\/]/, '') }

find_by(domain: uri.normalized_host)
end
end
end
@@ -7,8 +7,9 @@ class Instance

def initialize(resource)
@domain = resource.domain
@accounts_count = resource.is_a?(DomainBlock) ? nil : resource.accounts_count
@accounts_count = resource.respond_to?(:accounts_count) ? resource.accounts_count : nil
@domain_block = resource.is_a?(DomainBlock) ? resource : DomainBlock.rule_for(domain)
@domain_allow = resource.is_a?(DomainAllow) ? resource : DomainAllow.rule_for(domain)
end

def countable?
@@ -12,6 +12,10 @@ def results
scope = DomainBlock
scope = scope.matches_domain(params[:by_domain]) if params[:by_domain].present?
scope.order(id: :desc)
elsif params[:allowed].present?
scope = DomainAllow
scope = scope.matches_domain(params[:by_domain]) if params[:by_domain].present?
scope.order(id: :desc)
else
scope = Account.remote
scope = scope.matches_domain(params[:by_domain]) if params[:by_domain].present?

0 comments on commit 24552b5

Please sign in to comment.
You can’t perform that action at this time.