Land #14349, Fix merge mistake in PR 14222

rapid7 · Nov 5, 2020 · 5761fe9 · 5761fe9
2 parents a4f6f08 + a008784
commit 5761fe9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/exploits/multi/http/php_fpm_rce.rb b/modules/exploits/multi/http/php_fpm_rce.rb
@@ -126,8 +126,8 @@ def self.detect_methods
   end
 
   def send_crafted_request(path:, qsl: datastore['MinQSL'], customh_length: 1, cmd: '', allow_retry: true)
-    uri = CGI.escape(normalize_uri(target_uri.path, path)).gsub(/([?&])/, {'?'=>'%3F', '&'=>'%26'})
-    qsl_delta = uri.length - path.length - CGI.escape(target_uri.path).length
+    uri = Rex::Text.uri_encode(normalize_uri(target_uri.path, path)).gsub(/([?&])/, {'?'=>'%3F', '&'=>'%26'})
+    qsl_delta = uri.length - path.length - Rex::Text.uri_encode(target_uri.path).length
     if qsl_delta.odd?
       fail_with Failure::Unknown, "Got odd qslDelta, that means the URL encoding gone wrong: path=#{path}, qsl_delta=#{qsl_delta}"
     end