Skip to content

Commit c6b0c0b

Browse files
David MaloneyDavid Maloney
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 ea32c31 commit c6b0c0b

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ GEM
8282
arel (6.0.3)
8383
arel-helpers (2.3.0)
8484
activerecord (>= 3.1.0, < 6)
85-
aruba (0.14.1)
85+
aruba (0.14.2)
8686
childprocess (~> 0.5.6)
8787
contracts (~> 0.9)
8888
cucumber (>= 1.3.19)
@@ -92,7 +92,7 @@ GEM
9292
bcrypt (3.1.11)
9393
bit-struct (0.15.0)
9494
builder (3.2.2)
95-
capybara (2.7.1)
95+
capybara (2.8.1)
9696
addressable
9797
mime-types (>= 1.16)
9898
nokogiri (>= 1.3.3)
@@ -222,15 +222,15 @@ GEM
222222
thor (>= 0.18.1, < 2.0)
223223
rake (11.2.2)
224224
rb-readline-r7 (0.5.2.0)
225-
recog (2.0.21)
225+
recog (2.0.22)
226226
nokogiri
227227
redcarpet (3.3.4)
228228
rex-arch (0.1.1)
229229
rex-text
230230
rex-java (0.1.2)
231231
rex-ole (0.1.2)
232232
rex-text
233-
rex-powershell (0.1.1)
233+
rex-powershell (0.1.64)
234234
rex-random_identifier
235235
rex-text
236236
rex-random_identifier (0.1.0)
@@ -250,7 +250,7 @@ GEM
250250
rspec-mocks (3.5.0)
251251
diff-lcs (>= 1.2.0, < 2.0)
252252
rspec-support (~> 3.5.0)
253-
rspec-rails (3.5.1)
253+
rspec-rails (3.5.2)
254254
actionpack (>= 3.0)
255255
activesupport (>= 3.0)
256256
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)