Skip to content

Commit 383b44e

Browse files
johnnyshieldsjohnnyshields
committed
Fix HashSyntax (convert hash rockets to ruby19 style)
1 parent 4167996 commit 383b44e

File tree

9 files changed

+75
-83
lines changed

9 files changed

+75
-83
lines changed

‎.rubocop_todo.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -550,14 +550,6 @@ Style/GuardClause:
550550
- 'lib/onelogin/ruby-saml/utils.rb'
551551
- 'lib/xml_security.rb'
552552

553-
# Offense count: 76
554-
# This cop supports safe autocorrection (--autocorrect).
555-
# Configuration parameters: EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
556-
# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
557-
# SupportedShorthandSyntax: always, never, either, consistent
558-
Style/HashSyntax:
559-
EnforcedStyle: hash_rockets
560-
561553
# Offense count: 1
562554
# This cop supports unsafe autocorrection (--autocorrect-all).
563555
Style/HashTransformKeys:

‎lib/onelogin/ruby-saml/authrequest.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ def create_params(settings, params={})
7878
if settings.idp_sso_service_binding == Utils::BINDINGS[:redirect] && settings.security[:authn_requests_signed] && settings.private_key
7979
params['SigAlg'] = settings.security[:signature_method]
8080
url_string = OneLogin::RubySaml::Utils.build_query(
81-
:type => 'SAMLRequest',
82-
:data => base64_request,
83-
:relay_state => relay_state,
84-
:sig_alg => params['SigAlg']
81+
type: 'SAMLRequest',
82+
data: base64_request,
83+
relay_state: relay_state,
84+
sig_alg: params['SigAlg']
8585
)
8686
sign_algorithm = XMLSecurity::BaseDocument.new.algorithm(settings.security[:signature_method])
8787
signature = settings.get_sp_key.sign(sign_algorithm.new, url_string)

‎lib/onelogin/ruby-saml/idp_metadata_parser.rb‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -228,19 +228,19 @@ def to_hash(options = {})
228228
sso_binding = options[:sso_binding]
229229
slo_binding = options[:slo_binding]
230230
{
231-
:idp_entity_id => @entity_id,
232-
:name_identifier_format => idp_name_id_format(options[:name_id_format]),
233-
:idp_sso_service_url => single_signon_service_url(sso_binding),
234-
:idp_sso_service_binding => single_signon_service_binding(sso_binding),
235-
:idp_slo_service_url => single_logout_service_url(slo_binding),
236-
:idp_slo_service_binding => single_logout_service_binding(slo_binding),
237-
:idp_slo_response_service_url => single_logout_response_service_url(slo_binding),
238-
:idp_attribute_names => attribute_names,
239-
:idp_cert => nil,
240-
:idp_cert_fingerprint => nil,
241-
:idp_cert_multi => nil,
242-
:valid_until => valid_until,
243-
:cache_duration => cache_duration,
231+
idp_entity_id: @entity_id,
232+
name_identifier_format: idp_name_id_format(options[:name_id_format]),
233+
idp_sso_service_url: single_signon_service_url(sso_binding),
234+
idp_sso_service_binding: single_signon_service_binding(sso_binding),
235+
idp_slo_service_url: single_logout_service_url(slo_binding),
236+
idp_slo_service_binding: single_logout_service_binding(slo_binding),
237+
idp_slo_response_service_url: single_logout_response_service_url(slo_binding),
238+
idp_attribute_names: attribute_names,
239+
idp_cert: nil,
240+
idp_cert_fingerprint: nil,
241+
idp_cert_multi: nil,
242+
valid_until: valid_until,
243+
cache_duration: cache_duration,
244244
}.tap do |response_hash|
245245
merge_certificates_into(response_hash) unless certificates.nil?
246246
end

‎lib/onelogin/ruby-saml/logoutrequest.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ def create_params(settings, params={})
7575
if settings.idp_slo_service_binding == Utils::BINDINGS[:redirect] && settings.security[:logout_requests_signed] && settings.private_key
7676
params['SigAlg'] = settings.security[:signature_method]
7777
url_string = OneLogin::RubySaml::Utils.build_query(
78-
:type => 'SAMLRequest',
79-
:data => base64_request,
80-
:relay_state => relay_state,
81-
:sig_alg => params['SigAlg']
78+
type: 'SAMLRequest',
79+
data: base64_request,
80+
relay_state: relay_state,
81+
sig_alg: params['SigAlg']
8282
)
8383
sign_algorithm = XMLSecurity::BaseDocument.new.algorithm(settings.security[:signature_method])
8484
signature = settings.get_sp_key.sign(sign_algorithm.new, url_string)

‎lib/onelogin/ruby-saml/logoutresponse.rb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -228,19 +228,19 @@ def validate_signature
228228
end
229229

230230
query_string = OneLogin::RubySaml::Utils.build_query_from_raw_parts(
231-
:type => 'SAMLResponse',
232-
:raw_data => options[:raw_get_params]['SAMLResponse'],
233-
:raw_relay_state => options[:raw_get_params]['RelayState'],
234-
:raw_sig_alg => options[:raw_get_params]['SigAlg']
231+
type: 'SAMLResponse',
232+
raw_data: options[:raw_get_params]['SAMLResponse'],
233+
raw_relay_state: options[:raw_get_params]['RelayState'],
234+
raw_sig_alg: options[:raw_get_params]['SigAlg']
235235
)
236236

237237
expired = false
238238
if idp_certs.nil? || idp_certs[:signing].empty?
239239
valid = OneLogin::RubySaml::Utils.verify_signature(
240-
:cert => idp_cert,
241-
:sig_alg => options[:get_params]['SigAlg'],
242-
:signature => options[:get_params]['Signature'],
243-
:query_string => query_string
240+
cert: idp_cert,
241+
sig_alg: options[:get_params]['SigAlg'],
242+
signature: options[:get_params]['Signature'],
243+
query_string: query_string
244244
)
245245
if valid && settings.security[:check_idp_cert_expiration]
246246
if OneLogin::RubySaml::Utils.is_cert_expired(idp_cert)
@@ -251,10 +251,10 @@ def validate_signature
251251
valid = false
252252
idp_certs[:signing].each do |signing_idp_cert|
253253
valid = OneLogin::RubySaml::Utils.verify_signature(
254-
:cert => signing_idp_cert,
255-
:sig_alg => options[:get_params]['SigAlg'],
256-
:signature => options[:get_params]['Signature'],
257-
:query_string => query_string
254+
cert: signing_idp_cert,
255+
sig_alg: options[:get_params]['SigAlg'],
256+
signature: options[:get_params]['Signature'],
257+
query_string: query_string
258258
)
259259
if valid
260260
if settings.security[:check_idp_cert_expiration]

‎lib/onelogin/ruby-saml/settings.rb‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def get_idp_cert_multi
195195

196196
raise ArgumentError.new("Invalid value for idp_cert_multi") if not idp_cert_multi.is_a?(Hash)
197197

198-
certs = {:signing => [], :encryption => [] }
198+
certs = {signing: [], encryption: [] }
199199

200200
[:signing, :encryption].each do |type|
201201
certs_for_type = idp_cert_multi[type] || idp_cert_multi[type.to_s]
@@ -257,29 +257,29 @@ def get_binding(value)
257257
end
258258

259259
DEFAULTS = {
260-
:assertion_consumer_service_binding => Utils::BINDINGS[:post],
261-
:single_logout_service_binding => Utils::BINDINGS[:redirect],
262-
:idp_cert_fingerprint_algorithm => XMLSecurity::Document::SHA1,
263-
:compress_request => true,
264-
:compress_response => true,
265-
:message_max_bytesize => 250000,
266-
:soft => true,
267-
:double_quote_xml_attribute_values => false,
268-
:security => {
269-
:authn_requests_signed => false,
270-
:logout_requests_signed => false,
271-
:logout_responses_signed => false,
272-
:want_assertions_signed => false,
273-
:want_assertions_encrypted => false,
274-
:want_name_id => false,
275-
:metadata_signed => false,
276-
:embed_sign => false, # Deprecated
277-
:digest_method => XMLSecurity::Document::SHA1,
278-
:signature_method => XMLSecurity::Document::RSA_SHA1,
279-
:check_idp_cert_expiration => false,
280-
:check_sp_cert_expiration => false,
281-
:strict_audience_validation => false,
282-
:lowercase_url_encoding => false
260+
assertion_consumer_service_binding: Utils::BINDINGS[:post],
261+
single_logout_service_binding: Utils::BINDINGS[:redirect],
262+
idp_cert_fingerprint_algorithm: XMLSecurity::Document::SHA1,
263+
compress_request: true,
264+
compress_response: true,
265+
message_max_bytesize: 250000,
266+
soft: true,
267+
double_quote_xml_attribute_values: false,
268+
security: {
269+
authn_requests_signed: false,
270+
logout_requests_signed: false,
271+
logout_responses_signed: false,
272+
want_assertions_signed: false,
273+
want_assertions_encrypted: false,
274+
want_name_id: false,
275+
metadata_signed: false,
276+
embed_sign: false, # Deprecated
277+
digest_method: XMLSecurity::Document::SHA1,
278+
signature_method: XMLSecurity::Document::RSA_SHA1,
279+
check_idp_cert_expiration: false,
280+
check_sp_cert_expiration: false,
281+
strict_audience_validation: false,
282+
lowercase_url_encoding: false
283283
}.freeze
284284
}.freeze
285285
end

‎lib/onelogin/ruby-saml/slo_logoutrequest.rb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -264,19 +264,19 @@ def validate_signature
264264
end
265265

266266
query_string = OneLogin::RubySaml::Utils.build_query_from_raw_parts(
267-
:type => 'SAMLRequest',
268-
:raw_data => options[:raw_get_params]['SAMLRequest'],
269-
:raw_relay_state => options[:raw_get_params]['RelayState'],
270-
:raw_sig_alg => options[:raw_get_params]['SigAlg']
267+
type: 'SAMLRequest',
268+
raw_data: options[:raw_get_params]['SAMLRequest'],
269+
raw_relay_state: options[:raw_get_params]['RelayState'],
270+
raw_sig_alg: options[:raw_get_params]['SigAlg']
271271
)
272272

273273
expired = false
274274
if idp_certs.nil? || idp_certs[:signing].empty?
275275
valid = OneLogin::RubySaml::Utils.verify_signature(
276-
:cert => idp_cert,
277-
:sig_alg => options[:get_params]['SigAlg'],
278-
:signature => options[:get_params]['Signature'],
279-
:query_string => query_string
276+
cert: idp_cert,
277+
sig_alg: options[:get_params]['SigAlg'],
278+
signature: options[:get_params]['Signature'],
279+
query_string: query_string
280280
)
281281
if valid && settings.security[:check_idp_cert_expiration]
282282
if OneLogin::RubySaml::Utils.is_cert_expired(idp_cert)
@@ -287,10 +287,10 @@ def validate_signature
287287
valid = false
288288
idp_certs[:signing].each do |signing_idp_cert|
289289
valid = OneLogin::RubySaml::Utils.verify_signature(
290-
:cert => signing_idp_cert,
291-
:sig_alg => options[:get_params]['SigAlg'],
292-
:signature => options[:get_params]['Signature'],
293-
:query_string => query_string
290+
cert: signing_idp_cert,
291+
sig_alg: options[:get_params]['SigAlg'],
292+
signature: options[:get_params]['Signature'],
293+
query_string: query_string
294294
)
295295
if valid
296296
if settings.security[:check_idp_cert_expiration]

‎lib/onelogin/ruby-saml/slo_logoutresponse.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ def create_params(settings, request_id = nil, logout_message = nil, params = {},
8484
if settings.idp_slo_service_binding == Utils::BINDINGS[:redirect] && settings.security[:logout_responses_signed] && settings.private_key
8585
params['SigAlg'] = settings.security[:signature_method]
8686
url_string = OneLogin::RubySaml::Utils.build_query(
87-
:type => 'SAMLResponse',
88-
:data => base64_response,
89-
:relay_state => relay_state,
90-
:sig_alg => params['SigAlg']
87+
type: 'SAMLResponse',
88+
data: base64_response,
89+
relay_state: relay_state,
90+
sig_alg: params['SigAlg']
9191
)
9292
sign_algorithm = XMLSecurity::BaseDocument.new.algorithm(settings.security[:signature_method])
9393
signature = settings.get_sp_key.sign(sign_algorithm.new, url_string)

‎lib/onelogin/ruby-saml/utils.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ module RubySaml
99
# SAML2 Auxiliary class
1010
#
1111
class Utils
12-
BINDINGS = { :post => "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
13-
:redirect => "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" }.freeze
12+
BINDINGS = { post: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
13+
redirect: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" }.freeze
1414
DSIG = "http://www.w3.org/2000/09/xmldsig#"
1515
XENC = "http://www.w3.org/2001/04/xmlenc#"
1616
DURATION_FORMAT = %r(^

0 commit comments

Comments
 (0)