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
bug/bundler_fix
David Maloney 2016-08-26 13:51:26 -05:00 committed by dmohanty-r7
parent 6cb331e74d
commit 405c59b8b8
6 changed files with 12 additions and 7 deletions

View File

@ -85,7 +85,7 @@ GEM
arel (6.0.3) arel (6.0.3)
arel-helpers (2.3.0) arel-helpers (2.3.0)
activerecord (>= 3.1.0, < 6) activerecord (>= 3.1.0, < 6)
aruba (0.14.1) aruba (0.14.2)
childprocess (~> 0.5.6) childprocess (~> 0.5.6)
contracts (~> 0.9) contracts (~> 0.9)
cucumber (>= 1.3.19) cucumber (>= 1.3.19)
@ -95,7 +95,7 @@ GEM
bcrypt (3.1.11) bcrypt (3.1.11)
bit-struct (0.15.0) bit-struct (0.15.0)
builder (3.2.2) builder (3.2.2)
capybara (2.7.1) capybara (2.8.1)
addressable addressable
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
@ -263,7 +263,7 @@ GEM
rspec-mocks (3.5.0) rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0) rspec-support (~> 3.5.0)
rspec-rails (3.5.1) rspec-rails (3.5.2)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)

View File

@ -1,4 +1,5 @@
# -*- coding: binary -*- # -*- coding: binary -*-
require 'rex/ui/text/bidirectional_pipe'
module Msf module Msf
module Ui module Ui
module Web module Web
@ -83,7 +84,7 @@ module Comm
end end
def self.create_session_pipe(session) def self.create_session_pipe(session)
pipe = Rex::IO::BidirectionalPipe.new pipe = Rex::Ui::BidirectionalPipe.new
@session_pipes[session.id] = pipe @session_pipes[session.id] = pipe

View File

@ -1,4 +1,5 @@
# -*- coding: binary -*- # -*- coding: binary -*-
require 'rex/ui/text/bidirectional_pipe'
module Msf module Msf
module Ui module Ui
module Web module Web
@ -18,7 +19,7 @@ class WebConsole
attr_accessor :thread attr_accessor :thread
# Wrapper class in case we need to extend the pipe # Wrapper class in case we need to extend the pipe
class WebConsolePipe < Rex::IO::BidirectionalPipe class WebConsolePipe < Rex::Ui::Text::BidirectionalPipe
def prompting? def prompting?
false false
end end

View File

@ -8,7 +8,7 @@ module Msf
module Ui module Ui
module Web module Web
require 'rex/io/bidirectional_pipe' require 'rex/ui/text/bidirectional_pipe'
require 'msf/ui/web/console' require 'msf/ui/web/console'

View File

@ -13,6 +13,7 @@ require 'rex/ui/text/input'
require 'rex/ui/text/shell' require 'rex/ui/text/shell'
require 'rex/ui/text/dispatcher_shell' require 'rex/ui/text/dispatcher_shell'
require 'rex/ui/text/irb_shell' require 'rex/ui/text/irb_shell'
require 'rex/ui/text/bidirectional_pipe'
require 'rex/text/color' require 'rex/text/color'
require 'rex/text/table' require 'rex/text/table'

View File

@ -1,6 +1,7 @@
# -*- coding: binary -*- # -*- coding: binary -*-
module Rex module Rex
module IO module Ui
module Text
require 'rex/ui/text/output' require 'rex/ui/text/output'
require 'rex/ui/text/output/buffer' require 'rex/ui/text/output/buffer'
@ -155,3 +156,4 @@ end
end end
end end
end