Ensure range of Rex::Version objects are always returned

Author: jheysel-r7

lib/msf/core/exploit/remote/http/gitlab/version.rb

@@ -76,8 +76,8 @@ module Msf::Exploit::Remote::HTTP::Gitlab::Version
     'fa980d49a253a51e83172337904b1978dbc69de43104a53d4133dbbc418a6494' => '8.17.0-rc3.ee.1',
     '7bf13edad59917878b63efba2486366a' => '8.2.4-ee - 8.2.5-ee',
     '833807b5c778268c8229d8bc78c9856e' => '8.3.5-ee - 8.3.10-ee',
-    'b50e0477d0d18c817f77a8bc559fb925' => '8.4.6-ee 8.4.11-ee',
-    '254656ed7089daeabc34dace879988f4' => '8.5.6-ee 8.5.13-ee',
+    'b50e0477d0d18c817f77a8bc559fb925' => '8.4.6-ee - 8.4.11-ee',
+    '254656ed7089daeabc34dace879988f4' => '8.5.6-ee - 8.5.13-ee',
     '6c7f110da08da882c8794105d206651cf8bacf41f4c5927867a80a2cd1f33575' => '8.6.0-ee',
     'f11a89be9ea71c322f2b6389f15978c6696ce4949908c33c2fe70cd3fd63d7a6' => '8.6.1-ee',
     '65a19c35a07d9eb970b331633f1fb86adb02191b520e01e428b089718ed0176f' => '8.6.2-ee - 8.6.9-ee',
@@ -420,18 +420,37 @@ module Msf::Exploit::Remote::HTTP::Gitlab::Version
 
   include Msf::Exploit::Remote::HTTP::Gitlab::Rest::V4::Version
 
-  # Extracts the Gitlab version information
+  # Parses the Gitlab version information and ensures an array of two Rex::Version objects are returned in the
+  # following format: [Rex::Version(low_version), Rex::Version(high_version)] even if low_version and high_version
+  # are the same.
   #
-  # @return [String,nil] Gitlab version if found, nil otherwise
+  # @return [[Rex::Version(low_version), Rex::Version(high_version)],nil] Gitlab version range if found, nil otherwise
+  def normalize_version(version)
+    return nil unless version
+
+    if version.include?("\s-\s")
+      low_version, high_version = version.split(/\s-\s/)
+      low_version = Rex::Version.new(low_version)
+      high_version = Rex::Version.new(high_version)
+      [low_version, high_version]
+    else
+      version = Rex::Version.new(version)
+      [version, version]
+    end
+  end
+
+  # Extracts the Gitlab version information and returns a version range.
+  #
+  # @return [[Rex::Version(low_version), Rex::Version(high_version)],nil] Gitlab version if found, nil otherwise
   def gitlab_version
     version = gitlab_version_css(normalize_uri(target_uri.path))
-    return version if version
+    return normalize_version(version) if version
 
     version = gitlab_version_rest
-    return version if version
+    return normalize_version(version) if version
 
     version = gitlab_version_help_commit(normalize_uri(target_uri.path))
-    return version if version
+    return normalize_version(version) if version
 
     nil
   end

modules/auxiliary/scanner/http/gitlab_version.rb

@@ -22,7 +22,7 @@ def initialize
   def run_host(ip)
     version = gitlab_version
     if version
-      print_good("Gitlab version for #{ip}: #{version}")
+      print_good("Gitlab version range for #{ip}: #{version.to_s}")
       report_note(
         host: ip,
         port: datastore['RPORT'],