From dfb6907e08350ca487e2978a85013f4525526bdf Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 17 May 2018 04:03:28 +0200 Subject: HTTP signatures spec no longer requires algorithms field (#7525) Fix #7520 --- app/controllers/concerns/signature_verification.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb index f289228d3..41aa1c8a6 100644 --- 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) -- cgit From 7293b9fc6190acd6d2a481c158c718a7a8299c73 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 17 May 2018 13:00:56 +0200 Subject: Ensure unfilled fields are shown when errors are shown (#7523) Fix #7486 --- app/controllers/settings/profiles_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers') diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb index 1b01fc75f..fe265c81d 100644 --- a/app/controllers/settings/profiles_controller.rb +++ b/app/controllers/settings/profiles_controller.rb @@ -20,6 +20,7 @@ class Settings::ProfilesController < ApplicationController 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 -- cgit