Pass optional prefix for UUID to Utils.uuid

Author: gowda

lib/onelogin/ruby-saml/authrequest.rb

@@ -21,7 +21,7 @@ class Authrequest < SamlMessage
       # Asigns an ID, a random uuid.
       #
       def initialize(**options)
-        @uuid = "#{options[:id_prefix]}#{OneLogin::RubySaml::Utils.uuid}#{options[:id_suffix]}"
+        @uuid = OneLogin::RubySaml::Utils.uuid(options[:id_prefix] || '_')
       end
 
       def request_id

lib/onelogin/ruby-saml/utils.rb

@@ -333,8 +333,12 @@ def self.retrieve_plaintext(cipher_text, symmetric_key, algorithm)
         end
       end
 
-      def self.uuid
-        RUBY_VERSION < '1.9' ? "_#{@@uuid_generator.generate}" : "_#{SecureRandom.uuid}"
+      def self.uuid(prefix = '_')
+        "#{prefix}#{generate_uuid}"
+      end
+
+      def self.generate_uuid
+        RUBY_VERSION < '1.9' ? @@uuid_generator.generate : SecureRandom.uuid
       end
 
       # Given two strings, attempt to match them as URIs using Rails' parse method.  If they can be parsed,

test/request_test.rb

@@ -161,6 +161,18 @@ class RequestTest < Minitest::Test
       assert auth_url.include?('&RelayState=http%3A%2F%2Fexample.com')
     end
 
+    it "creates request with ID prefixed with default '_', when :id_prefix is not passed" do
+      request = OneLogin::RubySaml::Authrequest.new
+
+      assert_match /^_/, request.uuid
+    end
+
+    it "creates request with ID is prefixed, when :id_prefix is passed" do
+      request = OneLogin::RubySaml::Authrequest.new(id_prefix: 'test')
+
+      assert_match /^test/, request.uuid
+    end
+
     describe "when the target url is not set" do
       before do
         settings.idp_sso_service_url = nil

test/utils_test.rb

@@ -205,6 +205,11 @@ def result(duration, reference = 0)
         assert_match /^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/, OneLogin::RubySaml::Utils.uuid
       end
 
+      it "returns a uuid starting with an prefix, when passed" do
+        prefix = 'test'
+        assert_match /^#{prefix}[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/, OneLogin::RubySaml::Utils.uuid(prefix)
+      end
+
       it "doesn't return the same value twice" do
         refute_equal OneLogin::RubySaml::Utils.uuid, OneLogin::RubySaml::Utils.uuid
       end