Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-17 11:17:21 +00:00
parent 4bf43e6f3e 7293b9fc61
commit 2636a23092
3 changed files with 44 additions and 3 deletions
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -107,9 +107,7 @@ module SignatureVerification

  def incompatible_signature?(signature_params)
    signature_params['keyId'].blank? ||
-      signature_params['signature'].blank? ||
-      signature_params['algorithm'].blank? ||
-      signature_params['algorithm'] != 'rsa-sha256'
+      signature_params['signature'].blank?
  end

  def account_from_key_id(key_id)
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -17,6 +17,7 @@ class Settings::ProfilesController < Settings::BaseController
      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
      redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
    else
+      @account.build_fields
      render :show
    end
  end