Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.js`:
  Conflict because part of that file has been split to
  `app/javascript/core/settings.js`. Ported those changes
  there.
signup-info-prompt
Thibaut Girka 2020-07-01 19:23:14 +02:00
commit 45deca65b3
36 changed files with 344 additions and 119 deletions

28
.gitignore vendored
View File

@ -17,36 +17,36 @@
/log/* /log/*
!/log/.keep !/log/.keep
/tmp /tmp
coverage /coverage
public/system /public/system
public/assets /public/assets
public/packs /public/packs
public/packs-test /public/packs-test
.env .env
.env.production .env.production
.env.development .env.development
node_modules/ /node_modules/
build/ /build/
# Ignore Vagrant files # Ignore Vagrant files
.vagrant/ .vagrant/
# Ignore Capistrano customizations # Ignore Capistrano customizations
config/deploy/* /config/deploy/*
# Ignore IDE files # Ignore IDE files
.vscode/ .vscode/
.idea/ .idea/
# Ignore postgres + redis + elasticsearch volume optionally created by docker-compose # Ignore postgres + redis + elasticsearch volume optionally created by docker-compose
postgres /postgres
redis /redis
elasticsearch /elasticsearch
# ignore Helm lockfile, dependency charts, and local values file # ignore Helm lockfile, dependency charts, and local values file
chart/Chart.lock /chart/Chart.lock
chart/charts/*.tgz /chart/charts/*.tgz
chart/values.yaml /chart/values.yaml
# Ignore Apple files # Ignore Apple files
.DS_Store .DS_Store

View File

@ -444,8 +444,6 @@ GEM
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rack-cors (1.1.1) rack-cors (1.1.1)
rack (>= 2.0.0) rack (>= 2.0.0)
rack-protection (2.0.8.1)
rack
rack-proxy (0.6.5) rack-proxy (0.6.5)
rack rack
rack-test (1.1.0) rack-test (1.1.0)
@ -571,11 +569,10 @@ GEM
nokogiri (>= 1.8.0) nokogiri (>= 1.8.0)
nokogumbo (~> 2.0) nokogumbo (~> 2.0)
semantic_range (2.3.0) semantic_range (2.3.0)
sidekiq (6.0.7) sidekiq (6.1.0)
connection_pool (>= 2.2.2) connection_pool (>= 2.2.2)
rack (~> 2.0) rack (~> 2.0)
rack-protection (>= 2.0.0) redis (>= 4.2.0)
redis (>= 4.1.0)
sidekiq-bulk (0.2.0) sidekiq-bulk (0.2.0)
sidekiq sidekiq
sidekiq-scheduler (3.0.1) sidekiq-scheduler (3.0.1)

View File

@ -34,10 +34,12 @@ delegate(document, '#account_header', 'change', ({ target }) => {
delegate(document, '#account_locked', 'change', ({ target }) => { delegate(document, '#account_locked', 'change', ({ target }) => {
const lock = document.querySelector('.card .display-name i'); const lock = document.querySelector('.card .display-name i');
if (target.checked) { if (lock) {
lock.style.display = 'inline'; if (target.checked) {
} else { delete lock.dataset.hidden;
lock.style.display = 'none'; } else {
lock.dataset.hidden = 'true';
}
} }
}); });

View File

@ -492,6 +492,22 @@
}, },
{ {
"descriptors": [ "descriptors": [
{
"defaultMessage": "Public",
"id": "privacy.public.short"
},
{
"defaultMessage": "Unlisted",
"id": "privacy.unlisted.short"
},
{
"defaultMessage": "Followers-only",
"id": "privacy.private.short"
},
{
"defaultMessage": "Direct",
"id": "privacy.direct.short"
},
{ {
"defaultMessage": "Filtered", "defaultMessage": "Filtered",
"id": "status.filtered" "id": "status.filtered"
@ -647,6 +663,31 @@
], ],
"path": "app/javascript/mastodon/features/account_timeline/index.json" "path": "app/javascript/mastodon/features/account_timeline/index.json"
}, },
{
"descriptors": [
{
"defaultMessage": "No comment provided",
"id": "account_note.placeholder"
},
{
"defaultMessage": "Cancel",
"id": "account_note.cancel"
},
{
"defaultMessage": "Save",
"id": "account_note.save"
},
{
"defaultMessage": "Your note for @{name}",
"id": "account.account_note_header"
},
{
"defaultMessage": "Edit",
"id": "account_note.edit"
}
],
"path": "app/javascript/mastodon/features/account/components/account_note.json"
},
{ {
"descriptors": [ "descriptors": [
{ {
@ -777,6 +818,10 @@
"defaultMessage": "Open moderation interface for @{name}", "defaultMessage": "Open moderation interface for @{name}",
"id": "status.admin_account" "id": "status.admin_account"
}, },
{
"defaultMessage": "Add note for @{name}",
"id": "account.add_account_note"
},
{ {
"defaultMessage": "Follows you", "defaultMessage": "Follows you",
"id": "account.follows_you" "id": "account.follows_you"
@ -2465,6 +2510,27 @@
], ],
"path": "app/javascript/mastodon/features/status/components/card.json" "path": "app/javascript/mastodon/features/status/components/card.json"
}, },
{
"descriptors": [
{
"defaultMessage": "Public",
"id": "privacy.public.short"
},
{
"defaultMessage": "Unlisted",
"id": "privacy.unlisted.short"
},
{
"defaultMessage": "Followers-only",
"id": "privacy.private.short"
},
{
"defaultMessage": "Direct",
"id": "privacy.direct.short"
}
],
"path": "app/javascript/mastodon/features/status/components/detailed_status.json"
},
{ {
"descriptors": [ "descriptors": [
{ {
@ -3005,10 +3071,6 @@
"defaultMessage": "Exit full screen", "defaultMessage": "Exit full screen",
"id": "video.exit_fullscreen" "id": "video.exit_fullscreen"
}, },
{
"defaultMessage": "Download file",
"id": "video.download"
},
{ {
"defaultMessage": "Sensitive content", "defaultMessage": "Sensitive content",
"id": "status.sensitive_warning" "id": "status.sensitive_warning"

View File

@ -1,4 +1,6 @@
{ {
"account.account_note_header": "Your note for @{name}",
"account.add_account_note": "Add note for @{name}",
"account.add_or_remove_from_list": "Add or Remove from lists", "account.add_or_remove_from_list": "Add or Remove from lists",
"account.badges.bot": "Bot", "account.badges.bot": "Bot",
"account.badges.group": "Group", "account.badges.group": "Group",
@ -40,6 +42,10 @@
"account.unfollow": "Unfollow", "account.unfollow": "Unfollow",
"account.unmute": "Unmute @{name}", "account.unmute": "Unmute @{name}",
"account.unmute_notifications": "Unmute notifications from @{name}", "account.unmute_notifications": "Unmute notifications from @{name}",
"account_note.cancel": "Cancel",
"account_note.edit": "Edit",
"account_note.placeholder": "No comment provided",
"account_note.save": "Save",
"alert.rate_limited.message": "Please retry after {retry_time, time, medium}.", "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
"alert.rate_limited.title": "Rate limited", "alert.rate_limited.title": "Rate limited",
"alert.unexpected.message": "An unexpected error occurred.", "alert.unexpected.message": "An unexpected error occurred.",

View File

@ -76,6 +76,10 @@
margin-left: 15px; margin-left: 15px;
text-align: left; text-align: left;
i[data-hidden] {
display: none;
}
strong { strong {
font-size: 15px; font-size: 15px;
color: $primary-text-color; color: $primary-text-color;

View File

@ -992,7 +992,7 @@
position: relative; position: relative;
min-height: 54px; min-height: 54px;
border-bottom: 1px solid lighten($ui-base-color, 8%); border-bottom: 1px solid lighten($ui-base-color, 8%);
cursor: default; cursor: auto;
@supports (-ms-overflow-style: -ms-autohiding-scrollbar) { @supports (-ms-overflow-style: -ms-autohiding-scrollbar) {
// Add margin to avoid Edge auto-hiding scrollbar appearing over content. // Add margin to avoid Edge auto-hiding scrollbar appearing over content.

View File

@ -132,7 +132,7 @@ class ActivityPub::Activity
end end
def delete_arrived_first?(uri) def delete_arrived_first?(uri)
redis.exists("delete_upon_arrival:#{@account.id}:#{uri}") redis.exists?("delete_upon_arrival:#{@account.id}:#{uri}")
end end
def delete_later!(uri) def delete_later!(uri)

View File

@ -33,7 +33,7 @@ class ActivityPub::Activity::Move < ActivityPub::Activity
end end
def processed? def processed?
redis.exists("move_in_progress:#{@account.id}") redis.exists?("move_in_progress:#{@account.id}")
end end
def mark_as_processing! def mark_as_processing!

View File

@ -205,7 +205,7 @@ class FeedManager
private private
def push_update_required?(timeline_id) def push_update_required?(timeline_id)
redis.exists("subscribed:#{timeline_id}") redis.exists?("subscribed:#{timeline_id}")
end end
def blocks_or_mutes?(receiver_id, account_ids, context) def blocks_or_mutes?(receiver_id, account_ids, context)

View File

@ -0,0 +1,10 @@
# frozen_string_literal: true
class ResponseWithLimit
def initialize(response, limit)
@response = response
@limit = limit
end
attr_reader :response, :limit
end

View File

@ -108,7 +108,7 @@ class AccountConversation < ApplicationRecord
end end
def subscribed_to_timeline? def subscribed_to_timeline?
Redis.current.exists("subscribed:#{streaming_channel}") Redis.current.exists?("subscribed:#{streaming_channel}")
end end
def streaming_channel def streaming_channel

View File

@ -8,6 +8,17 @@ module Attachmentable
MAX_MATRIX_LIMIT = 16_777_216 # 4096x4096px or approx. 16MB MAX_MATRIX_LIMIT = 16_777_216 # 4096x4096px or approx. 16MB
GIF_MATRIX_LIMIT = 921_600 # 1280x720px GIF_MATRIX_LIMIT = 921_600 # 1280x720px
# For some file extensions, there exist different content
# type variants, and browsers often send the wrong one,
# for example, sending an audio .ogg file as video/ogg,
# likewise, MimeMagic also misreports them as such. For
# those files, it is necessary to use the output of the
# `file` utility instead
INCORRECT_CONTENT_TYPES = %w(
video/ogg
video/webm
).freeze
included do included do
before_post_process :obfuscate_file_name before_post_process :obfuscate_file_name
before_post_process :set_file_extensions before_post_process :set_file_extensions
@ -21,7 +32,7 @@ module Attachmentable
self.class.attachment_definitions.each_key do |attachment_name| self.class.attachment_definitions.each_key do |attachment_name|
attachment = send(attachment_name) attachment = send(attachment_name)
next if attachment.blank? || attachment.queued_for_write[:original].blank? next if attachment.blank? || attachment.queued_for_write[:original].blank? || !INCORRECT_CONTENT_TYPES.include?(attachment.instance_read(:content_type))
attachment.instance_write :content_type, calculated_content_type(attachment) attachment.instance_write :content_type, calculated_content_type(attachment)
end end
@ -63,9 +74,7 @@ module Attachmentable
end end
def calculated_content_type(attachment) def calculated_content_type(attachment)
content_type = Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp
content_type = 'video/mp4' if content_type == 'video/x-m4v'
content_type
rescue Terrapin::CommandLineError rescue Terrapin::CommandLineError
'' ''
end end

View File

@ -24,28 +24,16 @@ module Remotable
Request.new(:get, url).perform do |response| Request.new(:get, url).perform do |response|
raise Mastodon::UnexpectedResponseError, response unless (200...300).cover?(response.code) raise Mastodon::UnexpectedResponseError, response unless (200...300).cover?(response.code)
content_type = parse_content_type(response.headers.get('content-type').last) public_send("#{attachment_name}=", ResponseWithLimit.new(response, limit))
extname = detect_extname_from_content_type(content_type)
if extname.nil?
disposition = response.headers.get('content-disposition').last
matches = disposition&.match(/filename="([^"]*)"/)
filename = matches.nil? ? parsed_url.path.split('/').last : matches[1]
extname = filename.nil? ? '' : File.extname(filename)
end
basename = SecureRandom.hex(8)
public_send("#{attachment_name}_file_name=", basename + extname)
public_send("#{attachment_name}=", StringIO.new(response.body_with_limit(limit)))
end end
rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError => e rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError => e
Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}" Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
raise e unless suppress_errors raise e unless suppress_errors
rescue Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Paperclip::Error, Mastodon::DimensionsValidationError => e rescue Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Paperclip::Error, Mastodon::DimensionsValidationError => e
Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}" Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
nil
end end
nil
end end
define_method("#{attribute_name}=") do |url| define_method("#{attribute_name}=") do |url|
@ -59,26 +47,4 @@ module Remotable
alias_method("reset_#{attachment_name}!", "download_#{attachment_name}!") alias_method("reset_#{attachment_name}!", "download_#{attachment_name}!")
end end
end end
private
def detect_extname_from_content_type(content_type)
return if content_type.nil?
type = MIME::Types[content_type].first
return if type.nil?
extname = type.extensions.first
return if extname.nil?
".#{extname}"
end
def parse_content_type(content_type)
return if content_type.nil?
content_type.split(/\s*;\s*/).first
end
end end

View File

@ -32,16 +32,13 @@ class EncryptedMessage < ApplicationRecord
private private
def push_to_streaming_api def push_to_streaming_api
Rails.logger.info(streaming_channel)
Rails.logger.info(subscribed_to_timeline?)
return if destroyed? || !subscribed_to_timeline? return if destroyed? || !subscribed_to_timeline?
PushEncryptedMessageWorker.perform_async(id) PushEncryptedMessageWorker.perform_async(id)
end end
def subscribed_to_timeline? def subscribed_to_timeline?
Redis.current.exists("subscribed:#{streaming_channel}") Redis.current.exists?("subscribed:#{streaming_channel}")
end end
def streaming_channel def streaming_channel

View File

@ -8,6 +8,6 @@ class HomeFeed < Feed
end end
def regenerating? def regenerating?
redis.exists("account:#{@id}:regeneration") redis.exists?("account:#{@id}:regeneration")
end end
end end

View File

@ -13,4 +13,4 @@
%strong.emojify.p-name= display_name(account, custom_emojify: true) %strong.emojify.p-name= display_name(account, custom_emojify: true)
%span %span
= acct(account) = acct(account)
= fa_icon('lock') if account.locked? = fa_icon('lock', { :data => ({hidden: true} unless account.locked?)})

View File

@ -24,7 +24,7 @@ class ActivityPub::MoveDistributionWorker
private private
def inboxes def inboxes
@inboxes ||= @migration.account.followers.inboxes @inboxes ||= (@migration.account.followers.inboxes + @migration.account.blocked_by.inboxes).uniq
end end
def signed_payload def signed_payload

View File

@ -14,6 +14,8 @@ class MoveWorker
end end
copy_account_notes! copy_account_notes!
carry_blocks_over!
carry_mutes_over!
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
true true
end end
@ -51,4 +53,29 @@ class MoveWorker
end end
end end
end end
def carry_blocks_over!
@source_account.blocked_by_relationships.where(account: Account.local).find_each do |block|
unless block.account.blocking?(@target_account) || block.account.following?(@target_account)
BlockService.new.call(block.account, @target_account)
add_account_note_if_needed!(block.account, 'move_handler.carry_blocks_over_text')
end
end
end
def carry_mutes_over!
@source_account.muted_by_relationships.where(account: Account.local).find_each do |mute|
MuteService.new.call(mute.account, @target_account, notifications: mute.hide_notifications) unless mute.account.muting?(@target_account) || mute.account.following?(@target_account)
add_account_note_if_needed!(mute.account, 'move_handler.carry_mutes_over_text')
end
end
def add_account_note_if_needed!(account, id)
unless AccountNote.where(account: account, target_account: @target_account).exists?
text = I18n.with_locale(account.user.locale || I18n.default_locale) do
I18n.t(id, acct: @source_account.acct)
end
AccountNote.create!(account: account, target_account: @target_account, comment: text)
end
end
end end

View File

@ -14,7 +14,7 @@ class PublishAnnouncementReactionWorker
payload = Oj.dump(event: :'announcement.reaction', payload: payload) payload = Oj.dump(event: :'announcement.reaction', payload: payload)
FeedManager.instance.with_active_accounts do |account| FeedManager.instance.with_active_accounts do |account|
redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}") redis.publish("timeline:#{account.id}", payload) if redis.exists?("subscribed:timeline:#{account.id}")
end end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
true true

View File

@ -15,7 +15,7 @@ class PublishScheduledAnnouncementWorker
payload = Oj.dump(event: :announcement, payload: payload) payload = Oj.dump(event: :announcement, payload: payload)
FeedManager.instance.with_active_accounts do |account| FeedManager.instance.with_active_accounts do |account|
redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}") redis.publish("timeline:#{account.id}", payload) if redis.exists?("subscribed:timeline:#{account.id}")
end end
end end

View File

@ -8,7 +8,7 @@ class UnpublishAnnouncementWorker
payload = Oj.dump(event: :'announcement.delete', payload: announcement_id.to_s) payload = Oj.dump(event: :'announcement.delete', payload: announcement_id.to_s)
FeedManager.instance.with_active_accounts do |account| FeedManager.instance.with_active_accounts do |account|
redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}") redis.publish("timeline:#{account.id}", payload) if redis.exists?("subscribed:timeline:#{account.id}")
end end
end end
end end

View File

@ -7,12 +7,15 @@ require 'rails/all'
Bundler.require(*Rails.groups) Bundler.require(*Rails.groups)
require_relative '../app/lib/exceptions' require_relative '../app/lib/exceptions'
require_relative '../lib/redis/namespace_extensions'
require_relative '../lib/paperclip/url_generator_extensions' require_relative '../lib/paperclip/url_generator_extensions'
require_relative '../lib/paperclip/attachment_extensions' require_relative '../lib/paperclip/attachment_extensions'
require_relative '../lib/paperclip/media_type_spoof_detector_extensions'
require_relative '../lib/paperclip/lazy_thumbnail' require_relative '../lib/paperclip/lazy_thumbnail'
require_relative '../lib/paperclip/gif_transcoder' require_relative '../lib/paperclip/gif_transcoder'
require_relative '../lib/paperclip/video_transcoder' require_relative '../lib/paperclip/video_transcoder'
require_relative '../lib/paperclip/type_corrector' require_relative '../lib/paperclip/type_corrector'
require_relative '../lib/paperclip/response_with_limit_adapter'
require_relative '../lib/mastodon/snowflake' require_relative '../lib/mastodon/snowflake'
require_relative '../lib/mastodon/version' require_relative '../lib/mastodon/version'
require_relative '../lib/devise/two_factor_ldap_authenticatable' require_relative '../lib/devise/two_factor_ldap_authenticatable'

View File

@ -61,6 +61,7 @@ ignore_unused:
- 'admin.action_logs.actions.*' - 'admin.action_logs.actions.*'
- 'themes.*' - 'themes.*'
- 'statuses.attached.*' - 'statuses.attached.*'
- 'move_handler.carry_{mutes,blocks}_over_text'
ignore_inconsistent_interpolations: ignore_inconsistent_interpolations:
- '*.one' - '*.one'

View File

@ -1,6 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
Paperclip::DataUriAdapter.register Paperclip::DataUriAdapter.register
Paperclip::ResponseWithLimitAdapter.register
Paperclip.interpolates :filename do |attachment, style| Paperclip.interpolates :filename do |attachment, style|
if style == :original if style == :original

View File

@ -1,7 +1,5 @@
# frozen_string_literal: true # frozen_string_literal: true
Redis.exists_returns_integer = false
redis_connection = Redis.new( redis_connection = Redis.new(
url: ENV['REDIS_URL'], url: ENV['REDIS_URL'],
driver: :hiredis driver: :hiredis

View File

@ -941,6 +941,8 @@ en:
moderation: moderation:
title: Moderation title: Moderation
move_handler: move_handler:
carry_blocks_over_text: This user moved from %{acct}, which you had blocked.
carry_mutes_over_text: This user moved from %{acct}, which you had muted.
copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:' copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:'
notification_mailer: notification_mailer:
digest: digest:

View File

@ -56,7 +56,7 @@ en:
domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored
email_domain_block: email_domain_block:
domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected. domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected.
with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blocked
featured_tag: featured_tag:
name: 'You might want to use one of these:' name: 'You might want to use one of these:'
form_challenge: form_challenge:

View File

@ -4,28 +4,10 @@ require 'mime/types/columnar'
module Paperclip module Paperclip
class ImageExtractor < Paperclip::Processor class ImageExtractor < Paperclip::Processor
IMAGE_EXTRACTION_OPTIONS = {
convert_options: {
output: {
'loglevel' => 'fatal',
vf: 'scale=\'min(400\, iw):min(400\, ih)\':force_original_aspect_ratio=decrease',
}.freeze,
}.freeze,
format: 'png',
time: -1,
file_geometry_parser: FastGeometryParser,
}.freeze
def make def make
return @file unless options[:style] == :original return @file unless options[:style] == :original
image = begin image = extract_image_from_file!
begin
Paperclip::Transcoder.make(file, IMAGE_EXTRACTION_OPTIONS.dup, attachment)
rescue Paperclip::Error, ::Av::CommandError
nil
end
end
unless image.nil? unless image.nil?
begin begin
@ -36,7 +18,7 @@ module Paperclip
# to make sure it's cleaned up # to make sure it's cleaned up
begin begin
FileUtils.rm(image) image.close(true)
rescue Errno::ENOENT rescue Errno::ENOENT
nil nil
end end
@ -45,5 +27,28 @@ module Paperclip
@file @file
end end
private
def extract_image_from_file!
::Av.logger = Paperclip.logger
cli = ::Av.cli
dst = Tempfile.new([File.basename(@file.path, '.*'), '.png'])
dst.binmode
cli.add_source(@file.path)
cli.add_destination(dst.path)
cli.add_output_param loglevel: 'fatal'
begin
cli.run
rescue Cocaine::ExitStatusError
dst.close(true)
return nil
end
dst
end
end end
end end

View File

@ -0,0 +1,27 @@
# frozen_string_literal: true
module Paperclip
module MediaTypeSpoofDetectorExtensions
def calculated_content_type
@calculated_content_type ||= type_from_mime_magic || type_from_file_command
end
def type_from_mime_magic
@type_from_mime_magic ||= begin
begin
File.open(@file.path) do |file|
MimeMagic.by_magic(file)&.type
end
rescue Errno::ENOENT
''
end
end
end
def type_from_file_command
@type_from_file_command ||= FileCommandContentTypeDetector.new(@file.path).detect
end
end
end
Paperclip::MediaTypeSpoofDetector.prepend(Paperclip::MediaTypeSpoofDetectorExtensions)

View File

@ -0,0 +1,55 @@
# frozen_string_literal: true
module Paperclip
class ResponseWithLimitAdapter < AbstractAdapter
def self.register
Paperclip.io_adapters.register self do |target|
target.is_a?(ResponseWithLimit)
end
end
def initialize(target, options = {})
super
cache_current_values
end
private
def cache_current_values
@original_filename = filename_from_content_disposition || filename_from_path || 'data'
@size = @target.response.content_length
@tempfile = copy_to_tempfile(@target)
@content_type = @target.response.mime_type || ContentTypeDetector.new(@tempfile.path).detect
end
def copy_to_tempfile(source)
bytes_read = 0
source.response.body.each do |chunk|
bytes_read += chunk.bytesize
destination.write(chunk)
chunk.clear
raise Mastodon::LengthValidationError if bytes_read > source.limit
end
destination.rewind
destination
rescue Mastodon::LengthValidationError
destination.close(true)
raise
ensure
source.response.connection.close
end
def filename_from_content_disposition
disposition = @target.response.headers['content-disposition']
disposition&.match(/filename="([^"]*)"/)&.captures&.first
end
def filename_from_path
@target.response.uri.path.split('/').last
end
end
end

View File

@ -0,0 +1,12 @@
# frozen_string_literal: true
class Redis
module NamespaceExtensions
def exists?(*args, &block)
call_with_namespace('exists?', *args, &block)
end
end
end
Redis::Namespace::COMMANDS['exists?'] = [:first]
Redis::Namespace.prepend(Redis::NamespaceExtensions)

View File

@ -1,6 +1,6 @@
Fabricator(:account_migration) do Fabricator(:account_migration) do
account account
target_account target_account { |attrs| Fabricate(:account, also_known_as: [ActivityPub::TagManager.instance.uri_for(attrs[:account])]) }
acct { |attrs| attrs[:target_account].acct }
followers_count 1234 followers_count 1234
acct 'test@example.com'
end end

View File

@ -162,19 +162,15 @@ RSpec.describe Remotable do
let(:headers) { { 'content-disposition' => file } } let(:headers) { { 'content-disposition' => file } }
it 'assigns file' do it 'assigns file' do
string_io = StringIO.new('') response_with_limit = ResponseWithLimit.new(nil, 0)
extname = '.txt'
basename = '0123456789abcdef'
allow(SecureRandom).to receive(:hex).and_return(basename) allow(ResponseWithLimit).to receive(:new).with(anything, anything).and_return(response_with_limit)
allow(StringIO).to receive(:new).with(anything).and_return(string_io)
expect(foo).to receive(:public_send).with("download_#{hoge}!", url) expect(foo).to receive(:public_send).with("download_#{hoge}!", url)
foo.hoge_remote_url = url foo.hoge_remote_url = url
expect(foo).to receive(:public_send).with("#{hoge}=", string_io) expect(foo).to receive(:public_send).with("#{hoge}=", response_with_limit)
expect(foo).to receive(:public_send).with("#{hoge}_file_name=", basename + extname)
foo.download_hoge!(url) foo.download_hoge!(url)
end end

View File

@ -0,0 +1,22 @@
require 'rails_helper'
describe ActivityPub::MoveDistributionWorker do
subject { described_class.new }
let(:migration) { Fabricate(:account_migration) }
let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com') }
let(:blocker) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example2.com') }
describe '#perform' do
before do
allow(ActivityPub::DeliveryWorker).to receive(:push_bulk)
follower.follow!(migration.account)
blocker.block!(migration.account)
end
it 'delivers to followers and known blockers' do
subject.perform(migration.id)
expect(ActivityPub::DeliveryWorker).to have_received(:push_bulk).with(['http://example.com', 'http://example2.com'])
end
end
end

View File

@ -4,20 +4,29 @@ require 'rails_helper'
describe MoveWorker do describe MoveWorker do
let(:local_follower) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account } let(:local_follower) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
let(:blocking_account) { Fabricate(:user, email: 'bar@example.com', account: Fabricate(:account, username: 'bar')).account }
let(:muting_account) { Fabricate(:user, email: 'foo@example.com', account: Fabricate(:account, username: 'foo')).account }
let(:source_account) { Fabricate(:account, protocol: :activitypub, domain: 'example.com') } let(:source_account) { Fabricate(:account, protocol: :activitypub, domain: 'example.com') }
let(:target_account) { Fabricate(:account, protocol: :activitypub, domain: 'example.com') } let(:target_account) { Fabricate(:account, protocol: :activitypub, domain: 'example.com') }
let(:local_user) { Fabricate(:user) } let(:local_user) { Fabricate(:user) }
let!(:account_note) { Fabricate(:account_note, account: local_user.account, target_account: source_account) } let!(:account_note) { Fabricate(:account_note, account: local_user.account, target_account: source_account) }
let(:block_service) { double }
subject { described_class.new } subject { described_class.new }
before do before do
local_follower.follow!(source_account) local_follower.follow!(source_account)
blocking_account.block!(source_account)
muting_account.mute!(source_account)
allow(UnfollowFollowWorker).to receive(:push_bulk)
allow(BlockService).to receive(:new).and_return(block_service)
allow(block_service).to receive(:call)
end end
shared_examples 'user note handling' do shared_examples 'user note handling' do
it 'copies user note' do it 'copies user note' do
allow(UnfollowFollowWorker).to receive(:push_bulk)
subject.perform(source_account.id, target_account.id) subject.perform(source_account.id, target_account.id)
expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(source_account.acct) expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(source_account.acct)
expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(account_note.comment) expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(account_note.comment)
@ -26,7 +35,6 @@ describe MoveWorker do
it 'merges user notes when needed' do it 'merges user notes when needed' do
new_account_note = AccountNote.create!(account: account_note.account, target_account: target_account, comment: 'new note prior to move') new_account_note = AccountNote.create!(account: account_note.account, target_account: target_account, comment: 'new note prior to move')
allow(UnfollowFollowWorker).to receive(:push_bulk)
subject.perform(source_account.id, target_account.id) subject.perform(source_account.id, target_account.id)
expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(source_account.acct) expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(source_account.acct)
expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(account_note.comment) expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(account_note.comment)
@ -34,15 +42,29 @@ describe MoveWorker do
end end
end end
shared_examples 'block and mute handling' do
it 'makes blocks carry over and add a note' do
subject.perform(source_account.id, target_account.id)
expect(block_service).to have_received(:call).with(blocking_account, target_account)
expect(AccountNote.find_by(account: blocking_account, target_account: target_account).comment).to include(source_account.acct)
end
it 'makes mutes carry over and add a note' do
subject.perform(source_account.id, target_account.id)
expect(muting_account.muting?(target_account)).to be true
expect(AccountNote.find_by(account: muting_account, target_account: target_account).comment).to include(source_account.acct)
end
end
context 'both accounts are distant' do context 'both accounts are distant' do
describe 'perform' do describe 'perform' do
it 'calls UnfollowFollowWorker' do it 'calls UnfollowFollowWorker' do
allow(UnfollowFollowWorker).to receive(:push_bulk)
subject.perform(source_account.id, target_account.id) subject.perform(source_account.id, target_account.id)
expect(UnfollowFollowWorker).to have_received(:push_bulk).with([local_follower.id]) expect(UnfollowFollowWorker).to have_received(:push_bulk).with([local_follower.id])
end end
include_examples 'user note handling' include_examples 'user note handling'
include_examples 'block and mute handling'
end end
end end
@ -51,12 +73,12 @@ describe MoveWorker do
describe 'perform' do describe 'perform' do
it 'calls UnfollowFollowWorker' do it 'calls UnfollowFollowWorker' do
allow(UnfollowFollowWorker).to receive(:push_bulk)
subject.perform(source_account.id, target_account.id) subject.perform(source_account.id, target_account.id)
expect(UnfollowFollowWorker).to have_received(:push_bulk).with([local_follower.id]) expect(UnfollowFollowWorker).to have_received(:push_bulk).with([local_follower.id])
end end
include_examples 'user note handling' include_examples 'user note handling'
include_examples 'block and mute handling'
end end
end end
@ -71,6 +93,7 @@ describe MoveWorker do
end end
include_examples 'user note handling' include_examples 'user note handling'
include_examples 'block and mute handling'
it 'does not fail when a local user is already following both accounts' do it 'does not fail when a local user is already following both accounts' do
double_follower = Fabricate(:user, email: 'eve@example.com', account: Fabricate(:account, username: 'eve')).account double_follower = Fabricate(:user, email: 'eve@example.com', account: Fabricate(:account, username: 'eve')).account