Skip to content

Commit 405c59b

Browse files
David Maloneydmohanty-r7
authored andcommitted
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
1 parent 6cb331e commit 405c59b

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ GEM
8585
arel (6.0.3)
8686
arel-helpers (2.3.0)
8787
activerecord (>= 3.1.0, < 6)
88-
aruba (0.14.1)
88+
aruba (0.14.2)
8989
childprocess (~> 0.5.6)
9090
contracts (~> 0.9)
9191
cucumber (>= 1.3.19)
@@ -95,7 +95,7 @@ GEM
9595
bcrypt (3.1.11)
9696
bit-struct (0.15.0)
9797
builder (3.2.2)
98-
capybara (2.7.1)
98+
capybara (2.8.1)
9999
addressable
100100
mime-types (>= 1.16)
101101
nokogiri (>= 1.3.3)
@@ -263,7 +263,7 @@ GEM
263263
rspec-mocks (3.5.0)
264264
diff-lcs (>= 1.2.0, < 2.0)
265265
rspec-support (~> 3.5.0)
266-
rspec-rails (3.5.1)
266+
rspec-rails (3.5.2)
267267
actionpack (>= 3.0)
268268
activesupport (>= 3.0)
269269
railties (>= 3.0)

lib/msf/ui/web/comm.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# -*- coding: binary -*-
2+
require 'rex/ui/text/bidirectional_pipe'
23
module Msf
34
module Ui
45
module Web
@@ -83,7 +84,7 @@ def self.create_session_channel(session_id)
8384
end
8485

8586
def self.create_session_pipe(session)
86-
pipe = Rex::IO::BidirectionalPipe.new
87+
pipe = Rex::Ui::BidirectionalPipe.new
8788

8889
@session_pipes[session.id] = pipe
8990

lib/msf/ui/web/console.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# -*- coding: binary -*-
2+
require 'rex/ui/text/bidirectional_pipe'
23
module Msf
34
module Ui
45
module Web
@@ -18,7 +19,7 @@ class WebConsole
1819
attr_accessor :thread
1920

2021
# Wrapper class in case we need to extend the pipe
21-
class WebConsolePipe < Rex::IO::BidirectionalPipe
22+
class WebConsolePipe < Rex::Ui::Text::BidirectionalPipe
2223
def prompting?
2324
false
2425
end

lib/msf/ui/web/driver.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module Msf
88
module Ui
99
module Web
1010

11-
require 'rex/io/bidirectional_pipe'
11+
require 'rex/ui/text/bidirectional_pipe'
1212
require 'msf/ui/web/console'
1313

1414

lib/rex/ui.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
require 'rex/ui/text/shell'
1414
require 'rex/ui/text/dispatcher_shell'
1515
require 'rex/ui/text/irb_shell'
16+
require 'rex/ui/text/bidirectional_pipe'
1617

1718
require 'rex/text/color'
1819
require 'rex/text/table'

lib/rex/io/bidirectional_pipe.rb renamed to lib/rex/ui/text/bidirectional_pipe.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- coding: binary -*-
22
module Rex
3-
module IO
3+
module Ui
4+
module Text
45

56
require 'rex/ui/text/output'
67
require 'rex/ui/text/output/buffer'
@@ -155,3 +156,4 @@ def pgets
155156

156157
end
157158
end
159+
end

0 commit comments

Comments
 (0)