Enhance Tubes #63

hanhanW · 2017-11-01T09:25:32Z

Implement gets for Tubes
Implement puts for Tubes
- Fixed Sock#puts without argument should print an empty line #59
- Fixed Sock#puts should not append newline if already presented #61
Catch EOFError in the interative mode ( Fixed Sock#interact should catch EOFError #60 )
The sending methods in Tubes return the number of bytes had been sent.

This change is

* Implement gets for Tubes * Implement puts for Tubes * Fixed #59 * Fixed #61 * Catch EOFError in the interative mode ( Fixed #60 )

ShikChen · 2017-11-01T09:48:12Z

lib/pwnlib/tubes/tube.rb

+        s = ''
+        objs.map(&:to_s).each do |elem|
+          s << elem
+          s << context.newline if elem.empty? || !elem.end_with?(context.newline)


Why need to check elem.empty??

ShikChen · 2017-11-01T09:50:22Z

lib/pwnlib/tubes/tube.rb

@@ -236,6 +281,8 @@ def interact
            $stdout.write(s)
          end
        end
+      rescue


Should only rescue EOFError.

Future work: Use our own Exception class

david942j · 2017-11-01T10:02:33Z

lib/pwnlib/tubes/tube.rb

@@ -9,10 +9,18 @@
 module Pwnlib
  module Tubes
    # Things common to all tubes (sockets, tty, ...)
+    # @!macro [new] drop_definition
+    #   @param [Boalean] drop


david942j · 2017-11-01T10:05:57Z

lib/pwnlib/tubes/tube.rb

+      # @!macro timeout_definition
+      #
+      # @return [String]
+      #   The next "line".


add examples to clarify its recvuntil-like functionality

david942j · 2017-11-01T10:09:17Z

lib/pwnlib/tubes/tube.rb

@@ -236,6 +281,8 @@ def interact
            $stdout.write(s)
          end
        end
+      rescue


Future work: Use our own Exception class

hanhanW · 2017-11-01T12:37:51Z

Review status: 0 of 2 files reviewed at latest revision, 4 unresolved discussions.

lib/pwnlib/tubes/tube.rb, line 13 at r1 (raw file):

Previously, david942j (david942j) wrote…

Boolean

Done.

lib/pwnlib/tubes/tube.rb, line 206 at r1 (raw file):

Previously, david942j (david942j) wrote…

add examples to clarify its recvuntil-like functionality

Done.

lib/pwnlib/tubes/tube.rb, line 263 at r1 (raw file):

Previously, ShikChen wrote…

Why need to check elem.empty??

Done.

lib/pwnlib/tubes/tube.rb, line 284 at r1 (raw file):

Previously, david942j (david942j) wrote…

Future work: Use our own Exception class

Done.

Comments from Reviewable

david942j · 2017-11-02T08:06:26Z

lib/pwnlib/tubes/tube.rb

+      # The difference with IO#gets is using +context.newline+ as default newline.
+      #
+      # @param [Integer, String] sep
+      #   The separator.


describe the behavior when an integer is passed

david942j · 2017-11-02T08:13:23Z

lib/pwnlib/tubes/tube.rb

-      alias gets recvline
+
+      # Receives the next "line" from the tube; lines are separated by +sep+.
+      # The difference with IO#gets is using +context.newline+ as default newline.


david942j · 2017-11-02T08:15:01Z

lib/pwnlib/tubes/tube.rb

+      end
+
+      # Sends the given object(s) to the tube.
+      # The difference with IO#puts is using +context.newline+ as default newline.


hanhanW · 2017-11-02T10:16:17Z

Review status: 0 of 2 files reviewed at latest revision, 7 unresolved discussions.

lib/pwnlib/tubes/tube.rb, line 198 at r2 (raw file):

Previously, david942j (david942j) wrote…

+IO#gets+

Done.

lib/pwnlib/tubes/tube.rb, line 201 at r2 (raw file):

Previously, david942j (david942j) wrote…

describe the behavior when an integer is passed

Done.

lib/pwnlib/tubes/tube.rb, line 274 at r2 (raw file):

Previously, david942j (david942j) wrote…

+IO#puts+

Done.

Comments from Reviewable

david942j · 2017-11-02T12:07:19Z

lib/pwnlib/tubes/tube.rb

+      #   s.puts
+      #   puts client.recv
+      #   #
+      #


add #=> nil, otherwise it looks weird

david942j · 2017-11-02T12:10:03Z

lib/pwnlib/tubes/tube.rb

+      # The difference with +IO#puts+ is using +context.newline+ as default newline.
+      #
+      # @param [Array<Object>] objs
+      #   The objects to send.


david942j · 2017-11-02T12:13:40Z

lib/pwnlib/tubes/tube.rb

@@ -169,12 +180,11 @@ def recvuntil(delims, drop: false, timeout: nil)
        end
      end

-      # Receive a single line from the tube.
+      # Receives a single line from the tube.
      # A "line" is any sequence of bytes terminated by the byte sequence set in +context.newline+,
      # which defaults to +"\n"+.


+"\n"+ broken in parsed doc

hanhanW · 2017-11-02T12:55:05Z

Review status: 0 of 2 files reviewed at latest revision, 10 unresolved discussions.

lib/pwnlib/tubes/tube.rb, line 185 at r3 (raw file):

Previously, david942j (david942j) wrote…

+"\n"+ broken in parsed doc

Done.

lib/pwnlib/tubes/tube.rb, line 282 at r3 (raw file):

Previously, david942j (david942j) wrote…

to be sent

Done.

lib/pwnlib/tubes/tube.rb, line 290 at r3 (raw file):

Previously, david942j (david942j) wrote…

add #=> nil, otherwise it looks weird

Done.

Comments from Reviewable

david942j · 2017-11-08T13:19:58Z

@ShikChen

david942j · 2017-11-08T13:21:42Z

Reviewed 1 of 2 files at r3, 1 of 1 files at r4.
Review status: all files reviewed at latest revision, 2 unresolved discussions.

Comments from Reviewable

david942j · 2017-11-08T16:10:23Z

Review status: all files reviewed at latest revision, 2 unresolved discussions.

Comments from Reviewable

Enhance Tubes

23a7cca

* Implement gets for Tubes * Implement puts for Tubes * Fixed #59 * Fixed #61 * Catch EOFError in the interative mode ( Fixed #60 )

ShikChen requested changes Nov 1, 2017

View reviewed changes

david942j requested changes Nov 1, 2017

View reviewed changes

Address comments.

02e077b

david942j requested changes Nov 2, 2017

View reviewed changes

hanhanW added 2 commits November 2, 2017 17:53

Address comments

609d5b8

Add an example for Tubes#puts

0018712

Fix examples

84a7539

david942j requested changes Nov 2, 2017

View reviewed changes

address comments

7c89581

david942j approved these changes Nov 2, 2017

View reviewed changes

ShikChen approved these changes Nov 8, 2017

View reviewed changes

david942j merged commit 8f31313 into master Nov 8, 2017

david942j deleted the feature/tube branch November 8, 2017 16:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enhance Tubes #63

Enhance Tubes #63

hanhanW commented Nov 1, 2017 •

edited by peter50216

Loading

ShikChen Nov 1, 2017

ShikChen Nov 1, 2017

david942j Nov 1, 2017

david942j Nov 1, 2017

david942j Nov 1, 2017

david942j Nov 1, 2017

hanhanW commented Nov 1, 2017

david942j Nov 2, 2017

david942j Nov 2, 2017

david942j Nov 2, 2017

hanhanW commented Nov 2, 2017

david942j Nov 2, 2017

david942j Nov 2, 2017

david942j Nov 2, 2017

hanhanW commented Nov 2, 2017

david942j commented Nov 8, 2017

david942j commented Nov 8, 2017

david942j commented Nov 8, 2017

Enhance Tubes #63

Enhance Tubes #63

Conversation

hanhanW commented Nov 1, 2017 • edited by peter50216 Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hanhanW commented Nov 1, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hanhanW commented Nov 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hanhanW commented Nov 2, 2017

david942j commented Nov 8, 2017

david942j commented Nov 8, 2017

david942j commented Nov 8, 2017

hanhanW commented Nov 1, 2017 •

edited by peter50216

Loading