Commiting

app/controllers/concerns/account_controller_concern.rb

@@ -7,10 +7,8 @@ module AccountControllerConcern
 
   included do
     before_action :set_account
-    before_action :check_account_approval
     before_action :check_account_suspension
     before_action :set_instance_presenter
-    before_action :set_link_headers
   end
 
   private
@@ -23,51 +21,10 @@ module AccountControllerConcern
     @instance_presenter = InstancePresenter.new
   end
 
-  def set_link_headers
-    return if !@account.local? # TODO: Handle remote users
-
-    response.headers['Link'] = LinkHeader.new(
-      [
-        webfinger_account_link,
-        atom_account_url_link,
-        actor_url_link,
-      ]
-    )
-  end
-
   def username_param
     params[:account_username]
   end
 
-  def webfinger_account_link
-    [
-      webfinger_account_url,
-      [%w(rel lrdd), %w(type application/xrd+xml)],
-    ]
-  end
-
-  def atom_account_url_link
-    [
-      account_url(@account, format: 'atom'),
-      [%w(rel alternate), %w(type application/atom+xml)],
-    ]
-  end
-
-  def actor_url_link
-    [
-      ActivityPub::TagManager.instance.uri_for(@account),
-      [%w(rel alternate), %w(type application/activity+json)],
-    ]
-  end
-
-  def webfinger_account_url
-    webfinger_url(resource: @account.to_webfinger_s)
-  end
-
-  def check_account_approval
-    not_found if @account.user_pending?
-  end
-
   def check_account_suspension
     if @account.suspended?
       skip_session!

app/controllers/concerns/signature_verification.rb

@@ -43,7 +43,7 @@ module SignatureVerification
       return
     end
 
-    account = account_from_key_id(signature_params['keyId'])
+    account = nil
 
     if account.nil?
       @signature_verification_failure_reason = "Public key not found for key #{signature_params['keyId']}"
@@ -56,7 +56,7 @@ module SignatureVerification
 
     return account unless verify_signature(account, signature, compare_signed_string).nil?
 
-    account = stoplight_wrap_request { account.possibly_stale? ? account.refresh! : account_refresh_key(account) }
+    account = nil
 
     if account.nil?
       @signature_verification_failure_reason = "Public key not found for key #{signature_params['keyId']}"
@@ -122,27 +122,4 @@ module SignatureVerification
       signature_params['signature'].blank?
   end
 
-  def account_from_key_id(key_id)
-    if key_id.start_with?('acct:')
-      stoplight_wrap_request { ResolveAccountService.new.call(key_id.gsub(/\Aacct:/, '')) }
-    elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
-      account   = ActivityPub::TagManager.instance.uri_to_resource(key_id, Account)
-      account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false) }
-      account
-    end
-  end
-
-  def stoplight_wrap_request(&block)
-    Stoplight("source:#{request.remote_ip}", &block)
-      .with_fallback { nil }
-      .with_threshold(1)
-      .with_cool_off_time(5.minutes.seconds)
-      .with_error_handler { |error, handle| error.is_a?(HTTP::Error) ? handle.call(error) : raise(error) }
-      .run
-  end
-
-  def account_refresh_key(account)
-    return if account.local? || !account.activitypub?
-    ActivityPub::FetchRemoteAccountService.new.call(account.uri, only_key: true)
-  end
 end