Skip to content

Commit

Permalink
Add reject pattern to Admin setting
Browse files Browse the repository at this point in the history
  • Loading branch information
noellabo committed Jun 1, 2024
1 parent c93aaca commit 6306fde
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 1 deletion.
9 changes: 9 additions & 0 deletions app/controllers/admin/settings/others_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

class Admin::Settings::OthersController < Admin::SettingsController
private

def after_update_redirect_path
admin_settings_others_path
end
end
6 changes: 5 additions & 1 deletion app/lib/activitypub/activity/create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,12 @@ def message_franking
)
end

def reject_pattern?
Setting.reject_pattern.present? && @object['content']&.match?(Setting.reject_pattern)
end

def create_status
return reject_payload! if unsupported_object_type? || non_matching_uri_hosts?(@account.uri, object_uri) || tombstone_exists? || !related_to_local_activity?
return reject_payload! if unsupported_object_type? || non_matching_uri_hosts?(@account.uri, object_uri) || tombstone_exists? || !related_to_local_activity? || reject_pattern?

with_redis_lock("create:#{object_uri}") do
return if delete_arrived_first?(object_uri) || poll_vote?
Expand Down
2 changes: 2 additions & 0 deletions app/models/form/admin_settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class Form::AdminSettings
status_page_url
captcha_enabled
authorized_fetch
reject_pattern
).freeze

INTEGER_KEYS = %i(
Expand Down Expand Up @@ -79,6 +80,7 @@ class Form::AdminSettings
validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks_rationale) }
validates :media_cache_retention_period, :content_cache_retention_period, :backups_retention_period, numericality: { only_integer: true }, allow_blank: true, if: -> { defined?(@media_cache_retention_period) || defined?(@content_cache_retention_period) || defined?(@backups_retention_period) }
validates :site_short_description, length: { maximum: 200 }, if: -> { defined?(@site_short_description) }
validates :reject_pattern, regexp_syntax: true, if: -> { defined?(@reject_pattern) }
validates :status_page_url, url: true, allow_blank: true
validate :validate_site_uploads

Expand Down
13 changes: 13 additions & 0 deletions app/validators/regexp_syntax_validator.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# frozen_string_literal: true

class RegexpSyntaxValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
return if value.blank?

begin
Regexp.compile(value)
rescue RegexpError => e
record.errors.add(attribute, I18n.t('applications.invalid_regexp', message: e.message))
end
end
end
19 changes: 19 additions & 0 deletions app/views/admin/settings/others/show.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- content_for :page_title do
= t('admin.settings.others.title')

- content_for :heading do
%h2= t('admin.settings.title')
= render partial: 'admin/settings/shared/links'

= simple_form_for @admin_settings, url: admin_settings_others_path, html: { method: :patch } do |f|
= render 'shared/error_messages', object: @admin_settings

%p.lead= t('admin.settings.others.preamble')

%h4= t('admin.settings.others.activitypub')

.fields-group
= f.input :reject_pattern, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_pattern.title'), hint: t('admin.settings.reject_pattern.desc_html'), input_html: { rows: 8 }

.actions
= f.button :button, t('generic.save_changes'), type: :submit
1 change: 1 addition & 0 deletions app/views/admin/settings/shared/_links.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
primary.item :discovery, safe_join([fa_icon('search fw'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
primary.item :content_retention, safe_join([fa_icon('history fw'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
primary.item :appearance, safe_join([fa_icon('desktop fw'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
primary.item :others, safe_join([fa_icon('cogs fw'), t('admin.settings.others.title')]), admin_settings_others_path
8 changes: 8 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,10 @@ en:
all: To everyone
disabled: To no one
users: To logged-in local users
others:
activitypub: ActivityPub
preamble: Other settings, including customizing behavior
title: Other settings
registrations:
moderation_recommandation: Please make sure you have an adequate and reactive moderation team before you open registrations to everyone!
preamble: Control who can create an account on your server.
Expand All @@ -773,6 +777,9 @@ en:
none: Nobody can sign up
open: Anyone can sign up
warning_hint: We recommend using “Approval required for sign up” unless you are confident your moderation team can handle spam and malicious registrations in a timely fashion.
reject_pattern:
desc_html: Set a regular expression pattern to inspect Create Activity content, and refuse Activity if you match
title: Reject Pattern
security:
authorized_fetch: Require authentication from federated servers
authorized_fetch_hint: Requiring authentication from federated servers enables stricter enforcement of both user-level and server-level blocks. However, this comes at the cost of a performance penalty, reduces the reach of your replies, and may introduce compatibility issues with some federated services. In addition, this will not prevent dedicated actors from fetching your public posts and accounts.
Expand Down Expand Up @@ -1033,6 +1040,7 @@ en:
applications:
created: Application successfully created
destroyed: Application successfully deleted
invalid_regexp: "The provided Regexp is invalid: %{message}"
logout: Logout
regenerate_token: Regenerate access token
token_regenerated: Access token successfully regenerated
Expand Down
1 change: 1 addition & 0 deletions config/routes/admin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
resource :about, only: [:show, :update], controller: 'about'
resource :appearance, only: [:show, :update], controller: 'appearance'
resource :discovery, only: [:show, :update], controller: 'discovery'
resource :others, only: [:show, :update], controller: 'others'
end

resources :site_uploads, only: [:destroy]
Expand Down
1 change: 1 addition & 0 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ defaults: &defaults
require_invite_text: false
backups_retention_period: 7
captcha_enabled: false
reject_pattern: ''

development:
<<: *defaults
Expand Down

0 comments on commit 6306fde

Please sign in to comment.