From d5a185d7217a2b367e063d37e298e5d3d1fd7371 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Wed, 3 May 2023 23:51:18 -0400
Subject: [PATCH] Autofix Rubocop Style/CaseLikeIf (#23756)
---
.rubocop_todo.yml | 6 ------
app/controllers/concerns/signature_verification.rb | 7 ++++---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ca3e8fbc20..d1850aa2b5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1031,12 +1031,6 @@ Style/CaseEquality:
Exclude:
- 'config/initializers/trusted_proxies.rb'
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: MinBranchesCount.
-Style/CaseLikeIf:
- Exclude:
- - 'app/controllers/concerns/signature_verification.rb'
-
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowedMethods, AllowedPatterns.
# AllowedMethods: ==, equal?, eql?
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index db3144adbe..1d27c92c8c 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -180,14 +180,15 @@ module SignatureVerification
def build_signed_string
signed_headers.map do |signed_header|
- if signed_header == Request::REQUEST_TARGET
+ case signed_header
+ when Request::REQUEST_TARGET
"#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
- elsif signed_header == '(created)'
+ when '(created)'
raise SignatureVerificationError, 'Invalid pseudo-header (created) for rsa-sha256' unless signature_algorithm == 'hs2019'
raise SignatureVerificationError, 'Pseudo-header (created) used but corresponding argument missing' if signature_params['created'].blank?
"(created): #{signature_params['created']}"
- elsif signed_header == '(expires)'
+ when '(expires)'
raise SignatureVerificationError, 'Invalid pseudo-header (expires) for rsa-sha256' unless signature_algorithm == 'hs2019'
raise SignatureVerificationError, 'Pseudo-header (expires) used but corresponding argument missing' if signature_params['expires'].blank?
--
GitLab