More readable check functions

Author: Chocapikk

modules/exploits/multi/http/spip_connect_exec.rb

@@ -82,15 +82,19 @@ def check
 
     print_status("SPIP Version detected: #{rversion}")
 
-    if rversion.between?(Rex::Version.new('2.0.0'), Rex::Version.new('2.0.20'))
-      return Exploit::CheckCode::Appears
-    elsif rversion.between?(Rex::Version.new('2.1.0'), Rex::Version.new('2.1.15'))
-      return Exploit::CheckCode::Appears
-    elsif rversion.between?(Rex::Version.new('3.0.0'), Rex::Version.new('3.0.2'))
-      return Exploit::CheckCode::Appears
+    vulnerable_ranges = [
+      { start: '2.0.0', end: '2.0.20' },
+      { start: '2.1.0', end: '2.1.15' },
+      { start: '3.0.0', end: '3.0.2' }
+    ]
+
+    vulnerable_ranges.each do |range|
+      if rversion.between?(Rex::Version.new(range[:start]), Rex::Version.new(range[:end]))
+        return Exploit::CheckCode::Appears
+      end
     end
 
-    return Exploit::CheckCode::Safe
+    Exploit::CheckCode::Safe
   end
 
   def php_exec_cmd(encoded_payload)

modules/exploits/multi/http/spip_porte_plume_previsu_rce.rb

@@ -77,14 +77,16 @@ def check
 
     print_status("SPIP Version detected: #{rversion}")
 
-    if rversion >= Rex::Version.new('4.3.0-alpha2')
-      return CheckCode::Safe("The detected SPIP version (#{rversion}) is not vulnerable.")
-    elsif rversion.between?(Rex::Version.new('4.2.0'), Rex::Version.new('4.2.12'))
-      return Exploit::CheckCode::Appears("The detected SPIP version (#{rversion}) is vulnerable.")
-    elsif rversion.between?(Rex::Version.new('4.1.0'), Rex::Version.new('4.1.15'))
-      return Exploit::CheckCode::Appears("The detected SPIP version (#{rversion}) is vulnerable.")
-    elsif rversion < Rex::Version.new('4.1.0')
-      return Exploit::CheckCode::Appears("The detected SPIP version (#{rversion}) is vulnerable.")
+    vulnerable_ranges = [
+      { start: Rex::Version.new('4.2.0'), end: Rex::Version.new('4.2.12') },
+      { start: Rex::Version.new('4.1.0'), end: Rex::Version.new('4.1.15') },
+      { start: Rex::Version.new('0.0.0'), end: Rex::Version.new('4.0.99') }
+    ]
+
+    vulnerable_ranges.each do |range|
+      if rversion.between?(range[:start], range[:end])
+        return Exploit::CheckCode::Appears("The detected SPIP version (#{rversion}) is vulnerable.")
+      end
     end
 
     return Exploit::CheckCode::Safe("The detected SPIP version (#{rversion}) is not vulnerable.")

modules/exploits/multi/http/spip_rce_form.rb

@@ -80,17 +80,20 @@ def check
 
     print_status("SPIP Version detected: #{rversion}")
 
-    if rversion.between?(Rex::Version.new('4.2.0'), Rex::Version.new('4.2.1'))
-      return Exploit::CheckCode::Appears
-    elsif rversion.between?(Rex::Version.new('4.1.0'), Rex::Version.new('4.1.18'))
-      return Exploit::CheckCode::Appears
-    elsif rversion.between?(Rex::Version.new('4.0.0'), Rex::Version.new('4.0.10'))
-      return Exploit::CheckCode::Appears
-    elsif rversion.between?(Rex::Version.new('3.2.0'), Rex::Version.new('3.2.18'))
-      return Exploit::CheckCode::Appears
+    vulnerable_ranges = [
+      { start: Rex::Version.new('4.2.0'), end: Rex::Version.new('4.2.1') },
+      { start: Rex::Version.new('4.1.0'), end: Rex::Version.new('4.1.18') },
+      { start: Rex::Version.new('4.0.0'), end: Rex::Version.new('4.0.10') },
+      { start: Rex::Version.new('3.2.0'), end: Rex::Version.new('3.2.18') }
+    ]
+
+    vulnerable_ranges.each do |range|
+      if rversion.between?(range[:start], range[:end])
+        return Exploit::CheckCode::Appears("The detected SPIP version (#{rversion}) is vulnerable.")
+      end
     end
 
-    return Exploit::CheckCode::Safe
+    return Exploit::CheckCode::Safe("The detected SPIP version (#{rversion}) is not vulnerable.")
   end
 
   def execute_command(cmd, args = {})