Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove stray "include REXML" + fix REXML deprecation #706

Merged
merged 2 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2024-07-09 08:57:21 UTC using RuboCop version 1.64.1.
# on 2024-07-10 16:10:44 UTC using RuboCop version 1.64.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand All @@ -20,7 +20,7 @@ Layout/EmptyLineAfterGuardClause:
- 'lib/ruby_saml/slo_logoutrequest.rb'
- 'lib/ruby_saml/slo_logoutresponse.rb'

# Offense count: 6
# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
Expand All @@ -31,6 +31,7 @@ Layout/EmptyLinesAroundClassBody:
- 'lib/ruby_saml/logoutrequest.rb'
- 'lib/ruby_saml/logoutresponse.rb'
- 'lib/ruby_saml/metadata.rb'
- 'lib/ruby_saml/saml_message.rb'
- 'lib/ruby_saml/slo_logoutresponse.rb'

# Offense count: 1
Expand All @@ -39,14 +40,16 @@ Layout/EmptyLinesAroundMethodBody:
Exclude:
- 'lib/ruby_saml/slo_logoutrequest.rb'

# Offense count: 11
# Offense count: 13
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
Layout/EmptyLinesAroundModuleBody:
Exclude:
- 'lib/ruby_saml/attribute_service.rb'
- 'lib/ruby_saml/attributes.rb'
- 'lib/ruby_saml/authrequest.rb'
- 'lib/ruby_saml/idp_metadata_parser.rb'
- 'lib/ruby_saml/logoutrequest.rb'
- 'lib/ruby_saml/logoutresponse.rb'
- 'lib/ruby_saml/metadata.rb'
Expand Down Expand Up @@ -294,7 +297,7 @@ Performance/StringReplacement:
- 'lib/ruby_saml/utils.rb'
- 'lib/ruby_saml/xml/document.rb'

# Offense count: 52
# Offense count: 48
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: separated, grouped
Expand Down Expand Up @@ -414,14 +417,6 @@ Style/ModuleFunction:
Exclude:
- 'lib/ruby_saml/logging.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle, Autocorrect.
# SupportedStyles: module_function, extend_self, forbidden
Style/ModuleFunction:
Exclude:
- 'lib/ruby_saml/logging.rb'

# Offense count: 16
# Configuration parameters: AllowedMethods.
# AllowedMethods: respond_to_missing?
Expand Down Expand Up @@ -514,7 +509,7 @@ Style/SymbolArray:
Exclude:
- 'lib/ruby_saml/settings.rb'

# Offense count: 95
# Offense count: 92
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
# URISchemes: http, https
Expand Down
1 change: 0 additions & 1 deletion lib/ruby_saml/authrequest.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

# Only supports SAML 2.0
module RubySaml
include REXML

# SAML2 Authentication. AuthNRequest (SSO SP initiated, Builder)
#
Expand Down
1 change: 0 additions & 1 deletion lib/ruby_saml/idp_metadata_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

# Only supports SAML 2.0
module RubySaml
include REXML

# Auxiliary class to retrieve and parse the Identity Provider Metadata
#
Expand Down
1 change: 0 additions & 1 deletion lib/ruby_saml/saml_message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module RubySaml
# SAML2 Message
#
class SamlMessage
include REXML

ASSERTION = "urn:oasis:names:tc:SAML:2.0:assertion"
PROTOCOL = "urn:oasis:names:tc:SAML:2.0:protocol"
Expand Down
2 changes: 1 addition & 1 deletion lib/ruby_saml/xml/base_document.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
module RubySaml
module XML
class BaseDocument < REXML::Document
REXML::Document.entity_expansion_limit = 0
REXML::Security.entity_expansion_limit = 0

C14N = 'http://www.w3.org/2001/10/xml-exc-c14n#'
DSIG = 'http://www.w3.org/2000/09/xmldsig#'
Expand Down
Loading