mirror of
https://github.com/rapid7/metasploit-framework
synced 2024-11-05 14:57:30 +01:00
move bidirectional pipe into rex/ui/text
this didn't really fit with the rest of rex::io and it inherits from inside rex/ui/text so just put it there MS-1715
This commit is contained in:
parent
ea32c313d3
commit
c6b0c0b598
10
Gemfile.lock
10
Gemfile.lock
@ -82,7 +82,7 @@ GEM
|
||||
arel (6.0.3)
|
||||
arel-helpers (2.3.0)
|
||||
activerecord (>= 3.1.0, < 6)
|
||||
aruba (0.14.1)
|
||||
aruba (0.14.2)
|
||||
childprocess (~> 0.5.6)
|
||||
contracts (~> 0.9)
|
||||
cucumber (>= 1.3.19)
|
||||
@ -92,7 +92,7 @@ GEM
|
||||
bcrypt (3.1.11)
|
||||
bit-struct (0.15.0)
|
||||
builder (3.2.2)
|
||||
capybara (2.7.1)
|
||||
capybara (2.8.1)
|
||||
addressable
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
@ -222,7 +222,7 @@ GEM
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (11.2.2)
|
||||
rb-readline-r7 (0.5.2.0)
|
||||
recog (2.0.21)
|
||||
recog (2.0.22)
|
||||
nokogiri
|
||||
redcarpet (3.3.4)
|
||||
rex-arch (0.1.1)
|
||||
@ -230,7 +230,7 @@ GEM
|
||||
rex-java (0.1.2)
|
||||
rex-ole (0.1.2)
|
||||
rex-text
|
||||
rex-powershell (0.1.1)
|
||||
rex-powershell (0.1.64)
|
||||
rex-random_identifier
|
||||
rex-text
|
||||
rex-random_identifier (0.1.0)
|
||||
@ -250,7 +250,7 @@ GEM
|
||||
rspec-mocks (3.5.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-rails (3.5.1)
|
||||
rspec-rails (3.5.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
|
@ -1,4 +1,5 @@
|
||||
# -*- coding: binary -*-
|
||||
require 'rex/ui/text/bidirectional_pipe'
|
||||
module Msf
|
||||
module Ui
|
||||
module Web
|
||||
@ -83,7 +84,7 @@ module Comm
|
||||
end
|
||||
|
||||
def self.create_session_pipe(session)
|
||||
pipe = Rex::IO::BidirectionalPipe.new
|
||||
pipe = Rex::Ui::BidirectionalPipe.new
|
||||
|
||||
@session_pipes[session.id] = pipe
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
# -*- coding: binary -*-
|
||||
require 'rex/ui/text/bidirectional_pipe'
|
||||
module Msf
|
||||
module Ui
|
||||
module Web
|
||||
@ -18,7 +19,7 @@ class WebConsole
|
||||
attr_accessor :thread
|
||||
|
||||
# Wrapper class in case we need to extend the pipe
|
||||
class WebConsolePipe < Rex::IO::BidirectionalPipe
|
||||
class WebConsolePipe < Rex::Ui::Text::BidirectionalPipe
|
||||
def prompting?
|
||||
false
|
||||
end
|
||||
|
@ -8,7 +8,7 @@ module Msf
|
||||
module Ui
|
||||
module Web
|
||||
|
||||
require 'rex/io/bidirectional_pipe'
|
||||
require 'rex/ui/text/bidirectional_pipe'
|
||||
require 'msf/ui/web/console'
|
||||
|
||||
|
||||
|
@ -13,6 +13,7 @@ require 'rex/ui/text/input'
|
||||
require 'rex/ui/text/shell'
|
||||
require 'rex/ui/text/dispatcher_shell'
|
||||
require 'rex/ui/text/irb_shell'
|
||||
require 'rex/ui/text/bidirectional_pipe'
|
||||
|
||||
require 'rex/text/color'
|
||||
require 'rex/text/table'
|
||||
|
@ -1,6 +1,7 @@
|
||||
# -*- coding: binary -*-
|
||||
module Rex
|
||||
module IO
|
||||
module Ui
|
||||
module Text
|
||||
|
||||
require 'rex/ui/text/output'
|
||||
require 'rex/ui/text/output/buffer'
|
||||
@ -155,3 +156,4 @@ end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user