forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'v4.0.4' into hometown-4.0.4
- Loading branch information
Showing
53 changed files
with
481 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 3.0.4 | ||
| 3.0.6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class BackupsController < ApplicationController | ||
| include RoutingHelper | ||
|
|
||
| skip_before_action :require_functional! | ||
|
|
||
| before_action :authenticate_user! | ||
| before_action :set_backup | ||
|
|
||
| def download | ||
| case Paperclip::Attachment.default_options[:storage] | ||
| when :s3 | ||
| redirect_to @backup.dump.expiring_url(10) | ||
| when :fog | ||
| if Paperclip::Attachment.default_options.dig(:storage, :fog_credentials, :openstack_temp_url_key).present? | ||
| redirect_to @backup.dump.expiring_url(Time.now.utc + 10) | ||
| else | ||
| redirect_to full_asset_url(@backup.dump.url) | ||
| end | ||
| when :filesystem | ||
| redirect_to full_asset_url(@backup.dump.url) | ||
| end | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def set_backup | ||
| @backup = current_user.backups.find(params[:id]) | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class Admin::SystemCheck::MediaPrivacyCheck < Admin::SystemCheck::BaseCheck | ||
| include RoutingHelper | ||
|
|
||
| def skip? | ||
| !current_user.can?(:view_devops) | ||
| end | ||
|
|
||
| def pass? | ||
| check_media_uploads! | ||
| @failure_message.nil? | ||
| end | ||
|
|
||
| def message | ||
| Admin::SystemCheck::Message.new(@failure_message, @failure_value, @failure_action, true) | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def check_media_uploads! | ||
| if Rails.configuration.x.use_s3 | ||
| check_media_listing_inaccessible_s3! | ||
| else | ||
| check_media_listing_inaccessible! | ||
| end | ||
| end | ||
|
|
||
| def check_media_listing_inaccessible! | ||
| full_url = full_asset_url(media_attachment.file.url(:original, false)) | ||
|
|
||
| # Check if we can list the uploaded file. If true, that's an error | ||
| directory_url = Addressable::URI.parse(full_url) | ||
| directory_url.query = nil | ||
| filename = directory_url.path.gsub(%r{.*/}, '') | ||
| directory_url.path = directory_url.path.gsub(%r{/[^/]+\Z}, '/') | ||
| Request.new(:get, directory_url, allow_local: true).perform do |res| | ||
| if res.truncated_body&.include?(filename) | ||
| @failure_message = use_storage? ? :upload_check_privacy_error_object_storage : :upload_check_privacy_error | ||
| @failure_action = 'https://docs.joinmastodon.org/admin/optional/object-storage/#FS' | ||
| end | ||
| end | ||
| rescue | ||
| nil | ||
| end | ||
|
|
||
| def check_media_listing_inaccessible_s3! | ||
| urls_to_check = [] | ||
| paperclip_options = Paperclip::Attachment.default_options | ||
| s3_protocol = paperclip_options[:s3_protocol] | ||
| s3_host_alias = paperclip_options[:s3_host_alias] | ||
| s3_host_name = paperclip_options[:s3_host_name] | ||
| bucket_name = paperclip_options.dig(:s3_credentials, :bucket) | ||
|
|
||
| urls_to_check << "#{s3_protocol}://#{s3_host_alias}/" if s3_host_alias.present? | ||
| urls_to_check << "#{s3_protocol}://#{s3_host_name}/#{bucket_name}/" | ||
| urls_to_check.uniq.each do |full_url| | ||
| check_s3_listing!(full_url) | ||
| break if @failure_message.present? | ||
| end | ||
| rescue | ||
| nil | ||
| end | ||
|
|
||
| def check_s3_listing!(full_url) | ||
| bucket_url = Addressable::URI.parse(full_url) | ||
| bucket_url.path = bucket_url.path.delete_suffix(media_attachment.file.path(:original)) | ||
| bucket_url.query = "max-keys=1&x-random=#{SecureRandom.hex(10)}" | ||
| Request.new(:get, bucket_url, allow_local: true).perform do |res| | ||
| if res.truncated_body&.include?('ListBucketResult') | ||
| @failure_message = :upload_check_privacy_error_object_storage | ||
| @failure_action = 'https://docs.joinmastodon.org/admin/optional/object-storage/#S3' | ||
| end | ||
| end | ||
| end | ||
|
|
||
| def media_attachment | ||
| @media_attachment ||= begin | ||
| attachment = Account.representative.media_attachments.first | ||
| if attachment.present? | ||
| attachment.touch # rubocop:disable Rails/SkipsModelValidations | ||
| attachment | ||
| else | ||
| create_test_attachment! | ||
| end | ||
| end | ||
| end | ||
|
|
||
| def create_test_attachment! | ||
| Tempfile.create(%w(test-upload .jpg), binmode: true) do |tmp_file| | ||
| tmp_file.write( | ||
| Base64.decode64( | ||
| '/9j/4QAiRXhpZgAATU0AKgAAAAgAAQESAAMAAAABAAYAAAA' \ | ||
| 'AAAD/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA' \ | ||
| 'QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE' \ | ||
| 'BAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAEAAgMBEQACEQEDEQH/x' \ | ||
| 'ABKAAEAAAAAAAAAAAAAAAAAAAALEAEAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAA' \ | ||
| 'AAAAAEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwA/8H//2Q==' | ||
| ) | ||
| ) | ||
| tmp_file.flush | ||
| Account.representative.media_attachments.create!(file: tmp_file) | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class Admin::SystemCheck::Message | ||
| attr_reader :key, :value, :action | ||
| attr_reader :key, :value, :action, :critical | ||
|
|
||
| def initialize(key, value = nil, action = nil) | ||
| @key = key | ||
| @value = value | ||
| @action = action | ||
| def initialize(key, value = nil, action = nil, critical = false) | ||
| @key = key | ||
| @value = value | ||
| @action = action | ||
| @critical = critical | ||
| end | ||
| end |
Oops, something went wrong.