Skip to content

Commit 5dc7d4b

Browse files
author
Brent Cook
committed
Land rapid7#7043, Fix-up double slash handling with the LURI parameter
2 parents 58e3793 + 85dfec0 commit 5dc7d4b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/msf/core/handler/reverse_http.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@ def luri
142142

143143
if l && l.length > 0
144144
# strip trailing slashes
145-
while l[-1] == '/'
145+
while l[-1, 1] == '/'
146146
l = l[0...-1]
147147
end
148148

149149
# make sure the luri has the prefix
150-
if l[0] != '/'
150+
if l[0, 1] != '/'
151151
l = "/#{l}"
152152
end
153153

@@ -192,7 +192,7 @@ def setup_handler
192192
self.service.server_name = datastore['MeterpreterServerName']
193193

194194
# Add the new resource
195-
service.add_resource(luri + "/",
195+
service.add_resource((luri + "/").gsub("//", "/"),
196196
'Proc' => Proc.new { |cli, req|
197197
on_request(cli, req)
198198
},
@@ -212,7 +212,7 @@ def setup_handler
212212
#
213213
def stop_handler
214214
if self.service
215-
self.service.remove_resource(luri + "/")
215+
self.service.remove_resource((luri + "/").gsub("//", "/"))
216216
if self.service.resources.empty? && self.sessions == 0
217217
Rex::ServiceManager.stop_service(self.service)
218218
end

0 commit comments

Comments
 (0)