Fix tests

Author: johnnyshields

CHANGELOG.md

@@ -13,9 +13,10 @@
 * [#709](https://github.com/SAML-Toolkits/ruby-saml/pull/709) Allow passing in `Net::HTTP` `:open_timeout`, `:read_timeout`, and `:max_retries` settings to `IdpMetadataParser#parse_remote`.
 * [#715](https://github.com/SAML-Toolkits/ruby-saml/pull/715) Fix typo in error when SPNameQualifier value does not match the SP entityID.
 * [#718](https://github.com/SAML-Toolkits/ruby-saml/pull/718) Add support to retrieve from SAMLResponse the AuthnInstant and AuthnContextClassRef values
-* [#711](https://github.com/SAML-Toolkits/ruby-saml/pull/711) Standardize how RubySaml reads and formats certificate and private_key PEM values, including the `RubySaml::Util#format_cert` and `#format_private_key` methods.
+* [#711](https://github.com/SAML-Toolkits/ruby-saml/pull/711) Standardize how RubySaml reads and formats certificate and private_key PEM values, including the `RubySaml::Utils#format_cert` and `#format_private_key` methods.
 * [#733](https://github.com/SAML-Toolkits/ruby-saml/pull/733) Allow `RubySaml::Utils.is_cert_expired` and `is_cert_active` to accept an optional time argument.
 * [#731](https://github.com/SAML-Toolkits/ruby-saml/pull/731) Add CI coverage for Ruby 3.4. Remove CI coverage for Ruby 1.x and 2.x.
+* [#735](https://github.com/SAML-Toolkits/ruby-saml/pull/735) Add `Settings#sp_uuid_prefix` and deprecate `Utils#set_prefix`.
 
 ### 1.18.0  (???)
 * [#718](https://github.com/SAML-Toolkits/ruby-saml/pull/718) Add support to retrieve from SAMLResponse the AuthnInstant and AuthnContextClassRef values

lib/ruby_saml/authrequest.rb

@@ -24,7 +24,7 @@ class Authrequest < SamlMessage
     # @return [String] AuthNRequest string that includes the SAMLRequest
     #
     def create(settings, params = {})
-      @uuid = RubySaml::Utils.generate_uuid(settings.sp_uuid_prefix)
+      assign_uuid(settings)
       params = create_params(settings, params)
       params_prefix = /\?/.match?(settings.idp_sso_service_url) ? '&' : '?'
       saml_request = CGI.escape(params.delete("SAMLRequest"))
@@ -97,6 +97,7 @@ def create_authentication_xml_doc(settings)
 
     def create_xml_document(settings)
       time = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+      assign_uuid(settings)
 
       request_doc = RubySaml::XML::Document.new
       request_doc.uuid = uuid
@@ -180,5 +181,9 @@ def sign_document(document, settings)
 
       document
     end
+
+    def assign_uuid(settings)
+      @uuid ||= RubySaml::Utils.generate_uuid(settings.sp_uuid_prefix)
+    end
   end
 end

lib/ruby_saml/logoutrequest.rb

@@ -22,7 +22,7 @@ class Logoutrequest < SamlMessage
     # @return [String] Logout Request string that includes the SAMLRequest
     #
     def create(settings, params={})
-      @uuid = RubySaml::Utils.generate_uuid(settings.sp_uuid_prefix)
+      assign_uuid(settings)
       params = create_params(settings, params)
       params_prefix = /\?/.match?(settings.idp_slo_service_url) ? '&' : '?'
       saml_request = CGI.escape(params.delete("SAMLRequest"))
@@ -95,6 +95,7 @@ def create_logout_request_xml_doc(settings)
 
     def create_xml_document(settings)
       time = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+      assign_uuid(settings)
 
       request_doc = RubySaml::XML::Document.new
       request_doc.uuid = uuid
@@ -139,5 +140,9 @@ def sign_document(document, settings)
 
       document
     end
+
+    def assign_uuid(settings)
+      @uuid ||= RubySaml::Utils.generate_uuid(settings.sp_uuid_prefix)
+    end
   end
 end

lib/ruby_saml/slo_logoutresponse.rb

@@ -25,7 +25,7 @@ class SloLogoutresponse < SamlMessage
     # @return [String] Logout Request string that includes the SAMLRequest
     #
     def create(settings, request_id = nil, logout_message = nil, params = {}, logout_status_code = nil)
-      @uuid = RubySaml::Utils.generate_uuid(settings.sp_uuid_prefix)
+      assign_uuid(settings)
       params = create_params(settings, request_id, logout_message, params, logout_status_code)
       params_prefix = /\?/.match?(settings.idp_slo_service_url) ? '&' : '?'
       url = settings.idp_slo_response_service_url || settings.idp_slo_service_url
@@ -106,6 +106,7 @@ def create_logout_response_xml_doc(settings, request_id = nil, logout_message =
 
     def create_xml_document(settings, request_id = nil, logout_message = nil, status_code = nil)
       time = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
+      assign_uuid(settings)
 
       response_doc = RubySaml::XML::Document.new
       response_doc.uuid = uuid
@@ -149,5 +150,9 @@ def sign_document(document, settings)
 
       document
     end
+
+    def assign_uuid(settings)
+      @uuid ||= RubySaml::Utils.generate_uuid(settings.sp_uuid_prefix)
+    end
   end
 end

lib/ruby_saml/utils.rb

@@ -33,6 +33,7 @@ module Utils # rubocop:disable Metrics/ModuleLength
     UUID_DEFAULT_PREFIX = '_'
 
     # @deprecated Use UUID_DEFAULT_PREFIX instead.
+    # This constant is intentionally unfrozen for backwards compatibility.
     UUID_PREFIX = UUID_DEFAULT_PREFIX.dup
 
     # Checks if the x509 cert provided is expired.