Merge LURI fix from timwr

OJ · OJ · commit 917b45664b59 · 2016-12-02T08:01:12.000+10:00
diff --git a/lib/msf/core/payload/android/reverse_http.rb b/lib/msf/core/payload/android/reverse_http.rb
@@ -26,7 +26,7 @@ def transport_config(opts={})
   end
 
   def generate_config(opts={})
-    opts[:uri] ||= generate_uri(opts)
+    opts[:uri] ||= luri + generate_uri(opts)
     super(opts)
   end
 
diff --git a/lib/msf/core/payload/java/reverse_http.rb b/lib/msf/core/payload/java/reverse_http.rb
@@ -54,13 +54,6 @@ def generate_uri(opts={})
     generate_uri_uuid_mode(:init_java, uri_req_len)
   end
 
-  #
-  # Generate the URI for the initial stager
-  #
-  def generate_small_uri
-    generate_uri_uuid_mode(:init_java, 5)
-  end
-
   #
   # Generate configuration that is to be included in the stager.
   #

Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,6 @@ def generate_uri(opts={})`
`54`	`54`	`generate_uri_uuid_mode(:init_java, uri_req_len)`
`55`	`55`	`end`
`56`	`56`
`57`		`- #`
`58`		`- # Generate the URI for the initial stager`
`59`		`- #`
`60`		`- def generate_small_uri`
`61`		`- generate_uri_uuid_mode(:init_java, 5)`
`62`		`- end`
`63`		`-`
`64`	`57`	`#`
`65`	`58`	`# Generate configuration that is to be included in the stager.`
`66`	`59`	`#`